[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-basket.tmp... [rel_2_2]

Owen Leonard oleonard at athenscounty.lib.oh.us
Mon Jul 2 16:46:26 CEST 2007


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Owen Leonard <oleonard>	07/07/02 14:46:26

Modified files:
	koha-tmpl/opac-tmpl/npl/en: opac-basket.tmpl opac-main.tmpl 
	                            opac-recacquisitions.tmpl 
	                            opac-search.tmpl 
	                            opac-searchresults.tmpl 
	                            opac-shelves.tmpl 

Log message:
	Fixes for Bug 1366. These have NOT BEEN TESTED, because I don't have access to a rel_2_2 installation at the moment. There are still some outstanding instances of this bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.16&r2=1.3.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.15&r2=1.1.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.15&r2=1.1.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: opac-basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-basket.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- opac-basket.tmpl	22 Mar 2006 18:32:34 -0000	1.1.2.3
+++ opac-basket.tmpl	2 Jul 2007 14:46:25 -0000	1.1.2.4
@@ -71,7 +71,7 @@
 <!-- TMPL_ELSE -->
 <table><!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 				<!-- BIBLIO RECORD TABLE -->
-<tr<!-- TMPL_IF NAME="even" --> class="highlight"<!-- /TMPL_IF -->><td><form><!-- TMPL_UNLESS NAME="print_basket" --><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br><input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked);"><!-- /TMPL_UNLESS --></form></td><td><p><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_VAR NAME="author" -->
+<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><td><form><!-- TMPL_UNLESS NAME="print_basket" --><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br><input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked);"><!-- /TMPL_UNLESS --></form></td><td><p><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_VAR NAME="author" -->
 						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
 						<!-- TMPL_IF name="place" --> <!-- TMPL_VAR name="place" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" --><!-- /TMPL_IF --><!-- /TMPL_IF -->

Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-main.tmpl,v
retrieving revision 1.3.2.16
retrieving revision 1.3.2.17
diff -u -b -r1.3.2.16 -r1.3.2.17
--- opac-main.tmpl	17 Oct 2006 01:04:57 -0000	1.3.2.16
+++ opac-main.tmpl	2 Jul 2007 14:46:25 -0000	1.3.2.17
@@ -82,7 +82,9 @@
                         <select name="value">
                                 <option value="">Any Branch</option>
                         <!-- TMPL_LOOP name="branchloop" -->
-                                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
+						 <!-- TMPL_IF name="selected" -->
+						 <option value="<!-- TMPL_VAR name="value" -->"selected="selected"><!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR name="value" -->"><!-- /TMPL_IF --><!-- TMPL_VAR name
 ="branchname" --></option>
                         <!-- /TMPL_LOOP -->
                         </select>

Index: opac-recacquisitions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-recacquisitions.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- opac-recacquisitions.tmpl	8 Mar 2006 20:01:21 -0000	1.1.2.2
+++ opac-recacquisitions.tmpl	2 Jul 2007 14:46:25 -0000	1.1.2.3
@@ -26,7 +26,8 @@
                         <select name="value">
                                 <option value="">Any Branch</option>
                         <!-- TMPL_LOOP name="branchloop" -->
-                                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
+                                <!-- TMPL_IF name="selected" --><option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_ELSE -->
+                                <option value="<!-- TMPL_VAR name="value" -->"><!-- /TMPL_IF --><!-- TMPL_VAR name
 ="branchname" --></option>
                         <!-- /TMPL_LOOP -->
                         </select>

Index: opac-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-search.tmpl,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -b -r1.1.2.15 -r1.1.2.16
--- opac-search.tmpl	17 Oct 2006 01:04:57 -0000	1.1.2.15
+++ opac-search.tmpl	2 Jul 2007 14:46:25 -0000	1.1.2.16
@@ -70,7 +70,11 @@
 			<input type="hidden" name="excluding" value="" />
 			<input type="hidden" name="operator" value="=" />
 			<select name="value"><option value="">Any Itemtype</option>
