[Koha-cvs] koha/koha-tmpl/opac-tmpl/prog en/includes/navig...

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Antoine Farnault <toins>	07/07/16 15:40:24

Modified files:
	koha-tmpl/opac-tmpl/prog/en/includes: navigation.inc 
	koha-tmpl/opac-tmpl/prog/fr/includes: navigation.inc 

Log message:
	bug fix : bookbag was display even if opacbookbag syspref was set to '0'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/includes/navigation.inc?cvsroot=koha&r1=1.4&r2=1.5

Patches:
Index: en/includes/navigation.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- en/includes/navigation.inc	25 Jun 2007 15:02:16 -0000	1.6
+++ en/includes/navigation.inc	16 Jul 2007 15:40:24 -0000	1.7
@@ -1,8 +1,10 @@
 <div id="menu">
+			
             <!-- TMPL_VAR NAME="OpacNav" -->
             <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
             <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
             <li>Browse catalogue:</li>
+            
             <ul>
             <!-- TMPL_IF name="OpacBrowser" -->
                 <li><a href="/cgi-bin/koha/opac-browser.pl">by hierarchy</a></li>
@@ -16,7 +18,8 @@
             <!-- TMPL_IF name="OpacCloud" -->
                 <li><a href="/cgi-bin/koha/opac-tags_subject.pl">by cloud</a></li>
             <!-- /TMPL_IF -->
-            </ul>
+            
+            <!-- TMPL_IF NAME="opacbookbag"-->
             <li>
                 <a href="#" onclick="javascript:openBasket();" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket">
                     <script language="javascript" type="text/javascript">
@@ -24,6 +27,8 @@
                     </script></span>
                 </a>
             </li>
+            </ul>
+            <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="loggedinusername" -->
                 <!-- TMPL_IF name="virtualshelves" -->
                     <li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
@@ -32,6 +37,7 @@
                     <li><a href="opac-suggestions.pl">Suggestions</a></li>
                 <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
+            
  </div>
 
  <div id="main"> <!-- MAIN Body start here -->

Index: fr/includes/navigation.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/fr/includes/navigation.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fr/includes/navigation.inc	2 Jul 2007 09:15:42 -0000	1.4
+++ fr/includes/navigation.inc	16 Jul 2007 15:40:24 -0000	1.5
@@ -1,9 +1,10 @@
 <div id="menu">
+			<ul>
             <!-- TMPL_VAR NAME="OpacNav" -->
             <li><a href="/cgi-bin/koha/opac-main.pl">Recherche simple</a></li>
             <li><a href="/cgi-bin/koha/opac-search.pl">Recherche avancée</a></li>
             <li>Feuilleter le catalogue :</li>
-            <ul>
+            
             <!-- TMPL_IF name="OpacBrowser" -->
                 <li><a href="/cgi-bin/koha/opac-browser.pl">par hiérarchie</a></li>
             <!-- /TMPL_IF -->
@@ -16,7 +17,8 @@
             <!-- TMPL_IF name="OpacCloud" -->
                 <li><a href="/cgi-bin/koha/opac-tags_subject.pl">par nuage sujet</a></li>
             <!-- /TMPL_IF -->
-            </ul>
+            
+            <!-- TMPL_IF NAME="opacbookbag"-->
             <li>
                 <a href="#" onclick="javascript:openBasket();" title='Un "panier" pour vos sélections'>Panier<span id="basket">
                     <script language="javascript" type="text/javascript">
@@ -24,6 +26,7 @@
                     </script></span>
                 </a>
             </li>
+            <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="loggedinusername" -->
                 <!-- TMPL_IF name="virtualshelves" -->
                     <li><a href="/cgi-bin/koha/opac-shelves.pl">Etagères virtuelles</a></li>
@@ -32,6 +35,7 @@
                     <li><a href="opac-suggestions.pl">Suggestions</a></li>
                 <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
+            </ul>
  </div>
 
  <div id="main"> <!-- MAIN Body start here -->