Bugzilla – Attachment 48746 Details for
Bug 15925
Correct some markup issues with patron lists pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[3.22.x] Bug 15925: Correct some markup issues with patron lists pages
Bug-15925-Correct-some-markup-issues-with-patron-l.patch (text/plain), 5.62 KB, created by
Julian Maurice
on 2016-03-07 13:06:45 UTC
(
hide
)
Description:
[3.22.x] Bug 15925: Correct some markup issues with patron lists pages
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2016-03-07 13:06:45 UTC
Size:
5.62 KB
patch
obsolete
>From d3b4f19f997d12253597d00b197cc1374437f412 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: 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 <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>. > >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> >--- > .../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' %] >-<title>Koha › Tools › Patron lists › New list</title> >+<title>Koha › Tools › Patron lists › >+ [% 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> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › <a href="lists.pl">Patron lists</a> › Add / modify list</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › <a href="lists.pl">Patron lists</a> › >+ [% 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 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 @@ > > <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"> > <thead> > <tr> >@@ -73,6 +78,9 @@ > [% END %] > </tbody> > </table> >+ >+ [% END %] >+ > </div> >-</div> >+ > [% INCLUDE 'intranet-bottom.inc' %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15925
:
48466
|
48467
|
48607
|
48609
| 48746