gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 37250: (follow-up) More improvements to menus 

- Add highlighting to new sidebar menu
- Make labels more consistent in menus, breadcrumbs, and titles
- Add 'Print barcode range' link to the labels home page and sidebar
  menu.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Owen Leonard 2024-07-22 14:26:27 +00:00 committed by Katrin Fischer
parent c94c27ea34
commit ab2c692922
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
8 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
View File

@ -1,28 +1,10 @@
<div id="labels-menu" class="sidebar_menu">
<ul>
[% IF ( label_element_title == "Batches" ) %]
<li><a class="current" href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
[% ELSE -%]
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
[% END %]
[% IF ( label_element_title == "Layouts" ) %]
<li><a class="current" href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Label layouts</a></li>
[% ELSE -%]
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Label layouts</a></li>
[% END %]
[% IF ( label_element_title == "Templates" ) %]
<li><a class="current" href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a></li>
[% ELSE -%]
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a></li>
[% END %]
[% IF ( label_element_title == "Profiles" ) %]
<li><a class="current" href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a></li>
[% ELSE -%]
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a></li>
[% END %]
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a></li>
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Label layouts</a></li>
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a></li>
<li><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a></li>
<li><a href="/cgi-bin/koha/labels/label-edit-range.pl">Print barcode range</a></li>
</ul>
</div>
<!-- /.sidebar_menu -->

3
koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
View File

@ -3,10 +3,9 @@
<button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-plus"></i> New</button>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-batch.pl?op=new">Label batch</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Layout</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-layout.pl?op=new">Label layout</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-template.pl?op=new">Label template</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-profile.pl?op=new">Printer profile</a></li>
<li><a class="dropdown-item" href="/cgi-bin/koha/labels/label-edit-range.pl">Barcode range</a></li>
</ul>
</div>
</div>

5
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
View File

@ -12,7 +12,7 @@
[% ELSE %]
[% t("New label batch") | html %]
[% END %]
&rsaquo; [% t("Batches") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
&rsaquo; [% t("Label batches") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
[% END %]</title
>
[% INCLUDE 'doc-head-close.inc' %]
@ -32,7 +32,7 @@
<a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a>
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Label batches</a>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF description %]
@ -231,6 +231,7 @@
[% INCLUDE 'greybox.inc' %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("js/form-submit.js") | $raw %]
[% Asset.js("js/labels-menu.js") | $raw %]
<script>
function dofocus() { // named function req'd for body onload event by some FF and IE7 security models
$(".focus:last").select();

5
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
View File

@ -25,7 +25,7 @@
[% ELSE %]
[% t("New label layout") | html %]
[% END %]
&rsaquo; [% t("Layouts") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
&rsaquo; [% t("Label layouts") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
[% END %]</title
>
[% INCLUDE 'doc-head-close.inc' %]
@ -55,7 +55,7 @@
<a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a>
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Label layouts</a>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF ( layout_id ) %]
@ -229,6 +229,7 @@
[% END %]
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/labels-menu.js") | $raw %]
<script>
$(document).ready(function () {
$('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");

5
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt
View File

@ -10,7 +10,7 @@
[% ELSE %]
[% t("New printer profile") | html %]
[% END %]
&rsaquo; [% t("Profiles") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
&rsaquo; [% t("Printer profiles") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
[% END %]</title
>
[% INCLUDE 'doc-head-close.inc' %]
@ -30,7 +30,7 @@
<a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Profiles</a>
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Printer profiles</a>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF ( profile_id ) %]
@ -129,6 +129,7 @@
[% END %]
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/labels-menu.js") | $raw %]
<script>
$(document).ready(function () {
$('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");

5
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt
View File

@ -10,7 +10,7 @@
[% ELSE %]
[% t("New label template") | html %]
[% END %]
&rsaquo; [% t("Templates") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
&rsaquo; [% t("Label templates") | html %] &rsaquo; [% t("Label creator") | html %] &rsaquo; [% t("Cataloging") | html %] &rsaquo; [% t("Koha") | html %]
[% END %]</title
>
[% INCLUDE 'doc-head-close.inc' %]
@ -30,7 +30,7 @@
<a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
[% END %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Templates</a>
<a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Label templates</a>
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
[% IF ( template_id ) %]
@ -171,6 +171,7 @@
[% END %]
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/labels-menu.js") | $raw %]
<script>
$(document).ready(function () {
$('.sidebar_menu a[href$="/cgi-bin/koha/labels/label-home.pl"]').addClass("current");

5
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt
View File

@ -39,7 +39,7 @@
><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch"><i class="fa-solid fa-list-ul"></i> Label batches</a></li
>
<li
><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout"><i class="fa-solid fa-object-group"></i> Layouts</a></li
><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout"><i class="fa-solid fa-object-group"></i> Label layouts</a></li
>
<li
><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template"><i class="fa-solid fa-table-cells"></i> Label templates</a></li
@ -47,6 +47,9 @@
<li
><a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile"><i class="fa fa-print"></i> Printer profiles</a></li
>
<li
><a href="/cgi-bin/koha/labels/label-edit-range.pl"><i class="fa fa-barcode"></i> Print barcode range</a></li
>
</ul>
</div>
</div>

24
koha-tmpl/intranet-tmpl/prog/js/labels-menu.js Normal file
View File

@ -0,0 +1,24 @@
$(document).ready(function () {
var path = location.pathname.substring(1);
if (path.indexOf("label-edit-batch") >= 0) {
$(
'#labels-menu a[href$="/cgi-bin/koha/labels/label-manage.pl?label_element=batch"]'
).addClass("current");
} else if (path.indexOf("label-edit-layout") >= 0) {
$(
'#labels-menu a[href$="/cgi-bin/koha/labels/label-manage.pl?label_element=layout"]'
).addClass("current");
} else if (path.indexOf("label-edit-template") >= 0) {
$(
'#labels-menu a[href$="/cgi-bin/koha/labels/label-manage.pl?label_element=template"]'
).addClass("current");
} else if (path.indexOf("label-edit-profile") >= 0) {
$(
'#labels-menu a[href$="/cgi-bin/koha/labels/label-manage.pl?label_element=profile"]'
).addClass("current");
} else if (path.indexOf("label-edit-range") >= 0) {
$(
'#labels-menu a[href$="/cgi-bin/koha/labels/label-edit-range.pl"]'
).addClass("current");
}
});