From 8a3392bbbe16f50a9f6e42d2166fca5016effaa8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 26 Mar 2021 11:37:52 +0000 Subject: [PATCH] Bug 28041: Improve breadcrumbs and headings on label creator pages This patch changes various label creator templates so that breadcrumbs menus and headings are more specific to each operation. To test, apply the patch and confirm that headings, page titles, and breadcrumbs menus are correct for the various pages: - New -> Label batch: "Label creator -> Batches -> New label batch." - New -> Layout: "Label creator -> Layouts -> New label layout." - New -> Label template: "Label creator -> New label template." - New -> Printer profile: "Label creator -> New printer profile." - New -> Barcode range: "Label creator -> Print barcode range." - Manage -> Label batch -> Edit: "Label creator -> Batches -> Edit label batch X." - Manage -> Layout -> Edit: "Label creator -> Layouts -> Edit label layout X." - Manage -> Label templates -> Edit: "Label creator -> Templates -> Edit label template X." - Manage -> Printer profiles -> Edit: "Label creator -> Profiles -> Edit printer profile X." Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../en/modules/labels/label-edit-batch.tt | 15 +++++++++--- .../en/modules/labels/label-edit-layout.tt | 13 ++++++---- .../en/modules/labels/label-edit-profile.tt | 24 ++++++++++--------- .../en/modules/labels/label-edit-range.tt | 6 ++--- .../en/modules/labels/label-edit-template.tt | 13 ++++++---- 5 files changed, 46 insertions(+), 25 deletions(-) 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 0cd920aac8..aa593452bd 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 @@ -3,7 +3,7 @@ [% USE ItemTypes %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit ([% batch_id | html %])[% ELSE %]New[% END %] + Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit label batch [% batch_id | html %][% ELSE %]New label batch[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -36,14 +36,14 @@ [% ELSIF batch_id %]
  • - Edit ([% batch_id | html %]) + Edit label batch [% batch_id | html %]
    • [% ELSE %]
  • - New + New label batch
    • [% END %] @@ -56,6 +56,15 @@
    [% INCLUDE 'labels-toolbar.inc' %] + + [% IF description %] +

    Edit [% description | html %]

    + [% ELSIF batch_id %] +

    Edit label batch [% batch_id | html %]

    + [% ELSE %] +

    New label batch

    + [% END %] + [% IF ( err ) %] [% BLOCK xlate_errtype %] [% SWITCH errtype %] 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 aa939cc44b..927be6e891 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 @@ -10,7 +10,7 @@ [% END %] [% END %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Layouts › [% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %] + Koha › Tools › Label creator › Layouts › [% IF ( layout_id ) %]Edit label layout [% layout_id | html %] [% ELSE %] New label layout [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -43,13 +43,13 @@ [% IF ( layout_id ) %]
  • - Edit ([% layout_id | html %]) + Edit label layout [% layout_id | html %]
    • [% ELSE %]
  • - New + New label layout
    • [% END %] @@ -63,9 +63,14 @@ [% INCLUDE 'labels-toolbar.inc' %] + [% IF ( layout_id ) %] +

    Edit label layout [% layout_id | html %]

    + [% ELSE %] +

    New label layout

    + [% END %] +
    - [% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout
    1. 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 57c57cd1df..e6fb3e268d 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 @@ -1,7 +1,7 @@ [% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Profiles › [% IF ( profile_id ) %]Edit ([% profile_id | html %])[% ELSE %]New[% END%] + Koha › Tools › Label creator › Profiles › [% IF ( profile_id ) %]Edit printer profile [% profile_id | html %] [% ELSE %] New printer profile [% END%] [% INCLUDE 'doc-head-close.inc' %] @@ -24,19 +24,15 @@ Profiles
      2. - [% IF ( profile_id ) %]
    2. - Edit ([% profile_id | html %]) + [% IF ( profile_id ) %] + Edit printer profile [% profile_id | html %] + [% ELSE %] + New printer profile + [% END%]
      3. - [% ELSE %] -
    3. - - New - -
      4. - [% END%]
    @@ -46,7 +42,13 @@
    [% INCLUDE 'labels-toolbar.inc' %] -

    Edit printer profile

    + + [% IF ( profile_id ) %] +

    Edit printer profile [% profile_id | html %]

    + [% ELSE %] +

    New printer profile

    + [% END%] +
    Profile settings
      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 072453057d..11c5abb03f 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 @@ -1,6 +1,6 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Barcode range + Koha › Tools › Label creator › Print barcode range [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'greybox.inc' %] @@ -21,7 +21,7 @@
    1. - Barcode range + Print barcode range
    @@ -32,7 +32,7 @@
    [% INCLUDE 'labels-toolbar.inc' %] -

    Print barcode range

    +

    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 3ff475f4f2..0e65301d97 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 @@ -1,7 +1,7 @@ [% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Templates › [% IF ( template_id ) %]Edit ([% template_id | html %])[% ELSE %]New[% END %] + Koha › Tools › Label creator › Templates › [% IF ( template_id ) %]Edit label template [% template_id | html %] [% ELSE %] New label template [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -26,9 +26,9 @@
  • [% IF ( template_id ) %] - Edit ([% template_id | html %]) + Edit label template [% template_id | html %] [% ELSE %] - New + New label template [% END %]
    • @@ -41,7 +41,12 @@
    [% INCLUDE 'labels-toolbar.inc' %] -

    Edit label template

    + [% IF ( template_id ) %] +

    Edit label template [% template_id | html %]

    + [% ELSE %] +

    New label template

    + [% END %] +
    -- 2.39.5