Attachment 118915 Details for Bug 28041 – Bug 28041: Improve breadcrumbs and headings on label creator pages

[patch] Bug 28041: Improve breadcrumbs and headings on label creator pages

Bug-28041-Improve-breadcrumbs-and-headings-on-labe.patch (text/plain), 11.12 KB, created by Katrin Fischer on 2021-03-27 17:13:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2021-03-27 17:13:13 UTC

Size: 11.12 KB

patch

obsolete

>From 8f770c521f1a4ef2aa95882bfc356fafedc23640 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <lucas@bywatersolutions.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/labels/label-edit-batch.tt     | 15 +++++++++++---
> .../prog/en/modules/labels/label-edit-layout.tt    | 13 ++++++++----
> .../prog/en/modules/labels/label-edit-profile.tt   | 24 ++++++++++++----------
> .../prog/en/modules/labels/label-edit-range.tt     |  6 +++---
> .../prog/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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Batches &rsaquo; [% IF batch_id %]Edit ([% batch_id | html %])[% ELSE %]New[% END %]</title>
>+    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Batches &rsaquo; [% IF batch_id %]Edit label batch [% batch_id | html %][% ELSE %]New label batch[% END %]</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -36,14 +36,14 @@
>             [% ELSIF batch_id %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        Edit ([% batch_id | html %])
>+                        Edit label batch [% batch_id | html %]
>                     </a>
>                 </li>
> 
>             [% ELSE %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        New
>+                        New label batch
>                     </a>
>                 </li>
>             [% END %]
>@@ -56,6 +56,15 @@
>                 <main>
> 
>                         [% INCLUDE 'labels-toolbar.inc' %]
>+
>+                        [% IF description %]
>+                            <h1>Edit [% description | html %]</h1>
>+                        [% ELSIF batch_id %]
>+                            <h1>Edit label batch [% batch_id | html %]</h1>
>+                        [% ELSE %]
>+                            <h1>New label batch</h1>
>+                        [% 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Layouts &rsaquo; [% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %]</title>
>+    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Layouts &rsaquo; [% IF ( layout_id ) %]Edit label layout [% layout_id | html %] [% ELSE %] New label layout [% END %]</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -43,13 +43,13 @@
>             [% IF ( layout_id ) %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        Edit ([% layout_id | html %])
>+                        Edit label layout [% layout_id | html %]
>                     </a>
>                 </li>
>             [% ELSE %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        New
>+                        New label layout
>                     </a>
>                 </li>
>             [% END %]
>@@ -63,9 +63,14 @@
> 
>                     [% INCLUDE 'labels-toolbar.inc' %]
> 
>+                    [% IF ( layout_id ) %]
>+                        <h1>Edit label layout [% layout_id | html %]</h1>
>+                    [% ELSE %]
>+                        <h1>New label layout</h1>
>+                    [% END %]
>+
>                     <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
>                         <fieldset class="rows">
>-                            <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
>                             <ol>
>                                 <li>
>                                     <label for="layout_name">Layout name: </label>
>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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Profiles &rsaquo; [% IF ( profile_id ) %]Edit ([% profile_id | html %])[% ELSE %]New[% END%]</title>
>+    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Profiles &rsaquo; [% IF ( profile_id ) %]Edit printer profile [% profile_id | html %] [% ELSE %] New printer profile [% END%]</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -24,19 +24,15 @@
>                 <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Profiles</a>
>             </li>
> 
>-            [% IF ( profile_id ) %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        Edit ([% profile_id | html %])
>+                        [% IF ( profile_id ) %]
>+                            Edit printer profile [% profile_id | html %]
>+                        [% ELSE %]
>+                            New printer profile
>+                        [% END%]
>                     </a>
>                 </li>
>-            [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        New
>-                    </a>
>-                </li>
>-            [% END%]
>         </ol>
>     </nav>
> 
>@@ -46,7 +42,13 @@
>                 <main>
> 
>                     [% INCLUDE 'labels-toolbar.inc' %]
>-                            <h3>Edit printer profile</h3>
>+
>+                    [% IF ( profile_id ) %]
>+                        <h1>Edit printer profile [% profile_id | html %]</h1>
>+                    [% ELSE %]
>+                        <h1>New printer profile</h1>
>+                    [% END%]
>+
>                     <form name="input" action="/cgi-bin/koha/labels/label-edit-profile.pl" method="get">
>                                     <fieldset class="rows"><legend>Profile settings</legend>
>                                         <ol>
>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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Barcode range</title>
>+    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Print barcode range</title>
>     [% INCLUDE 'doc-head-close.inc' %]
>     [% INCLUDE 'greybox.inc' %]
> </head>
>@@ -21,7 +21,7 @@
>             </li>
>             <li>
>                 <a href="#" aria-current="page">
>-                    Barcode range
>+                    Print barcode range
>                 </a>
>             </li>
>         </ol>
>@@ -32,7 +32,7 @@
>             <div class="col-sm-10 col-sm-push-2">
>                 <main>
>                     [% INCLUDE 'labels-toolbar.inc' %]
>-                    <h2>Print barcode range</h2>
>+                    <h1>Print barcode range</h1>
>                     <form name="add_by_number" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
>                         <input type="hidden" name="op" value="add" />
>                         <fieldset class="rows">
>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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Templates &rsaquo; [% IF ( template_id ) %]Edit ([% template_id | html %])[% ELSE %]New[% END %]</title>
>+    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Templates &rsaquo; [% IF ( template_id ) %]Edit label template [% template_id | html %] [% ELSE %] New label template [% END %]</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>@@ -26,9 +26,9 @@
>             <li>
>                 <a href="#" aria-current="page">
>                     [% IF ( template_id ) %]
>-                        Edit ([% template_id | html %])
>+                        Edit label template [% template_id | html %]
>                     [% ELSE %]
>-                        New
>+                        New label template
>                     [% END %]
>                 </a>
>             </li>
>@@ -41,7 +41,12 @@
>                 <main>
>                     [% INCLUDE 'labels-toolbar.inc' %]
> 
>-                    <h3>Edit label template</h3>
>+                    [% IF ( template_id ) %]
>+                        <h1>Edit label template [% template_id | html %]</h1>
>+                    [% ELSE %]
>+                        <h1>New label template</h1>
>+                    [% END %]
>+
>                     <form name="input" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">
>                     <div class="row">
>                         <div class="col-sm-6">
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 28041: 118850 | 118870 | 118915