Bugzilla – Attachment 192128 Details for
Bug 40813
Add ability to embed page start and end timing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 40813: (follow-up) Add some CSS, udpate navbar structure
Bug-40813-follow-up-Add-some-CSS-udpate-navbar-str.patch (text/plain), 6.36 KB, created by
Owen Leonard
on 2026-01-28 18:10:49 UTC
(
hide
)
Description:
Bug 40813: (follow-up) Add some CSS, udpate navbar structure
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2026-01-28 18:10:49 UTC
Size:
6.36 KB
patch
obsolete
>From 62611345a98749660e2c3dd960c4fd3a0f0128a9 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 28 Jan 2026 12:58:00 -0500 >Subject: [PATCH] Bug 40813: (follow-up) Add some CSS, udpate navbar structure > >This follow-up changes the structure of the footer navbar markup so that >it avoids IDs related to "language" since its purpose is now more >general. > >The start and end time markup is adjusted for being inside a navbar and >to align it to the right away from the language menu (if present). > >Also changed: Added missing html filters and fixed a minor tidy >complaint in Auth.pm. >--- > C4/Auth.pm | 2 +- > .../prog/css/src/staff-global.scss | 4 +- > .../prog/en/includes/intranet-bottom.inc | 48 ++++++++++--------- > 3 files changed, 29 insertions(+), 25 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 615ee53525a..8414922ef0f 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -1239,7 +1239,7 @@ sub checkauth { > : Koha::Cash::Registers->search( > { branch => $branchcode, branch_default => 1 }, > { rows => 1 } >- )->single; >+ )->single; > $register_id = $register->id if ($register); > $register_name = $register->name if ($register); > } >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 ebb964719da..37cd184aa00 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -3187,7 +3187,7 @@ button, > } > } > >-#changelanguage { >+#footer_menu_container { > border-top: 1px solid rgb(173, 173, 173); > min-height: $language-footer-min-height; > position: unset; >@@ -4788,7 +4788,7 @@ div .suggestion_note { > padding-bottom: 4em; > } > >- #changelanguage { >+ #footer_menu_container { > bottom: 0; > display: block; > left: 0; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >index f1bb32929b8..c1340280d42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >@@ -12,14 +12,14 @@ > > [% IF start_time || ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %] > [% UNLESS ( one_language_enabled ) %] >- <div id="changelanguage" class="navbar navbar-expand navbar-light bg-light"> >+ <div id="footer_menu_container" class="navbar navbar-expand navbar-light bg-light"> > <div class="container-fluid"> >- <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#nav_lang_menu" aria-controls="nav_lang_menu" aria-expanded="false" aria-label="Toggle navigation"> >+ <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#footer_menu" aria-controls="footer_menu" aria-expanded="false" aria-label="Toggle navigation"> > <span class="navbar-toggler-icon"></span> > </button> > >- [% IF ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %] >- <div class="collapse navbar-collapse" id="nav_lang_menu"> >+ <div class="collapse navbar-collapse" id="footer_menu"> >+ [% IF ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %] > <ul id="i18nMenu" class="navbar-nav me-auto"> > [% FOREACH languages_loo IN languages_loop %] > [% IF ( languages_loo.group_enabled ) %] >@@ -92,27 +92,31 @@ > [% END # /FOREACH languages_loo %] > </ul> > <!-- /#i18nMenu --> >- </div> >- <!-- /.navbar-collapse --> >- [% END %] >+ [% END %] >+ [% IF start_time %] >+ <div id="start_end_time" class="d-flex justify-content-end flex-grow-1"> >+ <span class="navbar-text start_time" data-start="[% start_time | html %]"> >+ <span class="badge text-bg-light"> >+ Start >+ <span class="badge bg-info-subtle">[% start_time.hms(':') | html %]</span> >+ </span> >+ </span> >+ >+ [%- SET end_time = KohaDates.datetime_from_string %] >+ <span class="navbar-text end_time" data-end="[% end_time | html %]"> >+ <span class="badge text-bg-light"> >+ End >+ <span class="badge bg-primary-subtle">[% end_time.hms(':') | html %]</span> >+ </span> >+ </span> >+ </div> >+ [% END %] >+ </div> >+ <!-- /.navbar-collapse#footer_menu --> > </div> > <!-- /.container-fluid --> >- >- [% IF start_time %] >- <span class="container"> >- <span class="navbar-text start_time" data-start="[% start_time %]"> >- <span class="badge text-bg-info">Start</span> >- [% start_time.hms(':') %] >- </span> >- [%- SET end_time = KohaDates.datetime_from_string %] >- <span class="navbar-text end_time" data-end="[% end_time %]"> >- <span class="badge text-bg-primary">End</span> >- [% end_time.hms(':') %] >- </span> >- </span> >- [% END %] > </div> >- <!-- /#changelanguage --> >+ <!-- /#footer_menu_container --> > [% END # /UNLESS ( one_language_enabled ) %] > [% END # /IF ( ( languages_loop )... %] > >-- >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 40813
:
186445
|
186490
|
192095
|
192117
|
192128
|
192167
|
192168
|
192169
|
192170