X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fincludes%2Fheader.inc;h=b6bc66035ec9ebba88ca5d99ef2bfefafaf63bc1;hb=6bf848303fd4a0d827cc688dab907166df701102;hp=4783523446befcff116ec05cdc292c8d23d48d8d;hpb=d830925be8c673d6a390a5182b564c32053f1b30;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 4783523446..b6bc66035e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,33 +1,30 @@
-    [% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
-
-    <div id="header" class="clearfix">
-        <div id="toplevelnav">
-            <ul id="toplevelmenu">
-                [% IF ( CAN_user_circulate ) %]<li><a class="toplinks" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
-                [% IF ( CAN_user_borrowers ) %]<li><a class="toplinks" href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
-                [% IF ( CAN_user_catalogue ) %]<li><a class="toplinks" href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
+    <div id="header" class="navbar navbar-static-top">
+        <div class="navbar-inner">
+            <ul id="toplevelmenu" class="nav">
+                [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
+                [% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
+                [% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
                 [% IF ( intranetbookbag ) %]
-                    <li><a class="toplinks" href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
+                    <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
                 [% END %]
                 [% IntranetNav %]
-                <li class="more">
-                    <a class="toplinks" id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
-                    <div id="moremenu">
-                        <div class="bd">
-                            <ul>
+                <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
                             <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
-                            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
+                            [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
                             <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
                             [% END %]
                             [% IF ( CAN_user_acquisition ) %]
                             <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
                             [% END %]
-                            [% IF ( CAN_user_editauthorities ) %]
                             <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-                            [% END %]
                             [% IF ( CAN_user_serials ) %]
                             <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
                             [% END %]
+                            [% IF ( CAN_user_coursereserves ) %]
+                            <li><a href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a></li>
+                            [% END %]
                             [% IF ( CAN_user_reports ) %]
                             <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
                             [% END %]
@@ -39,45 +36,56 @@
                             [% END %]
                             <li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
                             </ul>
-                        </div>
-                    </div>
                 </li>
             </ul>
-        </div>
-    <div id="login">
-        [% IF ( AutoLocation ) %]
-            <strong>
-            [% LoginBranchname %]
-            </strong>
-        [% ELSE %]
-            <strong>
-            [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
-                NO LIBRARY SET
-            [% ELSE %]
-                [% LoginBranchname %]
-            [% END %]
-            </strong>
-            [% IF ( IndependantBranches ) %]
-                [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
-                    ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
-                [% END %]
-            [% ELSE %]
-                ( <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> )
-            [% END %]
-        |
-        [% END %]
-        [% IF ( loggedinusername ) %]
-            <span class="loggedinusername">
-                [% loggedinusername %]
-            </span>
-            [% IF ( intranetbookbag ) %]
-            ( <a class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log out</a> ) |
-            [% ELSE %]
-            ( <a class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log out</a> ) |
-            [% END %]
-        [% ELSE %]
-            You are not logged in |
-        [% END %]
-        <a class="toplinks" 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>	
+      <ul class="nav pull-right">
+        <li class="dropdown">
+          <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">
+           [% IF ( loggedinusername ) %]
+              <span class="loggedinusername">
+                  [% loggedinusername %]
+              </span>
+              <span class="separator">|</span>
+              [% IF ( AutoLocation ) %]
+                <brand>
+                  [% LoginBranchname %]
+                </brand>
+              [% ELSE %]
+                <strong>
+                  [% IF ( LoginBranchname == 'NO_LIBRARY_SET' ) %]
+                     NO LIBRARY SET
+                  [% ELSE %]
+                     [% LoginBranchname %]
+                  [% END %]
+                </strong>
+              [% END %]
+              <b class="caret"></b>
+          </a>
+          <ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
+           [% IF ( IndependentBranches ) %]
+              [% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
+                  <li>
+                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
+                  </li>
+              [% END %]
+           [% ELSE %]
+                  <li>
+                     <a class="toplinks" href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
+                  </li>
+           [% END %]
+              <li>
+                  <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
+              </li>
+           [% ELSE %]
+              You are not logged in |
+           [% END %]
+          </ul>
+          <li>
+         <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>
+          </li>
+        </li>
+      </ul>
+       </div>
+   </div>
+[% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
+</div>