From 8c14d4f2a91a11b4b6fc7d7e0ff900b2cdfb8e80 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 26 Mar 2019 16:34:34 +0000 Subject: [PATCH] Bug 22698: Fix incorrect button classes This patch builds on Bug 22023 in making further corrections to toolbar button classes. To test, apply the patch and view the following pages to confirm that toolbar buttons are consistent: - Acquisitions -> Vendor -> View basket. - Administration -> Additional fields -> Select a table. - Administration -> Audio alerts. - Catalog -> Advanced search -> More/fewer options link - Cataloging -> Edit record -> Advanced editor -> Advanced search. - Cataloging -> Edit record -> Advanced editor -> Macros. - Cataloging -> Edit record -> MARC21 008 value builder. - Cataloging -> Search results. - Circulation -> Checkout notes. - Circulation: Sticky due date clear button, view restrictions, override restrictions temporarily, add message, delete message - Course reserves: Toolbar buttons on that page and the course reserve detail page. - ILL requests -> View ILL requests. The "New ILL request" and "List requests" button. - Lists and Lists -> View list. - Patrons -> Search -> Merge patrons. - Patrons -> View patron -> "Edit" button on patron image (patronimages must be enabled). - Patrons -> View patron -> "More" menu -> Manage API keys. - Patrons -> View patron -> "More" menu -> Set permissions. - Patrons -> View patron -> Delete circulation message link. - Patrons -> View patron -> Edit patron. - Patrons -> View patron -> Housebound. - Reports -> Dictionary. - Serials -> Numbering patterns. - Serials -> Subscription -> Receive. - Tools -> Labels -> Manage -> Label batches: Export selected. - Tools -> Patron card creator -> Manage -> Card batches -> Edit batch. - Tools -> Patron card creator. The "New" and "Manage" buttons. - Tools -> Patron clubs. - Tools -> Quote editor -> Import quotes. - Tools -> Rotating collections. Toolbar buttons on that page and the collection view page. - Tools -> Tags. - Tools -> Upload local cover image. Signed-off-by: Michal Denar --- koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc | 8 ++++---- .../prog/en/includes/patroncards-toolbar.inc | 4 ++-- .../prog/en/includes/quotes-upload-toolbar.inc | 6 +++--- .../prog/en/includes/rotating-collections-toolbar.inc | 8 ++++---- .../prog/en/includes/virtualshelves-toolbar.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 ++-- .../prog/en/modules/admin/additional-fields.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 6 +++--- .../prog/en/modules/cataloguing/addbooks.tt | 2 +- .../intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 8 ++++---- .../cataloguing/value_builder/marc21_field_008.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/checkout-notes.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 10 +++++----- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt | 6 +++--- .../prog/en/modules/course_reserves/course-details.tt | 8 ++++---- .../prog/en/modules/course_reserves/course-reserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 16 ++++++++-------- .../intranet-tmpl/prog/en/modules/labels/label-manage.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/apikeys.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/housebound.tt | 4 ++-- .../prog/en/modules/members/member-flags.tt | 4 ++-- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/merge-patrons.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- .../prog/en/modules/patroncards/edit-batch.tt | 14 +++++++------- .../intranet-tmpl/prog/en/modules/reports/dictionary.tt | 2 +- .../prog/en/modules/serials/serials-edit.tt | 4 ++-- .../en/modules/serials/subscription-numberpatterns.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/tools/upload-images.tt | 2 +- 32 files changed, 80 insertions(+), 80 deletions(-) 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 b225e8536e..a79a55f38f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -13,12 +13,12 @@ [% IF ( patron.image ) %] [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])
-
Edit
+
Edit
[% ELSE %]
-
Add
+
Add
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc index f3ef56c74b..9499d7f0c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc @@ -4,7 +4,7 @@ [% IF backends_available %] [% IF backends.size > 1 %]
-
    @@ -14,16 +14,16 @@
[% ELSE %] - + New ILL request [% END %] [% ELSE %] - + New ILL request [% END %] - + List requests diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc index 4f39e70423..b0163a0234 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc @@ -1,7 +1,7 @@ [% INCLUDE 'blocking_errors.inc' %]
- +
- +
  • Card batches
  • Images
    • 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 b7554c8a78..b531be0452 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,5 +1,5 @@ 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 804fcfa57f..179f40e2c7 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,18 +1,18 @@ [% INCLUDE 'blocking_errors.inc' %] 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 e1ffa3e1ac..c5a6306a78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -5,7 +5,7 @@ [% IF ( can_add_biblios ) %]
    -
    @@ -14,7 +14,7 @@ [% IF shelf AND op == 'view' %] [% IF can_manage_shelf %]
    - +
    • Edit list
    • Delete list
      • 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 0fcbf5a11c..96858b9268 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -2,8 +2,8 @@ [% USE Asset %] [% BLOCK csv_export %]
      - Export as CSV - + Export as CSV +
      [% END %]
      - Clear fields + Clear fields
    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 343c57912f..f72eb30c39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -45,7 +45,7 @@
