From: Owen Leonard Date: Fri, 26 Feb 2016 14:17:52 +0000 (-0500) Subject: Bug 15925 [Revised] Correct some markup issues with patron lists pages X-Git-Tag: v16.05.00-beta~804 X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=f8647c1aaefbfb8ce83a0918c3f935ce87904677;p=koha_ffzg Bug 15925 [Revised] 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
. 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 Works as expected. No regression. Better texts. Consistent validation. Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher --- 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 d6a0d063c6..6f8408d2bc 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 8ce414311e..27b68a786b 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 5ad8f5ddf6..2f9b7e337c 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 @@
-

Your patron lists

-
- New patron list + +

Your patron lists

+ [% IF ( lists ) %] @@ -75,5 +78,5 @@
There are no patron lists.
[% END %] - + [% INCLUDE 'intranet-bottom.inc' %]