BZ6087: remove duplicate budget link

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / header.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 1dd1884..ea556c4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,6 +1,5 @@
     <!-- TMPL_IF NAME="intranetbookbag" --><div id="cartDetails">Your cart is empty.</div><!-- /TMPL_IF -->
 
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
     <div id="header" class="clearfix">
         <div id="toplevelnav">
             <ul id="toplevelmenu">
@@ -23,7 +22,9 @@
                             <!-- TMPL_IF NAME="CAN_user_acquisition" -->
                             <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
                             <!-- /TMPL_IF -->
+                            <!-- TMPL_IF NAME="CAN_user_editauthorities" -->
                             <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+                            <!-- /TMPL_IF -->
                             <!-- TMPL_IF NAME="CAN_user_serials" -->
                             <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
                             <!-- /TMPL_IF -->
@@ -63,10 +64,10 @@
             <span class="loggedinusername">
                 <!-- TMPL_VAR NAME="loggedinusername" -->
             </span>
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>) |
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1"<!-- TMPL_IF NAME="intranetbookbag" --> onclick="delBasket(true);"<!-- /TMPL_IF -->>Log Out</a>) |
         <!-- TMPL_ELSE -->
             You are not logged in |
         <!-- /TMPL_IF -->
-        <a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); return false;">[ ? ]</a>
+        <a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl?url='+escape(document.URL),'Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); return false;">[ ? ]</a>
     </div>
 </div>