[Koha-patches] [PATCH] Bug 9117 [Follow-up] Reports hierarchies management improvements

Owen Leonard Wed, 21 Nov 2012 07:41:17 -0800

This patch corrects serveral markup errors in the template
introduced by this bug as well as previous patches: unescaped
ampersands, missing closing tags, typos.


To test, view various stages of the process of viewing or
creating guided reports and check the source for validity.
---
 .../en/modules/reports/guided_reports_start.tt     |   21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git 
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt 
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 088b93b..819cd0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -306,7 +306,7 @@ canned reports and writing custom SQL reports.</p>
                             <a 
href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id 
%]&amp;phase=Show%20SQL">Show</a>
                             [% IF ( CAN_user_reports_create_reports ) %]
                                 <a 
href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id 
%]&amp;phase=Edit%20SQL">Edit</a>
-                                <a title="Duplicate this saved report" 
href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from 
SQL&sql=[% savedreport.savedsql |uri %]&reportname=[% savedreport.report_name 
|uri %]&notes=[% savedreport.notes |uri %]">Duplicate</a>
+                                <a title="Duplicate this saved report" 
href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from 
SQL&amp;sql=[% savedreport.savedsql |uri %]&amp;reportname=[% 
savedreport.report_name |uri %]&amp;notes=[% savedreport.notes |uri 
%]">Duplicate</a>
                             [% END %]
                         </td>
                         <td>
@@ -366,9 +366,9 @@ canned reports and writing custom SQL reports.</p>
 [% END %]
 </select></li>
 [% IF (public) %]
-  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0">No (default)</option> <option value="1" 
selected="selected">Yes</public> </select></li>
+  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0">No (default)</option> <option value="1" 
selected="selected">Yes</option> </select></li>
 [% ELSE %]
-  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0" selected="selected">No (default)</option> 
<option value="1">Yes</public> </select></li>
+  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0" selected="selected">No (default)</option> 
<option value="1">Yes</option> </select></li>
 [% END %]
 [% IF (usecache) %] <li>
 <label for="cache_expiry">Cache expiry:</label><input type="text" 
id="cache_expiry" name="cache_expiry" value="[% cache_expiry %]"></input>
@@ -380,7 +380,7 @@ canned reports and writing custom SQL reports.</p>
 </select>
 </li>[% END %]
 </ol>
-<ofieldset>
+</fieldset>
 <fieldset class="action">
 <input type="hidden" name="phase" value="Report on this Area" />
 <input type="submit" name="submit" value="Next &gt;&gt;" />
@@ -528,11 +528,13 @@ canned reports and writing custom SQL reports.</p>
     </fieldset>
 
 [% IF ( definitions ) %]
-<fieldset><legend>Dictionary definitions</legend><table>
+<fieldset><legend>Dictionary definitions</legend>
+<table>
 [% FOREACH definition IN definitions %]
     <tr><td><input type="checkbox" name="definition" value="[% definition.id 
%]" /> [% definition.name %]</td></tr>
 [% END %]
 </table>
+</fieldset>
 [% END %]
 
 <fieldset class="action"><input type="hidden" name="phase" value="Choose these 
criteria" />
@@ -712,9 +714,9 @@ $(document).ready(function() {
     [% PROCESS group_and_subgroup_selection %]
 
 [% IF (public) %]
-  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0">No (default)</option> <option value="1" 
selected="selected">Yes</public> </select></li>
+  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0">No (default)</option> <option value="1" 
selected="selected">Yes</option> </select></li>
 [% ELSE %]
-  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0" selected="selected">No (default)</option> 
<option value="1">Yes</public> </select></li>
+  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0" selected="selected">No (default)</option> 
<option value="1">Yes</option> </select></li>
 [% END %]
 [% IF (usecache) %] <li>
 <label for="cache_expiry">Cache expiry:</label><input type="text" 
id="cache_expiry" name="cache_expiry" value="[% cache_expiry %]"></input>
@@ -804,9 +806,9 @@ Sub report:<select name="subreport">
 <li><label for="reportname">Report name:</label><input type="text" 
id="reportname" name="reportname" value="[% reportname %]" size="50" /></li>
 [% PROCESS group_and_subgroup_selection %]
 [% IF (public) %]
-  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0">No (default)</option> <option value="1" 
selected="selected">Yes</public> </select></li>
+  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0">No (default)</option> <option value="1" 
selected="selected">Yes</option> </select></li>
 [% ELSE %]
-  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0" selected="selelcted">No (default)</option> 
<option value="1">Yes</public> </select></li>
+  <li><label for="public">Report is public:</label><select id="public" 
name="public"> <option value="0" selected="selelcted">No (default)</option> 
<option value="1">Yes</option> </select></li>
 [% END %]
 [% IF (usecache) %] <li>
 <label for="cache_expiry">Cache expiry:</label><input type="text" 
id="cache_expiry" name="cache_expiry" value="[% cache_expiry %]"></input>
@@ -883,6 +885,7 @@ Sub report:<select name="subreport">
     <li><label for="filter_author">Author:</label> <input type="text" 
id="filter_author" name="filter_author" value="[% filter_author %]" /></li>
     <li><label for="filter_keyword">Keyword:</label> <input type="text" 
id="filter_keyword" name="filter_keyword" value="[% filter_keyword %]" /></li>
   </ol>
+  </fieldset>
   <fieldset class="action"><input type="submit" value="Apply filter" 
/></fieldset>
 </form>
 </div>
-- 
1.7.9.5
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

[Koha-patches] [PATCH] Bug 9117 [Follow-up] Reports hierarchies management improvements

Reply via email to