[% END %] [% IF ( total ) %] -
+
[% END %]
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt index e8eb0d9516..38633c4ff5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -133,8 +133,8 @@
- - + +
  • @@ -255,8 +255,8 @@
      - - + +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt index cf2b4231f8..26f0f4e5f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt @@ -18,10 +18,10 @@
      - +
      - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index 58248c3168..ec7cfaf6f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -50,8 +50,8 @@ [% IF ( notes.count ) %]
      - - + +
      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 da0712d965..c9da737731 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -552,7 +552,7 @@ No patron matched [% message | html %] [% ELSE %] [% END %] - +
      [% END %] [% END %] @@ -704,10 +704,10 @@ No patron matched [% message | html %] [% END %]
      - View restrictions + View restrictions [% IF (noissues && patron && CAN_user_circulate_force_checkout) %] - Override restriction temporarily + Override restriction temporarily [% END %]
      • @@ -789,12 +789,12 @@ No patron matched [% message | html %] "[% message.message | html %]" [% IF message.branchcode == branch OR Koha.Preference('AllowAllMessageDeletion') %] - Delete + Delete [% END %] [% END %]
    - Add a new message + Add a new message
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 64338a5e6c..5194c5b741 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -45,7 +45,7 @@ [% IF CAN_user_clubs_edit_templates %]
    - New club template + New club template
    [% END %] @@ -106,9 +106,9 @@
    [% IF club_templates %] - + [% ELSE %] - + [% END %]
      [% FOREACH t IN club_templates %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index 23bd446aa0..446192d0e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -33,14 +33,14 @@ [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
      [% IF CAN_user_coursereserves_add_reserves %] - Add reserves - Batch add reserves + Add reserves + Batch add reserves [% END %] [% IF ( CAN_user_coursereserves_manage_courses ) %] - Edit course + Edit course [% END %] [% IF ( CAN_user_coursereserves_manage_courses ) %] - Delete course + Delete course [% END %]
      [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt index 0a59960220..12e5088c59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt @@ -23,7 +23,7 @@ [% IF CAN_user_coursereserves_add_reserves OR CAN_user_coursereserves_manage_courses OR CAN_user_coursereserves_manage_courses %]
      [% IF ( CAN_user_coursereserves_manage_courses ) %] - New course + New course [% END %]
      [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 2becaf5304..ce73bacbbc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -263,9 +263,9 @@ - + - No, do not delete + No, do not delete
    [% ELSIF query_type == 'illview' %] @@ -281,7 +281,7 @@

    Manage ILL request

    - + Edit request @@ -289,7 +289,7 @@ [% IF action.method == 'migrate' %] [% IF backends.size > 2 %]
    -
      @@ -303,7 +303,7 @@ [% ELSIF backends.size == 2 %] [% FOREACH backend IN backends %] [% IF backend != request.backend %] - + [% action.ui_method_name | html %] @@ -311,17 +311,17 @@ [% END %] [% END %] [% ELSIF action.method != 0 %] - + [% action.ui_method_name | html %] [% END %] [% END %] - + Display supplier metadata - + ILL request log diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index cd5c52cd53..f5981827cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -99,7 +99,7 @@ [% END %] [% END %] - [% IF ( print ) %][% END %] + [% IF ( print ) %][% END %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt index d3a05a3a72..3285dc15e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt @@ -46,7 +46,7 @@
      [% IF api_keys && api_keys.size > 0 %]

      - +

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index 9cc6edaebd..b42c291091 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -186,8 +186,8 @@
      - - Save changes + Cancel diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt index 6c65d69039..de955ccfdf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt @@ -29,8 +29,8 @@
      - - Cancel + + Cancel Show all Hide all
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 52a6913185..1ca6d6318e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -141,7 +141,7 @@ [% IF opadd %] [% ELSE %] - + [% END %] Cancel diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt index 0ae464498b..94abaa34e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt @@ -129,7 +129,7 @@ [% END %] [% UNLESS error %] - View patron record + View patron record [% END %] [% END %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index d64be13549..3b0314963d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -96,12 +96,12 @@ "[% patron_message.message | html %]" [% IF patron_message.branchcode == branchcode OR Koha.Preference('AllowAllMessageDeletion') %] - Delete + Delete [% END %] [% END %] - Add a new message + Add a new message
      [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index bcf488cee6..db6d10c60f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -57,13 +57,13 @@
      [% IF ( table_loop ) %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index d9fa12729c..528bc1d4d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -34,7 +34,7 @@ [% IF ( start_dictionary ) %] [% END %]

      Dictionary

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 0423a4168c..37ccf50194 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -424,9 +424,9 @@ $(document).ready(function() {
      -
      +
      [% UNLESS ( serialsadditems ) %]   -
      Multi receiving
      +
      Multi receiving
      [% END %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt index c2574c856f..44d1cacf6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt @@ -154,8 +154,8 @@
      - - + + Cancel
      @@ -221,7 +221,7 @@
      - +
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt index ace172b6cf..aa052ca7d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -137,8 +137,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% IF ( tagloop ) %]
      - - + +
      [% END %]
      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt index e895d95153..b341800702 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt @@ -55,7 +55,7 @@ Required
    -
    +
    -- 2.11.0