From 876e6dfe5d0639fb415ba0c0614ce91de08cb188 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 23 Mar 2023 16:12:15 +0000 Subject: [PATCH] Bug 33324: Use template wrapper for tabs: Tools This patch updates templates in the tools directory so that they use the new WRAPPER directive to build tabbed navigation. To test, apply the patch and test each page to confirm that tabs still work as before: - Cataloging -> Export - This page by default will have two tabs, "Export bibliographic records" and "Export authority records." You can edit koha-conf.xml to enable two additional options: backup_db_via_tools and backup_conf_via_tools - Tools -> Batch patron modification - "By card number" and "By borrowernumber," and "By patron list" if you have any patron lists defined. - Tools -> Overdue notice/status triggers --- .../prog/en/modules/tools/export.tt | 513 +++++++++--------- .../prog/en/modules/tools/modborrowers.tt | 172 +++--- .../prog/en/modules/tools/overduerules.tt | 176 +++--- 3 files changed, 437 insertions(+), 424 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt index acb46b36d6..3f2a384aee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -51,263 +51,280 @@ [% END %] -
- -
-
-

- Note : The items are exported by this tool unless specified. -

- -
-
- Select records to export -
    -
  1. - - -
    2. -
  2. - - -
    3. - -
  3. - - -
    4. - -
  4. - - [% INCLUDE 'branch-selector.inc' branches = libraries %] -
    5. -
- -
- Call number range -
    -
  1. - - -
    2. -
  2. - - -
    3. -
-
- -
- Accession date (inclusive) -
    -
  1. - - -
    2. -
  2. - - -
    3. -
-
- -
-
- - Use a file - -
    -
  1. File containing a list of biblionumbers with one biblionumber per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)
    2. -
    3. -
-
-
- Options -
  1. - - -
    2. -
  2. - - -
    3. -
  3. - - - separate by a blank. (e.g., 100a 200 606) -
-
-
- - Output format - -
  1. - - +
    2. +
  2. + + +
    3. + +
  3. + + +
    4. + +
  4. + + [% INCLUDE 'branch-selector.inc' branches = libraries %] +
    5. +
+ +
+ Call number range +
    +
  1. + + +
    2. +
  2. + + +
    3. +
+
+ +
+ Accession date (inclusive) +
    +
  1. + + +
    2. +
  2. + + +
    3. +
+
+
+ +
+ + Use a file + +
    +
  1. + File containing a list of biblionumbers with one biblionumber per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt) +
    2. +
  2. + +
    3. +
+
+ +
+ Options +
    +
  1. + + +
    2. +
  2. + + +
    3. +
  3. + + + separate by a blank. (e.g., 100a 200 606) +
    4. +
+
+ +
+ + Output format + +
    +
  1. + + +
    2. +
  2. + + +
    3. +
  3. + +
    4. +
+
+ + +
+ +
+
+ [% END # /tab_panel#bibs %] + + [% WRAPPER tab_panel tabname="auths" %] +
+
+ Select records to export +
    +
  1. + + +
    2. +
  2. + + +
    3. +
  3. + + +
    4. +
+
+ +
+ + Use a file + +
    +
  1. + File containing a list of authids with one authid per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt) +
    2. +
  2. + +
    3. +
+
+ +
+ Options +
    +
  1. + + +
    separate by a blank. (e.g., 100a 200 606)
    +
    2. +
+
+ +
+ Output format +
    +
  1. + + +
    2. +
  2. + + +
    3. +
