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 %]) [% ELSE %]
[% 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 %] [% 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' %]
- +
- +
[% 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 %] [% END %] @@ -106,9 +106,9 @@
    [% IF club_templates %] - + [% ELSE %] - + [% END %]
    [% 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 %] -
    +
    -- 2.11.0