[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en includes/masthe... [dev_week]

Owen Leonard oleonard at athenscounty.lib.oh.us
Tue Sep 26 22:22:31 CEST 2006 

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/09/26 20:22:31

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

Log message:
	- reformatting 'search available items only' link
	- altering opac-user template so that if the user follows a direct link to one of the content tabs the tab will appear with a message ("You have no reserves," etc).

CVSWeb URLs:
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.13&r2=1.1.2.8.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.7&r2=1.1.2.11.2.8

Patches:
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.13
retrieving revision 1.1.2.8.2.14
diff -u -b -r1.1.2.8.2.13 -r1.1.2.8.2.14
--- includes/masthead.inc	25 Sep 2006 20:00:42 -0000	1.1.2.8.2.13
+++ includes/masthead.inc	26 Sep 2006 20:22:31 -0000	1.1.2.8.2.14
@@ -33,7 +33,7 @@
 	</ul></div><!-- /TMPL_IF --></div>
 
 <div id="breadcrumbs">
-<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="searchdesc" --><!-- TMPL_IF NAME="available" --><i> and available <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->">X</a></i><!-- /TMPL_IF -->&rdquo; </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="available" --><!-- TMPL_ELSE -->Limit to <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --><!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF --> <a href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME="searchdesc" -->?count=10&amp;startPage=1"><img title="RSS Feed for search <!-- TMPL_VAR NAME="searchdesc" -->" alt="RSS Feed for search <!-- TMPL_VAR NAME="searchdesc" -->" src="<!-- TMPL_VAR NAME="themelang">/images/feed-icon-16x16.png" border="0" /></a>
+<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo; </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --><!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF --> <a href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME="searchdesc" -->?count=10&amp;startPage=1"><img title="RSS Feed for search <!-- TMPL_VAR NAME="searchdesc" -->" alt="RSS Feed for search <!-- TMPL_VAR NAME="searchdesc" -->" src="<!-- TMPL_VAR NAME="themelang">/images/feed-icon-16x16.png" border="0" /></a>
 <!-- TMPL_ELSE -->
 <strong>&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</strong>
 <!-- TMPL_VAR NAME="search_error" --> 

Index: opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.11.2.7
retrieving revision 1.1.2.11.2.8
diff -u -b -r1.1.2.11.2.7 -r1.1.2.11.2.8
--- opac-user.tmpl	20 Sep 2006 20:22:03 -0000	1.1.2.11.2.7
+++ opac-user.tmpl	26 Sep 2006 20:22:31 -0000	1.1.2.11.2.8
@@ -18,12 +18,12 @@
 <!-- TMPL_IF NAME="lost" --><li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li><!-- /TMPL_IF --></ul></div><!-- /TMPL_IF -->
 
 <ul class="link-tabs">
-<li id="issues_tab"<!-- TMPL_IF name="showissues" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=issues" onclick="changeView('issues'); return false;">Issues</a></li> <!-- TMPL_IF NAME="overdues_count" --><li id="overdues_tab"<!-- TMPL_IF name="showoverdues" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=overdues" onclick="changeView('overdues'); return false;">Overdues</a></li><!-- /TMPL_IF -->
+<li id="issues_tab"<!-- TMPL_IF name="showissues" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=issues" onclick="changeView('issues'); return false;">Issues</a></li> <!-- TMPL_IF NAME="overdues_count" --><li id="overdues_tab"<!-- TMPL_IF name="showoverdues" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=overdues" onclick="changeView('overdues'); return false;">Overdues</a></li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="showoverdues" --><li id="overdues_tab" class="on"><a href="/cgi-bin/koha/opac-user.pl?display=overdues" onclick="changeView('overdues'); return false;">Overdues</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="amountoverfive" --><li id="fines_tab"<!-- TMPL_IF name="showfines" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a class="debit" href="/cgi-bin/koha/opac-user.pl?display=fines" onclick="changeView('fines'); return false;">Fines</a></li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="amountoverzero" --><li id="fines_tab"<!-- TMPL_IF name="showfines" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=fines" onclick="changeView('fines'); return false;">Fines</a></li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="amountlessthanzero" --><li id="fines_tab"<!-- TMPL_IF name="showfines" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=fines" onclick="changeView('fines'); return false;">Credits</a></li><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="waiting_count" --><li id="waiting_tab"<!-- TMPL_IF name="showwaiting" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=waiting" onclick="changeView('waiting'); return false;">Waiting</a></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="waiting_count" --><li id="waiting_tab"<!-- TMPL_IF name="showwaiting" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=waiting" onclick="changeView('waiting'); return false;">Waiting</a></li><!-- TMPL_ELSE --><!-- TMPL_IF name="showwaiting" --><li id="waiting_tab" class="on"><a href="/cgi-bin/koha/opac-user.pl?display=waiting" onclick="changeView('waiting'); return false;">Waiting</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-
-<li id="reserves_tab"<!-- TMPL_IF name="showreserves" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=reserves" onclick="changeView('reserves'); return false;">Reserves</a></li>
+<!-- TMPL_IF NAME="reserves_count" -->
+<li id="reserves_tab"<!-- TMPL_IF name="showreserves" --> class="on"<!-- TMPL_ELSE --> class="off"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/opac-user.pl?display=reserves" onclick="changeView('reserves'); return false;">Reserves</a></li><!-- TMPL_ELSE --><!-- TMPL_IF name="showreserves" --><li id="reserves_tab" class="on"><a href="/cgi-bin/koha/opac-user.pl?display=reserves" onclick="changeView('reserves'); return false;">Reserves</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
 </ul>
 
 
@@ -68,10 +68,9 @@
 		<!-- /TMPL_LOOP -->
 	</table>
 </div>
-<!-- /TMPL_IF -->
+<!-- TMPL_ELSE --><!-- TMPL_IF NAME="showwaiting" --><div id="waiting"><p>You have no waiting items.</p></div><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="overdues_count" -->
-
 <div id="overdues"<!-- TMPL_IF name="showoverdues" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->><table>
 <caption>Overdues <span class="count">(<!-- TMPL_VAR NAME="overdues_count" --> total)</span></caption>
 <!-- OVERDUES TABLE ROWS -->
@@ -100,7 +99,7 @@
 </tr>
 <!-- /TMPL_LOOP -->
 </table></div>
-<!-- /TMPL_IF -->
+<!-- TMPL_ELSE --><!-- TMPL_IF NAME="showoverdues" --><div id="overdues"><p>You have nothing overdue.</p></div><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="issues_count" -->
 <div id="issues"<!-- TMPL_IF name="showissues" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->><table>
@@ -134,10 +133,7 @@
 </table></div>
 
 	<!-- TMPL_ELSE -->
-<div id="issues"<!-- TMPL_IF name="showissues" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->>	<table>
-		<caption>Issues</caption>
-		<tr><td>You have nothing checked out</td></tr>
-	</table></div>
+<div id="issues"<!-- TMPL_IF name="showissues" --> style="display:block;"<!-- TMPL_ELSE --> style="display:none;"<!-- /TMPL_IF -->><p>You have nothing checked out.</p></div>
 	<!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="reserves_count" -->
@@ -165,7 +161,7 @@
 
 <p>If you no longer want a reserve, please send us an e-mail, or go to the circulation desk at your library to get it removed.</p>
 </div>
-<!-- /TMPL_IF -->
+<!-- TMPL_ELSE --><!-- TMPL_IF NAME="showreserves" --><div id="reserves"><p>You have no reserves.</p></div><!-- /TMPL_IF --><!-- /TMPL_IF -->
 </div>
 </div>
 </div>

More information about the Koha-cvs mailing list