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 44d1f4c..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
@@ -16,9 +16,6 @@
             [% IF ( CAN_user_parameters_manage_libraries ) %]
                 <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li>
                 <li><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></li>
-                [% IF ( Koha.Preference('UseCirculationDesks') ) %]
-                    <li><a href="/cgi-bin/koha/admin/desks.pl">Desks</a></li>
-                [% END %]
             [% END %]
             [% IF ( CAN_user_parameters_manage_itemtypes ) %]
                 <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
@@ -48,6 +45,9 @@
             [% 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 %]
@@ -67,6 +67,13 @@
         </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>
@@ -93,6 +100,9 @@
             [% 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 %]