From bf2b42b6d44fb88a7c23270d741679ddf2e5fde9 Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Fri, 8 Jul 2022 13:51:25 +0200 Subject: [PATCH] Bug 30952: update buttons toolbar --- .../prog/en/includes/acquisitions-toolbar.inc | 18 ++++++------- .../prog/en/includes/authorities-toolbar.inc | 6 ++--- .../en/includes/budgets-admin-toolbar.inc | 8 +++--- .../prog/en/includes/cat-toolbar.inc | 26 +++++++++---------- .../prog/en/includes/ill-toolbar.inc | 12 ++++----- .../prog/en/includes/labels-toolbar.inc | 4 +-- .../prog/en/includes/members-toolbar.inc | 19 +++++++------- .../prog/en/includes/patron-toolbar.inc | 6 ++--- .../prog/en/includes/patroncards-toolbar.inc | 4 +-- .../prog/en/includes/reports-toolbar.inc | 22 ++++++++-------- .../includes/rotating-collections-toolbar.inc | 8 +++--- .../prog/en/includes/serials-toolbar.inc | 26 +++++++++---------- .../en/includes/stockrotation-toolbar.inc | 8 +++--- .../en/includes/virtualshelves-toolbar.inc | 12 ++++----- 14 files changed, 90 insertions(+), 89 deletions(-) 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 ff961777ef..ca847f9a59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -3,7 +3,7 @@
[% IF ( booksellerid ) %]
- New + New
    @@ -20,14 +20,14 @@
