From 1c65a0a7e6c013043806c042a87b0e8f80f00b84 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 28 Sep 2015 13:26:14 +0100 Subject: [PATCH] Bug 13696: Pass the classes to use for icons to the templates --- C4/Auth.pm | 2 ++ .../prog/en/includes/acquisitions-toolbar.inc | 10 +++++----- .../prog/en/includes/auth-finder-search.inc | 4 ++-- .../prog/en/includes/authorities-toolbar.inc | 12 ++++++------ .../prog/en/includes/budgets-admin-toolbar.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 16 ++++++++-------- .../intranet-tmpl/prog/en/includes/checkouts-table.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/members-toolbar.inc | 12 ++++++------ .../intranet-tmpl/prog/en/includes/patron-toolbar.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/quotes-toolbar.inc | 6 +++--- .../prog/en/includes/quotes-upload-toolbar.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/reports-toolbar.inc | 6 +++--- .../prog/en/includes/rotating-collections-toolbar.inc | 6 +++--- .../intranet-tmpl/prog/en/includes/serials-toolbar.inc | 18 +++++++++--------- .../prog/en/includes/virtualshelves-toolbar.inc | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 14 +++++++------- .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 4 ++-- .../prog/en/modules/admin/aqbudgetperiods.tt | 10 +++++----- .../prog/en/modules/admin/auth_tag_structure.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/authtypes.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/branches.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/categorie.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 2 +- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/printers.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 4 ++-- .../prog/en/modules/authorities/authorities.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 14 +++++++------- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- .../prog/en/modules/cataloguing/addbiblio.tt | 8 ++++---- .../prog/en/modules/cataloguing/addbooks.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 4 ++-- .../prog/en/modules/course_reserves/course-details.tt | 6 +++--- .../prog/en/modules/course_reserves/course-reserves.tt | 2 +- .../prog/en/modules/members/purchase-suggestions.tt | 2 +- .../intranet-tmpl/prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 8 ++++---- .../prog/en/modules/reports/dictionary.tt | 2 +- .../prog/en/modules/reports/guided_reports_start.tt | 12 ++++++------ .../prog/en/modules/serials/serials-search.tt | 12 ++++++------ .../prog/en/modules/suggestion/suggestion.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +++++----- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 12 ++++++------ 59 files changed, 174 insertions(+), 172 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index ef0c585..bc17421 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -369,7 +369,9 @@ sub get_template_and_user { my $https = $in->{query}->https(); my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0; + warn ( C4::Context->preference("IconTheme") eq 'Font-Awesome' ? 'fa fa-fw fa' : 'icon'); $template->param( + icon_theme_classes => ( C4::Context->preference("IconTheme") eq 'Font-Awesome' ? 'fa fa-fw fa' : 'icon'), "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1, EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'), GoogleJackets => C4::Context->preference("GoogleJackets"), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index c0007d1..c59e451 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -10,7 +10,7 @@ function confirm_deletion() {
[% IF ( booksellerid ) %]
- New + New
    @@ -26,15 +26,15 @@ function confirm_deletion() {
[% IF ( CAN_user_acquisition_vendors_manage ) %] -
Edit vendor
+
Edit vendor
[% UNLESS ( basketcount OR subscriptioncount ) %] -
Delete vendor
+
Delete vendor
[% END %] [% END %] [% IF CAN_user_acquisition_order_receive && basketcount %] -
Receive shipments
+
Receive shipments
[% END %] [% ELSE %] -
New vendor
+
New vendor
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index 9adbc7f..3063cc6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -106,8 +106,8 @@ function finderjumpfull(page)
-
Clear field
-
Create new authority
+
Clear field
+
Create new authority
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc index b460cdc..fce286e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -28,15 +28,15 @@ [% IF ( authid ) %] [% IF ( CAN_user_editauthorities ) %] -
Edit
-
Duplicate
+
Edit
+
Duplicate
[% UNLESS ( count ) %] -
Delete
+
Delete
[% END %] [% END %]
- Save + Save
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index d36c2ca..24011be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -1,7 +1,7 @@
[% IF ( budget_period_id ) %]
- +
  • New budget
    • [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %] @@ -14,7 +14,7 @@
- +
- +
    [% IF ( CAN_user_acquisition_planning_manage ) %]
  • @@ -55,7 +55,7 @@
[% ELSE %] -
New budget
+
New budget
[% END %]
\ No newline at end of file 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 ee39f31..c793b70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -136,7 +136,7 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_serials_create_subscription ) %]
- +
    [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
  • New record
    • @@ -161,7 +161,7 @@ CAN_user_serials_create_subscription ) %] [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
    - +
      [% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
    • Edit record
      • @@ -218,7 +218,7 @@ CAN_user_serials_create_subscription ) %] [% END %]
      - +
      [% ELSIF ( virtualshelves ) %] -
      Add to list
      +
      Add to list
      [% ELSIF ( intranetbookbag ) %] -
      Add to cart
      +
      Add to cart
      [% END %] -
      Print
      +
      Print
      [% IF ( CAN_user_reserveforothers ) %] [% UNLESS ( norequests ) %] [% IF ( holdfor ) %]
      @@ -262,7 +262,7 @@ CAN_user_serials_create_subscription ) %]
    [% ELSE %] -
    Place hold
    +
    Place hold
    [% END %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index 7c2e7a9..d61634d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -2,7 +2,7 @@ [% IF ( issuecount ) %] @@ -41,8 +41,8 @@ [% END %] [% END %] - - + + [% IF ( exports_enabled ) %] @@ -61,7 +61,7 @@ - + [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index 70edbc0..12a3183 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -135,28 +135,28 @@ function searchToHold(){ [% ELSE %] [% END %] - Edit + Edit [% END %] [% IF ( CAN_user_borrowers ) %] [% IF ( adultborrower AND activeBorrowerRelationship ) %] - Add child + Add child [% END %] [% IF ( CAN_user_borrowers ) %] - Change password + Change password [% END %] - Duplicate + Duplicate [% END %]
- +
- Search to hold + Search to hold
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index 2df6cec..385fdea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -4,13 +4,13 @@ [% UNLESS ( no_add ) %]
    - +
    [% IF CAN_user_tools_manage_patron_lists %] - Patron lists + Patron lists [% END %]
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc index 9b8f37f..ef11b31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-toolbar.inc @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc index ef3fd3d..379ebbb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/quotes-upload-toolbar.inc @@ -1,4 +1,4 @@ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc index b7e7a79..18636e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -1,7 +1,7 @@
    [% IF ( CAN_user_reports_create_reports ) %]
    - +
    • New guided report
    • New SQL report
      • @@ -14,7 +14,7 @@ [% IF ( CAN_user_reports_create_reports ) %]
      - Edit + Edit
      [% END %] @@ -23,7 +23,7 @@ [% UNLESS ( errors ) # Unless there are errors saving a report %]
      - Run report + Run report
      [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc index 321d179..00aad1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc @@ -1,6 +1,6 @@
      - New collection + New collection
      [% IF ( colId ) %] @@ -8,10 +8,10 @@ Transfer
      - Edit + Edit
      - Delete + Delete
      [% END %]
    \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index f1d6547..4ba4f52 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -39,16 +39,16 @@
    [% IF CAN_user_serials_create_subscription %] [% IF biblionumber_for_new_subscription %] -
    New subscription
    +
    New subscription
    [% ELSE %] -
    New subscription
    +
    New subscription
    [% END %] [% END %] [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %] [% UNLESS ( cannotedit ) %]
    - +
      [% IF ( cannotedit ) %]
    • [% ELSE %]
    • [% END %] @@ -67,16 +67,16 @@ [% IF not cannotedit or CAN_user_serials_receive_serials %] [% IF CAN_user_serials_renew_subscription and not closed %] -
      Renew
      +
      Renew
      [% END %] [% IF CAN_user_serials_receive_serials and not closed %] -
      Receive
      +
      Receive
      [% END %] [% UNLESS cannotedit %] [% IF closed %] -
      Reopen
      +
      Reopen
      [% ELSE %] -
      Close
      +
      Close
      [% END %] [% END %] [% END %] @@ -84,9 +84,9 @@ [% ELSIF CAN_user_serials_create_subscription %]
      [% IF ( biblionumber_for_new_subscription ) %] -
      New subscription
      +
      New subscription
      [% ELSE %] -
      New subscription
      +
      New subscription
      [% END %]
      [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index 1e00cc4..46dd7a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -27,12 +27,12 @@
      -
      New list
      +
      New list
      [% IF ( viewshelf ) %] [% IF ( manageshelf ) %]
      - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index de16aa0..d00c0ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -162,20 +162,20 @@ [% UNLESS ( closedate ) %]
      [% IF active %] -
      Add to basket
      +
      Add to basket
      [% END %] -
      Edit basket
      +
      Edit basket
      [%# FIXME This action should not be available for everyone %] -
      Delete this basket
      +
      Delete this basket
      [% IF ( unclosable ) %] [% ELSIF ( uncertainprices ) %]
      Uncertain prices
      [% ELSE %]
      - Close this basket + Close this basket
      [% END %] -
      Export this basket as CSV
      +
      Export this basket as CSV
      [% ELSE %]

      Basket grouping for [% booksellername |html %]

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 8312cb2..f696bbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -82,13 +82,13 @@ $(document).ready(function() { [% IF ( CAN_user_acquisition_order_manage ) %] [% IF ( supplier.active ) %] - New basket + New basket [% ELSE %] (inactive) [% END %] [% END %] [% IF ( supplier.loop_basket.size ) %] - Receive shipment + Receive shipment [% END %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 519cfee..563c94f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -151,14 +151,14 @@ $(document).ready(function() { Actions
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 5bf8e61..0d6e3d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -45,7 +45,7 @@ [% END %]
      • - [% IF contact.id %]
      • [% END %] + [% IF contact.id %]
      • [% END %] [% END %] @@ -204,7 +204,7 @@ function delete_contact(ev) { [% INCLUDE edit_contact %] [% END %] - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 5d7918d..99faa1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -8,19 +8,19 @@
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 0480bf5..65164b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -181,7 +181,7 @@ [% IF ( else ) %]

    Select an authority framework

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 7dae71e..7e72e01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -183,8 +183,8 @@ $(document).ready(function() { [% IF ( else ) %]

    Authorized values

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index 3fbc439..3307887 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -105,7 +105,7 @@ [% IF ( else ) %]

    Authority types

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 791e971..4f7f818 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -101,7 +101,7 @@ [% IF ( else ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 887b81f..d464285 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -80,8 +80,8 @@ tinyMCE.init({
    [% IF ( else ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index 92a6a28..0c0644e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -324,7 +324,7 @@ [% IF ( else ) %]

    Patron category administration

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 3404483..0616812 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -112,7 +112,7 @@ [% IF ( else ) %]

    Cities

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index 8c40153..89dde44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -227,8 +227,8 @@ function CheckRuleForm(f) { [% IF ( display_lists ) %]

    Classification sources

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt index 57c38cf..0f7b19f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -64,7 +64,7 @@
    [% IF ( else ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index a3d8af4..95317b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -82,7 +82,7 @@ Item types administration
    [% IF ( else ) %][% END %] [% FOREACH message IN messages %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index fc8f463..9a9212d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -53,7 +53,7 @@ $(document).ready(function() { [% IF ( else ) %] [% END %]

    MARC Framework for [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]default MARC framework[% END %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 816dada..1e13b7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -545,7 +545,7 @@ function CheckRuleForm(f) { [% IF ( display_list ) %]

    Record matching rules

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt index 02eaf39..f43fbbd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -71,7 +71,7 @@ function delDescField(minusButton) { [% ELSE %]

    OAI sets

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index d2873cd..1c71bd9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -262,7 +262,7 @@ function CheckAttributeTypeForm(f) { [% IF ( display_list ) %]

    Patron attribute types

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt index 0e77e8b..48ebff2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt @@ -148,7 +148,7 @@ [% IF ( else ) %]

    Printers

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 03f1b29..5bbfdb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -308,7 +308,7 @@ [% IF ( else ) %] [% IF ( tab != 'local_use' ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt index 0ff1b09..4a35a16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -209,8 +209,8 @@ [% IF op == 'list' %]

    Z39.50/SRU servers administration

    [% IF id %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt index d6b3a2e..cffe822 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -204,9 +204,9 @@ function confirmnotdup(redirect){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 847088c..57c1c89 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -109,10 +109,10 @@ function batchDelete(){

    Your cart

    - [% IF ( verbose ) %] Brief display[% ELSE %] More details[% END %] - Send + [% IF ( verbose ) %] Brief display[% ELSE %] More details[% END %] + Send
    - Download + Download
    • iso2709
    • RIS
      • @@ -124,7 +124,7 @@ function batchDelete(){
    [% IF CAN_user_tools_records_batchmod %]
    - Actions + Actions
      [% IF CAN_user_tools_records_batchmod %]
    • Modify
      • @@ -132,9 +132,9 @@ function batchDelete(){
    [% END %] - Print - Empty and close - Hide window + Print + Empty and close + Hide window
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 4b1c94b..296c15a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -318,7 +318,7 @@ var holdForPatron = function () { [% IF ( CAN_user_reserveforothers && DisplayMultiPlaceHold ) %] [% IF ( holdfor ) %]
    - + @@ -330,11 +330,11 @@ var holdForPatron = function () {
[% ELSE %] - + [% END %] [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
Z39.50/SRU search
[% END %] + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
Z39.50/SRU search
[% END %] [% IF ( stopwords_removed ) %]

Ignored the following common words: "[% stopwords_removed %]"

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 3bc00d5..ef9f44b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -440,11 +440,11 @@ function Changefwk(FwkList) { [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] [% IF (circborrowernumber) %][%# fast cataloging must lead to items %] -
Save
+
Save
[% ELSE %]
- + @@ -457,11 +457,11 @@ function Changefwk(FwkList) { [% END %] [% ELSE %] -
Save
+
Save
[% END %] [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] -
Z39.50/SRU search
+
Z39.50/SRU search
[% IF (biblionumber) %] [% IF ( BiblioDefaultViewmarc ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index affa0fe..e1c311d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -71,7 +71,7 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
- +
  • Default framework
    • [% FOREACH frameworkcodeloo IN frameworkcodeloop %] @@ -80,7 +80,7 @@
- + @@ -92,7 +92,7 @@
[% IF ( total ) %] -
+
[% END %]
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 064e308..d75a39c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -759,7 +759,7 @@ No patron matched [% message %] [% END %]
- View restrictions + View restrictions [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %] Override restriction temporarily diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt index b8a679d8..d203b41 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -620,9 +620,9 @@ $(document).ready(function () {