+
+ + + + +
+
+ [% END # /tab_panel#auths %] + + [% IF ( allow_db_export ) %] + [% WRAPPER tab_panel tabname="db" %] +
+

Note : This export file will be very large, and is generated nightly.

+
+ Choose a file + [% IF ( dbfiles && (dbfiles.size > 0) ) %] +
    + [% FOREACH dbfile IN dbfiles %] +
  • [% dbfile | html %]
    • + [% END %] +
[% ELSE %] - - [% END %] - - -
  • - - -
    • -
  • - -
    • -
    - - - -
    -
    -
    - -
    -
    -
    - Select records to export -
    1. - - -
      2. -
    2. - - -
      3. -
    3. - - -
      4. -
    -
    -
    - - Use a file - -
      -
    1. File containing a list of authids with one authid per line. This list works as a filter: it is compatible with other parameters. (File types accepted: .csv and .txt)
      2. -
      3. -
    -
    -
    - Options -
      -
    1. - - - separate by a blank. (e.g., 100a 200 606) -
    -
    -
    - Output format -
    1. - - -
      2. -
    2. - -
    -
    - - - -
    -
    -
    + - [% IF ( allow_db_export ) %] -
    -
    -

    Note : This export file will be very large, and is generated nightly.

    -
    - Choose a file - [% IF ( dbfiles && (dbfiles.size > 0) ) %] -
      - [% FOREACH dbfile IN dbfiles %] -
    • [% dbfile | html %]
      • - [% END %] -
    - [% ELSE %] -

    Unfortunately, no backups are available.

    - [% END %] -
    - - [% IF ( dbfiles && (dbfiles.size > 0) ) %] - - -
    - [% END %] -
    -
    - [% END %] + [% IF ( dbfiles && (dbfiles.size > 0) ) %] + + +
    + [% END %] + + [% END # /tab_panel#db %] + [% END # /IF allow_db_export %] [% IF ( allow_conf_export ) %] -
    -
    -

    Note : This export file will be very large, and is generated nightly.

    -
    - Choose a file - [% IF ( conffiles && (conffiles.size > 0) ) %] -
      - [% FOREACH conffile IN conffiles %] -
    • [% conffile | html %]
      • - [% END %] -
    - [% ELSE %] -

    Unfortunately, no backups are available.

    - [% END %] -
    - - [% IF ( conffiles && (conffiles.size > 0) ) %] - - -
    - [% END %] -
    -
    - [% END %] -
    -
    + [% WRAPPER tab_panel tabname="conf" %] +
    +

    Note : This export file will be very large, and is generated nightly.

    +
    + Choose a file + [% IF ( conffiles && (conffiles.size > 0) ) %] +
      + [% FOREACH conffile IN conffiles %] +
    • [% conffile | html %]
      • + [% END %] +
    + [% ELSE %] +

    Unfortunately, no backups are available.

    + [% END %] +
    + + [% IF ( conffiles && (conffiles.size > 0) ) %] + + +
    + [% END %] +
    + [% END # /tab_panel#conf %] + [% END # /IF allow_conf_export %] + [% END # /WRAPPER tab_panels %] +[% END # /WRAPPER tabs %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 3ba5183cd0..fdd054868a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -38,91 +38,39 @@
    [% IF ( op == 'show_form' ) %] -

    Batch patron modification

    -
    - -
    - -
    -
    -
    - Use a file of card numbers -
      -
    1. - -
      File must contain one card number per line.
      -
      2. -
    -
    -
    - Or list card numbers one by one -
      -
    1. - - -
      2. -
    -
    -
    - - Cancel -
    -
    -
    -
    - Use a file of borrowernumbers -
      -
    1. - -
      File must contain one borrowernumber per line.
      -
      2. -
    -
    -
    - List borrowernumbers one by one -
      -
    1. - - -
      2. -
    -
    -
    - - Cancel -
    -
    - [% IF patron_lists %] -
    +

    Batch patron modification

    + + + + [% WRAPPER tabs id= "batch_patron_options" %] + [% WRAPPER tabs_nav %] + [% WRAPPER tab_item tabname= "usecardnumber" bt_active= 1 %] By card number [% END %] + [% WRAPPER tab_item tabname= "useborrowernumber" %] By borrowernumber [% END %] + [% IF patron_lists %] + [% WRAPPER tab_item tabname= "uselist" %] By patron list [% END %] + [% END %] + [% END # /WRAPPER tabs_nav %] + + [% WRAPPER tab_panels %] + [% WRAPPER tab_panel tabname="usecardnumber" bt_active= 1 %]
    - Use a patron list + Use a file of card numbers
    1. - - + +
      File must contain one card number per line.
      +
      2. +
    +
    +
    + Or list card numbers one by one +
      +
    1. + +
    @@ -130,11 +78,61 @@ Cancel -
    - [% END %] -
    -
    -
    + [% END # /tab_panel# %] + + [% WRAPPER tab_panel tabname="useborrowernumber" %] +
    + Use a file of borrowernumbers +
      +
    1. + +
      File must contain one borrowernumber per line.
      +
      2. +
    +
    +
    + List borrowernumbers one by one +
      +
    1. + + +
      2. +
    +
    +
    + + Cancel +
    + [% END # /tab_panel# %] + + [% IF patron_lists %] + [% WRAPPER tab_panel tabname="uselist" %] +
    + Use a patron list +
      +
    1. + + +
      2. +
    +
    +
    + + Cancel +
    + [% END # /tab_panel# %] + [% END %] + [% END # /WRAPPER tab_panels %] + [% END # /WRAPPER tabs %] + [% END %] [% IF ( op == 'show') && (!borrowers) && (!notfoundcardnumbers) # Alert if no patrons given%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt index 377ac80fd2..18284ba858 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt @@ -69,99 +69,98 @@ [% END %] [% IF ( table ) %] -
    - - -

    Rules for overdue actions: [% IF ( branch ) %][% Branches.GetName( branch ) | html %][% ELSE %] default library [% END %]

    - [% IF ( datasaved ) %]
    Changes saved.
    [% END %] + + + +

    Rules for overdue actions: [% IF ( branch ) %][% Branches.GetName( branch ) | html %][% ELSE %] default library [% END %]

    + [% IF ( datasaved ) %]
    Changes saved.
    [% END %] -
    -
      - [% FOR tab IN tabs %] -
    • - -
      • - [% END %] -
    -
    - [% FOR tab IN tabs %] -
    - - - - - - - - [% FOREACH mtt IN message_transport_types %] - [% NEXT IF mtt == 'itiva' AND !Koha.Preference('TalkingTechItivaPhoneNotification') %] - [% NEXT IF mtt == 'phone' AND !Koha.Preference('PhoneNotification') %] - - [% END %] - - - - [% FOREACH value IN tab.values %] + [% WRAPPER tabs id= "rulestabs" %] + [% WRAPPER tabs_nav %] + [% FOR tab IN tabs %] + [% WRAPPER tab_item tabname= tab.id %][% END %] + [% END %] + [% END # /WRAPPER tabs_nav %] + + [% WRAPPER tab_panels %] + [% FOR tab IN tabs %] + [% WRAPPER tab_panel tabname=tab.id %] +
     DelayLetterRestrict - [% SWITCH mtt %] - [% CASE 'email' %]Email - [% CASE 'print' %][% tp('Message transport type', 'Print') | html %] - [% CASE 'sms' %]SMS - [% CASE 'feed' %]Feed - [% CASE 'itiva' %]Phone (i-tiva) - [% CASE 'phone' %]Phone - [% CASE %][% mtt | html %] - [% END %] -
    + - - - + + + + [% FOREACH mtt IN message_transport_types %] + [% NEXT IF mtt == 'itiva' AND !Koha.Preference('TalkingTechItivaPhoneNotification') %] + [% NEXT IF mtt == 'phone' AND !Koha.Preference('PhoneNotification') %] + - [% FOREACH mtt IN value.message_transport_types %] - [% NEXT IF mtt.value == 'itiva' AND !Koha.Preference('TalkingTechItivaPhoneNotification') %] - [% NEXT IF mtt.value == 'phone' AND !Koha.Preference('PhoneNotification') %] + + [% END %] + + + + [% FOREACH value IN tab.values %] + + + + - [% END # /FOREACH mtt %] - - [% END # /FOREACH value %] - -
    [% value.line | html %] - - -  DelayLetterRestrict + [% SWITCH mtt %] + [% CASE 'email' %]Email + [% CASE 'print' %][% tp('Message transport type', 'Print') | html %] + [% CASE 'sms' %]SMS + [% CASE 'feed' %]Feed + [% CASE 'itiva' %]Phone (i-tiva) + [% CASE 'phone' %]Phone + [% CASE %][% mtt | html %] [% END %] - - - - [% IF ( value.debarred ) %] - - [% ELSE %] - - [% END %] -
    [% value.line | html %] - [% IF mtt.selected %] - - [% ELSE %] - [% IF mtt.value == "sms" and not Koha.Preference("SMSSendDriver") %] - - [% ELSE %] - + + + + + [% IF ( value.debarred ) %] + + [% ELSE %] + [% END %]
    -
    - [% END # /FOR tabs %] -
    -
    + [% FOREACH mtt IN value.message_transport_types %] + [% NEXT IF mtt.value == 'itiva' AND !Koha.Preference('TalkingTechItivaPhoneNotification') %] + [% NEXT IF mtt.value == 'phone' AND !Koha.Preference('PhoneNotification') %] + + [% IF mtt.selected %] + + [% ELSE %] + [% IF mtt.value == "sms" and not Koha.Preference("SMSSendDriver") %] + + [% ELSE %] + + [% END %] + [% END %] + + [% END # /FOREACH mtt %] + + [% END # /FOREACH value %] + + + [% END # /tab_panel# %] + [% END %] + [% END # /WRAPPER tab_panels %] + [% END # /WRAPPER tabs %] -
    -
    +
    + [% ELSE %]
    You don't have patron categories defined, or the patron categories are not set to receive overdue notices.
    If this is not what you were expecting, go to patron categories

    @@ -180,15 +179,14 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") | $raw %]