Correcting catalog-related includes.
---
 .../intranet-tmpl/prog/en/includes/cat-search.inc  |    6 +-
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   44 ++++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc 
b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 379cc56..444c1ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -89,9 +89,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
        [% END %]
        
                        <ul>
-                       [% IF ( CAN_user_circulate ) %]<li><a 
href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a 
href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>[% END %]
-                       [% IF ( CAN_user_catalogue ) %]<li 
class="ui-tabs-selected"><a 
href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the 
Catalog</a></li>[% END %]
+                       [% IF ( CAN_user_circulate ) %]<li><a 
href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check out</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a 
href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check in</a></li>[% END %]
+                       [% IF ( CAN_user_catalogue ) %]<li 
class="ui-tabs-selected"><a 
href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the 
catalog</a></li>[% END %]
                        </ul>   
 </div>
 <!-- End Catalogue Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc 
b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index be2f74f..d954b0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -82,19 +82,19 @@ function confirm_items_deletion() {
                //      Menu for new record, new item, new subscription
                var newmenu = [
                        [% IF CAN_user_editcatalogue_edit_catalogue %]
-            {text: _("New Record"), url: 
"/cgi-bin/koha/cataloguing/addbiblio.pl" },
+            {text: _("New record"), url: 
"/cgi-bin/koha/cataloguing/addbiblio.pl" },
             [% END %]
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]
-            {text: _("New Item"), url: 
"/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]#additema" 
},
+            {text: _("New item"), url: 
"/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]#additema" 
},
             [% END %]
             [% IF ( CAN_user_serials_create_subscription ) %]
-                {text: _("New Subscription"), url: 
"/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% 
biblionumber %]"},
+                {text: _("New subscription"), url: 
"/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% 
biblionumber %]"},
             [% END %]
             [% IF ( EasyAnalyticalRecords && 
CAN_user_editcatalogue_edit_catalogue ) %]
-                {text: _("Analyze Items"), url: 
"/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&analyze=1" },
+                {text: _("Analyze items"), url: 
"/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&analyze=1" },
             [% END %]
             [% IF CAN_user_editcatalogue_edit_catalogue %]
-                {text: _("New Child Record"), url: 
"/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber %]" 
},
+                {text: _("New child record"), url: 
"/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber %]" 
},
             [% END %]
                ];
                if(newmenu.length){
@@ -108,15 +108,15 @@ function confirm_items_deletion() {
                         });
                 }
            var editmenu = [
-               [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: 
_("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% 
biblionumber %]&amp;frameworkcode=&amp;op=" },[% END %]
-               [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Edit 
Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% 
biblionumber %]" },[% END %]
-               [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Attach 
Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% 
biblionumber %]" },[% END %]
-            [% IF ( EasyAnalyticalRecords ) %][% IF ( 
CAN_user_editcatalogue_edit_items ) %]{ text: _("Link to Host Item"), url: 
"/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]" },[% 
END %][% END %]
-            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( 
CAN_user_tools_upload_local_cover_images ) %]{ text: _("Upload Image"), url: 
"/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber 
%]&filetype=image" },[% END %][% END %]
-               [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: 
_("Edit as New (Duplicate)"), url: 
"/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber 
%]&amp;frameworkcode=&amp;op=duplicate" },[% END %]
-                       [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ 
text: _("Replace Record via Z39.50"), onclick: {fn: PopupZ3950 } },[% END %]
-                       [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ 
text: _("Delete Record"), onclick: {fn: confirm_deletion }[% IF ( count ) 
%],id:'disabled'[% END %] },[% END %]
-               [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Delete 
all Items"), onclick: {fn: confirm_items_deletion }[% UNLESS ( count ) 
%],id:'disabled'[% END %] }[% END %]
+               [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: 
_("Edit record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% 
biblionumber %]&amp;frameworkcode=&amp;op=" },[% END %]
+               [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Edit 
items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% 
biblionumber %]" },[% END %]
+               [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Attach 
item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% 
biblionumber %]" },[% END %]
+            [% IF ( EasyAnalyticalRecords ) %][% IF ( 
CAN_user_editcatalogue_edit_items ) %]{ text: _("Link to host item"), url: 
"/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber %]" },[% 
END %][% END %]
+            [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( 
CAN_user_tools_upload_local_cover_images ) %]{ text: _("Upload image"), url: 
"/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber 
%]&filetype=image" },[% END %][% END %]
+               [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ text: 
_("Edit as new (duplicate)"), url: 
"/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber 
%]&amp;frameworkcode=&amp;op=duplicate" },[% END %]
+                       [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ 
text: _("Replace record via Z39.50"), onclick: {fn: PopupZ3950 } },[% END %]
+                       [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]{ 
text: _("Delete record"), onclick: {fn: confirm_deletion }[% IF ( count ) 
%],id:'disabled'[% END %] },[% END %]
+               [% IF ( CAN_user_editcatalogue_edit_items ) %]{ text: _("Delete 
all items"), onclick: {fn: confirm_items_deletion }[% UNLESS ( count ) 
%],id:'disabled'[% END %] }[% END %]
            ];
                if(editmenu.length){
                        new YAHOO.widget.Button({
@@ -210,23 +210,23 @@ function confirm_items_deletion() {
 <ul class="toolbar" id="cattoolbar">
 
        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-       <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New 
Record</a></li>
+       <li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New 
record</a></li>
        [% END %]
        [% IF ( CAN_user_editcatalogue_edit_items ) %]
-       <li><a id="newitem" 
href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">New 
Item</a></li>
+       <li><a id="newitem" 
href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber %]">New 
item</a></li>
        [% END %]
        [% IF ( CAN_user_serials_create_subscription ) %]
-       <li><a id="newsub" 
href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[%
 biblionumber %]">New Subscription</a></li>
+       <li><a id="newsub" 
href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[%
 biblionumber %]">New subscription</a></li>
        [% END %]
 
        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-       <li><a id="editbiblio" 
href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber 
%]&amp;frameworkcode=[% current_framework %]&amp;op=">Edit Record</a></li>
+       <li><a id="editbiblio" 
href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber 
%]&amp;frameworkcode=[% current_framework %]&amp;op=">Edit record</a></li>
        [% END %]
        [% IF ( CAN_user_editcatalogue_edit_items ) %]
-       <li><a id="edititems" 
href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber 
%]">Edit Items</a></li>
+       <li><a id="edititems" 
href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber 
%]">Edit items</a></li>
        [% END %]
        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
