[Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently (Circulation)

Owen Leonard Tue, 03 Apr 2012 07:16:25 -0700

Correcting Circulation-related includes
---
 .../prog/en/includes/checkin-search.inc            |    4 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    6 ++--
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |    6 ++--
 .../intranet-tmpl/prog/en/includes/circ-search.inc |    6 ++--
 .../prog/en/includes/circ-toolbar.inc              |   24 ++++++++++----------
 5 files changed, 23 insertions(+), 23 deletions(-)


diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc 
b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 04c43a3..0ee0558 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -12,8 +12,8 @@
 </div>
 [% 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_catalogue ) %]<li><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_catalogue ) %]<li><a 
href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the 
catalog</a></li>[% END %]
 </ul>   
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc 
b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 472db64..fb9a85d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -62,15 +62,15 @@
 </ul></div>
 <div id="menu">
 <ul>
-       [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber 
%]">Check Out</a></li>
+       [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber 
%]">Check out</a></li>
        [% IF ( CAN_user_borrowers ) %]
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber 
%]">Details</a></li>
        [% END %]
         [% IF ( CAN_user_updatecharges ) %]
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber 
%]">Fines</a></li>
        [% END %]
-       [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber 
%]">Circulation History</a></li>[% END %]
-       [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[%
 borrowernumber %]&amp;src=circ">Modification Log</a></li>[% END %]
+       [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber 
%]">Circulation history</a></li>[% END %]
+       [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[%
 borrowernumber %]&amp;src=circ">Modification log</a></li>[% END %]
     [% IF ( EnhancedMessagingPreferences ) %]
     [% END %]  
        [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber 
%]">Notices</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt 
b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index 84400bd..8102d73 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -65,15 +65,15 @@ in the global namespace %]
 </ul></div>
 <div id="menu">
 <ul>
-       [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% 
borrower.borrowernumber %]">Check Out</a></li>
+       [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% 
borrower.borrowernumber %]">Check out</a></li>
        [% IF ( CAN_user_borrowers ) %]
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% 
borrower.borrowernumber %]">Details</a></li>
        [% END %]
         [% IF ( CAN_user_updatecharges ) %]
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% 
borrower.borrowernumber %]">Fines</a></li>
        [% END %]
-       [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% 
borrower.borrowernumber %]">Circulation History</a></li>[% END %]
-       [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[%
 borrower.borrowernumber %]&amp;src=circ">Modification Log</a></li>[% END %]
+       [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% 
borrower.borrowernumber %]">Circulation history</a></li>[% END %]
+       [% IF ( CAN_user_parameters ) %][% IF ( logview ) %]<li 
class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[%
 borrower.borrowernumber %]&amp;src=circ">Modification log</a></li>[% END %]
     [% IF ( EnhancedMessagingPreferences ) %]
     [% END %]
     [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a 
href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% 
borrower.borrowernumber %]">Notices</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc 
b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 089b06d..dc99b90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -21,9 +21,9 @@
 </div>[% 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><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><a 
href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the 
catalog</a></li>[% END %]
 </ul>   
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc 
b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index efad86e..77c1820 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -61,17 +61,17 @@ function export_barcodes() {
        function yuiToolbar() {
            var printmenu = [
             [% IF ( CAN_user_borrowers ) %]
-               { text: _("Print Page"), onclick: {fn: 
function(){printx_window("page")}} },
+               { text: _("Print page"), onclick: {fn: 
function(){printx_window("page")}} },
             [% END %]
-               { text: _("Print Slip"), onclick: {fn: 
function(){printx_window("slip")}} },
-               { text: _("Quick Slip"), onclick: {fn: 
function(){printx_window("qslip")}} }
+               { text: _("Print slip"), onclick: {fn: 
function(){printx_window("slip")}} },
+               { text: _("Quick slip"), onclick: {fn: 
function(){printx_window("qslip")}} }
            ];
        
                var moremenu = [
-                       { text: _("Renew Patron"),  onclick: { fn: 
confirm_reregistration } },
-                       { text: _("Set Permissions"), url: 
"/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS 
CAN_user_permissions %], disabled: true[% END %]},
+                       { text: _("Renew patron"),  onclick: { fn: 
confirm_reregistration } },
+                       { text: _("Set permissions"), url: 
"/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]"[% UNLESS 
CAN_user_permissions %], disabled: true[% END %]},
             { text: _("Delete"), [% UNLESS CAN_user_borrowers %]disabled: 
true, [% END %] onclick: { fn: confirm_deletion } },
-            { text: _("Update Child to Adult Patron") , onclick: { fn: 
update_child }[% UNLESS is_child %], disabled: true[% END %]},
+            { text: _("Update child to adult patron") , onclick: { fn: 
update_child }[% UNLESS is_child %], disabled: true[% END %]},
             { text: _("Export today's checked in barcodes"), onclick: { fn: 
export_barcodes }}
         ];
 
@@ -126,20 +126,20 @@ function export_barcodes() {
        [% END %]
        [% IF ( CAN_user_borrowers ) %]
         [% IF ( adultborrower AND activeBorrowerRelationship ) %]<li><a 
id="addchild" 
href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% 
borrowernumber %]&amp;category_type=C">Add child</a></li>[% END %]
-        [% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" 
href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber 
%]">Change Password</a></li>[% END %]
+        [% IF ( CAN_user_staffaccess ) %] <li><a id="changepassword" 
href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber 
%]">Change password</a></li>[% END %]
     [% END %]
     <li><a id="duplicate" 
href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% 
borrowernumber %]&amp;category_type=[% category_type %]">Duplicate</a></li>
-       <li id="printmenuc"><a id="printpage" 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber 
%]&amp;print=page">Print Page</a></li>
-       <li><a id="printslip" 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber 
%]&amp;print=slip">Print Slip</a></li>
+       <li id="printmenuc"><a id="printpage" 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber 
%]&amp;print=page">Print page</a></li>
+       <li><a id="printslip" 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber 
%]&amp;print=slip">Print slip</a></li>
        <li id="searchtoholdc"><a id="searchtohold" href="#">Search to 
hold</a></li>
-       <li id="moremenuc"><a id="renewpatron" 
href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[%
 borrowernumber %]">Renew Account</a></li>
+       <li id="moremenuc"><a id="renewpatron" 
href="/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber=[%
 borrowernumber %]">Renew account</a></li>
     [% IF ( CAN_user_permissions ) %]
         [% IF ( StaffMember ) %]
             [% IF ( CAN_user_staffaccess ) %]
-                <li><a id="patronflags" 
href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set 
Permissions</a></li>
+                <li><a id="patronflags" 
href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set 
permissions</a></li>
             [% END %]
           [% ELSE %]
-                <li><a id="patronflags" 
href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set 
Permissions</a></li>
+                <li><a id="patronflags" 
href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set 
permissions</a></li>
         [% END %]
     [% END %]
     [% IF ( StaffMember ) %][% UNLESS ( CAN_user_staffaccess ) %]<li><a 
id="deletepatron" href="javascript:confirm_deletion();">Delete</a></li>[% END %]
-- 
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/

[Koha-patches] [PATCH] Bug 2780 - Capitalize strings consistently (Circulation)

Reply via email to