Bugzilla – Attachment 177869 Details for
Bug 37222
Standardize markup for sidebar menus
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37222: Standardize markup for sidebar menus
Bug-37222-Standardize-markup-for-sidebar-menus.patch (text/plain), 121.52 KB, created by
Owen Leonard
on 2025-02-12 13:31:24 UTC
(
hide
)
Description:
Bug 37222: Standardize markup for sidebar menus
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-02-12 13:31:24 UTC
Size:
121.52 KB
patch
obsolete
>From f3c38ed240b706595b8ac5bbd834668dc3f6e080 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 >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> >Signed-off-by: David Nind <david@davidnind.com> >--- > koha-tmpl/intranet-tmpl/prog/css/print.css | 4 +- > .../prog/css/src/staff-global.scss | 18 +- > .../prog/en/includes/acquisitions-menu.inc | 111 +++--- > .../prog/en/includes/admin-menu.inc | 361 +++++++++--------- > .../prog/en/includes/biblio-view-menu.inc | 3 +- > .../prog/en/includes/cat-menu.inc | 243 ++++++------ > .../prog/en/includes/circ-menu.inc | 6 +- > .../prog/en/includes/circ-nav.inc | 242 ++++++------ > .../prog/en/includes/guided-reports-view.inc | 41 +- > .../prog/en/includes/pos-menu.inc | 47 ++- > .../prog/en/includes/prefs-menu.inc | 3 +- > .../prog/en/includes/preservation-menu.inc | 17 +- > .../prog/en/includes/reports-menu.inc | 94 +++-- > .../prog/en/includes/serials-menu.inc | 77 ++-- > .../prog/en/includes/tools-menu.inc | 185 +++++---- > .../prog/en/includes/vendor-menu.inc | 3 +- > .../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/patroncards/edit-batch.tt | 1 + > .../en/modules/patroncards/edit-layout.tt | 1 + > .../en/modules/patroncards/edit-profile.tt | 1 + > .../en/modules/patroncards/image-manage.tt | 1 + > .../prog/en/modules/patroncards/manage.tt | 1 + > .../prog/en/modules/serials/serials-edit.tt | 2 +- > .../prog/en/modules/tags/list.tt | 4 +- > .../prog/en/modules/tags/review.tt | 1 + > .../prog/en/modules/tools/stockrotation.tt | 3 +- > .../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 | 28 +- > .../prog/js/vue/components/ERM/Main.vue | 6 +- > .../prog/js/vue/components/LeftMenu.vue | 29 +- > .../js/vue/components/Preservation/Main.vue | 6 +- > members/accountline-details.pl | 1 + > members/paycollect.pl | 1 + > 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 +- > 50 files changed, 795 insertions(+), 808 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/print.css b/koha-tmpl/intranet-tmpl/prog/css/print.css >index 78ba3d57269..dae73e14213 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/print.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/print.css >@@ -317,7 +317,7 @@ td.debit { > #menu, > #limitselect, > #batchModify, >-#navmenu, >+.sidebar_menu, > .gradient, > .noprint, > form#sortbyform, >@@ -379,4 +379,4 @@ p#upload_image { > > #catalog_detail .col-sm-push-2 { > left: 0; >-} >+} >\ No newline at end of file >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 878634a08a4..30aef6b29ed 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -441,9 +441,7 @@ aside { > } > } > >-#menu, >-#navmenulist, >-#serialmenu { >+.sidebar_menu { > background-color: #E6E6E6; > display: block; > padding: 1em 0 1em 0; >@@ -461,7 +459,8 @@ aside { > padding-left: 0; > > ul { >- font-size: 75%; >+ background-color: #F3F4F4; >+ font-size: 85%; > } > > li { >@@ -498,15 +497,6 @@ aside { > } > } > >-#admin_preferences #menu { >- ul { >- ul { >- background-color: #F3F4F4; >- font-size: 85%; >- } >- } >-} >- > div { > &.mainmenu { > display: inline; >@@ -4895,4 +4885,4 @@ div .suggestion_note { > display: block; > } > } >-} >+} >\ No newline at end of file >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 819be190c7b..39684340df0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >@@ -1,62 +1,61 @@ > [% 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_create || CAN_user_suggestions_suggestions_manage || CAN_user_suggestions_suggestions_delete %]<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> >- <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_create || CAN_user_suggestions_suggestions_manage || CAN_user_suggestions_suggestions_delete %]<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_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 ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %] >+ <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/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 Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage %] >+ <li><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</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 ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %] >- <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 Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage %] >- <li><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</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> >+ [% END %] > </div> >+<!-- /.sidebar_menu --> >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 d184e2a7df1..464dbf7a568 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc >@@ -1,192 +1,191 @@ > [% USE Koha %] > >-<div id="navmenu"> >- <div id="navmenulist"> >- [% IF ( CAN_user_parameters_manage_sysprefs ) %] >- <h5>System preferences</h5> >- <ul> >- <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li> >- </ul> >- [% END %] >+<div id="admin-menu" class="sidebar_menu"> >+ [% IF ( CAN_user_parameters_manage_sysprefs ) %] >+ <h5>System preferences</h5> >+ <ul> >+ <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li> >+ </ul> >+ [% END %] > >- [% IF ( CAN_user_parameters_manage_libraries || CAN_user_parameters_manage_itemtypes || CAN_user_parameters_manage_auth_values ) %] >- <h5>Basic parameters</h5> >- <ul> >- [% IF ( CAN_user_parameters_manage_libraries ) %] >- <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li> >- <li><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_itemtypes ) %] >- <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_auth_values ) %] >- <li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li> >- [% END %] >- </ul> >- [% END %] >+ [% IF ( CAN_user_parameters_manage_libraries || CAN_user_parameters_manage_itemtypes || CAN_user_parameters_manage_auth_values ) %] >+ <h5>Basic parameters</h5> >+ <ul> >+ [% IF ( CAN_user_parameters_manage_libraries ) %] >+ <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li> >+ <li><a href="/cgi-bin/koha/admin/library_groups.pl">Library groups</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_itemtypes ) %] >+ <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_auth_values ) %] >+ <li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li> >+ [% END %] >+ </ul> >+ [% END %] > >- [% IF ( CAN_user_parameters_manage_patron_categories || CAN_user_parameters_manage_circ_rules || CAN_user_parameters_manage_patron_attributes || CAN_user_parameters_manage_transfers || CAN_user_parameters_manage_item_circ_alerts || CAN_user_parameters_manage_cities || CAN_user_parameters_manage_curbside_pickups || CAN_user_parameters_manage_patron_restrictions ) %] >- <h5>Patrons and circulation</h5> >- <ul> >- [% IF ( CAN_user_parameters_manage_patron_categories ) %] >- <li><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_circ_rules ) %] >- <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fine rules</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_patron_attributes ) %] >- <li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_transfers ) %] >- <li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li> >- <li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_item_circ_alerts ) %] >- <li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li> >- [% END %] >- [% IF ( Koha.Preference('UseCirculationDesks') && CAN_user_parameters_manage_libraries ) %] >- <li><a href="/cgi-bin/koha/admin/desks.pl">Desks</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_cities ) %] >- <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_curbside_pickups ) %] >- <li><a href="/cgi-bin/koha/admin/curbside_pickup.pl">Curbside pickup</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_patron_restrictions ) %] >- <li><a href="/cgi-bin/koha/admin/restrictions.pl">Patron restriction types</a></li> >- [% END %] >- </ul> >- [% END %] >+ [% IF ( CAN_user_parameters_manage_patron_categories || CAN_user_parameters_manage_circ_rules || CAN_user_parameters_manage_patron_attributes || CAN_user_parameters_manage_transfers || CAN_user_parameters_manage_item_circ_alerts || CAN_user_parameters_manage_cities || CAN_user_parameters_manage_curbside_pickups || CAN_user_parameters_manage_patron_restrictions ) %] >+ <h5>Patrons and circulation</h5> >+ <ul> >+ [% IF ( CAN_user_parameters_manage_patron_categories ) %] >+ <li><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_circ_rules ) %] >+ <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fine rules</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_patron_attributes ) %] >+ <li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_transfers ) %] >+ <li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li> >+ <li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_item_circ_alerts ) %] >+ <li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li> >+ [% END %] >+ [% IF ( Koha.Preference('UseCirculationDesks') && CAN_user_parameters_manage_libraries ) %] >+ <li><a href="/cgi-bin/koha/admin/desks.pl">Desks</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_cities ) %] >+ <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_curbside_pickups ) %] >+ <li><a href="/cgi-bin/koha/admin/curbside_pickup.pl">Curbside pickup</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_patron_restrictions ) %] >+ <li><a href="/cgi-bin/koha/admin/restrictions.pl">Patron restriction types</a></li> >+ [% END %] >+ </ul> >+ [% END %] > >- [% IF ( CAN_user_parameters_manage_accounts || ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) ) %] >- <h5>Accounting</h5> >- <ul> >- [% IF ( CAN_user_parameters_manage_accounts ) %] >- <li><a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a></li> >- <li><a href="/cgi-bin/koha/admin/credit_types.pl">Credit types</a></li> >- [% END %] >- [% IF ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) %] >- <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Cash registers</a></li> >- [% END %] >- </ul> >- [% END %] >+ [% IF ( CAN_user_parameters_manage_accounts || ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) ) %] >+ <h5>Accounting</h5> >+ <ul> >+ [% IF ( CAN_user_parameters_manage_accounts ) %] >+ <li><a href="/cgi-bin/koha/admin/debit_types.pl">Debit types</a></li> >+ <li><a href="/cgi-bin/koha/admin/credit_types.pl">Credit types</a></li> >+ [% END %] >+ [% IF ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) %] >+ <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Cash registers</a></li> >+ [% END %] >+ </ul> >+ [% END %] > >- [% IF CAN_user_plugins && plugins_enabled %] >- <h5>Plugins</h5> >- <ul> >- <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a></li> >- </ul> >- [% END %] >+ [% IF CAN_user_plugins && plugins_enabled %] >+ <h5>Plugins</h5> >+ <ul> >+ <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a></li> >+ </ul> >+ [% END %] > >- [% IF CAN_user_parameters_manage_background_jobs %] >- <h5>Jobs</h5> >- <ul> >- <li><a href="/cgi-bin/koha/admin/background_jobs.pl">Jobs</a></li> >- </ul> >- [% END %] >+ [% IF CAN_user_parameters_manage_background_jobs %] >+ <h5>Jobs</h5> >+ <ul> >+ <li><a href="/cgi-bin/koha/admin/background_jobs.pl">Jobs</a></li> >+ </ul> >+ [% END %] > >- [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules || ( Koha.Preference('SavedSearchFilters') && CAN_user_parameters_manage_search_filters ) ) %] >- <h5>Catalog</h5> >- <ul> >- [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] >- <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li> >- <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] >- <li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC bibliographic framework test</a></li> >- <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_classifications ) %] >- <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification configuration</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_matching_rules ) %] >- <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_record_sources ) %] >- <li><a href="/cgi-bin/koha/admin/record_sources">Record sources</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %] >- <li><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">Record overlay rules</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_oai_sets ) %] >- <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_item_search_fields ) %] >- <li><a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a></li> >- [% END %] >- [% IF ( Koha.Preference('SavedSearchFilters') && CAN_user_parameters_manage_search_filters ) %] >- <li><a href="/cgi-bin/koha/admin/search_filters.pl">Search filters</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_search_engine_config ) %] >- <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></li> >- [% END %] >- </ul> >- [% END %] >+ [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules || ( Koha.Preference('SavedSearchFilters') && CAN_user_parameters_manage_search_filters ) ) %] >+ <h5>Catalog</h5> >+ <ul> >+ [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] >+ <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li> >+ <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_marc_frameworks ) %] >+ <li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC bibliographic framework test</a></li> >+ <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_classifications ) %] >+ <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification configuration</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_matching_rules ) %] >+ <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_record_sources ) %] >+ <li><a href="/cgi-bin/koha/admin/record_sources">Record sources</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %] >+ <li><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">Record overlay rules</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_oai_sets ) %] >+ <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_item_search_fields ) %] >+ <li><a href="/cgi-bin/koha/admin/items_search_fields.pl">Item search fields</a></li> >+ [% END %] >+ [% IF ( Koha.Preference('SavedSearchFilters') && CAN_user_parameters_manage_search_filters ) %] >+ <li><a href="/cgi-bin/koha/admin/search_filters.pl">Search filters</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_search_engine_config ) %] >+ <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></li> >+ [% END %] >+ </ul> >+ [% END %] > >- [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %] >- <h5>Acquisition parameters</h5> >- <ul> >- [% IF ( CAN_user_acquisition_currencies_manage ) %] >- <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li> >- [% END %] >- [% 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 ( 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 ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %] >- <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">MARC ordering accounts</a></li> >- [% END %] >- </ul> >- [% END %] >+ [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %] >+ <h5>Acquisition parameters</h5> >+ <ul> >+ [% IF ( CAN_user_acquisition_currencies_manage ) %] >+ <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li> >+ [% END %] >+ [% 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 ( 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 ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %] >+ <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">MARC ordering accounts</a></li> >+ [% END %] >+ </ul> >+ [% END %] > >- [% IF ( CAN_user_parameters_manage_identity_providers || CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %] >- <h5>Additional parameters</h5> >- <ul> >- [% IF ( CAN_user_parameters_manage_identity_providers) %] >- <li><a href="/cgi-bin/koha/admin/identity_providers.pl">Identity providers</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_search_targets ) %] >- <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li> >- <li><a href="/cgi-bin/koha/admin/oai_servers.pl">OAI repositories</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_smtp_servers ) %] >- <li><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_didyoumean ) %] >- <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_column_config ) %] >- <li><a href="/cgi-bin/koha/admin/columns_settings.pl">Table settings</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_audio_alerts ) %] >- <li><a href="/cgi-bin/koha/admin/audio_alerts.pl">Audio alerts</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) %] >- <li><a href="/cgi-bin/koha/admin/sms_providers.pl">SMS cellular providers</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_usage_stats ) %] >- <li><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share usage statistics</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_mana ) %] >- <li><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></li> >- [% END %] >- [% IF ( CAN_user_parameters_manage_additional_fields ) %] >- <li><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></li> >- [% END %] >- [% IF ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) %] >- <li><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></li> >- [% END %] >- [% IF Koha.Preference('ILLModule ') && CAN_user_ill %] >- <li><a href="/cgi-bin/koha/admin/ill_batch_statuses.pl">Interlibrary loan batch statuses</a></li> >- [% END %] >- </ul> >- [% END %] >- </div> >+ [% IF ( CAN_user_parameters_manage_identity_providers || CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %] >+ <h5>Additional parameters</h5> >+ <ul> >+ [% IF ( CAN_user_parameters_manage_identity_providers) %] >+ <li><a href="/cgi-bin/koha/admin/identity_providers.pl">Identity providers</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_search_targets ) %] >+ <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li> >+ <li><a href="/cgi-bin/koha/admin/oai_servers.pl">OAI repositories</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_smtp_servers ) %] >+ <li><a href="/cgi-bin/koha/admin/smtp_servers.pl">SMTP servers</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_didyoumean ) %] >+ <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_column_config ) %] >+ <li><a href="/cgi-bin/koha/admin/columns_settings.pl">Table settings</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_audio_alerts ) %] >+ <li><a href="/cgi-bin/koha/admin/audio_alerts.pl">Audio alerts</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) %] >+ <li><a href="/cgi-bin/koha/admin/sms_providers.pl">SMS cellular providers</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_usage_stats ) %] >+ <li><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share usage statistics</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_mana ) %] >+ <li><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></li> >+ [% END %] >+ [% IF ( CAN_user_parameters_manage_additional_fields ) %] >+ <li><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></li> >+ [% END %] >+ [% IF ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) %] >+ <li><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></li> >+ [% END %] >+ [% IF Koha.Preference('ILLModule ') && CAN_user_ill %] >+ <li><a href="/cgi-bin/koha/admin/ill_batch_statuses.pl">Interlibrary loan batch statuses</a></li> >+ [% END %] >+ </ul> >+ [% END %] > </div> >+<!-- /.sidebar_menu --> >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 5f11926d362..1cf21f31eb2 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,7 +2,7 @@ > [% USE Biblio %] > [% SET biblio_object_id = biblio.biblionumber %] > >-<div id="menu"> >+<div id="biblio-view-menu" class="sidebar_menu"> > <ul> > <li [% IF detailview %]class="active"[% END %]> > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio_object_id | url %]">Normal</a> >@@ -85,3 +85,4 @@ > [%- END -%] > </ul> > </div> >+<!-- /.sidebar_menu --> >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 fb932fec267..1687b185298 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc >@@ -1,131 +1,130 @@ > [% USE Koha %] >-<div id="navmenu"> >- <div id="navmenulist"> >- [% 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> >- [% END %] >- [% IF ( CAN_user_tools_manage_staged_marc ) %] >- <li> >- <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged records</a> >- </li> >- [% END %] >- </ul> >- [% END %] >+<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> >+ [% END %] >+ [% IF ( CAN_user_tools_manage_staged_marc ) %] >+ <li> >+ <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged records</a> >+ </li> >+ [% END %] >+ </ul> >+ [% END %] > >- [% 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> >- [% END %] >- </ul> >- [% END %] >+ [% 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> >+ [% END %] >+ </ul> >+ [% END %] > >- [% 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> >- [% 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> >- [% END %] >- </ul> >- [% END %] >+ [% 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> >+ [% 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> >+ [% END %] >+ </ul> >+ [% 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 ) %] >- <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> >- [% END %] >- [% IF ( CAN_user_tools_items_batchdel ) %] >- <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> >- [% END %] >- [% IF CAN_user_tools_records_batchdel %] >- <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> >- [% END %] >- </ul> >- [% 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 ) %] >+ <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> >+ [% END %] >+ [% IF ( CAN_user_tools_items_batchdel ) %] >+ <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> >+ [% END %] >+ [% IF CAN_user_tools_records_batchdel %] >+ <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> >+ [% END %] >+ </ul> >+ [% END %] > >- [% 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> >- [% END %] >- [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %] >- <li> >- <a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a> >- </li> >- [% END %] >- </ul> >- [% END %] >+ [% 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> >+ [% END %] >+ [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %] >+ <li> >+ <a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a> >+ </li> >+ [% END %] >+ </ul> >+ [% END %] > >- [% 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> >- [% END %] >+ [% 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> >+ [% 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> >- [% END %] >- </ul> >- [% 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> >+ [% END %] >+ </ul> >+ [% END %] > >- [% 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> >- [% END %] >- <li> >- <a class="circ-button" href="/cgi-bin/koha/admin/admin-home.pl">Configuration</a> >- </li> >- </ul> >- [% END %] >- </div> >+ [% 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> >+ [% END %] >+ <li> >+ <a class="circ-button" href="/cgi-bin/koha/admin/admin-home.pl">Configuration</a> >+ </li> >+ </ul> >+ [% END %] > </div> >+<!-- /.sidebar_menu --> >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 982428466d9..da04093e615 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -159,7 +159,7 @@ > </div> > <!-- /.patronifo --> > >- <div id="menu"> >+ <div id="circ-menu" class="sidebar_menu"> > <ul> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <li [% IF circview %]class="active"[% END %]> >@@ -257,6 +257,7 @@ > [% END %] > </ul> > </div> >+ <!-- /.sidebar_menu --> > > [% IF patronimages && CAN_user_tools_batch_upload_patron_images %] > <!-- Modal --> >@@ -282,8 +283,7 @@ > <div class="hint"> > [% patron.title | html %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title | html %] > [% patron.firstname | html %] >- [% patron.surname | html %], >- enter the name of an image file to upload. >+ [% patron.surname | html %], enter the name of an image file to upload. > </div> > [% END # /IF patron.image %] > <p>Only PNG, GIF, JPEG, XPM formats are supported.</p> >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 d2b9d245f79..a610def3061 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >@@ -1,134 +1,126 @@ > <!-- circ-nav.inc --> > [% USE Koha %] > [% USE Branches %] >-<div id="navmenu"> >- <div id="navmenulist"> >- <div class="row"> >- <div class="col-sm-6 col-md-12"> >- <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> >- [% ELSE %] >- <a href="/cgi-bin/koha/circ/set-library.pl">Set library</a> >- [% END %] >- </li> >- [% 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 ) %] >- <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 ) %] >- <li> >- <a href="/cgi-bin/koha/circ/checkout-notes.pl">Checkout notes</a> >- </li> >- [% END %] >- [% IF Koha.Preference('OnSiteCheckouts') %] >- <li> >- <a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a> >- </li> >- [% END %] >- </ul> >+<div class="circ-nav-menu 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> >+ [% ELSE %] >+ <a href="/cgi-bin/koha/circ/set-library.pl">Set library</a> >+ [% END %] >+ </li> >+ [% 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 ) %] >+ <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 ) %] >+ <li> >+ <a href="/cgi-bin/koha/circ/checkout-notes.pl">Checkout notes</a> >+ </li> >+ [% END %] >+ [% IF Koha.Preference('OnSiteCheckouts') %] >+ <li> >+ <a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a> >+ </li> >+ [% 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 ) %] >- <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> >- </div> >+ <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> > >- <div class="col-sm-6 col-md-12"> >- [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %] >- <h5>Recalls</h5> >- <ul> >- <li> >- <a href="/cgi-bin/koha/recalls/recalls_queue.pl" title="All active recalls">Recalls queue</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/recalls/recalls_to_pull.pl" title="Recalls that could be filled but have not been set waiting">Recalls to pull</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/recalls/recalls_overdue.pl" title="Recalled items that are overdue to be returned">Overdue recalls</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/recalls/recalls_waiting.pl" title="Recalled items awaiting pickup">Recalls awaiting pickup</a> >- </li> >- <li> >- <a href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls">Old recalls</a> >- </li> >- </ul> >- [% END %] >+ [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %] >+ <h5>Recalls</h5> >+ <ul> >+ <li> >+ <a href="/cgi-bin/koha/recalls/recalls_queue.pl" title="All active recalls">Recalls queue</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/recalls/recalls_to_pull.pl" title="Recalls that could be filled but have not been set waiting">Recalls to pull</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/recalls/recalls_overdue.pl" title="Recalled items that are overdue to be returned">Overdue recalls</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/recalls/recalls_waiting.pl" title="Recalled items awaiting pickup">Recalls awaiting pickup</a> >+ </li> >+ <li> >+ <a href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls">Old recalls</a> >+ </li> >+ </ul> >+ [% END %] > >- [% 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 %] >+ [% 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 %] > >- <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> >- <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> >+ <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> >+ <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> > >- [% IF ( CAN_user_circulate_overdues_report ) %] >- <h5>Overdues</h5> >- <ul> >- <li> >- <a href="/cgi-bin/koha/circ/overdue.pl" title="Warning: This report is very resource intensive on systems with large numbers of overdue items.">Overdues</a> >- </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> >- </ul> >- [% END %] >- </div> >- </div> >- </div> >+ [% IF ( CAN_user_circulate_overdues_report ) %] >+ <h5>Overdues</h5> >+ <ul> >+ <li> >+ <a href="/cgi-bin/koha/circ/overdue.pl" title="Warning: This report is very resource intensive on systems with large numbers of overdue items.">Overdues</a> >+ </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> >+ </ul> >+ [% END %] > </div> >-<!-- /circ-nav.inc --> >+<!-- /.sidebar_menu --> >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 c92bee77c0e..4461581ba12 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,23 +1,22 @@ > [% 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 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> >+<!-- /.sidebar_menu --> >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 b3823570aed..ddd273d955f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc >@@ -1,28 +1,27 @@ > [% USE Branches %] > [% USE Registers %] >-<div id="navmenu"> >- <div id="navmenulist"> >- [% 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> >- [% IF !(Registers.session_register_name == '') %] >- <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li> >- [% 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) %] >- <h5>Administration</h5> >- <ul> >- [% IF ( CAN_user_parameters_manage_cash_registers ) %] >- <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Configure cash registers</a></li> >- [% END %] >+<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> >+ [% IF !(Registers.session_register_name == '') %] >+ <li><a href="/cgi-bin/koha/pos/register.pl">Transaction history for [% Registers.session_register_name | html %]</a></li> >+ [% 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) %] >+ <h5>Administration</h5> >+ <ul> >+ [% IF ( CAN_user_parameters_manage_cash_registers ) %] >+ <li><a href="/cgi-bin/koha/admin/cash_registers.pl">Configure cash registers</a></li> >+ [% END %] > >- [% IF ( CAN_user_parameters_manage_accounts ) %] >- <li><a href="/cgi-bin/koha/admin/debit_types.pl">Configure items for purchase</a></li> >- [% END %] >- </ul> >- [% END %] >- </div> >+ [% IF ( CAN_user_parameters_manage_accounts ) %] >+ <li><a href="/cgi-bin/koha/admin/debit_types.pl">Configure items for purchase</a></li> >+ [% END %] >+ </ul> >+ [% END %] > </div> >+<!-- /.sidebar_menu --> >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 e6354715552..937e1741128 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"> >@@ -221,6 +221,7 @@ > [% END %] > </ul> > </div> >+<!-- /.sidebar_menu --> > > [% 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 e284b96a423..d55701c6a54 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,10 @@ > [% 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 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> >+<!-- /.sidebar_menu --> >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 fc8e9331a7d..843d9a74536 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc >@@ -1,57 +1,55 @@ > [% USE Koha %] >+<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 %] >+ [% 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> > >-<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> > >- <h5>Statistics wizards</h5> >+ [% IF plugins_enabled %] >+ <h5>Report plugins</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> >+ <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li> > </ul> >+ [% END %] > >- [% 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> >- [% 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>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>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> >+ <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> >+<!-- /.sidebar_menu --> >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 7223ace00da..0fb23fdb8cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >@@ -1,47 +1,46 @@ >-<div id="navmenu"> >- <div id="navmenulist"> >- <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 %] >- [% IF ( routing && CAN_user_serials_routing ) %] >- [% IF ( hasRouting ) %] >- <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]">Edit routing list</a></li> >- [% ELSE %] >- <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&op=new">Create routing list</a></li> >- [% END %] >+<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 %] >+ [% IF ( routing && CAN_user_serials_routing ) %] >+ [% IF ( hasRouting ) %] >+ <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]">Edit routing list</a></li> >+ [% ELSE %] >+ <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&op=new">Create routing list</a></li> > [% END %] > [% END %] > [% 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 %] >- </div> >+ </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> >+<!-- /.sidebar_menu --> >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 a57e3fb6647..28cd71f6b7c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -2,101 +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> >- <!-- /#navmenulist --> >+ [% 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> >-<!-- /#navmenu --> >+<!-- /.sidebar_menu --> >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 c83b1271f77..399b41d994a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >@@ -1,5 +1,5 @@ > [% IF ( booksellerid ) %] >- <div id="menu"> >+ <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 %] >@@ -13,4 +13,5 @@ > [% END %][% END %] > </ul> > </div> >+ <!-- /.sidebar_menu --> > [% 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 7ad4c2c534b..a6ca7ba7b4e 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 >@@ -339,7 +339,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 7bc1d390702..5a0b09d0e85 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 >@@ -231,7 +231,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(); > }); >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 a62269e5f21..c77adab421b 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 >@@ -131,7 +131,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 9202d5cd351..952301e31d2 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 >@@ -93,7 +93,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) { >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 d0ba92c35c9..17b9f6298b0 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 >@@ -173,7 +173,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 e2ab002b54f..afc4329c4c5 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 >@@ -208,7 +208,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/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index a93d32465d1..b8705c7defa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -175,6 +175,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] >+ [% Asset.js("js/tools-menu.js") | $raw %] > <script> > function DeleteConfirm() { > var msg = _("Are you sure you want to delete batch %s?").format("[% batch_id | html %]"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >index 42c8af89d46..c4c9c658147 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt >@@ -481,6 +481,7 @@ > </form> > [% END %] > [% MACRO jsinclude BLOCK %] >+ [% Asset.js("js/tools-menu.js") | $raw %] > <script> > $(document).ready(function () { > var selectedUnit = $("#units option:selected").val(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >index 600a69eb100..75807c94cd5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt >@@ -117,6 +117,7 @@ > </form> > [% END %] > [% MACRO jsinclude BLOCK %] >+ [% Asset.js("js/tools-menu.js") | $raw %] > <script> > $(document).ready(function () { > var selectedUnit = $("#units option:selected").val(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >index f7274130665..9c8fff43f17 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt >@@ -148,6 +148,7 @@ > [% END %] > > [% MACRO jsinclude BLOCK %] >+ [% Asset.js("js/tools-menu.js") | $raw %] > <script> > function DeleteConfirm() { > var results = selected_images(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >index 0d931ccf619..11146b329a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt >@@ -188,6 +188,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'greybox.inc' %] >+ [% Asset.js("js/tools-menu.js") | $raw %] > <script> > function DeleteConfirm() { > var element_ids = selected_layouts("delete"); >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 8c1333391af..e8daf5fc3fb 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 >@@ -621,7 +621,7 @@ > <div class="col-md-2 order-sm-2 order-md-1"> > <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 593b0b6d8e1..45397c3054b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -130,7 +130,7 @@ > > <div class="col-md-2 order-sm-2 order-md-1"> > <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> >@@ -138,6 +138,7 @@ > <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">All tags</a></li> > </ul> > </div> >+ <!-- /.sidebar_menu --> > [% INCLUDE 'tools-menu.inc' %] > </aside> > </div> >@@ -149,6 +150,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >+ [% Asset.js("js/tools-menu.js") | $raw %] > <script> > $(document).ready(function () { > $(".delete").click(function (event) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index b093e277642..5325701b1b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -304,6 +304,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >+ [% Asset.js("js/tools-menu.js") | $raw %] > [% Asset.js("js/pages/tags-review.js") | $raw %] > [% END %] > >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 6bd670be11f..eb6031ac061 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -686,7 +686,7 @@ > <div class="col-md-2 order-sm-2 order-md-1"> > <aside> > [% IF ( op == 'manage_stages' || op == 'manage_items' ) %] >- <div id="menu"> >+ <div id="stockrotation-menu" class="sidebar_menu"> > <ul> > [% SET item_class = "" %] > [% IF op == 'manage_stages' %] >@@ -704,6 +704,7 @@ > </li> > </ul> > </div> >+ <!-- /.sidebar_menu --> > [% 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 bf6ec45f548..ccfafcf6703 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/acquisitions-menu.js >@@ -13,7 +13,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( >+ $('.sidebar_menu a[href$="/cgi-bin/koha/acqui/invoices.pl"]').addClass( > "current" > ); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js b/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js >index fa171232ce0..3935585464a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/admin-menu.js >@@ -5,26 +5,26 @@ $(document).ready(function () { > path == "cgi-bin/koha/admin/marc_subfields_structure.pl" > ) { > $( >- '#navmenulist a[href$="/cgi-bin/koha/admin/biblio_framework.pl"]' >+ '.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( >+ $('.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( >+ $('.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"]' >+ '.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"]' >+ '.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 864239293e2..bad09d65884 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >@@ -190,18 +190,18 @@ $(document).ready(function () { > $($(this).data("element")).toggle(); > }); > >- 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 d60c1f84d9d..2c59ab4d7db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js >@@ -5,44 +5,48 @@ $(document).ready(function () { > path.indexOf("spine") < 0 && > path.indexOf("barcode") < 0 > ) { >- $( >- '#navmenulist a[href$="/cgi-bin/koha/labels/label-home.pl"]' >- ).addClass("current"); >+ $('#tools-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( >+ $('#tools-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( >+ $('#tools-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"]' >+ '#tools-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"]' >+ '#tools-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"]' >+ '#tools-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( >+ $('#tools-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"]' >+ '#tools-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"]' >+ '#tools-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"]' >+ '#tools-menu a[href$="/cgi-bin/koha/tools/additional-contents.pl?category=pages"]' > ).addClass("current"); >+ } else if (path.indexOf("/tags/") >= 0) { >+ $('#tools-menu a[href$="/cgi-bin/koha/tags/review.pl"]').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 63a8ffc05e8..dc769258988 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%; > } >@@ -196,12 +196,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 f9877e7ad28..026b15d6bc0 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> >+ <!-- /.sidebar_menu --> > </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 78584ac69b6..d0d4104dd50 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%; > } >@@ -133,12 +133,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/members/accountline-details.pl b/members/accountline-details.pl >index c400ddf504f..c85e77834e5 100755 >--- a/members/accountline-details.pl >+++ b/members/accountline-details.pl >@@ -60,6 +60,7 @@ if ($accountline) { > available_additional_fields => Koha::AdditionalFields->search( > { tablename => $accountline->credit_type_code ? 'accountlines:credit' : 'accountlines:debit' } > ), >+ finesview => 1, > ); > > my $patron = Koha::Patrons->find( $accountline->borrowernumber ); >diff --git a/members/paycollect.pl b/members/paycollect.pl >index f614c43a667..6b93d1cff42 100755 >--- a/members/paycollect.pl >+++ b/members/paycollect.pl >@@ -277,6 +277,7 @@ if ( $input->param('error_over') ) { > } > > $template->param( >+ finesview => 1, > payment_id => $payment_id, > type => $type, > borrowernumber => $borrowernumber, # some templates require global >diff --git a/t/cypress/integration/ERM/Agreements_spec.ts b/t/cypress/integration/ERM/Agreements_spec.ts >index 78a834c930a..1d6dd91a255 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='alert alert-warning']").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 53777312288..9c2ba4ecc5a 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='alert alert-warning']").contains( > /Something went wrong/ > ); >diff --git a/t/cypress/integration/ERM/Dialog_spec.ts b/t/cypress/integration/ERM/Dialog_spec.ts >index 89e0ef8285c..dfe7e11e150 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='alert alert-warning']").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='alert alert-warning']").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='alert alert-info']").contains( > "There are no agreements defined" >@@ -116,7 +116,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='alert alert-info']").should("not.exist"); > }); >diff --git a/t/cypress/integration/ERM/Licenses_spec.ts b/t/cypress/integration/ERM/Licenses_spec.ts >index f712b528cda..361dfa94bff 100644 >--- a/t/cypress/integration/ERM/Licenses_spec.ts >+++ b/t/cypress/integration/ERM/Licenses_spec.ts >@@ -26,7 +26,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='alert alert-warning']").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 fe8e9d1d232..f0157b97591 100644 >--- a/t/cypress/integration/ERM/Packages_spec.ts >+++ b/t/cypress/integration/ERM/Packages_spec.ts >@@ -19,7 +19,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='alert alert-warning']").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 6d19e87a9d8..05646453318 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='alert alert-warning']").contains( > /Something went wrong/ > ); >diff --git a/t/cypress/integration/Preservation/Settings.ts b/t/cypress/integration/Preservation/Settings.ts >index 9ad10dd4b30..fe03a3fd0d9 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 fdfbc0739b7..b03582e033f 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='alert alert-warning']").contains( > /Something went wrong/ > ); >diff --git a/t/cypress/integration/Preservation/WaitingList.ts b/t/cypress/integration/Preservation/WaitingList.ts >index 28d90b9c764..930f9d7cc6a 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 01e5c19bd72..64fa23fb518 100644 >--- a/t/cypress/support/e2e.js >+++ b/t/cypress/support/e2e.js >@@ -48,7 +48,7 @@ Cypress.Commands.add("login", (username, password) => { > }); > > Cypress.Commands.add("left_menu_active_item_is", label => { >- cy.get("#navmenulist a.current:not(.disabled)") >+ cy.get(".sidebar_menu a.current:not(.disabled)") > .should("have.length", 1) > .contains(label); > }); >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 37222
:
168285
|
168560
|
168562
|
168595
|
169426
|
169739
|
170640
|
170997
|
171151
|
173971
|
174477
|
175333
|
175334
|
175969
|
176469
|
176732
|
176733
|
176734
|
177288
|
177289
|
177290
|
177291
|
177324
|
177409
|
177410
|
177411
|
177412
| 177869 |
177870
|
177871
|
177872