Attachment 168560 Details for Bug 37222 – Bug 37222: Standardize markup for sidebar menus

[patch] Bug 37222: Standardize markup for sidebar menus

Bug-37222-Standardize-markup-for-sidebar-menus.patch (text/plain), 91.84 KB, created by Owen Leonard on 2024-07-05 16:37:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2024-07-05 16:37:47 UTC

Size: 91.84 KB

patch

obsolete

>From b42465937d9bb338922ec0dc8767ae110841dae5 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 28 Jun 2024 17:24:41 +0000
>Subject: [PATCH] Bug 37222: Standardize markup for sidebar menus
>
>This patch updates sidebar menu markup so that it's consistent, with a
>common class (".sidebar_menu") and a unique ID. The style is tied to the
>class rather than the ID, simplifying the CSS.
>
>Note: This patch contains indentation changes so ignore whitespace when
>viewing the diff.
>
>The updated patch contains corrections to JavaScript which needed
>selectors to be changed to match the new markup.
>
>To test, apply the patch and rebuild the staff interface CSS
>(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)
>
>Check pages which contain each modified menu:
>
>- Circulation -> Check out to a patron
>- Catalog -> View a bibliographic record
>- Administration -> View system preferences
>- Acquisitions -> Acquisitions home
>- Cataloging -> Stock rotation -> Manage stages and manage items for a
>  rotation
>- Cataloging -> Stage MARC records for import
>- Reports -> Acquisitions statistics
>- Reports -> View dictionary
>- Point of sale
>- E-resource management
>- Preservation
>- Serials
>- Tools -> Patron lists
>
>Sponsored-by: Athens County Public Libraries
>---
> koha-tmpl/intranet-tmpl/prog/css/print.css    |   2 +-
> .../prog/css/src/staff-global.scss            |   4 +-
> .../prog/en/includes/acquisitions-menu.inc    | 106 +++++-----
> .../prog/en/includes/admin-menu.inc           |   7 +-
> .../prog/en/includes/biblio-view-menu.inc     | 130 ++++++------
> .../prog/en/includes/cat-menu.inc             | 138 +++++++------
> .../prog/en/includes/circ-menu.inc            |   4 +-
> .../prog/en/includes/circ-nav.inc             | 114 ++++++-----
> .../prog/en/includes/guided-reports-view.inc  |  43 ++--
> .../prog/en/includes/pos-menu.inc             |  14 +-
> .../prog/en/includes/prefs-menu.inc           |   4 +-
> .../prog/en/includes/preservation-menu.inc    |  18 +-
> .../prog/en/includes/reports-menu.inc         | 106 +++++-----
> .../prog/en/includes/serials-menu.inc         |  68 ++++---
> .../prog/en/includes/tools-menu.inc           | 185 +++++++++---------
> .../prog/en/includes/vendor-menu.inc          |  28 +--
> .../en/modules/labels/label-edit-batch.tt     |   2 +-
> .../en/modules/labels/label-edit-layout.tt    |   2 +-
> .../en/modules/labels/label-edit-profile.tt   |   2 +-
> .../en/modules/labels/label-edit-range.tt     |   2 +-
> .../en/modules/labels/label-edit-template.tt  |   2 +-
> .../prog/en/modules/labels/label-manage.tt    |   2 +-
> .../prog/en/modules/serials/serials-edit.tt   |   2 +-
> .../prog/en/modules/tags/list.tt              |   4 +-
> .../prog/en/modules/tools/stockrotation.tt    |  10 +-
> .../prog/js/acquisitions-menu.js              |   2 +-
> koha-tmpl/intranet-tmpl/prog/js/admin-menu.js |  10 +-
> .../intranet-tmpl/prog/js/staff-global.js     |  10 +-
> koha-tmpl/intranet-tmpl/prog/js/tools-menu.js |  20 +-
> .../prog/js/vue/components/ERM/Main.vue       |   6 +-
> .../prog/js/vue/components/LeftMenu.vue       |  29 ++-
> .../js/vue/components/Preservation/Main.vue   |   6 +-
> t/cypress/integration/ERM/Agreements_spec.ts  |   2 +-
> .../integration/ERM/DataProviders_spec.ts     |   2 +-
> t/cypress/integration/ERM/Dialog_spec.ts      |   8 +-
> t/cypress/integration/ERM/Licenses_spec.ts    |   2 +-
> t/cypress/integration/ERM/Packages_spec.ts    |   2 +-
> t/cypress/integration/ERM/Titles_spec.ts      |   2 +-
> .../integration/Preservation/Settings.ts      |   2 +-
> t/cypress/integration/Preservation/Trains.ts  |   2 +-
> .../integration/Preservation/WaitingList.ts   |   4 +-
> t/cypress/support/e2e.js                      |   2 +-
> 42 files changed, 542 insertions(+), 568 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/print.css b/koha-tmpl/intranet-tmpl/prog/css/print.css
>index e2c9d152ac..bc598fe13f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/print.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/print.css
>@@ -318,7 +318,7 @@ td.debit {
> #menu,
> #limitselect,
> #batchModify,
>-#navmenu,
>+.sidebar_menu,
> .gradient,
> .noprint,
> form#sortbyform,
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index 43115f8ce8..59571ea2c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -320,9 +320,7 @@ aside {
>     }
> }
> 
>-#menu,
>-#navmenulist,
>-#serialmenu {
>+.sidebar_menu {
>     background-color: #E6E6E6;
>     display: block;
>     padding: 1em 0 1em 0;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
>index 2130e18792..91dc769692 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
>@@ -1,59 +1,57 @@
> [% USE Koha %]
>-<div id="navmenu">
>-    <div id="navmenulist">
>-        <h5>Acquisitions</h5>
>+<div id="acquisitions-menu" class="sidebar_menu">
>+    <h5>Acquisitions</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li>
>+        <li><a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a></li>
>+        [% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %]
>+        [% IF ( CAN_user_suggestions_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
>+        <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
>+        [% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
>+            <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
>+        [% END %]
>+    </ul>
>+    [% IF ( CAN_user_reports || CAN_user_circulate_circulate_remaining_permissions ) %]
>+        <h5>Reports</h5>
>+        <ul>
>+            [% IF ( CAN_user_reports ) %]
>+                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics wizard</a></li>
>+                <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>+                <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
>+            [% END %]
>+        </ul>
>+    [% END %]
>+    [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %]
>+        <h5>Administration</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li>
>-            <li><a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a></li>
>-            [% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %]
>-            [% IF ( CAN_user_suggestions_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
>-            <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
>+            [% IF ( CAN_user_acquisition_period_manage ) %]
>+                <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_acquisition_budget_manage ) %]
>+                <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_acquisition_currencies_manage ) %]
>+                <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
>+            [% END %]
>             [% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
>-                <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
>+                <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
>+                <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
>+            [% END %]
>+            [% IF CAN_user_acquisition_edit_invoices && CAN_user_parameters_manage_additional_fields %]
>+                <li>
>+                    <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=aqinvoices">Manage invoice fields</a>
>+                </li>
>+            [% END %]
>+            [% IF CAN_user_acquisition_order_manage && CAN_user_parameters_manage_additional_fields %]
>+                <li>
>+                    <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=aqbasket">Manage order basket fields</a>
>+                </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=aqorders">Manage order line fields</a>
>+                </li>
>             [% END %]
>         </ul>
>-        [% IF ( CAN_user_reports || CAN_user_circulate_circulate_remaining_permissions ) %]
>-            <h5>Reports</h5>
>-            <ul>
>-                [% IF ( CAN_user_reports ) %]
>-                    <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics wizard</a></li>
>-                    <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>-                    <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
>-                [% END %]
>-            </ul>
>-        [% END %]
>-        [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %]
>-            <h5>Administration</h5>
>-            <ul>
>-                [% IF ( CAN_user_acquisition_period_manage ) %]
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_acquisition_budget_manage ) %]
>-                    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_acquisition_currencies_manage ) %]
>-                    <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
>-                [% END %]
>-                [% IF Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage %]
>-                    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
>-                    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
>-                [% END %]
>-                [% IF CAN_user_acquisition_edit_invoices && CAN_user_parameters_manage_additional_fields %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=aqinvoices">Manage invoice fields</a>
>-                    </li>
>-                [% END %]
>-                [% IF CAN_user_acquisition_order_manage && CAN_user_parameters_manage_additional_fields %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=aqbasket">Manage order basket fields</a>
>-                    </li>
>-                    <li>
>-                        <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=aqorders">Manage order line fields</a>
>-                    </li>
>-                [% END %]
>-            </ul>
>-        [% END %]
>-    </div>
>-</div>
>+    [% END %]
>+</div> 
>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 3aa5b87b95..eb497674e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>@@ -1,7 +1,6 @@
> [% USE Koha %]
> 
>-<div id="navmenu">
>-<div id="navmenulist">
>+<div id="admin-menu" class="sidebar_menu">
> 
>     [% IF ( CAN_user_parameters_manage_sysprefs ) %]
>         <h5>System preferences</h5>
>@@ -185,5 +184,5 @@
>             [% END %]
>         </ul>
>     [% END %]
>-</div>
>-</div>
>+
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
>index 3e5625eff0..a113c4e87d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
>@@ -2,21 +2,21 @@
> [% USE Biblio %]
> [% SET biblio_object_id = biblio.biblionumber %]
> 
>-<div id="menu">
>+<div id="biblio-view-menu" class="sidebar_menu">
>     <ul>
>         [%- IF ( detailview ) -%]
>-        <li class="active">
>+            <li class="active">
>         [%- ELSE -%]
>-        <li>
>+            <li>
>         [%- END -%]
>             <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url  %]">Normal</a>
>         </li>
> 
>         [%- IF Koha.Preference('viewMARC') -%]
>         [%- IF ( marcview ) -%]
>-        <li class="active">
>+            <li class="active">
>         [%- ELSE -%]
>-        <li>
>+            <li>
>         [%- END -%]
>             <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% biblio_object_id | url  %]">MARC</a>
>         </li>
>@@ -24,9 +24,9 @@
> 
>         [%- IF Koha.Preference('viewLabeledMARC') -%]
>         [%- IF ( labeledmarcview ) -%]
>-        <li class="active">
>+            <li class="active">
>         [%- ELSE -%]
>-        <li>
>+            <li>
>         [%- END -%]
>             <a href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=[% biblio_object_id | url  %]">Labeled MARC</a>
>         </li>
>@@ -34,104 +34,104 @@
> 
>         [%- IF Koha.Preference('viewISBD') -%]
>         [%- IF ( isbdview ) -%]
>-        <li class="active">
>+            <li class="active">
>         [%- ELSE -%]
>-        <li>
>+            <li>
>         [%- END -%]
>             <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=[% biblio_object_id | url  %]">ISBD</a>
>         </li>
>         [%- END -%]
> 
>         [%- IF ( moredetailview ) -%]
>-        <li class="active">
>+            <li class="active">
>         [%- ELSE -%]
>-        <li>
>+            <li>
>         [%- END -%]
>             <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio_object_id | url  %]">Items</a>
>         </li>
> 
>         [% IF ( CAN_user_circulate_manage_bookings && biblio.items.filter_by_bookable.count ) %]
>-        [%- IF ( bookingsview ) -%]
>-        <li class="active">
>-        [%- ELSE -%]
>-        <li>
>-        [%- END -%]
>-            <a href="/cgi-bin/koha/bookings/list.pl?biblionumber=[% biblio_object_id | url  %]">Bookings (<span class="bookings_count">[% biblio.bookings.filter_by_active.count | html %]</span>)</a>
>-        </li>
>+            [%- IF ( bookingsview ) -%]
>+                <li class="active">
>+            [%- ELSE -%]
>+                <li>
>+            [%- END -%]
>+                <a href="/cgi-bin/koha/bookings/list.pl?biblionumber=[% biblio_object_id | url  %]">Bookings (<span     class="bookings_count">[% biblio.bookings.filter_by_active.count | html %]</span>)</a>
>+            </li>
>         [% END %]
> 
>         [%- IF ( CAN_user_reserveforothers ) -%]
>-        [%- IF ( holdsview ) -%]
>-        <li class="active">
>-        [%- ELSE -%]
>-        <li>
>-        [%- END -%]
>-            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio_object_id | url  %]">Holds ([% biblio.holds.count | html %])</a>
>-        </li>
>+            [%- IF ( holdsview ) -%]
>+                <li class="active">
>+            [%- ELSE -%]
>+                <li>
>+            [%- END -%]
>+                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio_object_id | url %]">Holds ([% biblio.holds.count | html %])</a>
>+            </li>
>         [%- END -%]
> 
>         [%- IF ( EasyAnalyticalRecords ) -%]
>-        [%- IF ( analyze ) -%]
>-        <li class="active">
>-        [%- ELSE -%]
>-        <li>
>-        [%- END -%]
>-            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url  %]&amp;analyze=1">Analytics</a>
>-        </li>
>+            [%- IF ( analyze ) -%]
>+                <li class="active">
>+            [%- ELSE -%]
>+                <li>
>+            [%- END -%]
>+                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url  %]&amp;analyze=1">Analytics</a>
>+            </li>
>         [%- END -%]
> 
>         [%- IF Koha.Preference('ArticleRequests') -%]
>-        [%- IF ( article_requests_view ) -%]
>-        <li class="active">
>-        [%- ELSE -%]
>-        <li>
>-        [%- END -%]
>-            <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object | uri %][% ELSE %][% biblionumber | uri %][% END %]">Article requests ([% biblio.article_requests.filter_by_current.count | html %])</a>
>-        </li>
>+            [%- IF ( article_requests_view ) -%]
>+                <li class="active">
>+            [%- ELSE -%]
>+                <li>
>+            [%- END -%]
>+                <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object | uri %][% ELSE %][%   biblionumber | uri %][% END %]">Article requests ([% biblio.article_requests.filter_by_current.count | html %])</a>
>+            </li>
>         [%- END -%]
> 
>         [%- IF ( subscriptionsnumber ) -%]
>-        <li>
>-            <a href="/cgi-bin/koha/serials/serials-search.pl?searched=1&amp;biblionumber=[% biblio_object_id | url  %]">Subscriptions ([% subscriptionsnumber | html %])</a>
>-        </li>
>+            <li>
>+                <a href="/cgi-bin/koha/serials/serials-search.pl?searched=1&amp;biblionumber=[% biblio_object_id | url  %]">Subscriptions ([% subscriptionsnumber | html %])</a>
>+            </li>
>         [%- END -%]
> 
>         [%- IF ( issuehistoryview ) -%]
>-        <li class="active">
>+            <li class="active">
>         [%- ELSE -%]
>-        <li>
>+            <li>
>         [%- END -%]
>             <a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id | url  %]" >Checkout history</a>
>         </li>
> 
>         [%- IF ( CAN_user_tools_view_system_logs ) -%]
>-        [%- IF ( logview ) -%]
>-        <li class="active">
>-        [%- ELSE -%]
>-        <li>
>-        [%- END -%]
>-            <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=CATALOGUING&amp;action=MODIFY&amp;object=[% biblio_object_id | url  %]&amp;object_type=biblio">Modification log</a>
>-        </li>
>+            [%- IF ( logview ) -%]
>+                <li class="active">
>+            [%- ELSE -%]
>+                <li>
>+            [%- END -%]
>+                <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=CATALOGUING&amp;action=MODIFY&amp;object=[%     biblio_object_id | url  %]&amp;object_type=biblio">Modification log</a>
>+            </li>
>         [%- END -%]
> 
>         [%- IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) -%]
>-        [%- IF ( stockrotationview ) -%]
>-        <li class="active">
>-        [%- ELSE -%]
>-        <li>
>-        [%- END -%]
>-            <a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id | uri %]">Rota</a>
>-        </li>
>+            [%- IF ( stockrotationview ) -%]
>+                <li class="active">
>+            [%- ELSE -%]
>+                <li>
>+            [%- END -%]
>+                <a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id | uri %]">Rota</a>
>+            </li>
>         [%- END -%]
> 
>         [%- IF ( Koha.Preference('UseRecalls') && CAN_user_recalls ) -%]
>-        [%- IF ( recallsview ) -%]
>-        <li class="active">
>-        [%- ELSE -%]
>-        <li>
>-        [%- END -%]
>+            [%- IF ( recallsview ) -%]
>+                <li class="active">
>+            [%- ELSE -%]
>+                <li>
>+            [%- END -%]
>             <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% biblio_object_id | url %]">Recalls ([% biblio.recalls.search( completed => 0 ).count | html %])</a>
>-        </li>
>+            </li>
>         [%- END -%]
>     </ul>
>-</div>
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>index 90cbd56bf2..284d6d5a3c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
>@@ -1,133 +1,129 @@
> [% USE Koha %]
>-<div id="navmenu">
>-    <div id="navmenulist">
>-
>-        [% IF ( CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc ) %]
>+<div id="cat-menu" class="sidebar_menu">
>+    [% IF ( CAN_user_tools_stage_marc_import || CAN_user_tools_manage_staged_marc ) %]
>         <h5>Import</h5>
>         <ul>
>             [% IF ( CAN_user_tools_stage_marc_import ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage records for import</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage records for import</a>
>+                </li>
>             [% END %]
>             [% IF ( CAN_user_tools_manage_staged_marc ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged records</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged records</a>
>+                </li>
>             [% END %]
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        [% IF ( CAN_user_tools_export_catalog ) %]
>+    [% IF ( CAN_user_tools_export_catalog ) %]
>         <h5>Export</h5>
>         <ul>
>             [% IF ( CAN_user_tools_export_catalog ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/export.pl">Export catalog data</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/export.pl">Export catalog data</a>
>+                </li>
>             [% END %]
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        [% IF ( CAN_user_tools_inventory || ( ( Koha.Preference('OpacCatalogConcerns') || Koha.Preference('CatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) ) %]
>+    [% IF ( CAN_user_tools_inventory || ( ( Koha.Preference('OpacCatalogConcerns') || Koha.Preference('CatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) ) %]
>         <h5>Reports</h5>
>         <ul>
>             [% IF ( CAN_user_tools_inventory ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a>
>+                </li>
>             [% END %]
>             [% IF ( Koha.Preference('OpacCatalogConcerns') || Koha.Preference('CatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue %]
>-            <li>
>-                <a href="/cgi-bin/koha/cataloguing/concerns.pl">Catalog concerns</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/cataloguing/concerns.pl">Catalog concerns</a>
>+                </li>
>             [% END %]
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        [% IF ( CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_marc_modification_templates ) %]
>+    [% IF ( CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel || CAN_user_tools_records_batchmod || CAN_user_tools_records_batchdel || CAN_user_tools_marc_modification_templates ) %]
>         <h5>Batch editing</h5>
>         <ul>
>             [% IF ( CAN_user_tools_items_batchmod ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a>
>+                </li>
>             [% END %]
>             [% IF ( CAN_user_tools_items_batchdel ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a>
>+                </li>
>             [% END %]
>             [% IF CAN_user_tools_records_batchmod %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/batch_record_modification.pl">Batch record modification</a>
>+                </li>
>             [% END %]
>             [% IF CAN_user_tools_records_batchdel %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/batch_delete_records.pl">Batch record deletion</a>
>+                </li>
>             [% END %]
>             [% IF ( CAN_user_tools_marc_modification_templates ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a>
>+                </li>
>             [% END %]
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        [% IF ( CAN_user_tools_items_batchmod || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) ) %]
>+    [% IF ( CAN_user_tools_items_batchmod || ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) ) %]
>         <h5>Automation</h5>
>         <ul>
>             [% IF ( CAN_user_tools_items_batchmod ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Item modifications by age</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Item modifications by age</a>
>+                </li>
>             [% END %]
>             [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a>
>+                </li>
>             [% END %]
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        [% IF ( CAN_user_tools_label_creator || CAN_user_tools_upload_local_cover_images ) %]
>+    [% IF ( CAN_user_tools_label_creator || CAN_user_tools_upload_local_cover_images ) %]
>         <h5>Tools</h5>
>         <ul>
>             [% IF ( CAN_user_tools_label_creator ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/labels/barcode-print.pl">Barcode image generator</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>+                </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/labels/barcode-print.pl">Barcode image generator</a>
>+                </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/labels/spinelabel-home.pl">Quick spine label creator</a>
>+                </li>
>             [% END %]
> 
>             [% IF ( CAN_user_tools_upload_local_cover_images ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a>
>-            </li>
>+                <li>
>+                    <a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a>
>+                </li>
>             [% END %]
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        [% IF ( CAN_user_parameters ) %]
>+    [% IF ( CAN_user_parameters ) %]
>         <h5>Administration</h5>
>         <ul>
>             [% IF ( CAN_user_parameters_manage_sysprefs ) %]
>-            <li>
>-                <a class="circ-button" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Preferences</a>
>-            </li>
>+                <li>
>+                    <a class="circ-button" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Preferences</a>
>+                </li>
>             [% END %]
>             <li>
>                 <a class="circ-button" href="/cgi-bin/koha/admin/admin-home.pl">Configuration</a>
>             </li>
>         </ul>
>-        [% END %]
>-
>-    </div>
>-</div>
>+    [% END %]
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>index 8c2592c037..4784954da5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
>@@ -160,7 +160,7 @@
>         </ul> 
>     </div> 
> 
>-    <div id="menu">
>+    <div id="circ-menu" class="sidebar_menu">
>         <ul>
>             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>                 [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]
>@@ -257,7 +257,7 @@
>                 </li>
>             [% END %]
>         </ul>
>-    </div>
>+    </div> 
> 
>     [% IF patronimages && CAN_user_tools_batch_upload_patron_images %]
>         
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
>index d7a504fb76..0a851ef3ee 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc
>@@ -1,70 +1,69 @@
> [% USE Koha %]
> [% USE Branches %]
>-<div id="navmenu">
>-    <div id="navmenulist">
>-        <h5>Circulation</h5>
>-        <ul>
>-            <li>
>-                <a href="/cgi-bin/koha/circ/circulation.pl">Check out</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/circ/returns.pl">Check in</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/circ/renew.pl">Renew</a>
>-            </li>
>-            [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary ) %]
>+<div class="circ-nav-menu" class="sidebar_menu">
>+    <h5>Circulation</h5>
>+    <ul>
>+        <li>
>+            <a href="/cgi-bin/koha/circ/circulation.pl">Check out</a>
>+        </li>
>+        <li>
>+            <a href="/cgi-bin/koha/circ/returns.pl">Check in</a>
>+        </li>
>+        <li>
>+            <a href="/cgi-bin/koha/circ/renew.pl">Renew</a>
>+        </li>
>+        [% IF ( CAN_user_superlibrarian || CAN_user_loggedinlibrary ) %]
>             <li>
>                 [% IF Koha.Preference('UseCirculationDesks') %]
>-                <a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
>+                    <a href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
>                 [% ELSE %]
>-                <a href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
>+                    <a href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
>                 [% END %]
>             </li>
>-            [% ELSIF Koha.Preference('UseCirculationDesks') %]
>+        [% ELSIF Koha.Preference('UseCirculationDesks') %]
>             <li>
>                 <a href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
>             </li>
>-            [% END %]
>-            [% IF ( fast_cataloging && CAN_user_editcatalogue_fast_cataloging ) %]
>+        [% END %]
>+        [% IF ( fast_cataloging && CAN_user_editcatalogue_fast_cataloging ) %]
>             <li>
>                 <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA"> Fast cataloging</a>
>             </li>
>-            [% END %]
>-            [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
>+        [% END %]
>+        [% IF ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes ) %]
>             <li>
>                 <a href="/cgi-bin/koha/circ/checkout-notes.pl">Checkout notes</a>
>             </li>
>-            [% END %]
>-            [% IF Koha.Preference('OnSiteCheckouts') %]
>+        [% END %]
>+        [% IF Koha.Preference('OnSiteCheckouts') %]
>             <li>
>                 <a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a>
>             </li>
>-            [% END %]
>-        </ul>
>+        [% END %]
>+    </ul>
> 
>-        <h5>Holds</h5>
>-        <ul>
>-            <li>
>-                <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
>-            </li>
>-            [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %]
>+    <h5>Holds</h5>
>+    <ul>
>+        <li>
>+            <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a>
>+        </li>
>+        <li>
>+            <a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a>
>+        </li>
>+        <li>
>+            <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
>+        </li>
>+        [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %]
>             <li>
>                 <a href="/cgi-bin/koha/circ/curbside_pickups.pl">Curbside pickups</a>
>             </li>
>-            [% END %]
>-            <li>
>-                <a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a>
>-            </li>
>-        </ul>
>+        [% END %]
>+        <li>
>+            <a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a>
>+        </li>
>+    </ul>
> 
>-        [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
>+    [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
>         <h5>Recalls</h5>
>         <ul>
>             <li>
>@@ -83,35 +82,35 @@
>                 <a href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls">Old recalls</a>
>             </li>
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        [% IF Koha.Preference('ArticleRequests') %]
>+    [% IF Koha.Preference('ArticleRequests') %]
>         <h5>Patron request</h5>
>         <ul>
>             <li>
>                 <a href="/cgi-bin/koha/circ/article-requests.pl">Article requests</a>
>             </li>
>         </ul>
>-        [% END %]
>+    [% END %]
> 
>-        <h5>Transfers</h5>
>-        <ul>
>+    <h5>Transfers</h5>
>+    <ul>
>         [% IF !Koha.Preference('IndependentBranchesTransfers') || CAN_user_superlibrarian %]
>             <li>
>                 <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a>
>             </li>
>         [% END %]
>         [% IF Koha.Preference('StockRotation') %]
>-             <li>
>+            <li>
>                 <a href="/cgi-bin/koha/circ/transfers_to_send.pl">Transfers to send</a>
>             </li>
>         [% END %]
>-            <li>
>-                <a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a>
>-            </li>
>-        </ul>
>+        <li>
>+            <a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a>
>+        </li>
>+    </ul>
> 
>-        [% IF ( CAN_user_circulate_overdues_report ) %]
>+    [% IF ( CAN_user_circulate_overdues_report ) %]
>         <h5>Overdues</h5>
>         <ul>
>             <li>
>@@ -119,8 +118,7 @@
>             </li>
>             <li>
>                 <a href="/cgi-bin/koha/circ/branchoverdues.pl" title="Limited to your library. See report help for other details.">Overdues with fines</a>
>-             </li>
>+                </li>
>         </ul>
>-        [% END %]
>-    </div>
>-</div>
>+    [% END %]
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
>index a04f416812..2c4570163c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc
>@@ -1,24 +1,21 @@
> [% USE Koha %]
>-<div id="navmenu">
>-<div id="navmenulist">
>-
>-<h5>Run reports</h5>
>-<ul>
>-	[% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=list">Saved reports</a></li>[% END %]
>-</ul>
>-<h5>Reports dictionary</h5>
>-<ul>
>-<li><a href="/cgi-bin/koha/reports/dictionary.pl">View dictionary</a></li>
>-</ul>
>-<h5>Useful resources</h5>
>-<ul>
>-<li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li>
>-[% SET koha_version = Koha.Version %]
>-[% IF koha_version.development %]
>-    <li><a href="http://schema.koha-community.org/main" target="blank">Koha database schema</a></li>
>-[% ELSE %]
>-    <li><a href="http://schema.koha-community.org/[% koha_version.major | uri %]_[% koha_version.minor | uri %]" target="blank">Koha database schema</a></li>
>-[% END %]
>-</ul>
>-</div>
>-</div>
>+<div id="guided-reports-view-menu" class="sidebar_menu">
>+    <h5>Run reports</h5>
>+    <ul>
>+        [% IF ( CAN_user_reports_execute_reports ) %]<li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=list">Saved reports</a></li>[% END %]
>+    </ul>
>+    <h5>Reports dictionary</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/reports/dictionary.pl">View dictionary</a></li>
>+    </ul>
>+    <h5>Useful resources</h5>
>+    <ul>
>+        <li><a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="blank">Koha report library</a></li>
>+        [% SET koha_version = Koha.Version %]
>+        [% IF koha_version.development %]
>+            <li><a href="http://schema.koha-community.org/main" target="blank">Koha database schema</a></li>
>+        [% ELSE %]
>+            <li><a href="http://schema.koha-community.org/[% koha_version.major | uri %]_[% koha_version.minor | uri %]" target="blank">Koha database schema</a></li>
>+        [% END %]
>+    </ul>
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc
>index 3878bfa742..5bb8542ed9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc
>@@ -1,8 +1,7 @@
> [% USE Branches %]
> [% USE Registers %]
>-<div id="navmenu">
>-    <div id="navmenulist">
>-        [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %]
>+<div id="pos-menu" class="sidebar_menu">
>+    [% IF ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) %]
>         <h5>Cash management</h5>
>         <ul>
>             <li><a href="/cgi-bin/koha/pos/pay.pl">Point of sale</a></li>
>@@ -11,8 +10,8 @@
>             [% END %]
>             <li><a href="/cgi-bin/koha/pos/registers.pl">Cash summary for [% Branches.GetLoggedInBranchname | html %]</a></li>
>         </ul>
>-        [% END %]
>-        [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %]
>+    [% END %]
>+    [% IF ( CAN_user_parameters_manage_cash_registers || CAN_user_parameters_manage_accounts) %]
>         <h5>Administration</h5>
>         <ul>
>             [% IF ( CAN_user_parameters_manage_cash_registers ) %]
>@@ -23,6 +22,5 @@
>                 <li><a href="/cgi-bin/koha/admin/debit_types.pl">Configure items for purchase</a></li>
>             [% END %]
>         </ul>
>-        [% END %]
>-    </div>
>-</div>
>+    [% END %]
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>index 021b8f7bf7..17769521ae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
>@@ -1,5 +1,5 @@
> [% USE HtmlId %]
>-<div id="menu">
>+<div id="prefs-menu" class="sidebar_menu">
>     <ul>
>         [% IF ( accounting ) %]
>             <li class="active">
>@@ -199,7 +199,7 @@
>         [% END %]
>         </li>
>     </ul>
>-</div>
>+</div> 
> 
> [% BLOCK subtabs %]
>     [% UNLESS ( searchfield ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/preservation-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/preservation-menu.inc
>index e284b96a42..39c39ef716 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/preservation-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/preservation-menu.inc
>@@ -1,11 +1,9 @@
> [% USE Koha %]
>-<div id="navmenu">
>-    <div id="navmenulist">
>-        <h5>Preservation</h5>
>-        <ul>
>-            <li><a href="/cgi-bin/koha/preservation/home.pl">Preservation home</a></li>
>-            <li><a href="/cgi-bin/koha/preservation/waiting-list.pl">Waiting list</a></li>
>-            <li><a href="/cgi-bin/koha/preservation/trains.pl">Trains</a></li>
>-        </ul>
>-    </div>
>-</div>
>+<div id="preservation-menu" class="sidebar_menu">
>+    <h5>Preservation</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/preservation/home.pl">Preservation home</a></li>
>+        <li><a href="/cgi-bin/koha/preservation/waiting-list.pl">Waiting list</a></li>
>+        <li><a href="/cgi-bin/koha/preservation/trains.pl">Trains</a></li>
>+    </ul>
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
>index cb6f892e5f..1e50ea90cf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
>@@ -1,59 +1,55 @@
> [% USE Koha %]
>-
>-<div id="navmenu">
>-    <div id="navmenulist">
>-
>-        <h5>Guided reports</h5>
>-            <ul>
>-                <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li>
>-                [% IF ( CAN_user_reports_create_reports ) %]
>-                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">Build new</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_reports_execute_reports ) %]
>-                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=list">Use saved</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_reports_create_reports ) %]
>-                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql">Create from SQL</a></li>
>-                [% END %]
>-            </ul>
>-
>-        <h5>Statistics wizards</h5>
>-            <ul>
>-                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
>-                <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
>-                <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li>
>-                <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
>-                <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li>
>-                <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li>
>-                <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li>
>-            </ul>
>-
>-        [% IF plugins_enabled %]
>-            <h5>Report plugins</h5>
>-            <ul>
>-                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li>
>-            </ul>
>+<div id="reports-menu" class="sidebar_menu">
>+    <h5>Guided reports</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports</a></li>
>+        [% IF ( CAN_user_reports_create_reports ) %]
>+            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form">Build new</a></li>
>         [% END %]
>-
>-        <h5>Top lists</h5>
>-        <ul>
>-            <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
>-            <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li>
>-        </ul>
>-
>-        <h5>Inactive</h5>
>-        <ul>
>-            <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
>-            <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li>
>-        </ul>
>-
>-
>-        <h5>Other</h5>
>+        [% IF ( CAN_user_reports_execute_reports ) %]
>+            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=list">Use saved</a></li>
>+        [% END %]
>+        [% IF ( CAN_user_reports_create_reports ) %]
>+            <li><a href="/cgi-bin/koha/reports/guided_reports.pl?op=add_form_sql">Create from SQL</a></li>
>+        [% END %]
>+    </ul>
>+
>+    <h5>Statistics wizards</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
>+        <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
>+        <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li>
>+        <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
>+        <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li>
>+        <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li>
>+        <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li>
>+    </ul>
>+
>+    [% IF plugins_enabled %]
>+        <h5>Report plugins</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li>
>-            <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li>
>-            <li><a href="/cgi-bin/koha/reports/catalog_by_itemtype.pl">Catalog by item type</a></li>
>-            <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
>+            <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li>
>         </ul>
>-    </div>
>-</div>
>+    [% END %]
>+
>+    <h5>Top lists</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a></li>
>+        <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most-circulated items</a></li>
>+    </ul>
>+
>+    <h5>Inactive</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
>+        <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a></li>
>+    </ul>
>+
>+
>+    <h5>Other</h5>
>+    <ul>
>+        <li><a href="/cgi-bin/koha/reports/itemslost.pl">Lost items</a></li>
>+        <li><a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a></li>
>+        <li><a href="/cgi-bin/koha/reports/catalog_by_itemtype.pl">Catalog by item type</a></li>
>+        <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
>+    </ul>
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>index 1f3d48333a..b3b845a933 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
>@@ -1,7 +1,6 @@
>-<div id="navmenu">
>-    <div id="navmenulist">
>-        <h5>Serials</h5>
>-        <ul>
>+<div id="serials-menu" class="sidebar_menu">
>+    <h5>Serials</h5>
>+    <ul>
>         [% IF ( subscriptionid ) %]
>                 <li><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscriptionid | uri %]">Serial collection</a></li>
>                 [% UNLESS closed %]
>@@ -15,38 +14,37 @@
>                 [% END %]
>         [% END %]
> 
>-            [% IF ( CAN_user_serials_claim_serials ) %]
>-                <li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
>-            [% END %]
>-            [% IF ( CAN_user_serials_check_expiration ) %]
>-                <li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check expiration</a></li>
>-            [% END %]
>-            <li>
>-                <a href="/cgi-bin/koha/serials/subscription-frequencies.pl">
>-                    Manage frequencies
>-                </a>
>-            </li>
>+        [% IF ( CAN_user_serials_claim_serials ) %]
>+            <li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
>+        [% END %]
>+        [% IF ( CAN_user_serials_check_expiration ) %]
>+            <li><a href="/cgi-bin/koha/serials/checkexpiration.pl">Check expiration</a></li>
>+        [% END %]
>+        <li>
>+            <a href="/cgi-bin/koha/serials/subscription-frequencies.pl">
>+                Manage frequencies
>+            </a>
>+        </li>
>+        <li>
>+            <a href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">
>+                Manage numbering patterns
>+            </a>
>+        </li>
>+        [% IF Koha.Preference('Mana') == 1 %]
>+            <li><a href="/cgi-bin/koha/serials/serials-search.pl?mana=1">Search on Mana</a></li>
>+        [% END %]
>+        [% IF CAN_user_serials_edit_subscription && CAN_user_parameters_manage_additional_fields %]
>             <li>
>-                <a href="/cgi-bin/koha/serials/subscription-numberpatterns.pl">
>-                    Manage numbering patterns
>-                </a>
>+                <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=subscription">Manage subscription fields</a>
>             </li>
>-            [% IF Koha.Preference('Mana') == 1 %]
>-                <li><a href="/cgi-bin/koha/serials/serials-search.pl?mana=1">Search on Mana</a></li>
>-            [% END %]
>-            [% IF CAN_user_serials_edit_subscription && CAN_user_parameters_manage_additional_fields %]
>-                <li>
>-                    <a href="/cgi-bin/koha/admin/additional-fields.pl?tablename=subscription">Manage subscription fields</a>
>-                </li>
>-            [% END %]
>-        </ul>
>-
>-        [% IF ( CAN_user_reports ) %]
>-            <h5>Reports</h5>
>-            <ul>
>-                <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials statistics wizard</a></li>
>-            </ul>
>         [% END %]
>+    </ul>
>+
>+    [% IF ( CAN_user_reports ) %]
>+        <h5>Reports</h5>
>+        <ul>
>+            <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials statistics wizard</a></li>
>+        </ul>
>+    [% END %]
> 
>-    </div>
>-</div>
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>index b106cffbea..39cb7c31be 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>@@ -2,99 +2,98 @@
> [% USE Branches %]
> [% USE Registers %]
> 
>-<div id="navmenu">
>-    <div id="navmenulist">
>+<div id="tools-menu" class="sidebar_menu">
>+    <ul>
>+        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li>
>+    </ul>
>+    [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) || CAN_user_tools_rotating_collections ) %]
>+        <h5>Patrons and circulation</h5>
>         <ul>
>-            <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li>
>+            [% IF ( CAN_user_tools_manage_patron_lists ) %]
>+                <li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li>
>+            [% END %]
>+            [% IF (CAN_user_clubs) %]
>+                <li><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_moderate_comments ) %]
>+                <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_import_patrons ) %]
>+                <li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_edit_notices ) %]
>+                <li><a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_edit_notice_status_triggers ) %]
>+                <li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_label_creator ) %]
>+                <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_delete_anonymize_patrons ) %]
>+                <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion and anonymization</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_edit_patrons ) %]
>+                <li><a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_batch_extend_due_dates ) %]
>+                <li><a href="/cgi-bin/koha/tools/batch_extend_due_dates.pl">Batch extend due dates</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_moderate_tags ) %]
>+                <li><a href="/cgi-bin/koha/tags/review.pl">Tags</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %]
>+                <li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_rotating_collections ) %]
>+                <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li>
>+            [% END %]
>         </ul>
>-        [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) || CAN_user_tools_rotating_collections ) %]
>-            <h5>Patrons and circulation</h5>
>-            <ul>
>-                [% IF ( CAN_user_tools_manage_patron_lists ) %]
>-                    <li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li>
>-                [% END %]
>-                [% IF (CAN_user_clubs) %]
>-                    <li><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_moderate_comments ) %]
>-                    <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_import_patrons ) %]
>-                    <li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_edit_notices ) %]
>-                    <li><a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_edit_notice_status_triggers ) %]
>-                    <li><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue notice/status triggers</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_label_creator ) %]
>-                    <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_delete_anonymize_patrons ) %]
>-                    <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion and anonymization</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_edit_patrons ) %]
>-                    <li><a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_batch_extend_due_dates ) %]
>-                    <li><a href="/cgi-bin/koha/tools/batch_extend_due_dates.pl">Batch extend due dates</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_moderate_tags ) %]
>-                    <li><a href="/cgi-bin/koha/tags/review.pl">Tags</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %]
>-                    <li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_rotating_collections ) %]
>-                    <li><a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a></li>
>-                [% END %]
>-            </ul>
>-        [% END # /IF ( CAN_user_tools_items_batchdel... %]
>+    [% END # /IF ( CAN_user_tools_items_batchdel... %]
> 
>-        [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]
>-            <h5>Additional tools</h5>
>-            <ul>
>-                [% IF ( CAN_user_tools_edit_calendar ) %]
>-                    <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_manage_csv_profiles ) %]
>-                    <li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_view_system_logs ) %]
>-                    <li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_edit_additional_contents ) %]
>-                    <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a></li>
>-                    <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a></li>
>-                    <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_schedule_tasks ) %]
>-                    <li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_edit_quotes ) %]
>-                    <li><a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a></li>
>-                [% END %]
>-                [% IF ( plugins_enabled && CAN_user_plugins_tool ) %]
>-                    <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">Tool plugins</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_upload_general_files ) %]
>-                    <li><a href="/cgi-bin/koha/tools/upload.pl">Uploads</a></li>
>-                [% END %]
>-                [% IF ( CAN_user_tools_access_files ) %]
>-                    <li><a href="/cgi-bin/koha/tools/access_files.pl">Access files</a></li>
>-                [% END %]
>-                [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
>-                    <li><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></li>
>-                [% END %]
>-            </ul>
>-        [% END # /IF ( CAN_user_tools_edit_calendar... %]
>-        [% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %]
>-            <h5>Cash management</h5>
>-            <ul>
>-                <li><a href="/cgi-bin/koha/pos/registers.pl">Cash summary for [% Branches.GetLoggedInBranchname | html %]</a></li>
>-                <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li>
>-            </ul>
>-        [% END %]
>-    </div> 
>-</div> 
>+    [% IF ( CAN_user_tools_edit_calendar || CAN_user_tools_manage_csv_profiles || CAN_user_tools_view_system_logs || CAN_user_tools_edit_additional_contents  || CAN_user_tools_schedule_tasks || CAN_user_tools_edit_quotes || ( Koha.ArePluginsEnabled() && CAN_user_plugins_tool )  || CAN_user_tools_upload_general_files || CAN_user_tools_access_files ) %]
>+        <h5>Additional tools</h5>
>+        <ul>
>+            [% IF ( CAN_user_tools_edit_calendar ) %]
>+                <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_manage_csv_profiles ) %]
>+                <li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_view_system_logs ) %]
>+                <li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_edit_additional_contents ) %]
>+                <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a></li>
>+                <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a></li>
>+                <li><a href="/cgi-bin/koha/tools/additional-contents.pl?category=pages">Pages</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_schedule_tasks ) %]
>+                <li><a href="/cgi-bin/koha/tools/scheduler.pl">Task scheduler</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_edit_quotes ) %]
>+                <li><a href="/cgi-bin/koha/tools/quotes.pl">Quote editor</a></li>
>+            [% END %]
>+            [% IF ( plugins_enabled && CAN_user_plugins_tool ) %]
>+                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=tool">Tool plugins</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_upload_general_files ) %]
>+                <li><a href="/cgi-bin/koha/tools/upload.pl">Uploads</a></li>
>+            [% END %]
>+            [% IF ( CAN_user_tools_access_files ) %]
>+                <li><a href="/cgi-bin/koha/tools/access_files.pl">Access files</a></li>
>+            [% END %]
>+            [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
>+                <li><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></li>
>+            [% END %]
>+        </ul>
>+    [% END # /IF ( CAN_user_tools_edit_calendar... %]
>+    [% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %]
>+        <h5>Cash management</h5>
>+        <ul>
>+            <li><a href="/cgi-bin/koha/pos/registers.pl">Cash summary for [% Branches.GetLoggedInBranchname | html %]</a></li>
>+            <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li>
>+        </ul>
>+    [% END %]
>+
>+</div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc
>index 631692721e..897edb1bcb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc
>@@ -1,16 +1,16 @@
> [% IF ( booksellerid ) %]
>-<div id="menu">
>-    <ul>
>-        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %]
>-        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
>-        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a></li>[% END %]
>-        [% IF ( CAN_user_acquisition_issue_manage ) %]<li><a href="/cgi-bin/koha/acqui/vendor_issues.pl?booksellerid=[% booksellerid | uri %]">Vendor issues</a></li>[% END %]
>-        <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid | uri %]&amp;op=do_search">Invoices</a></li>
>-        [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]
>-        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;owner=1">Uncertain prices</a></li>
>-        [% ELSE %]
>-        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1">Uncertain prices</a></li>
>-        [% END %] [% END %]
>-    </ul>
>-</div>
>+    <div id="vendor-menu" class="sidebar_menu">
>+        <ul>
>+            [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %]
>+            [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
>+            [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a></li>[% END %]
>+            [% IF ( CAN_user_acquisition_issue_manage ) %]<li><a href="/cgi-bin/koha/acqui/vendor_issues.pl?booksellerid=[% booksellerid | uri %]">Vendor issues</a></li>[% END %]
>+            <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid | uri %]&amp;op=do_search">Invoices</a></li>
>+            [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]
>+            <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;owner=1">Uncertain prices</a></li>
>+            [% ELSE %]
>+            <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&amp;owner=1">Uncertain prices</a></li>
>+            [% END %] [% END %]
>+        </ul>
>+    </div> 
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>index 15acdb833e..aad00808f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
>@@ -323,7 +323,7 @@
>         }
> 
>         $(document).ready(function() {
>-            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>+            $('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             [% IF table_loop %]
>                 $("#description").show();
>             [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>index a7fa1a488d..424d72629f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
>@@ -233,7 +233,7 @@
> [% MACRO jsinclude BLOCK %]
>     <script>
>         $(document).ready(function() {
>-            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>+            $('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             $("input[name='layout_choice']").change( function() { layout_method() } );
>             layout_method();
>             $("#font").on("change",function(){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>index a5b5798314..60288f1fad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
>@@ -153,7 +153,7 @@
> [% MACRO jsinclude BLOCK %]
>     <script>
>         $(document).ready(function(){
>-            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>+            $('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             var selectedUnit = $("#units option:selected").val();
>             var unitfields = $("#offset_horz,#offset_vert,#creep_horz,#creep_vert");
>             $(unitfields).after("<span class=\"unit\">"+getUnit(selectedUnit)+"</span>");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>index feb837db1c..f27f3a8192 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt
>@@ -105,7 +105,7 @@
>             }
> 
>         $(document).ready(function () {
>-            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>+            $('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             $.validator.addMethod("gt", function(value, element, params) {
>                 return parseInt(value) >= parseInt($(params).val());
>             }, _("Must be greater or equal to the from value."));
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>index 900a7d15e5..8fdbddab56 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
>@@ -199,7 +199,7 @@
> [% MACRO jsinclude BLOCK %]
>     <script>
>         $(document).ready(function(){
>-            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>+            $('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             var selectedUnit = $("#units option:selected").val();
>             var unitfields = $("#page_height,#page_width,#label_width,#label_height,#top_margin,#left_margin,#top_text_margin,#left_text_margin,#col_gap,#row_gap");
>             $(unitfields).after("<span class=\"unit\">"+getUnit(selectedUnit)+"</span>");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>index 582d7786a3..aef75f2a0b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
>@@ -185,7 +185,7 @@
>             return (-1);
>         }
>         $(document).ready(function(){
>-            $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>+            $('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>             $("#print").click(function(e){
>                 e.preventDefault();
>                 Xport();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>index 14c5cb2b65..fa0744d4f5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>@@ -506,7 +506,7 @@ $(document).ready(function() {
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>                 [% INCLUDE 'serials-menu.inc' %]
>-                <div id="serialmenu">
>+                <div id="serialmenu" class="sidebar_menu">
>                     <h5>Serial links</h5>
>                     <ul>
>                         [% FOREACH subscription IN subscriptions %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
>index 7c07c8d87d..aa184248e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt
>@@ -103,14 +103,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                <div id="menu">
>+                <div id="list-menu" class="sidebar_menu">
>                     <ul>
>                         <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved tags</a></li>
>                         <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected tags</a></li>
>                         <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending tags</a></li>
>                         <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">All tags</a></li>
>                     </ul>
>-                </div>
>+                </div> 
>                 [% INCLUDE 'tools-menu.inc' %]
>             </aside>
>         </div> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>index dec382dc8b..168a391c15 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
>@@ -669,24 +669,24 @@
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>                 [% IF ( op == 'manage_stages' || op == 'manage_items' ) %]
>-                    <div id="menu">
>+                    <div id="stockrotation-menu" class="sidebar_menu">
>                         <ul>
>                             [% IF op == 'manage_stages' %]
>                                 <li class="active">
>                             [% ELSE %]
>                                 <li>
>                             [% END %]
>-                                    <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&amp;rota_id=[% rota_id | uri %]">Manage stages</a>
>-                                </li>
>+                                <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&amp;rota_id=[% rota_id | uri %]">Manage stages</a>
>+                            </li>
>                             [% IF op == 'manage_items' %]
>                                 <li class="active">
>                             [% ELSE %]
>                                 <li>
>                             [% END %]
>-                                    <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&amp;rota_id=[% rota_id | uri %]">Manage items</a>
>+                                <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&amp;rota_id=[% rota_id | uri %]">Manage items</a>
>                             </li>
>                         </ul>
>-                    </div>
>+                    </div> 
>                 [% END %]
>                 [% INCLUDE 'cat-menu.inc' %]
>             </aside>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js b/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js
>index 313ae0f5ef..eade2ff33c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js
>@@ -9,7 +9,7 @@ function searchToOrder( basketno, vendorid ){
> $(document).ready(function() {
>     var path = location.pathname.substring(1);
>     if (path.indexOf("invoice") >= 0) {
>-        $('#navmenulist a[href$="/cgi-bin/koha/acqui/invoices.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/acqui/invoices.pl"]').addClass("current");
>     }
> 
>     $("body").on("click", "#searchtoorder", function(){
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js b/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js
>index f7b69c77fe..ba2b5b571b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js
>@@ -1,14 +1,14 @@
> $(document).ready(function() {
>     var path = location.pathname.substring(1);
>     if (path == "cgi-bin/koha/admin/marctagstructure.pl" || path == "cgi-bin/koha/admin/marc_subfields_structure.pl") {
>-        $('#navmenulist a[href$="/cgi-bin/koha/admin/biblio_framework.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/admin/biblio_framework.pl"]').addClass("current");
>     } else if (path == "cgi-bin/koha/admin/auth_tag_structure.pl" || path == "cgi-bin/koha/admin/auth_subfields_structure.pl") {
>-        $('#navmenulist a[href$="/cgi-bin/koha/admin/authtypes.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/admin/authtypes.pl"]').addClass("current");
>     } else if (path == "cgi-bin/koha/admin/oai_set_mappings.pl") {
>-        $('#navmenulist a[href$="/cgi-bin/koha/admin/oai_sets.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/admin/oai_sets.pl"]').addClass("current");
>     } else if (path == "cgi-bin/koha/admin/items_search_field.pl") {
>-        $('#navmenulist a[href$="/cgi-bin/koha/admin/items_search_fields.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/admin/items_search_fields.pl"]').addClass("current");
>     } else if (path == "cgi-bin/koha/admin/clone-rules.pl") {
>-        $('#navmenulist a[href$="/cgi-bin/koha/admin/smart-rules.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/admin/smart-rules.pl"]').addClass("current");
>     }
> });
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>index ceaf8b8d57..db6d53e6b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>@@ -163,18 +163,18 @@ $(document).ready(function () {
>         }
>     });
> 
>-    var navmenulist = $("#navmenulist");
>-    if (navmenulist.length > 0) {
>+    var sidebar_menu = $(".sidebar_menu");
>+    if (sidebar_menu.length > 0) {
>         var path = location.pathname.substring(1);
>         var url = window.location.toString();
>         var params = "";
>         if (url.match(/\?(.+)$/)) {
>             params = "?" + RegExp.$1;
>         }
>-        if ($('a[href$="/' + path + params + '"]', navmenulist).length == 0) {
>-            $('a[href$="/' + path + '"]', navmenulist).addClass("current");
>+        if ($('a[href$="/' + path + params + '"]', sidebar_menu).length == 0) {
>+            $('a[href$="/' + path + '"]', sidebar_menu).addClass("current");
>         } else {
>-            $('a[href$="/' + path + params + '"]', navmenulist).addClass(
>+            $('a[href$="/' + path + params + '"]', sidebar_menu).addClass(
>                 "current"
>             );
>         }
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js b/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js
>index fa8c1a6e2d..85b9e04e11 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js
>@@ -1,24 +1,24 @@
>   $(document).ready(function() {
>       var path = location.pathname.substring(1);
>       if (path.indexOf("labels") >= 0 && path.indexOf("spine") < 0 && path.indexOf("barcode") < 0 ) {
>-        $('#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");
>       } else if (path.indexOf("patroncards") >= 0 ) {
>-        $('#navmenulist a[href$="/cgi-bin/koha/patroncards/home.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/patroncards/home.pl"]').addClass("current");
>       } else if (path.indexOf("clubs") >= 0 ) {
>-          $('#navmenulist a[href$="/cgi-bin/koha/clubs/clubs.pl"]').addClass("current");
>+          $('.sidebar_menu a[href$="/cgi-bin/koha/clubs/clubs.pl"]').addClass("current");
>       } else if (path.indexOf("patron_lists") >= 0 ) {
>-        $('#navmenulist a[href$="/cgi-bin/koha/patron_lists/lists.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/patron_lists/lists.pl"]').addClass("current");
>       } else if (path.indexOf("rotating_collections") >= 0 ){
>-        $('#navmenulist a[href$="/cgi-bin/koha/rotating_collections/rotatingCollections.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/rotating_collections/rotatingCollections.pl"]').addClass("current");
>       } else if ((path+location.search).indexOf("batchMod.pl?del=1") >= 0 ) {
>-        $('#navmenulist a[href$="/cgi-bin/koha/tools/batchMod.pl?del=1"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/tools/batchMod.pl?del=1"]').addClass("current");
>       } else if (path.indexOf("quotes-upload.pl") >= 0 ){
>-        $('#navmenulist a[href$="/cgi-bin/koha/tools/quotes.pl"]').addClass("current");
>+        $('.sidebar_menu a[href$="/cgi-bin/koha/tools/quotes.pl"]').addClass("current");
>       } else if (path.indexOf("stockrotation") >= 0 ) {
>-          $('#navmenulist a[href$="/cgi-bin/koha/tools/stockrotation.pl"]').addClass("current");
>+          $('.sidebar_menu a[href$="/cgi-bin/koha/tools/stockrotation.pl"]').addClass("current");
>       } else if (path.indexOf("plugins") >= 0 ) {
>-          $('#navmenulist a[href$="/cgi-bin/koha/plugins/plugins-home.pl?method=tool"]').addClass("current");
>+          $('.sidebar_menu a[href$="/cgi-bin/koha/plugins/plugins-home.pl?method=tool"]').addClass("current");
>       } else if (path.indexOf("page.pl") >= 0 ) {
>-          $('#navmenulist a[href$="/cgi-bin/koha/tools/additional-contents.pl?category=pages"]').addClass("current");
>+          $('.sidebar_menu a[href$="/cgi-bin/koha/tools/additional-contents.pl?category=pages"]').addClass("current");
>       }
>   });
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
>index 5cccf1b4ab..bdb8cf593a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
>@@ -172,7 +172,7 @@ export default {
> 
> <style>
> #menu ul ul,
>-#navmenulist ul ul {
>+.sidebar_menu ul ul {
>     padding-left: 2em;
>     font-size: 100%;
> }
>@@ -194,12 +194,12 @@ textarea {
> .flatpickr-input {
>     width: 30%;
> }
>-#navmenulist ul li a.current.disabled {
>+.sidebar_menu ul li a.current.disabled {
>     background-color: inherit;
>     border-left: 5px solid #e6e6e6;
>     color: #000;
> }
>-#navmenulist ul li a.disabled {
>+.sidebar_menu ul li a.disabled {
>     color: #666;
>     pointer-events: none;
>     font-weight: 700;
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/LeftMenu.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/LeftMenu.vue
>index 147402b067..da951c02e6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/LeftMenu.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/LeftMenu.vue
>@@ -1,17 +1,16 @@
> <template>
>     <aside>
>-        <div id="navmenu">
>-            <div id="navmenulist">
>-                <h5>{{ $__(title) }}</h5>
>-                <ul>
>-                    <NavigationItem
>-                        v-for="(item, key) in navigationTree"
>-                        v-bind:key="key"
>-                        :item="item"
>-                    ></NavigationItem>
>-                </ul>
>-            </div>
>+        <div class="sidebar_menu">
>+            <h5>{{ $__(title) }}</h5>
>+            <ul>
>+                <NavigationItem
>+                    v-for="(item, key) in navigationTree"
>+                    v-bind:key="key"
>+                    :item="item"
>+                ></NavigationItem>
>+            </ul>
>         </div>
>+        
>     </aside>
> </template>
> 
>@@ -47,21 +46,21 @@ export default {
> </script>
> 
> <style scoped>
>-#navmenulist a.router-link-active {
>+.sidebar_menu a.router-link-active {
>     font-weight: 700;
> }
> #menu ul ul,
>-#navmenulist ul ul {
>+.sidebar_menu ul ul {
>     padding-left: 2em;
>     font-size: 100%;
> }
> 
>-#navmenulist ul li a.disabled {
>+.sidebar_menu ul li a.disabled {
>     color: #666;
>     pointer-events: none;
>     font-weight: 700;
> }
>-#navmenulist ul li a.disabled.router-link-active {
>+.sidebar_menu ul li a.disabled.router-link-active {
>     color: #000;
> }
> </style>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/Main.vue
>index 217bc51393..d68e6debf2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/Main.vue
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/Main.vue
>@@ -108,7 +108,7 @@ export default {
> 
> <style>
> #menu ul ul,
>-#navmenulist ul ul {
>+.sidebar_menu ul ul {
>     padding-left: 2em;
>     font-size: 100%;
> }
>@@ -131,12 +131,12 @@ textarea {
>     width: 30%;
> }
> 
>-#navmenulist ul li a.current.disabled {
>+.sidebar_menu ul li a.current.disabled {
>     background-color: inherit;
>     border-left: 5px solid #e6e6e6;
>     color: #000;
> }
>-#navmenulist ul li a.disabled {
>+.sidebar_menu ul li a.disabled {
>     color: #666;
>     pointer-events: none;
>     font-weight: 700;
>diff --git a/t/cypress/integration/ERM/Agreements_spec.ts b/t/cypress/integration/ERM/Agreements_spec.ts
>index e8b18014f6..cbb69e9a4b 100644
>--- a/t/cypress/integration/ERM/Agreements_spec.ts
>+++ b/t/cypress/integration/ERM/Agreements_spec.ts
>@@ -26,7 +26,7 @@ describe("Agreement CRUD operations", () => {
>             statusCode: 500,
>         });
>         cy.visit("/cgi-bin/koha/erm/erm.pl");
>-        cy.get("#navmenulist").contains("Agreements").click();
>+        cy.get(".sidebar_menu").contains("Agreements").click();
>         cy.get("main div[class='dialog alert']").contains(
>             "Something went wrong: Error: Internal Server Error"
>         );
>diff --git a/t/cypress/integration/ERM/DataProviders_spec.ts b/t/cypress/integration/ERM/DataProviders_spec.ts
>index 1f80f6ca78..01aa4a9db9 100644
>--- a/t/cypress/integration/ERM/DataProviders_spec.ts
>+++ b/t/cypress/integration/ERM/DataProviders_spec.ts
>@@ -28,7 +28,7 @@ describe("Data provider CRUD operations", () => {
>             error: "Something went wrong",
>         });
>         cy.visit("/cgi-bin/koha/erm/erm.pl");
>-        cy.get("#navmenulist").contains("Data providers").click();
>+        cy.get(".sidebar_menu").contains("Data providers").click();
>         cy.get("main div[class='dialog alert']").contains(
>             /Something went wrong/
>         );
>diff --git a/t/cypress/integration/ERM/Dialog_spec.ts b/t/cypress/integration/ERM/Dialog_spec.ts
>index c52da243ef..3c1673d8b7 100644
>--- a/t/cypress/integration/ERM/Dialog_spec.ts
>+++ b/t/cypress/integration/ERM/Dialog_spec.ts
>@@ -55,7 +55,7 @@ describe("Dialog operations", () => {
>             },
>         });
>         cy.visit("/cgi-bin/koha/erm/erm.pl");
>-        cy.get("#navmenulist").contains("Packages").click();
>+        cy.get(".sidebar_menu").contains("Packages").click();
>         cy.get("main div[class='dialog alert']").contains(
>             "Something went wrong: Error: This is a specific error message"
>         );
>@@ -64,13 +64,13 @@ describe("Dialog operations", () => {
>             statusCode: 500, // No body, in case of Internal Server Error, we get statusText
>         });
>         cy.visit("/cgi-bin/koha/erm/erm.pl");
>-        cy.get("#navmenulist").contains("Packages").click();
>+        cy.get(".sidebar_menu").contains("Packages").click();
>         cy.get("main div[class='dialog alert']").contains(
>             "Something went wrong: Error: Internal Server Error"
>         );
> 
>         cy.intercept("GET", "/api/v1/erm/agreements*", []);
>-        cy.get("#navmenulist").contains("Agreements").click();
>+        cy.get(".sidebar_menu").contains("Agreements").click();
>         // Info messages should be cleared when view is changed
>         cy.get("main div[class='dialog message']").contains(
>             "There are no agreements defined"
>@@ -114,7 +114,7 @@ describe("Dialog operations", () => {
>                 "X-Total-Count": "1",
>             },
>         });
>-        cy.get("#navmenulist").contains("Titles").click();
>+        cy.get(".sidebar_menu").contains("Titles").click();
>         // Info messages should be cleared when view is changed
>         cy.get("main div[class='dialog message']").should("not.exist");
>     });
>diff --git a/t/cypress/integration/ERM/Licenses_spec.ts b/t/cypress/integration/ERM/Licenses_spec.ts
>index 5718ca4c6c..a12cb1c382 100644
>--- a/t/cypress/integration/ERM/Licenses_spec.ts
>+++ b/t/cypress/integration/ERM/Licenses_spec.ts
>@@ -51,7 +51,7 @@ describe("License CRUD operations", () => {
>             statusCode: 500,
>         });
>         cy.visit("/cgi-bin/koha/erm/erm.pl");
>-        cy.get("#navmenulist").contains("Licenses").click();
>+        cy.get(".sidebar_menu").contains("Licenses").click();
>         cy.get("main div[class='dialog alert']").contains(
>             "Something went wrong: Error: Internal Server Error"
>         );
>diff --git a/t/cypress/integration/ERM/Packages_spec.ts b/t/cypress/integration/ERM/Packages_spec.ts
>index 2ba71e529a..e59d2e4c8e 100644
>--- a/t/cypress/integration/ERM/Packages_spec.ts
>+++ b/t/cypress/integration/ERM/Packages_spec.ts
>@@ -40,7 +40,7 @@ describe("Package CRUD operations", () => {
>             statusCode: 500,
>         });
>         cy.visit("/cgi-bin/koha/erm/erm.pl");
>-        cy.get("#navmenulist").contains("Packages").click();
>+        cy.get(".sidebar_menu").contains("Packages").click();
>         cy.get("main div[class='dialog alert']").contains(
>             "Something went wrong: Error: Internal Server Error"
>         );
>diff --git a/t/cypress/integration/ERM/Titles_spec.ts b/t/cypress/integration/ERM/Titles_spec.ts
>index 22229b339c..b2b0841162 100644
>--- a/t/cypress/integration/ERM/Titles_spec.ts
>+++ b/t/cypress/integration/ERM/Titles_spec.ts
>@@ -78,7 +78,7 @@ describe("Title CRUD operations", () => {
>             error: "Something went wrong",
>         });
>         cy.visit("/cgi-bin/koha/erm/erm.pl");
>-        cy.get("#navmenulist").contains("Titles").click();
>+        cy.get(".sidebar_menu").contains("Titles").click();
>         cy.get("main div[class='dialog alert']").contains(
>             /Something went wrong/
>         );
>diff --git a/t/cypress/integration/Preservation/Settings.ts b/t/cypress/integration/Preservation/Settings.ts
>index 9aff16a927..df09bde420 100644
>--- a/t/cypress/integration/Preservation/Settings.ts
>+++ b/t/cypress/integration/Preservation/Settings.ts
>@@ -82,7 +82,7 @@ describe("Processings", () => {
> 
>     it("Settings", () => {
>         cy.visit("/cgi-bin/koha/preservation/home.pl");
>-        cy.get("#navmenulist").contains("Settings").click();
>+        cy.get(".sidebar_menu").contains("Settings").click();
>         cy.get("#not_for_loan_waiting_list_in .vs__selected").contains(
>             "In preservation"
>         );
>diff --git a/t/cypress/integration/Preservation/Trains.ts b/t/cypress/integration/Preservation/Trains.ts
>index 03cb7ba236..c040673115 100644
>--- a/t/cypress/integration/Preservation/Trains.ts
>+++ b/t/cypress/integration/Preservation/Trains.ts
>@@ -262,7 +262,7 @@ describe("Trains", () => {
>             error: "Something went wrong",
>         });
>         cy.visit("/cgi-bin/koha/preservation/home.pl");
>-        cy.get("#navmenulist").contains("Trains").click();
>+        cy.get(".sidebar_menu").contains("Trains").click();
>         cy.get("main div[class='dialog alert']").contains(
>             /Something went wrong/
>         );
>diff --git a/t/cypress/integration/Preservation/WaitingList.ts b/t/cypress/integration/Preservation/WaitingList.ts
>index 1b397f7af0..588d9b969d 100644
>--- a/t/cypress/integration/Preservation/WaitingList.ts
>+++ b/t/cypress/integration/Preservation/WaitingList.ts
>@@ -49,7 +49,7 @@ describe("WaitingList", () => {
>         );
>         cy.visit("/cgi-bin/koha/preservation/home.pl");
>         cy.intercept("GET", "/api/v1/preservation/waiting-list/items*", []);
>-        cy.get("#navmenulist").contains("Waiting list").click();
>+        cy.get(".sidebar_menu").contains("Waiting list").click();
>         cy.get("#waiting-list").contains(
>             "You need to configure this module first."
>         );
>@@ -62,7 +62,7 @@ describe("WaitingList", () => {
>         );
>         cy.visit("/cgi-bin/koha/preservation/home.pl");
>         cy.intercept("GET", "/api/v1/preservation/waiting-list/items*", []);
>-        cy.get("#navmenulist").contains("Waiting list").click();
>+        cy.get(".sidebar_menu").contains("Waiting list").click();
>         cy.get("#waiting-list").contains(
>             "There are no items in the waiting list"
>         );
>diff --git a/t/cypress/support/e2e.js b/t/cypress/support/e2e.js
>index c0d0d2d6f7..84f99e8f92 100644
>--- a/t/cypress/support/e2e.js
>+++ b/t/cypress/support/e2e.js
>@@ -41,7 +41,7 @@ Cypress.Commands.add('login', (username, password) => {
> })
> 
> Cypress.Commands.add('left_menu_active_item_is', (label) => {
>-    cy.get("#navmenulist a.current:not(.disabled)").should('have.length',1).contains(label);
>+    cy.get(".sidebar_menu a.current:not(.disabled)").should('have.length',1).contains(label);
> })
> const dayjs = require("dayjs") /* Cannot use our calendar JS code, it's in an include file (!)
>                                    Also note that moment.js is deprecated */
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 37222: 168285 | 168560 | 168562 | 168595 | 169426 | 169739 | 170640 | 170997 | 171151 | 173971 | 174477