Attachment 5129 Details for Bug 6458 – Signed off patch correcting 3x reports

[patch] Signed off patch correcting 3x reports

0001-8-SIGNED-OFF-Bug-6458-Incorrect-translation-processing.patch (text/plain), 3.73 KB, created by Owen Leonard on 2011-08-24 20:11:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2011-08-24 20:11:03 UTC

Size: 3.73 KB

patch

obsolete

>From 1fdf8497e7ad581bedce964e7a38498d81f8d014 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Mon, 22 Aug 2011 23:25:37 +0200
>Subject: [PATCH] [SIGNED-OFF] Bug 6458: Incorrect translation processing / 3x reports/...
>Content-Type: text/plain; charset="utf-8"
>
>Patch removes template directives from within HTML tags from
>- Reports > Guided Reports
>- Reports > Items with no checkouts
>- Reports > Patron statistics
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../prog/en/modules/reports/borrowers_stats.tt     |    6 ++++--
> .../prog/en/modules/reports/catalogue_out.tt       |    3 ++-
> .../en/modules/reports/guided_reports_start.tt     |    5 ++++-
> 3 files changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>index 78f927b..4d3bba2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>@@ -40,7 +40,8 @@
> 				<th>TOTAL</th>
> 			</tr>
> 				[% FOREACH loopro IN mainloo.looprow %]
>-					<tr[% UNLESS ( loop.odd ) %] class="highlight"[% END %]>
>+                    [% UNLESS ( loop.odd ) %]<tr class="highlight">
>+                    [% ELSE %]<tr>[% END %]
> 						<td>[% IF ( loopro.rowtitle_display ) %][% loopro.rowtitle_display %][% ELSE %][% loopro.rowtitle %][% END %]
> 						</td>
> 						[% FOREACH loopcel IN loopro.loopcell %]
>@@ -236,7 +237,8 @@
> 				</tr>
> 			[% END %]
> 			[% IF ( SORT2_LOOP ) %]
>-				<tr[% UNLESS ( SORT1_LOOP ) %] class="highlight"[% END %]>
>+                [% UNLESS ( SORT1_LOOP ) %]<tr class="highlight">
>+                [% ELSE %]<tr>[% END %]
> 				<td>Sort2</td>
> 				<td><input type="radio" name="Line" value="sort2" /></td>
> 				<td><input type="radio" name="Column" value="sort2" /></td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>index 404892d..48ad8a3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>@@ -65,7 +65,8 @@
> 			</tr>
> 				[% IF ( looptable.looprow ) %]
> 				[% FOREACH loopro IN looptable.looprow %]
>-					<tr[% UNLESS ( loop.odd ) %] class="highlight"[% END %]>
>+                    [% UNLESS ( loop.odd ) %]<tr class="highlight">
>+                    [% ELSE %]<tr>[% END %]
> 						<td>[% loop.count %]</td>
> 						<td>[% DEFAULT loopro.itemcallnumber="No Call Number" %]</td>
> 						<td>[% DEFAULT loopro.barcode="No Barcode" %]</td>
>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 0449c84..487f9a2 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
>@@ -540,7 +540,10 @@ canned reports and writing custom SQL reports.</p>
> <fieldset class="rows">
> <legend>Create Report From SQL</legend>
> <ol>
>-    <li><label for="reportname">Report Name:</label> <input type="text" id="reportname" name="reportname" [% IF ( reportname ) %] value="[% reportname %]"[% END %] /> </li>
>+    <li><label for="reportname">Report Name:</label> 
>+        [% IF ( reportname ) %]<input type="text" id="reportname" name="reportname" value="[% reportname %]" />
>+        [% ELSE %]<input type="text" id="reportname" name="reportname" />[% END %] 
>+    </li>
>     <li><label for="notes">Notes:</label> <textarea id="notes" name="notes" cols="50" rows="2">[% notes %]</textarea></li>
>     <li><label for="types">Type:</label>
>         <select id="types" name="types">
>-- 
>1.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 6458: 4695 | 4697 | 4699 | 4729 | 4968 | 5070 | 5071 | 5072 | 5074 | 5078 | 5079 | 5080 | 5081 | 5082 | 5090 | 5091 | 5092 | 5093 | 5094 | 5095 | 5096 | 5121 | 5125 | 5126 | 5127 | 5128 | 5129 | 5130 | 5131 | 5132 | 5133 | 5147 | 5148 | 5149 | 5150 | 5152 | 5153 | 5155 | 5156 | 5157 | 5158 | 5159 | 5160 | 5168 | 5169 | 5170 | 5258 | 5259 | 5260 | 5261 | 5262 | 5263 | 5273 | 5274 | 5286 | 5287 | 5288 | 5289 | 5292 | 5293 | 5299 | 5300 | 5416 | 5417 | 5418 | 5419 | 5420 | 5425 | 5426 | 5427