[% IF ( CAN_user_acquisition_vendors_manage ) %]
- Edit vendor + Edit vendor
[% UNLESS ( basketcount OR subscriptioncount ) %]
- +
[% END %] @@ -40,31 +40,31 @@ [% END %] [% IF ( CAN_user_acquisition_vendors_manage ) %]
- Edit vendor + Edit vendor
[% UNLESS ( basketcount OR subscriptioncount ) %]
- +
[% END %] [% IF CAN_user_acquisition_order_receive && basketcount && active %] -
Receive shipments
+
Receive shipments
[% END %] [% ELSE %] -
New vendor
+
New vendor
[% 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/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc index 40852695f1..1cc4d02ab9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -4,7 +4,7 @@
[% IF ( CAN_user_editauthorities ) %]
- @@ -16,7 +16,7 @@
[% IF servers.count > 0 %]
- +
[% END %] [% END %] @@ -24,7 +24,7 @@ [% IF ( authid ) %] [% IF ( CAN_user_editauthorities ) %]
-
    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 35fdcb33ac..4379d814f9 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 @@ -2,7 +2,7 @@
    [% IF ( budget_period_id ) %]
    - +
    • New budget
      • [% IF ( budget_period_locked || !CAN_user_acquisition_budget_add_del ) %] @@ -18,7 +18,7 @@
    - +
    - +
      [% IF ( CAN_user_acquisition_planning_manage ) %]
    • @@ -59,7 +59,7 @@
    [% ELSE %] -
    New budget
    +
    New budget
    [% END %]
    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 a07708ef1e..56bcadd552 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -4,7 +4,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
      • @@ -29,7 +29,7 @@ [% 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
        • @@ -92,7 +92,7 @@ [% END %]
        - +
        [% ELSE %] -
        Place hold
        +
        Place hold
        [% END %] [% END %] [% END %] [% IF Koha.Preference('ArticleRequests') %] -
        Request article
        +
        Request article
        [% END %] [% IF ( CAN_user_acquisition_order_manage ) %] [% IF ( searchtoorder_basketno && searchtoorder_vendorid ) %]
        - Add order + Add order
        [% END %] [% 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 10a77abb4b..0b4b5ef6e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc @@ -4,31 +4,31 @@ [% IF backends_available %] [% IF backends.size > 1 %]
        - -
        [% ELSE %] - + New ILL request [% END %] [% ELSE %] - + New ILL request [% END %] [% IF query_type == 'illlist' %] - + Refresh [% ELSE %] - + List requests [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc index b7fcc2c4a0..b7bb362895 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc @@ -1,7 +1,7 @@ [% INCLUDE 'blocking_errors.inc' %]
        - +
        - +
        • Label batches
        • Layouts
          • 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 f6c4a3ad2f..f3f0a02a70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -8,18 +8,19 @@
          [% IF CAN_user_borrowers_edit_borrowers %] - Edit + Edit [% END %] [% IF CAN_user_borrowers_edit_borrowers %] - [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %] - Add guarantee + [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %] + Add guarantee + [% END %] + Change password + Duplicate [% END %] - Change password - Duplicate
          - +
            [% IF CAN_user_borrowers_edit_borrowers %]
          • Renew patron
            • @@ -80,7 +81,7 @@
          [% IF CAN_user_circulate_circulate_remaining_permissions %]
          - +
          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 bbea65b099..72ffc29ff8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -6,7 +6,7 @@ [% UNLESS ( no_add ) %]
          - + @@ -14,7 +14,7 @@
          [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %] - + @@ -24,7 +24,7 @@
          [% IF CAN_user_tools_manage_patron_lists %] - Patron lists + Patron lists [% END %]
          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 98d1f5bf59..3ce84b4b8c 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/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc index 63e8db6de8..5c891ee91d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -2,7 +2,7 @@
            [% IF ( CAN_user_reports_create_reports ) %]
            - +
            • New guided report
            • New SQL report
              • @@ -16,14 +16,14 @@ [% IF ( showsql || execute || editsql || save_successful ) %] [% IF ( CAN_user_reports_delete_reports && !CAN_user_reports_create_reports ) %]
              - + Delete
              [% ELSE %] [% IF ( CAN_user_reports_create_reports || CAN_user_reports_delete_reports ) %]
              - @@ -59,12 +59,12 @@ [% IF ( showsql || execute || editsql || save_successful ) %] [% UNLESS ( errors ) # Unless there are errors saving a report %]
              - + Run report
              - + Schedule
              @@ -72,7 +72,7 @@ [% IF ( mana_id && Koha.Preference('Mana') == 1 ) %]
              - +
                [% FOREACH c IN mana_comments %]
              • @@ -112,7 +112,7 @@
                - +
                -
                [% IF allresults.size %] - Create chart + Create chart [% ELSE %] - Create chart - Fetch all data for chart + Create chart + Fetch all data for chart [% 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 107dd76401..cb58a57dda 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/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index eece5f481b..9ed4827702 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -4,16 +4,16 @@
                [% IF CAN_user_serials_create_subscription %] [% IF biblionumber_for_new_subscription %] -
                New subscription for this serial
                +
                New subscription for this serial
                [% 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 ( CAN_user_serials_edit_subscription ) %]
                • @@ -51,31 +51,31 @@ [% 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 %] [% IF Koha.Preference('Mana') == 1 and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %] [% IF one_language_enabled==0 or mana_id %] -
                  Share
                  +
                  Share
                  [% ELSE %] - + [% END %] [% END %] [% IF ( mana_id && Koha.Preference('Mana') == 1 ) %]
                  - +
                  - +
                diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc index 77919f4318..1e8cbac316 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc @@ -2,14 +2,14 @@
                [% IF no_op_set %] - New rota + New rota [% END %] [% IF op == 'manage_stages' %] - Edit rota - Add stage + Edit rota + Add stage [% END %] [% IF op == 'manage_items' %] Edit rota - Add items + Add items [% 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 e54837d59a..c0f4f41fca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -1,11 +1,11 @@ [% INCLUDE 'blocking_errors.inc' %]
                -
                New list
                +
                New list
                [% IF ( can_add_biblios ) %]
                -
                @@ -14,7 +14,7 @@ [% IF shelf AND op == 'view' %] [% IF can_manage_shelf %]
                - +
                -- 2.17.1