Attachment 118750 Details for Bug 27846 – Bug 27846: labels folder

[patch] Bug 27846: labels folder

Bug-27846-labels-folder.patch (text/plain), 14.81 KB, created by Martin Renvoize (ashimema) on 2021-03-24 13:39:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-03-24 13:39:43 UTC

Size: 14.81 KB

patch

obsolete

>From 3beddc91a782209a0bc9bbf387506d833fc3bc7b Mon Sep 17 00:00:00 2001
>From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
>Date: Tue, 9 Mar 2021 02:03:34 +0000
>Subject: [PATCH] Bug 27846: labels folder
>
>Modified breadcrumbs to be accessible, in particular for a
>screen-reader.
>
>Made the block of breadcrumbs be a <nav aria label="Breadcrumb"
>class="breadcrumb"> with an ordered list inside. The last breadcrumbs
>also has aria-current="page" to specify that it is the current page.
>
>To test:
>1) Apply patch
>2) Build scss file
>3) Ensure each of the files in the labels folder have breadcrumbs that
>   are in a <nav aria label="Breadcrumb" class="breadcrumb"> block
>4) Ensure that there is an ordered list in the block of breadcrumbs
>5) Ensure that the last breadcrumb has aria-current="page"
>6) Ensure that the breadcrumbs on each page of the staff client
>   belonging to these files look the same as before, but the '>' symbol
>   is replaced with '/' and the last breadcrumb has bold text
>7) Ensure that when the last breadcrumb is clicked it takes you to the
>   page you are currently on
>
>Sponsored-by: Catalyst IT
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../en/modules/labels/label-edit-batch.tt     | 52 ++++++++++++++-----
> .../en/modules/labels/label-edit-layout.tt    | 38 +++++++++++---
> .../en/modules/labels/label-edit-profile.tt   | 38 +++++++++++---
> .../en/modules/labels/label-edit-range.tt     | 25 ++++++---
> .../en/modules/labels/label-edit-template.tt  | 33 +++++++++---
> .../prog/en/modules/labels/label-home.tt      | 21 ++++++--
> .../prog/en/modules/labels/label-manage.tt    | 25 ++++++---
> .../prog/en/modules/labels/spinelabel-home.tt | 16 +++++-
> 8 files changed, 196 insertions(+), 52 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 faa5e64c55..fddcf81a42 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
>@@ -10,19 +10,45 @@
> <body id="labels_label-edit-batch" class="tools labels" onload="dofocus();">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a> &rsaquo;
>-        [% IF description %]
>-            Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">[% description | html %]</a>
>-        [% ELSIF batch_id %]
>-            Edit <a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=edit&element_id=[% batch_id | uri %]">([% batch_id | html %])</a>
>-        [% ELSE %]
>-            New
>-        [% END %]
>-    </div>
>+
>+    <nav aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Batches</a>
>+            </li>
>+
>+            [% IF description %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Edit [% description | html %]
>+                    </a>
>+                </li>
>+
>+            [% ELSIF batch_id %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Edit ([% batch_id | html %])
>+                    </a>
>+                </li>
>+
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        New
>+                    </a>
>+                </li>
>+            [% END %]
>+        </ol>
>+    </nav>
> 
>     <div class="main container-fluid">
>         <div class="row">
>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 b7a42e8b46..5f8fb001f3 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
>@@ -24,13 +24,37 @@
> <body id="labels_label-edit-layout" class="tools labels">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a> &rsaquo;
>-        [% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %]
>-    </div>
>+
>+    <nav aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Layouts</a>
>+            </li>
>+
>+            [% IF ( layout_id ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Edit ([% layout_id | html %])
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        New
>+                    </a>
>+                </li>
>+            [% END %]
>+        </ol>
>+    </nav>
> 
>     <div class="main container-fluid">
>         <div class="row">
>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 1fc6f594c3..910c9bbe7e 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
>@@ -8,13 +8,37 @@
> <body id="labels_label-edit-profile" class="tools labels">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=profile">Profiles</a> &rsaquo;
>-        [% IF ( profile_id ) %]Edit ([% profile_id | html %])[% ELSE %]New[% END%]
>-    </div>
>+
>+    <nav aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>+            </li>
>+            <li>
>+                <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 %])
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        New
>+                    </a>
>+                </li>
>+            [% END%]
>+        </ol>
>+    </nav>
> 
>     <div class="main container-fluid">
>         <div class="row">
>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 5685f1b132..46c1bd36ad 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
>@@ -7,12 +7,25 @@
> <body id="labels_label-home" class="tools labels">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
>-        Barcode range
>-    </div>
>+
>+    <nav aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Barcode range
>+                </a>
>+            </li>
>+        </ol>
>+    </nav>
> 
>     <div class="main container-fluid">
>         <div class="row">
>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 071cb64d44..74f4315068 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
>@@ -8,13 +8,32 @@
> <body id="labels_label-edit-template" class="tools labels">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Templates</a> &rsaquo;
>-        [% IF ( template_id ) %]Edit ([% template_id | html %])[% ELSE %]New[% END %]
>-    </div>
>+
>+    <nav aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=template">Templates</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    [% IF ( template_id ) %]
>+                        Edit ([% template_id | html %])
>+                    [% ELSE %]
>+                        New
>+                    [% END %]
>+                </a>
>+            </li>
>+        </ol>
>+    </nav>
> 
>     <div class="main container-fluid">
>         <div class="row">
>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 f4898fcb6d..7f09d40baf 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
>@@ -8,11 +8,22 @@
> <body id="labels_label-home" class="tools labels">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        Label creator
>-    </div>
>+
>+    <nav aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Label creator
>+                </a>
>+            </li>
>+        </ol>
>+    </nav>
> 
> <div class="main container-fluid">
>     <div class="row">
>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 35c3afd6ae..156f4ec1bf 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
>@@ -21,12 +21,25 @@
> <body id="labels_label-manage" class="tools labels">
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.inc' %]
>-    <div id="breadcrumbs">
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>-        <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a> &rsaquo;
>-        [% PROCESS translate_label_element element=label_element_title %]
>-    </div>
>+
>+    <nav aria-label="Breadcrumb" class="breadcrumb">
>+        <ol>
>+            <li>
>+                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            </li>
>+            <li>
>+                <a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    [% PROCESS translate_label_element element=label_element_title %]
>+                </a>
>+            </li>
>+        </ol>
>+    </nav>
> 
>     <div class="main container-fluid">
>         <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>index b323b4ccdc..f655f72532 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
>@@ -9,7 +9,21 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Quick spine label creator</div>
>+<nav aria-label="Breadcrumb" class="breadcrumb">
>+    <ol>
>+        <li>
>+            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+        </li>
>+        <li>
>+            <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+        </li>
>+        <li>
>+            <a href="#" aria-current="page">
>+                Quick spine label creator
>+            </a>
>+        </li>
>+    </ol>
>+</nav>
> 
> <div class="main container-fluid">
>     <div class="row">
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27846: 118016 | 118569 | 118570 | 118571 | 118573 | 118576 | 118626 | 118627 | 118628 | 118630 | 118631 | 118632 | 118633 | 118636 | 118637 | 118638 | 118639 | 118640 | 118641 | 118642 | 118643 | 118717 | 118718 | 118719 | 118720 | 118721 | 118722 | 118723 | 118724 | 118725 | 118726 | 118727 | 118728 | 118729 | 118730 | 118731 | 118732 | 118738 | 118739 | 118740 | 118744 | 118745 | 118746 | 118747 | 118748 | 118749 | 118750 | 118751 | 118752 | 118753 | 118754 | 118755 | 118756 | 118757 | 118758 | 118759 | 118760 | 118761 | 118767 | 118770