bug 4862 - Change label of Browse by subject or author to Authority search

[koha.git] / koha-tmpl / opac-tmpl / ccsr / en / includes / masthead.inc

diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
index d666113..fc29042 100644 (file)
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
@@ -65,7 +65,7 @@
                 [% IF ( ShowOpacRecentSearchLink ) %]
                     <li><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a></li>
                 [% END %]
-                [% IF ( loggedinusername ) %]<li><a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li>[% END %]
+ [% IF ( loggedinusername ) %]<li>[% IF persona %]<a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'>[% ELSE %]<a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">[% END %]Log Out</a></li>[% END %]
         </ul>
       [% END %]
     </div>
@@ -77,7 +77,19 @@
 <div id="opac-main-search" class="yui-g">
 
 <a class="logo" href="/cgi-bin/koha/opac-main.pl">
+  [% UNLESS ( opacsmallimage ) %]
+      [% UNLESS ( LibraryName ) %]
     <img src="/opac-tmpl/ccsr/images/logo-koha.png" alt="Koha Online Catalog" />
+      [% ELSE %]
+    <img src="/opac-tmpl/ccsr/images/logo-koha.png" alt="[% LibraryName %] Online Catalog" />
+      [% END %]
+  [% ELSE %]
+      [% UNLESS ( LibraryName ) %]
+    <img src="[% opacsmallimage %]" alt="Koha Online Catalog" />
+      [% ELSE %]
+    <img src="[% opacsmallimage %]" alt="[% LibraryName %] Online Catalog" />
+      [% END %]
+  [% END %]
 </a>
 
 <div id="fluid">
@@ -156,13 +168,28 @@
         [% ELSE %]
             <div id="libraries" class="mobile-hidden">
         [% END %]
-      <select name="limit" id="select_library" class="left">
-         <option value="">All libraries</option>
-         [% FOREACH BranchesLoo IN BranchesLoop %]
-            [% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
-            [% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %]
-         [% END %]
-      </select>
+
+        <select name="branch_group_limit" id="select_library" class="left">
+           <option value="">All libraries</option>
+           <optgroup label="Libraries">
+               [% FOREACH BranchesLoo IN BranchesLoop %]
+                  [% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
+                  [% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %]
+               [% END %]
+           </optgroup>
+           [% IF BranchCategoriesLoop %]
+               <optgroup label="Groups">
+                   [% FOREACH bc IN BranchCategoriesLoop %]
+                       [% IF ( bc.selected ) %]
+                           <option selected="selected" value="multibranchlimit-[% bc.categorycode %]">[% bc.categoryname %]</option>
+                       [% ELSE %]
+                           <option value="multibranchlimit-[% bc.categorycode %]">[% bc.categoryname %]</option>
+                       [% END %]
+                   [% END %]
+               </optgroup>
+           [% END %]
+        </select>
+
     </div>
    [% ELSE %]
       [% IF ( opac_limit_override ) %]
@@ -236,7 +263,7 @@
 <div id="moresearches">
 <a href="/cgi-bin/koha/opac-search.pl">Advanced search</a>
 [% IF ( OpacBrowser ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a>[% END %]
-[% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a>[% END %]
+[% IF ( OpacAuthorities ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a>[% END %]
 [% IF ( opacuserlogin && reviewson && OpacShowRecentComments ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a>[% END %]
 [% IF ( TagsEnabled ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags.pl">Tag cloud</a>[% END %]
 [% IF ( OpacCloud ) %]<span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a>[% END %]