From ceb17c3c300ab821addbb633d5485194babbc097 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 1 Jul 2024 11:23:58 +0000 Subject: [PATCH] Bug 37250: Redesign labels home page to match other module home pages This patch changes the labels home page so that it shows the links which previously were buried in a dropdown menu. Generally speaking we shouldn't be using the button toolbar for navigation. To test, apply the patch and go to Cataloging -> Label creator. - You should see links styled like they are on the circulation or cataloging home page. - If you follow any of those links you should see a new menu in the sidebar which has all the navigation items previously in the "Manage" dropdown menu. Sponsored-by: Athens County Public Libraries Signed-off-by: David Nind Signed-off-by: Martin Renvoize --- .../prog/en/includes/labels-menu.inc | 28 +++++++++++++++++++ .../prog/en/includes/labels-toolbar.inc | 9 ------ .../prog/en/includes/main-container.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-home.tt | 21 +++++++++++++- .../prog/en/modules/labels/label-manage.tt | 2 +- 10 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc new file mode 100644 index 00000000000..065b2918294 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc @@ -0,0 +1,28 @@ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc index 29d92091970..2e504b27612 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc @@ -9,13 +9,4 @@
  • Barcode range
  • - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc index e2c4f6fdb8b..9a614fc4d61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc @@ -33,6 +33,9 @@ [% INCLUDE 'guided-reports-view.inc' %] [% CASE 'ill-filter' %] [% INCLUDE 'ill-filter.inc' %] + [% CASE 'labels-menu' %] + [% INCLUDE 'labels-menu.inc' %] + [% INCLUDE 'cat-menu.inc' %] [% CASE 'vendor-menu' %] [% INCLUDE 'vendor-menu.inc' %] [% CASE 'pos-menu' %] 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 f2bac5fb730..b1b712a7a37 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 @@ -46,7 +46,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' aside='cat-menu' %] +[% WRAPPER 'main-container.inc' aside='labels-menu' %] [% INCLUDE 'labels-toolbar.inc' %] 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 5a0b09d0e85..075ff673e05 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 @@ -67,7 +67,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' aside='cat-menu' %] +[% WRAPPER 'main-container.inc' aside='labels-menu' %] [% INCLUDE 'labels-toolbar.inc' %] [% IF ( layout_id ) %] 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 c77adab421b..39e40bfa7bd 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 @@ -42,7 +42,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' aside='cat-menu' %] +[% WRAPPER 'main-container.inc' aside='labels-menu' %] [% INCLUDE 'labels-toolbar.inc' %] 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 952301e31d2..d901797855b 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 @@ -31,7 +31,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' aside='cat-menu' %] +[% WRAPPER 'main-container.inc' aside='labels-menu' %] [% INCLUDE 'labels-toolbar.inc' %]

    Print barcode range

    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 17b9f6298b0..5a9f43b66ed 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 @@ -42,7 +42,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' aside='cat-menu' %] +[% WRAPPER 'main-container.inc' aside='labels-menu' %] [% INCLUDE 'labels-toolbar.inc' %] [% IF ( template_id ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt index 40a723390db..1c984283358 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -28,8 +28,27 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' aside='cat-menu' %] +[% WRAPPER 'main-container.inc' aside='labels-menu' %] [% INCLUDE 'labels-toolbar.inc' %]

    Label creator

    + + [% END %] [% INCLUDE 'intranet-bottom.inc' %] 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 c1347dbe31e..f3d076aa096 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 @@ -53,7 +53,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% WRAPPER 'main-container.inc' aside='cat-menu' %] +[% WRAPPER 'main-container.inc' aside='labels-menu' %] [% INCLUDE 'labels-toolbar.inc' %]

    [% PROCESS translate_label_element element=label_element_title %]

    -- 2.48.1