Attachment 119835 Details for Bug 27631 – Bug 27631: authorities, clubs, common, course_reserves folders

[patch] Bug 27631: authorities, clubs, common, course_reserves folders

Bug-27631-authorities-clubs-common-coursereserves-.patch (text/plain), 11.23 KB, created by Wainui Witika-Park on 2021-04-19 07:49:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wainui Witika-Park

Created: 2021-04-19 07:49:50 UTC

Size: 11.23 KB

patch

obsolete

>From 790aea69eb66f52a59c753725f6d6d4649694c3a Mon Sep 17 00:00:00 2001
>From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
>Date: Mon, 5 Apr 2021 08:52:33 +0000
>Subject: [PATCH] Bug 27631: authorities, clubs, common, course_reserves
> folders
>
>Changed each of the pages in the authorities, clubs, common, course_reserves folders to have one <h1> tag showing that describes the page, rather than the <h1> describing the logo.
>
>The hierarchy of heading tags may be broken in many pages, but this will
>be dealt with in an additional bug.
>
>To test:
>1) Go to the Staff Client
>2) Apply patch
>3) Go to each of the pages in the authorities, clubs, common, course_reserves folders and check that they have an obvious and descriptive heading
>4) Ensure that the heading in the page is <h1>
>
>Sponsored-by: Catalyst IT
>---
> .../prog/en/modules/authorities/authorities-home.tt          |  2 ++
> .../intranet-tmpl/prog/en/modules/authorities/detail.tt      |  3 ++-
> .../intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt  | 12 +++++++-----
> .../intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt     |  4 ++--
> .../prog/en/modules/clubs/templates-add-modify.tt            |  4 ++--
> .../intranet-tmpl/prog/en/modules/common/patron_search.tt    |  2 +-
> .../prog/en/modules/course_reserves/add_items-step1.tt       |  1 +
> .../prog/en/modules/course_reserves/add_items-step2.tt       |  3 +++
> .../prog/en/modules/course_reserves/batch_add_items.tt       |  3 ++-
> .../prog/en/modules/course_reserves/batch_rm_items.tt        |  3 ++-
> .../intranet-tmpl/prog/en/modules/course_reserves/course.tt  |  3 ++-
> .../prog/en/modules/course_reserves/invalid-course.tt        |  2 +-
> 12 files changed, 27 insertions(+), 15 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
>index e5dffffa3e..939ee66f99 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
>@@ -27,6 +27,8 @@
> 
>     [% INCLUDE 'authorities-toolbar.inc' %]
> 
>+    <h1>Authorities</h1>
>+
>     <div id="merge_in_progress"></div>
> 
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>index bd7be90775..db97fe5a97 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
>@@ -53,9 +53,10 @@
> 
> 
> [% IF ( unknownauthid ) %]
>+    <h1>Authority does not exist</h1>
>     <div class="dialog message">The authority record you requested does not exist ([% errauthid | html %]).</div>
> [% ELSE %]
>-<h1>Authority #[% authid | html %] ([% authtypetext | html %])</h1>
>+    <h1>Authority #[% authid | html %] ([% authtypetext | html %])</h1>
> 
> <div id="action">
>     [% IF count %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>index 88d86bcdd5..037bffd6cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>@@ -52,11 +52,13 @@
>                 <fieldset class="rows">
> 
>                     <legend>
>-                        [% IF club %]
>-                            Modify club <em>[% club.name | html %]</em>
>-                        [% ELSE %]
>-                            Create a new <em>[% club_template.name | html %]</em> club
>-                        [% END %]
>+                        <h1>
>+                            [% IF club %]
>+                                Modify club <em>[% club.name | html %]</em>
>+                            [% ELSE %]
>+                                Create a new <em>[% club_template.name | html %]</em> club
>+                            [% END %]
>+                        </h1>
>                     </legend>
> 
>                     <ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
>index 21ff9056b0..13f209ba46 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
>@@ -1,9 +1,9 @@
> [% USE AuthorisedValues %]
> [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
> 
>-<h3>
>+<h1>
>     Enroll in <em>[% club.name | html %]</em>
>-</h3>
>+</h1>
> 
> <div class="container">
>     <form id="patron-enrollment-form">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>index f8904f544f..1011f9aaf7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>@@ -52,13 +52,13 @@
>             <form method="post" class="validated">
>                 <input type="hidden" name="id" value="[% club_template.id | html %]" />
> 
>-                <h2>
>+                <h1>
>                     [% IF club_template %]
>                         Modify club template <em>[% club_template.name | html %]</em>
>                     [% ELSE %]
>                         Create a new club template
>                     [% END %]
>-                </h2>
>+                </h1>
> 
> 
>                 <fieldset class="rows">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>index 1772d97f3e..66843a3127 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>@@ -15,7 +15,7 @@
> 
>         <form id="searchform">
>             <fieldset class="brief">
>-                <h3>Search for patron</h3>
>+                <h1>Search for patron</h1>
>                 <ol>
>                     <li>
>                         <label for="searchmember_filter">Search:</label>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>index 37e09b5faf..7b2d5259ff 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>@@ -26,6 +26,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            <h1>Add reserves for <em>[% course.course_name | html %]</em></h1>
> 
>         [% IF ERROR_ITEM_NOT_FOUND %]
>             [% IF UNKNOWN_BARCODE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>index 1f35522f45..a70007d9ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>@@ -30,6 +30,9 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            <h1>
>+i               [% IF is_edit || course_reserve %]Edit [% ELSE %]Reserve [% END %]<em>[% biblio.title | html %]</em> for <em>[% course.course_name | html %]</em>
>+            </h1>
> 
>         [% IF course_reserve && !is_edit%]<div class="dialog message" id="already_on_reserve_this">This course already has this item on reserve.</div>[% END %]
>         [% IF course_item %]<div class="dialog message" id="already_on_reserve">Number of courses reserving this item: [% course_item.course_reserves.count | html %]</div>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>index f3fe4ea1a5..3fa4652215 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>@@ -32,6 +32,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            <h1>Add reserves for <em>[% course.course_name | html %]</em></h1>
>         [% IF action == 'invalid_course' %]
>             <div id="invalid-course-error" class="dialog alert">Invalid course!</div>
>         [% END %]
>@@ -132,7 +133,7 @@
>         [% END %]
> 
>         [% IF action == 'display_results' %]
>-            <h1>Results</h1>
>+            <h2>Results</h2>
> 
>             <h3>Items added</h3>
>             [% IF items_added.size > 0 %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>index c2485e0219..41560fd397 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>@@ -29,6 +29,7 @@
> <div class="main container-fluid">
>     <div class="row">
>         <div class="col-md-8 col-md-offset-2">
>+            <h1>Batch remove reserves</h1>
>         [% IF action == 'display_form' %]
>             <form method="post" action="/cgi-bin/koha/course_reserves/batch_rm_items.pl">
>                 <input type="hidden" name="action" value="batch_rm" />
>@@ -50,7 +51,7 @@
>         [% END %]
> 
>         [% IF action == 'display_results' %]
>-            <h1>Results</h1>
>+            <h2>Results</h2>
> 
>             <h3>Items removed</h3>
>             [% IF item_and_count > 0 %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>index 09319eaa1c..409bfb4b57 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>@@ -38,6 +38,7 @@
>     <div class="main container-fluid">
>         <div class="row">
>             <div class="col-md-8 col-md-offset-2">
>+                <h1>[% IF course_name %] Edit <em>[% course_name | html %]</em> [% ELSE %] New course [% END %]</h1>
> 
>             <form method="post" action="/cgi-bin/koha/course_reserves/mod_course.pl" class="validated">
>                 [% IF course_id %]<input type="hidden" name="course_id" value="[% course_id | html %]" />[% END %]
>@@ -156,8 +157,8 @@
> [% ELSE %]
> 
> <div class="dialog alert">
>+    <h1>No DEPARTMENT authorized values found!</h1>
>     <p>
>-        No DEPARTMENT authorized values found!
>         [% IF ( CAN_user_parameters ) %]
>             Please <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=DEPARTMENT">create one or more authorized values</a> with the category DEPARTMENT.
>         [% ELSE %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>index 32a8cab1e6..6e62d213a8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>@@ -24,7 +24,7 @@
>         <div class="col-md-8 col-md-offset-2">
> 
>             <div class="dialog alert">
>-                <p>Invalid course!</p>
>+                <h1>Invalid course!</h1>
>             </div>
> 
>         </div>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 27631: 116352 | 119492 | 119493 | 119496 | 119497 | 119498 | 119500 | 119501 | 119502 | 119544 | 119545 | 119546 | 119547 | 119830 | 119831 | 119832 | 119834 | 119835 | 119836 | 119837 | 119838 | 119839 | 119840 | 119841 | 119842 | 119843 | 120158 | 120159 | 120160 | 120161 | 120162 | 120166 | 120190 | 120191 | 121356 | 121469 | 121470 | 121522 | 121559 | 125547 | 125548 | 125549 | 125550 | 125551 | 125552 | 125553 | 125554 | 125555 | 125556 | 125557 | 125558 | 125559 | 125560 | 125561 | 125562 | 125563 | 125564 | 127295 | 127296 | 127297 | 127298 | 127299 | 127300 | 127301 | 127302 | 127303 | 127304 | 127305 | 127306 | 127307 | 127308 | 127309 | 127310 | 127311 | 127312 | 127432 | 127433 | 127449 | 127456 | 131069 | 131070 | 131071 | 131072 | 131073 | 131074 | 131075 | 131076 | 131077 | 131078 | 131079 | 131080 | 131081 | 131082 | 131083 | 131084 | 131085 | 131086 | 131087 | 131192 | 132886 | 132887 | 132888 | 132889 | 132890 | 132891 | 132892 | 132893 | 132894 | 132895 | 132896 | 132897 | 132898 | 132899 | 132900 | 132901 | 132902 | 132903 | 132904 | 132905