Bugzilla – Attachment 176469 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: (follow-up) More corrections to sidebar style
Bug-37222-follow-up-More-corrections-to-sidebar-st.patch (text/plain), 5.84 KB, created by
Owen Leonard
on 2025-01-13 18:46:53 UTC
(
hide
)
Description:
Bug 37222: (follow-up) More corrections to sidebar style
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-01-13 18:46:53 UTC
Size:
5.84 KB
patch
obsolete
>From bbe312e72b2580d21a24098d34ce79fc7183a828 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 13 Jan 2025 18:21:44 +0000 >Subject: [PATCH] Bug 37222: (follow-up) More corrections to sidebar style > >--- > .../prog/css/src/staff-global.scss | 6 +++- > .../prog/en/modules/tools/stockrotation.tt | 12 ++------ > .../intranet-tmpl/prog/js/staff-global.js | 28 ++++++++++--------- > .../prog/js/vue/components/ERM/Main.vue | 17 ++++++----- > 4 files changed, 32 insertions(+), 31 deletions(-) > >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 5f7f77c673..1fd1974949 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -478,7 +478,7 @@ aside { > list-style: none; > > a { >- border-left: 5px solid #E6E6E6; >+ border-left: 5px solid transparent; > color: #000; > display: block; > padding: .7em .3em .7em 1rem; >@@ -506,6 +506,10 @@ aside { > } > } > } >+ >+ .breadcrumb-item { >+ font-style: normal; >+ } > } > > div { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index 015fcf28d2..715e1e388c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -640,18 +640,10 @@ > [% IF ( op == 'manage_stages' || op == 'manage_items' ) %] > <div id="stockrotation-menu" class="sidebar_menu"> > <ul> >- [% IF op == 'manage_stages' %] >- <li class="active"> >- [% ELSE %] >- <li> >- [% END %] >+ <li> > <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&rota_id=[% rota_id | uri %]">Manage stages</a> > </li> >- [% IF op == 'manage_items' %] >- <li class="active"> >- [% ELSE %] >- <li> >- [% END %] >+ <li> > <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_items&rota_id=[% rota_id | uri %]">Manage items</a> > </li> > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >index 53f2eba8ef..07348dc521 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >@@ -181,19 +181,21 @@ $(document).ready(function () { > > 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 + '"]', sidebar_menu).length == 0) { >- $('a[href$="/' + path + '"]', sidebar_menu).addClass("current"); >- } else { >- $('a[href$="/' + path + params + '"]', sidebar_menu).addClass( >- "current" >- ); >- } >+ sidebar_menu.each(function(){ >+ var path = location.pathname.substring(1); >+ var url = window.location.toString(); >+ var params = ""; >+ if (url.match(/\?(.+)$/)) { >+ params = "?" + RegExp.$1; >+ } >+ if ($('a[href$="/' + path + params + '"]', $(this) ).length == 0) { >+ $('a[href$="/' + path + '"]', $(this) ).addClass("current"); >+ } else { >+ $('a[href$="/' + path + params + '"]', $(this) ).addClass( >+ "current" >+ ); >+ } >+ }); > } > > $("#catalog-search-link a").on("mouseenter mouseleave", function () { >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 8a3c55e51b..55b378401d 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 >@@ -102,11 +102,11 @@ export default { > av_item_reports_metrics: "ERM_ITEM_REPORTS_METRICS", > } > >- let av_cat_array = Object.keys(authorised_values).map(function ( >- av_cat >- ) { >- return '"' + authorised_values[av_cat] + '"' >- }) >+ let av_cat_array = Object.keys(authorised_values).map( >+ function (av_cat) { >+ return '"' + authorised_values[av_cat] + '"' >+ } >+ ) > > promises.push( > av_client.values >@@ -173,6 +173,7 @@ export default { > <style> > #menu ul ul, > .sidebar_menu ul ul { >+ background-color: transparent; > padding-left: 2em; > font-size: 100%; > } >@@ -184,7 +185,9 @@ form .v-select { > } > > .v-select, >-input:not([type="submit"]):not([type="search"]):not([type="button"]):not([type="checkbox"]):not([type="radio"]), >+input:not([type="submit"]):not([type="search"]):not([type="button"]):not( >+ [type="checkbox"] >+ ):not([type="radio"]), > textarea { > border-color: rgba(60, 60, 60, 0.26); > border-width: 1px; >@@ -196,7 +199,7 @@ textarea { > } > .sidebar_menu ul li a.current.disabled { > background-color: inherit; >- border-left: 5px solid #e6e6e6; >+ border-left: 5px solid transparent; > color: #000; > } > .sidebar_menu ul li a.disabled { >-- >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