Bugzilla – Attachment 62659 Details for
Bug 3311
Statistical reports should error if row and column aren't selected
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 3311: Followup clean up HTML on page.
SIGNED-OFF-Bug-3311-Followup-clean-up-HTML-on-page.patch (text/plain), 6.27 KB, created by
Owen Leonard
on 2017-04-25 12:10:13 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 3311: Followup clean up HTML on page.
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2017-04-25 12:10:13 UTC
Size:
6.27 KB
patch
obsolete
>From 6ee4b8d89d37a70ada43905f56ed997156ceb344 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Fri, 21 Apr 2017 11:45:45 -0400 >Subject: [PATCH] [SIGNED-OFF] Bug 3311: Followup clean up HTML on page. > >There should be no validator.w3.org validation issues >for this page's source. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 5 +++ > .../prog/en/modules/reports/catalogue_stats.tt | 37 +++++++++++++++------- > 2 files changed, 31 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >index 35479c8..b582831 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >@@ -1265,11 +1265,16 @@ div.note i.fa-exclamation { > text-decoration : underline; > } > >+th.required, > label.required, > span.required { > color : #C00; > } > >+th.required { >+ width: 17%; >+} >+ > span.required { > font-style : italic; > margin-left : .5em; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >index 3e33d3a..b48d9d5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt >@@ -99,18 +99,18 @@ > [% END %] > [% ELSE %] > >- <form method="post" class="validated" action="/cgi-bin/koha/reports/catalogue_stats.pl"> >+ <form name="configure_report" id="configure_report" method="post" class="validated" action="/cgi-bin/koha/reports/catalogue_stats.pl"> > <fieldset class="rows"> > <legend>Catalog statistics</legend> > <table> > <thead> > <tr> > <th>Title</th> >- <th><label for="Line" class="required">Row</label> >- <label for="Line" class="error" style="display: none"><br>A row must be selected.</label> >+ <th class="required">Row<br> >+ <span id="LineError"></span> > </th> >- <th><label for="Column" class="required">Column</label> >- <label for="Column" class="error" style="display: none"><br>A column must be selected.</label> >+ <th class="required">Column<br> >+ <span id="ColumnError"></span> > </th> > <th>Filter</th> > </tr> >@@ -125,7 +125,7 @@ > <tr> > <td> </td> > <td colspan="2"><select name="cotedigits" id="cotedigits"> >- <option value=""> </option> >+ <option value="">Not filtered by</option> > <option value ="1">1</option> > <option value ="2">2</option> > <option value ="3">3</option> >@@ -141,7 +141,7 @@ > <td><input type="radio" name="Line" value="[% item_itype %]" /></td> > <td><input type="radio" name="Column" value="[% item_itype %]" /></td> > <td><select name="Filter" id="[% item_itype %]"> >- <option value=""> </option> >+ <option value="">Not filtered by item type</option> > [% FOREACH itemtype IN itemtypes %] > <option value="[% itemtype.itemtype %]">[% itemtype.translated_description %]</option> > [% END %] >@@ -158,14 +158,14 @@ > <td>Publication year</td> > <td><input type="radio" name="Line" value="publicationyear" /></td> > <td><input type="radio" name="Column" value="publicationyear" /></td> >- <td><label for="pubyearFrom">From</label> <input type="text" name="Filter" id="pubYearFrom" /> <label for="pubyearTo">To</label> <input type="text" name="Filter" id="pubyearTo" /></td> >+ <td><label for="pubYearFrom">From</label> <input type="text" name="Filter" id="pubYearFrom" /> <label for="pubyearTo">To</label> <input type="text" name="Filter" id="pubyearTo" /></td> > </tr> > <tr> > <td>Home library</td> > <td><input type="radio" name="Line" value="items.homebranch" /></td> > <td><input type="radio" name="Column" value="items.homebranch" /></td> > <td><select name="Filter" id="branch"> >- <option value=""> </option> >+ <option value="">Not filtered by home library</option> > [% PROCESS options_for_libraries libraries => Branches.all() %] > </select> > </td> >@@ -175,7 +175,7 @@ > <td><input type="radio" name="Line" value="items.location" /></td> > <td><input type="radio" name="Column" value="items.location" /></td> > <td><select name="Filter" id="location"> >- <option value=""> </option> >+ <option value="">Not filtered by shelving location</option> > [% FOREACH locationloo IN locationloop %] > [% IF ( locationloo.selected ) %]<option value="[% locationloo.code %]" selected="selected">[% locationloo.description %]</option>[% ELSE %]<option value="[% locationloo.code %]">[% locationloo.description %]</option>[% END %] > [% END %] >@@ -187,7 +187,7 @@ > <td><input type="radio" name="Line" value="items.ccode" /></td> > <td><input type="radio" name="Column" value="items.ccode" /></td> > <td><select name="Filter" id="ccode"> >- <option value=""> </option> >+ <option value="">Not filtered by collection</option> > [% FOREACH authval IN authvals %] > [% IF ( authval.selected ) %]<option value="[% authval.code %]" selected="selected">[% authval.description %]</option>[% ELSE %]<option value="[% authval.code %]">[% authval.description %]</option>[% END %] > [% END %] >@@ -277,6 +277,21 @@ > <input type="text" name="Filter" id="deldateTo" class="datepicker"/> > </td> > </tr> >+<script type="text/javascript"> >+//<![CDATA[ >+ $("#configure_report").validate({ >+ errorPlacement: function(error, element) { >+ if (element.attr("name") == "Line") { >+ $("#LineError").html( error ); >+ } else if (element.attr("name") == "Column") { >+ $("#ColumnError").html( error ); >+ } else { >+ error.insertAfter(element); >+ } >+ } >+ }); >+//]]> >+</script> > </tbody> > </table><br /></fieldset> > >-- >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 3311
:
52775
|
52776
|
52777
|
52778
|
52779
|
53194
|
53195
|
53291
|
62533
|
62541
|
62623
|
62624
|
62630
|
62658
|
62659
|
62776
|
62777
|
62793
|
62794
|
62795
|
62796
|
62797
|
62798
|
62799
|
62800
|
62801
|
62802