-       <li><a id="duplicatebiblio" 
href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber 
%]&amp;frameworkcode=[% current_framework %]&amp;op=duplicate">Duplicate 
Record</a></li>
+       <li><a id="duplicatebiblio" 
href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber 
%]&amp;frameworkcode=[% current_framework %]&amp;op=duplicate">Duplicate 
record</a></li>
        [% END %]
        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
        <li><a id="deletebiblio" 
href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=[% 
biblionumber %]">Delete</a></li>
@@ -235,9 +235,9 @@ function confirm_items_deletion() {
        <li><a id="addtoshelf" 
href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=[% 
biblionumber %]">Add to shelf</a></li>
        <li><a id="printbiblio" 
href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=[% biblionumber 
%]">Print</a></li>
        [% IF ( CAN_user_reserveforothers ) %]
-       [% UNLESS ( norequests ) %]<li><a id="placehold" 
href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place 
Hold</a></li>[% END %]
+       [% UNLESS ( norequests ) %]<li><a id="placehold" 
href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">Place 
hold</a></li>[% END %]
        [% END %]
-       [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li 
id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" 
onclick="PopupZ3950(); return false;" /></li>[% END %]
+       [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li 
id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 search" 
onclick="PopupZ3950(); return false;" /></li>[% END %]
     </ul>
 </form>
 </div>
-- 
1.7.5.4

_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to