Bug 7734: NO_LIBRARY_SET should be translatable

[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 0db885a..5da4991 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -50,9 +50,15 @@
             [% LoginBranchname %]
             </strong>
         [% ELSE %]
-            <strong>[% LoginBranchname %]</strong>
+            <strong>
+            [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
+                NO LIBRARY SET
+            [% ELSE %]
+                [% LoginBranchname %]
+            [% END %]
+            </strong>
             [% IF ( IndependantBranches ) %]
-                [% IF ( CAN_user_management ) %]
+                [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
                     (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>)
                 [% END %]
             [% ELSE %]
@@ -64,10 +70,14 @@
             <span class="loggedinusername">
                 [% loggedinusername %]
             </span>
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1"[% IF ( intranetbookbag ) %] onclick="delBasket(true);"[% END %]>Log Out</a>) |
+            [% IF ( intranetbookbag ) %]
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log Out</a>) |
+            [% ELSE %]
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log Out</a>) |
+            [% END %]
         [% ELSE %]
             You are not logged in |
         [% END %]
-        <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>
+        <a href="/cgi-bin/koha/help.pl" id="helper" onclick="var link=window.open('','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); link.location='/cgi-bin/koha/help.pl'; return false;">[ ? ]</a>
     </div>
 </div>