Attachment 48609 Details for Bug 15925 – Bug 15925 [Revised] Correct some markup issues with patron lists pages

[patch] Bug 15925 [Revised] Correct some markup issues with patron lists pages

Bug-15925-Revised-Correct-some-markup-issues-with-.patch (text/plain), 5.95 KB, created by Jonathan Druart on 2016-03-03 09:26:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-03-03 09:26:00 UTC

Size: 5.95 KB

patch

obsolete

>From 1072c470c95f270302d01a78000b7aad54275e8d Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 26 Feb 2016 09:17:52 -0500
>Subject: [PATCH] Bug 15925 [Revised] Correct some markup issues with patron
> lists pages
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch makes some markup changes to the patron lists interface in
>order to make them more consistent with other areas of Koha.
>
>Change to look for when testing:
>
>Tools -> Patron lists:
>
>- Wrap "New patron list" button in standard <div id="toolbar">
>- Place toolbar above page heading.
>
>Tools -> Patron lists -> New patron list:
>
>- Use built-in form validation for required fields
>- Clarify page title and breadcrumbs on list add and edit
>
>Validation errors have been corrected on all three templates, including
>removal of an extra </div>.
>
>Revision: I was wrong about the frequency of use of "Modify." There's no
>clear-cut reason to replace it with "Edit" so I have undone that change.
>
>Signed-off-by: FrÃ©dÃ©ric Demians <f.demians@tamil.fr>
>  Works as expected. No regression. Better texts. Consistent validation.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/patron_lists/add-modify.tt     | 48 +++++++++++-----------
> .../prog/en/modules/patron_lists/list.tt           |  2 +-
> .../prog/en/modules/patron_lists/lists.tt          | 11 +++--
> 3 files changed, 31 insertions(+), 30 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>index d6a0d06..6f8408d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>@@ -1,28 +1,24 @@
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Tools &rsaquo; Patron lists &rsaquo; New list</title>
>+<title>Koha &rsaquo; Tools &rsaquo; Patron lists &rsaquo;
>+    [% IF list.patron_list_id %]
>+        Modify patron list
>+    [% ELSE %]
>+        New patron list
>+    [% END %]
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
>-
>-<script type="text/javascript">
>-//<![CDATA[
>-
>-function CheckForm() {
>-  if ( !$("#list-name").val() ) {
>-    alert( _("Name is a required field!")  );
>-    return false;
>-  }
>-
>-  return true;
>-}
>-
>-//]]>
>-</script>
>-
> </head>
> 
> <body id="patlist_add_modify" class="pat patlist">
> [% 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="lists.pl">Patron lists</a> &rsaquo; Add / modify list</div>
>+<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="lists.pl">Patron lists</a> &rsaquo;
>+    [% IF list.patron_list_id %]
>+        Modify patron list
>+    [% ELSE %]
>+        New patron list
>+    [% END %]
>+</div>
> 
> 
> <div class="yui-t7">
>@@ -35,7 +31,7 @@ function CheckForm() {
>             [% END %]
>         </h1>
> 
>-        <form method="post" onsubmit="return CheckForm()">
>+        <form method="post" action="/cgi-bin/koha/patron_lists/add-modify.pl" class="validated">
>             <fieldset class="rows">
> 
>                 <legend>
>@@ -48,8 +44,8 @@ function CheckForm() {
> 
>                 <ol>
>                     <li>
>-                        <label class="required" for="name">Name:</label>
>-                        <input id="list-name" name="name" type="text" value="[% list.name %]" />
>+                        <label class="required" for="list-name">Name:</label>
>+                        <input id="list-name" name="name" type="text" class="required" required="required" value="[% list.name %]" />
>                     </li>
> 
>                     <li>
>@@ -59,10 +55,12 @@ function CheckForm() {
> 
>             </fieldset>
> 
>-            <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" />
>-            <input type="submit" class="btn" value="Save" />
>-            <a href="lists.pl" class="cancel">Cancel</a>
>+            <fieldset class="action">
>+                <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" />
>+                <input type="submit" value="Save" />
>+                <a href="lists.pl" class="cancel">Cancel</a>
>+            </fieldset>
>         </form>
>     </div>
>-</div>
>+
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>index 8ce4143..27b68a7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>@@ -152,5 +152,5 @@ $(document).ready(function() {
>             <input type="submit" value="Remove selected patrons" />
>         </form>
>     </div>
>-</div>
>+
> [% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>index 5ad8f5d..2f9b7e3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>@@ -32,12 +32,15 @@
> 
> <div class="yui-t7">
>     <div class="yui-main">
>-        <h1>Your patron lists</h1>
> 
>-        <div class="btn-group">
>-            <a class="btn btn-small" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a>
>+        <div id="toolbar" class="btn-toolbar">
>+            <div class="btn-group">
>+                <a class="btn btn-small" href="add-modify.pl"><i class="fa fa-plus"></i> New patron list</a>
>+            </div>
>         </div>
> 
>+        <h1>Your patron lists</h1>
>+
>         [% IF ( lists ) %]
> 
>         <table id="patron-lists-table">
>@@ -75,5 +78,5 @@
>            <div class="dialog message">There are no patron lists.</div>
>         [% END %]
>     </div>
>-</div>
>+
> [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.7.0

Actions: View | Diff | Splinter Review

Attachments on bug 15925: 48466 | 48467 | 48607 | 48609 | 48746