[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-results.tm... [dev_week]

Joshua Ferraro jmf at kados.org
Fri Jul 21 18:26:24 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/07/21 16:26:24

Modified files:
	koha-tmpl/opac-tmpl/npl/en: opac-results.tmpl 
	koha-tmpl/opac-tmpl/npl/en/includes: masthead-user.inc 
	                                     masthead.inc 
	                                     opac-layout.css 

Log message:
	display and sorting of call numbers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.6&r2=1.1.2.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.1&r2=1.1.2.8.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.2&r2=1.1.2.4.2.3

Patches:
Index: opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- opac-results.tmpl	11 Jul 2006 14:06:57 -0000	1.1.2.4
+++ opac-results.tmpl	21 Jul 2006 16:26:24 -0000	1.1.2.5
@@ -24,14 +24,14 @@
 <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span></h3>
 	<!-- <h4><!-- TMPL_VAR NAME="total" --> Records Found</h4> -->
 
-	<div class="pages">
+	<!-- <div class="pages">
     <!-- Row of numbers corresponding to search result pages -->
    <!-- TMPL_LOOP NAME="numbers" -->
 		<!-- TMPL_IF NAME="highlight" -->
 		    &nbsp;<span class="current"><!-- TMPL_VAR NAME="number" --></span>&nbsp;<!-- TMPL_ELSE --><a class="nav"  href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->"><!-- TMPL_VAR NAME=number --></a>
 		<!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->	    		
-</div>
+</div> -->
 			<div id="results"><!-- TMPL_IF name=total -->
 		Results <b><!-- TMPL_VAR NAME="starting" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="total" --></b> records.
 			<!-- TMPL_ELSE -->
@@ -124,13 +124,13 @@
 		<tr>
 			<th><!--TMPL_IF NAME="opacbookbag" --><a href="#" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></th>
 			<!-- TMPL_IF NAME="AmazonContent" -->
-			<th colspan="2"><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=4 <i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&darr;</a>Title<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=4 >i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&uarr;</a></th>
+			<th colspan="2"><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=4 <i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&darr;</a>Title<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=4 >i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&#8593;</a></th>
 			<!-- TMPL_ELSE -->
 			<th><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;pqf_sort_by=@or @attr 7=1 @attr 1=4 0&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">Title</a></th>
 			<!-- /TMPL_IF -->
 			<th><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=1003 <i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&darr;</a>Author<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=1003 >i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&uarr;</a></th>
 
-			<th nowrap><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=1003 <i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&darr;</a>Call Num<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=1003 >i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&uarr;</a></th>
+			<th nowrap><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=12 <i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&darr;</a>Call Num<a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;then_sort_by=1=12 >i&amp;ccl_query=<!-- TMPL_VAR NAME="ccl_query" escape="url" -->&amp;cql_query=<!-- TMPL_VAR NAME="cql_query" escape="url" -->&amp;pqf_query=<!-- TMPL_VAR NAME="pqf_query" escape="url" -->">&uarr;</a></th>
 			<th>Availablity</th>
 		</tr>
 		<!-- Actual Search Results -->
@@ -142,7 +142,7 @@
 <td><div class="menu"> <a class="p1" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="Book Cover Image" class="thumbnail" /></a></div></td>
 <!-- /TMPL_IF -->
 
-				<td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->				
+				<td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->				
 			 <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
@@ -150,8 +150,8 @@
 						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF --></td>
-					<td><a href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=ccl&amp;op=get_results&amp;ccl_query=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a></td>
-				<td><!-- TMPL_VAR NAME="classification" --></td>
+					<td><a href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=ccl&amp;op=get_results&amp;ccl_query=au=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a></td>
+				<td><a href="/cgi-bin/koha/opac-zoomsearch.pl?query_form=ccl&amp;op=get_results&amp;ccl_query=dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a></td>
 				<td><!-- TMPL_VAR name="location" --><br /></td></tr>
 			<!-- /TMPL_LOOP -->
 	</table>

Index: includes/masthead-user.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead-user.inc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.6.2.1
diff -u -b -r1.1.2.6 -r1.1.2.6.2.1
--- includes/masthead-user.inc	27 Apr 2006 17:02:20 -0000	1.1.2.6
+++ includes/masthead-user.inc	21 Jul 2006 16:26:24 -0000	1.1.2.6.2.1
@@ -1,14 +1,9 @@
 <div id="masthead">
 <h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME='opacsmallimage' -->" /><!-- /TMPL_IF -->Library Catalog Search</h1>
-<div class="menu"><form action="/cgi-bin/koha/opac-search.pl" method="post">
-<p><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag</a><!-- /TMPL_IF --></p> <p><label for="value">Search the Catalog</label>
-  <input type="hidden" name="op" value="do_search" />
-			<input type="hidden" name="type" value="opac" />
-			<input type="hidden" name="marclist" value="" />
-			<input type="hidden" name="and_or" value="and" />
-			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="contains" />
-			<input type="text" size="12" name="value" id="value" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form></p></div>
+<div class="menu"><form action="/cgi-bin/koha/opac-zoomsearch.pl" method="post">
+<p><a href="/cgi-bin/koha/opac-zoomsearch.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag</a><!-- /TMPL_IF --></p> <p><label for="quick_ccl_query">Search the Catalog</label><input type="hidden" name="op" value="get_results" />
+<input name="ccl_query" id="quick_ccl_query" type="text" />
+<input type="submit" value="Search" class="submit" /></p></form></div>
 <!-- <div class="menu"><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a> | <a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a> | <a class="logout" href="/cgi-bin/koha/opac-logout.pl">log out</a>
   </ul>

Index: includes/masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc,v
retrieving revision 1.1.2.8.2.1
retrieving revision 1.1.2.8.2.2
diff -u -b -r1.1.2.8.2.1 -r1.1.2.8.2.2
--- includes/masthead.inc	11 Jul 2006 14:06:57 -0000	1.1.2.8.2.1
+++ includes/masthead.inc	21 Jul 2006 16:26:24 -0000	1.1.2.8.2.2
@@ -1,15 +1,10 @@
 <div id="masthead">
 <h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /><!-- /TMPL_IF -->Library Catalog Search</h1>
-<div class="menu">
-
-<form style="margin:0px;" name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
-<input type="hidden" name="op" value="get_results" />
-<input name="ccl_query" type="text"/>
-<input type="submit" value="Search" class="submit" />
-</form>
-
-<p><a href="/cgi-bin/koha/opac-zoomsearch.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF --></p> <p><label for="value">Search the Catalog</label></p>
-
+<div class="menu"><form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
+<p><a href="/cgi-bin/koha/opac-zoomsearch.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF --></p> <p><label for="quick_ccl_query">Search the Catalog</label><input type="hidden" name="op" value="get_results" />
+<input name="ccl_query" id="quick_ccl_query" type="text" />
+<input type="submit" value="Search" class="submit" /></p>
+</form></div>
 
 <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><div id="members">
 	<ul>

Index: includes/opac-layout.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-layout.css,v
retrieving revision 1.1.2.4.2.2
retrieving revision 1.1.2.4.2.3
diff -u -b -r1.1.2.4.2.2 -r1.1.2.4.2.3
--- includes/opac-layout.css	11 Jul 2006 14:06:57 -0000	1.1.2.4.2.2
+++ includes/opac-layout.css	21 Jul 2006 16:26:24 -0000	1.1.2.4.2.3
@@ -58,6 +58,18 @@
 	text-decoration : none;
 }
 
+a.title {
+	font-size : 110%;
+	font-style : normal;
+	font-weight : bold;
+}
+
+th a {
+	font-weight : bold;
+	font-size: 150%;
+	text-decoration: none;
+}
+
 .menu a:link.logout {
 	font-weight : bold;
 	padding : 3px 15px 3px 15px;
@@ -218,18 +230,23 @@
 }
 
 td {
-	font-size : .90em;
+	font-size : .80em;
+	padding : 5px 5px 5px 5px;
+}
+
+td:last-child {
+	font-size : .80em;
 	padding : 5px 5px 5px 5px;
 }
 
 th {
-	font-size : 12px;
+	font-size : .80em;
 	font-weight : bold;
 	padding : 5px 5px 5px 5px;
 }
 
 th:last-child {
-	font-size : 14px;
+	font-size : .80em;
 	font-weight : bold;
 	padding : 5px 5px 5px 5px;
 }
@@ -266,11 +283,6 @@
 	padding : 4px;
 }
 
-td:last-child {
-	font-size : 12px;
-	padding : 5px 5px 5px 5px;
-}
-
 .rejected {
 	text-decoration: line-through;
 }





More information about the Koha-cvs mailing list