@@ -, +, @@ --- .../prog/en/modules/admin/additional-fields.tt | 51 ++++++++- .../prog/en/modules/admin/admin-home.tt | 13 ++- .../prog/en/modules/admin/adveditorshortcuts.tt | 18 ++- .../prog/en/modules/admin/aqbudgetperiods.tt | 86 ++++++++++++--- .../prog/en/modules/admin/aqbudgets.tt | 61 ++++++++++- .../prog/en/modules/admin/aqcontract.tt | 82 +++++++++++--- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 26 +++-- .../prog/en/modules/admin/audio_alerts.tt | 16 ++- .../en/modules/admin/auth_subfields_structure.tt | 77 ++++++++++--- .../prog/en/modules/admin/auth_tag_structure.tt | 121 +++++++++++++++++---- .../prog/en/modules/admin/authorised_values.tt | 62 +++++++++-- .../prog/en/modules/admin/authtypes.tt | 50 +++++++-- .../prog/en/modules/admin/background_jobs.tt | 25 ++++- .../prog/en/modules/admin/biblio_framework.tt | 56 ++++++++-- .../en/modules/admin/branch_transfer_limits.tt | 16 ++- .../prog/en/modules/admin/branches.tt | 56 ++++++++-- .../prog/en/modules/admin/cash_registers.tt | 55 ++++++++-- .../prog/en/modules/admin/categories.tt | 71 +++++++++++- .../prog/en/modules/admin/checkmarc.tt | 22 +++- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 52 +++++++-- .../prog/en/modules/admin/classsources.tt | 73 +++++++++++-- .../prog/en/modules/admin/clone-rules.tt | 19 +++- .../prog/en/modules/admin/columns_settings.tt | 16 ++- .../prog/en/modules/admin/credit_types.tt | 40 +++++-- .../prog/en/modules/admin/currency.tt | 45 +++++++- .../prog/en/modules/admin/debit_types.tt | 40 +++++-- .../intranet-tmpl/prog/en/modules/admin/desks.tt | 52 +++++++-- .../prog/en/modules/admin/didyoumean.tt | 17 ++- .../prog/en/modules/admin/edi_accounts.tt | 61 ++++++++--- .../prog/en/modules/admin/edi_ean_accounts.tt | 57 +++++++--- .../en/modules/admin/item_circulation_alerts.tt | 17 ++- .../prog/en/modules/admin/items_search_field.tt | 35 +++++- .../prog/en/modules/admin/items_search_fields.tt | 21 +++- .../prog/en/modules/admin/itemtypes.tt | 87 +++++++++++---- .../prog/en/modules/admin/koha2marclinks.tt | 14 ++- .../prog/en/modules/admin/library_groups.tt | 18 ++- .../en/modules/admin/marc_subfields_structure.tt | 84 ++++++++++---- .../prog/en/modules/admin/marctagstructure.tt | 94 +++++++++++++--- .../prog/en/modules/admin/matching-rules.tt | 57 +++++++--- .../prog/en/modules/admin/oai_set_mappings.tt | 17 ++- .../prog/en/modules/admin/oai_sets.tt | 39 ++++++- .../prog/en/modules/admin/overdrive.tt | 15 ++- .../prog/en/modules/admin/patron-attr-types.tt | 54 +++++++-- .../prog/en/modules/admin/preferences.tt | 16 ++- .../admin/searchengine/elasticsearch/mappings.tt | 16 ++- .../prog/en/modules/admin/share_content.tt | 16 ++- .../prog/en/modules/admin/smart-rules.tt | 16 ++- .../prog/en/modules/admin/sms_providers.tt | 16 ++- .../prog/en/modules/admin/smtp_servers.tt | 48 ++++++-- .../prog/en/modules/admin/systempreferences.tt | 71 +++++++++++- .../prog/en/modules/admin/transport-cost-matrix.tt | 16 ++- .../prog/en/modules/admin/usage_statistics.tt | 16 ++- .../prog/en/modules/admin/z3950servers.tt | 44 +++++++- 53 files changed, 1887 insertions(+), 376 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -17,14 +17,53 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -8,7 +8,18 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt @@ -11,11 +11,19 @@ [% INCLUDE 'prefs-admin-search.inc' %] [% PROCESS 'keyboard_shortcuts.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -77,41 +77,95 @@ - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -14,15 +14,66 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'budgets-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -19,33 +19,79 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'contracts-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -13,13 +13,25 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'budgets-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -11,7 +11,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt @@ -9,21 +9,68 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -15,43 +15,124 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -22,21 +22,61 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -16,16 +16,46 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt @@ -9,11 +9,26 @@ [% INCLUDE 'header.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -16,16 +16,52 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -12,7 +12,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -18,16 +18,52 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -18,16 +18,51 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -17,10 +17,73 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patrons-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -10,8 +10,26 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -10,16 +10,48 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cities-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -30,18 +30,67 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt @@ -10,7 +10,24 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -179,7 +179,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -22,14 +22,38 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -16,11 +16,46 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'currencies-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -23,14 +23,38 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -11,16 +11,48 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'desks-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -31,7 +31,22 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -20,21 +20,52 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -20,21 +20,48 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt @@ -45,7 +45,22 @@ table.grid td.default { [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt @@ -9,12 +9,35 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -10,11 +10,22 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -37,26 +37,73 @@ Data deleted [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -10,7 +10,19 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -12,11 +12,19 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - + [% FOR m IN messages %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -28,29 +28,71 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + + [% IF ( delete_confirm ) %] +
  • + Tag [% mss.tagfield | html %] Subfield structure +
  • +
  • + + Confirm deletion of subfield [% mss.tagsubfield | html %]i + +
  • + [% END %] + + [% IF ( else ) %] +
  • + + Tag [% tagfield | html %] Subfield structure + +
  • + [% END %] + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -15,23 +15,83 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -63,25 +63,48 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -10,7 +10,22 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -10,7 +10,44 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt @@ -13,8 +13,19 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -25,18 +25,48 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -17,7 +17,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -16,7 +16,21 @@ a.add, a.delete { [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - + [% INCLUDE 'blocking_errors.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt @@ -11,7 +11,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -31,7 +31,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -10,7 +10,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -18,16 +18,44 @@ SMTP servers [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -12,8 +12,75 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt @@ -16,7 +16,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt @@ -14,7 +14,21 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -22,11 +22,45 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'z3950-admin-search.inc' %] - +
    --