From d3b4f19f997d12253597d00b197cc1374437f412 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 26 Feb 2016 09:17:52 -0500 Subject: [PATCH] Bug 15925: Correct some markup issues with patron lists pages 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
- 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
. Signed-off-by: Julian Maurice --- .../prog/en/modules/patron_lists/add-modify.tt | 48 +++++++++++----------- .../prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 16 ++++++-- 3 files changed, 36 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' %] -Koha › Tools › Patron lists › New list +Koha › Tools › Patron lists › + [% IF list.patron_list_id %] + Modify patron list + [% ELSE %] + New patron list + [% END %] + [% INCLUDE 'doc-head-close.inc' %] - - - [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -35,7 +31,7 @@ function CheckForm() { [% END %] -
+
@@ -48,8 +44,8 @@ function CheckForm() {
  1. - - + +
  2. @@ -59,10 +55,12 @@ function CheckForm() {
- - - Cancel +
+ + + Cancel +
- + [% 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() { - + [% 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 eee075e..6f645af 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,17 @@
-

Your patron lists

-
- New patron list + +

Your patron lists

+ + [% IF ( lists ) %] + @@ -73,6 +78,9 @@ [% END %]
+ + [% END %] +
-
+ [% INCLUDE 'intranet-bottom.inc' %] -- 2.1.4