Bug 14957: (QA follow-up) Rename 'merge' => 'overlay'

[srvgit] / koha-tmpl / intranet-tmpl / prog / en / includes / admin-menu.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 5096024..bfdfee2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -45,22 +45,42 @@
             [% IF ( CAN_user_parameters_manage_item_circ_alerts ) %]
                 <li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
             [% END %]
+            [% IF ( Koha.Preference('UseCirculationDesks') && CAN_user_parameters_manage_libraries ) %]
+                <li><a href="/cgi-bin/koha/admin/desks.pl">Desks</a></li>
+            [% END %]
             [% IF ( CAN_user_parameters_manage_cities ) %]
                 <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
             [% END %]
         </ul>
     [% END %]
 
-    [% IF ( CAN_user_parameters_manage_keywords2koha_mappings || CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || (Koha.Preference('SearchEngine') == 'Elasticsearch' && CAN_user_parameters_manage_search_engine_config) ) %]
+    [% IF ( CAN_user_parameters_manage_accounts || ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) ) %]
+        <h5>Accounting</h5>
+        <ul>
+            [% IF ( CAN_user_parameters_manage_accounts ) %]
+                <li><a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a></li>
+                <li><a href="/cgi-bin/koha/admin/credit_types.pl">Credit types</a></li>
+            [% END %]
+            [% IF ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) %]
+                <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Cash registers</a></li>
+            [% END %]
+        </ul>
+    [% END %]
+
+    [% IF CAN_user_parameters_manage_background_jobs %]
+        <h5>Background jobs</h5>
+        <ul>
+            <li><a href="/cgi-bin/koha/admin/background_jobs.pl">Background jobs</a></li>
+        </ul>
+    [% END %]
+
+    [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config ) %]
         <h5>Catalog</h5>
         <ul>
             [% IF ( CAN_user_parameters_manage_marc_frameworks ) %]
                 <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li>
                 <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li>
             [% END %]
-            [% IF ( CAN_user_parameters_manage_keywords2koha_mappings ) %]
-                <li><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></li>
-            [% END %]
             [% IF ( CAN_user_parameters_manage_marc_frameworks ) %]
                 <li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC bibliographic framework test</a></li>
                 <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li>
@@ -77,8 +97,11 @@
             [% IF ( CAN_user_parameters_manage_item_search_fields ) %]
                 <li><a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a></li>
             [% END %]
-            [% IF ( Koha.Preference('SearchEngine') == 'Elasticsearch' && CAN_user_parameters_manage_search_engine_config ) %]
-                <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration</a></li>
+            [% IF ( CAN_user_parameters_manage_search_engine_config ) %]
+                <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></li>
+            [% END %]
+            [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %]
+                <li><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">MARC overlay rules</a></li>
             [% END %]
         </ul>
     [% END %]
@@ -110,18 +133,20 @@
         </ul>
     [% END %]
 
-    [% IF ( CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %]
+    [% IF ( CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %]
         <h5>Additional parameters</h5>
         <ul>
-            <!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
             [% IF ( CAN_user_parameters_manage_search_targets ) %]
                 <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li>
             [% END %]
+            [% IF ( CAN_user_parameters_manage_smtp_servers ) %]
+                <li><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></li>
+            [% END %]
             [% IF ( CAN_user_parameters_manage_didyoumean ) %]
                 <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
             [% END %]
             [% IF ( CAN_user_parameters_manage_column_config ) %]
-                <li><a href="/cgi-bin/koha/admin/columns_settings.pl">Columns settings</a></li>
+                <li><a href="/cgi-bin/koha/admin/columns_settings.pl">Table settings</a></li>
             [% END %]
             [% IF ( CAN_user_parameters_manage_audio_alerts ) %]
                 <li><a href="/cgi-bin/koha/admin/audio_alerts.pl">Audio alerts</a></li>