-			<!-- TMPL_LOOP name="itemtypeloop" --><option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option><!-- /TMPL_LOOP -->
+			<!-- TMPL_LOOP name="itemtypeloop" -->
+			<!-- TMPL_IF name="selected" -->
+						 <option value="<!-- TMPL_VAR name="value" -->"selected="selected"><!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR name="value" -->"><!-- /TMPL_IF -->
+			<!-- TMPL_VAR name="description" --></option><!-- /TMPL_LOOP -->
 			</td></tr>
 <tr><th><label for="branch">Location</label></th><td><input type="hidden" name="marclist" value="items.homebranch" />
 				<input type="hidden" name="and_or" value="and" />
@@ -79,7 +83,9 @@
 				 <select name="value" id="branch">
                     <option value="">Any Branch</option>
                         <!-- TMPL_LOOP name="branchloop" -->
-                    <option value="<!-- TMPL_VAR name="value" -->"<!--TMPL_IF Name="selected"-->selected="selected"<!--/TMPL_IF-->> <!-- TMPL_VAR name="branchname" -->  </option>
+                    <!-- TMPL_IF name="selected" -->
+						 <option value="<!-- TMPL_VAR name="value" -->"selected="selected"><!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR name="value" -->"><!-- /TMPL_IF --> <!-- TMPL_VAR name="branchname" -->  </option>
                         <!-- /TMPL_LOOP -->
                 </select></td></tr>
 </table>			
@@ -148,7 +154,9 @@
                         <select name="value">
                                 <option value="">Any Branch</option>
                         <!-- TMPL_LOOP name="branchloop" -->
-                                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
+                                <!-- TMPL_IF name="selected" -->
+						 <option value="<!-- TMPL_VAR name="value" -->"selected="selected"><!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR name="value" -->"><!-- /TMPL_IF --><!-- TMPL_VAR name
 ="branchname" --></option>
                         <!-- /TMPL_LOOP -->
                         </select>

Index: opac-searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-searchresults.tmpl,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -b -r1.1.2.15 -r1.1.2.16
--- opac-searchresults.tmpl	8 Apr 2007 16:41:05 -0000	1.1.2.15
+++ opac-searchresults.tmpl	2 Jul 2007 14:46:25 -0000	1.1.2.16
@@ -54,7 +54,7 @@
 		</tr>
 		<!-- Actual Search Results -->
 		<!-- TMPL_LOOP NAME="results" -->
-			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
+			<!-- TMPL_IF name="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 			<td><!--TMPL_IF NAME="opacbookbag" --><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_IF --><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /><!--TMPL_IF NAME="opacbookbag" --></label><br /><input type="checkbox" name="bibid" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><!-- /TMPL_IF --></td>
 <!-- TMPL_IF NAME="AmazonContent" -->
 <td><div id="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" /><!--<img class="large"  src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01._PE_SCLZZZZZZZ_.jpg" title="Enlarged view of image" alt="Enlarged view of image" />

Index: opac-shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-shelves.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- opac-shelves.tmpl	27 Jan 2005 18:18:19 -0000	1.1.2.2
+++ opac-shelves.tmpl	2 Jul 2007 14:46:25 -0000	1.1.2.3
@@ -12,7 +12,7 @@
 		</tr>
 		<!-- TMPL_IF NAME="itemsloop" -->
 		<!-- TMPL_LOOP Name="itemsloop" -->
-			<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
+			<!-- TMPL_IF name="color" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
 	<input type="hidden" name="modifyshelfcontents" value="1" />
 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /></td>
@@ -121,7 +121,7 @@
 <caption>Virtual Shelves</caption>
 <tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
 <!-- TMPL_LOOP Name="shelvesloop" -->
-<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<!-- TMPL_IF name="color" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 			<!-- /TMPL_LOOP -->
 		</table>
 		<p><form action="opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" class="submit" /></form></p>





More information about the Koha-cvs mailing list