Merge remote-tracking branch 'origin/new/bug_8092'

[koha.git] / koha-tmpl / opac-tmpl / prog / en / includes / navigation.inc

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index db3a0a4..9cd2c12 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -1,30 +1,6 @@
-<div id="menu">
-            
-            <ul>
-            <!-- 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>
-                        
-            <!-- TMPL_IF NAME="loggedinusername" -->
-                <!-- TMPL_IF name="virtualshelves" -->
-                    <li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
-                <!-- /TMPL_IF -->
-                <!-- TMPL_IF name="suggestion" -->
-                    <li><a href="opac-suggestions.pl">Suggestions</a></li>
-                <!-- /TMPL_IF -->
-            <!-- /TMPL_IF -->
-            <li>Browse catalogue: <ul> <!-- TMPL_IF name="OpacBrowser" -->
-                <li><a href="/cgi-bin/koha/opac-browser.pl">by hierarchy</a></li>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="OpacAuthorities" -->
-                <li><a href="/cgi-bin/koha/opac-authorities-home.pl">by headings</a></li>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="OpacTopissue" -->
-                <li><a href="/cgi-bin/koha/opac-topissues.pl">by top issues</a></li>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="OpacCloud" -->
-                <li><a href="/cgi-bin/koha/opac-tags_subject.pl">by cloud</a></li>
-            <!-- /TMPL_IF --></ul></li>
-            </ul>
-            
- </div>
+[% OpacNav %]
+[% IF IsPatronPage %]
+[% INCLUDE usermenu.inc %]
+[% END %]
+[% OpacNavBottom %]
+