Bug 6458: Incorrect translation processing / 3x reports/...

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>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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 (file)
--- 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 (file)
--- 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 (file)
--- 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">