Bugzilla – Attachment 2306 Details for
Bug 2889
templates should not use [% IF ( loop.odd ) %]
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch for report tmpl's.
0001-Bug-2889-Fixes-or-adds-highlighting-to-several-repo.patch (text/plain), 12.89 KB, created by
Garry Collum
on 2010-07-03 21:09:43 UTC
(
hide
)
Description:
Proposed patch for report tmpl's.
Filename:
MIME Type:
Creator:
Garry Collum
Created:
2010-07-03 21:09:43 UTC
Size:
12.89 KB
patch
obsolete
>From 0187d605e8413d4b2770b1f64492480c3d4172c1 Mon Sep 17 00:00:00 2001 >From: Garry Collum <gcollum@gmail.com> >Date: Sat, 3 Jul 2010 17:13:15 -0400 >Subject: [PATCH] Bug 2889: Fixes or adds highlighting to several reports. >Content-Type: text/plain; charset="utf-8" > >--- > .../en/modules/reports/acquisitions_stats.tmpl | 23 ++++++++---------- > .../prog/en/modules/reports/bor_issues_top.tmpl | 11 +++----- > .../prog/en/modules/reports/cat_issues_top.tmpl | 2 +- > .../prog/en/modules/reports/catalogue_stats.tmpl | 23 ++++++++---------- > .../prog/en/modules/reports/issues_avg_stats.tmpl | 25 ++++++++----------- > .../prog/en/modules/reports/itemtypes.tmpl | 2 +- > 6 files changed, 37 insertions(+), 49 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl >index 0bf5daf..73c392a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl >@@ -34,18 +34,15 @@ > <th>TOTAL</th> > </tr> > <!-- TMPL_LOOP NAME="looprow" --> >- <tr> >- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_VAR NAME="rowtitle" --></td> >+ <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS --> >+ <td><!-- TMPL_VAR NAME="rowtitle" --></td> > <!-- TMPL_LOOP NAME="loopcell" --> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" --> >+ <td><!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" --> > <!-- TMPL_ELSE--> > <!-- /TMPL_IF --> > </td> > <!-- /TMPL_LOOP --> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_VAR NAME="totalrow" --> >+ <td><!-- TMPL_VAR NAME="totalrow" --> > </td> > </tr> > <!-- /TMPL_LOOP --> >@@ -74,7 +71,7 @@ > </tr> > </thead> > <tbody> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td>Placed On</td> > <td><input type="radio" name="Line" value="aqbasket.closedate" /></td> > <td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td> >@@ -144,7 +141,7 @@ > <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span> > </td> > </tr> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td> </td> > <td colspan="2">group by <select name="PlacedOnDisplay"> > <option value="">None</option> >@@ -238,7 +235,7 @@ > </td> > <td> </td> > </tr> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td>Vendor</td> > <td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td> > <td><input type="radio" name="Column" value="aqbooksellers.name" /></td> >@@ -251,7 +248,7 @@ > <td><!-- TMPL_VAR NAME="CGIItemType" --></td> > </tr> > >- <tr> >+ <tr class="highlight"> > <td>Budget</td> > <td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td> > <td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td> >@@ -259,7 +256,7 @@ > </tr> > > <!-- TMPL_IF Name="hassort1" --> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td>Sort1</td> > <td><input type="radio" name="Line" value="aqorders.sort1" /></td> > <td><input type="radio" name="Column" value="aqorders.sort1" /></td> >@@ -267,7 +264,7 @@ > </tr> > <!-- /TMPL_IF --> > <!-- TMPL_IF Name="hassort2" --> >- <!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> >+ <!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> > <td>Sort2</td> > <td><input type="radio" name="Line" value="aqorders.sort2" /></td> > <td><input type="radio" name="Column" value="aqorders.sort2" /></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl >index b20a2f7..5bf9341 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl >@@ -46,17 +46,14 @@ function Dopop(link) { > <!-- /TMPL_LOOP --> > </tr> > <!-- TMPL_LOOP NAME="looprow" --> >- <tr> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_VAR NAME="rowtitle" --></td> >+ <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS --> >+ <td><!-- TMPL_VAR NAME="rowtitle" --></td> > <!-- TMPL_LOOP NAME="loopcell" --> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="reference" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->"><!-- /TMPL_IF --> >+ <td><!-- TMPL_IF NAME="reference" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->"><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF --> > </td> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF --> >+ <td><!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF --> > </td> > <!-- /TMPL_LOOP --> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl >index 6a66948..b7b712c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl >@@ -46,7 +46,7 @@ function Dopop(link) { > <!-- /TMPL_LOOP --> > </tr> > <!-- TMPL_LOOP NAME="looprow" --> >-<!-- TMPL_IF NAME="hilighted" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --> >+<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS --> > <td><!-- TMPL_VAR NAME="rowtitle" --></td> > <!-- TMPL_LOOP NAME="loopcell" --> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl >index 419193e..061bbd0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl >@@ -33,18 +33,15 @@ > <th>TOTAL</th> > </tr> > <!-- TMPL_LOOP NAME="looprow" --> >- <tr> >- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_VAR NAME="rowtitle" --></td> >+ <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS --> >+ <td><!-- TMPL_VAR NAME="rowtitle" --></td> > <!-- TMPL_LOOP NAME="loopcell" --> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --> >- <!--TMPL_ELSE--> >- <!--/TMPL_IF--> >+ <td><!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --> >+ <!--TMPL_ELSE--> >+ <!--/TMPL_IF--> > </td> > <!-- /TMPL_LOOP --> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_VAR NAME="totalrow" --> >+ <td><!-- TMPL_VAR NAME="totalrow" --> > </td> > </tr> > <!-- /TMPL_LOOP--> >@@ -124,7 +121,7 @@ > <!-- TMPL_ELSE --> > <tr><td colspan="4"><input type="hidden" name="Filter" /> <input type="hidden" name="Filter" /></td></tr> > <!-- /TMPL_IF --> >- <tr> >+ <tr class="highlight"> > <td>Item Type</td> > <td><input type="radio" name="Line" value="<!-- TMPL_VAR NAME="item_itype" -->" /></td> > <td><input type="radio" name="Column" value="<!-- TMPL_VAR NAME="item_itype" -->" /></td> >@@ -144,7 +141,7 @@ > <td><input type="radio" name="Column" value="publishercode" /></td> > <td><input type="text" name="Filter" /></td> > </tr> >- <tr> >+ <tr class="highlight"> > <td>Publication Year</td> > <td><input type="radio" name="Line" value="publicationyear" /></td> > <td><input type="radio" name="Column" value="publicationyear" /></td> >@@ -162,7 +159,7 @@ > </select> > </td> > </tr> >- <tr> >+ <tr class="highlight"> > <td>Shelving Location</td> > <td><input type="radio" name="Line" value="items.location" /></td> > <td><input type="radio" name="Column" value="items.location" /></td> >@@ -186,7 +183,7 @@ > </select> > </td> > </tr> >- <tr> >+ <tr class="highlight"> > <td colspan="3">Filter barcode</td> > <td> > <select name="Filter" id="like"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl >index 26d671b..6753208 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl >@@ -34,16 +34,13 @@ > <th>TOTAL</th> > </tr> > <!-- TMPL_LOOP NAME="looprow" --> >- <tr> >- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_VAR NAME="rowtitle" --></td> >+ <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS --> >+ <td><!-- TMPL_VAR NAME="rowtitle" --></td> > <!-- TMPL_LOOP NAME="loopcell" --> >- <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF --> >- </td> >+ <td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF --> >+ </td> > <!-- /TMPL_LOOP --> >- <!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF --> >- <!-- TMPL_VAR NAME="totalrow" --> >+ <td><!-- TMPL_VAR NAME="totalrow" --> > </td> > </tr> > <!-- /TMPL_LOOP --> >@@ -73,7 +70,7 @@ > </tr> > </thead> > <tbody> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td>Checkout date</td> > <td><input type="radio" name="Line" value="timestamp" /></td> > <td><input type="radio" name="Column" value="timestamp" /></td> >@@ -137,7 +134,7 @@ > </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span> > </td> > </tr> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td> </td> > <td colspan="2">by <select name="IssueDisplay"> > <option value=""> </option> >@@ -225,7 +222,7 @@ > </td> > <td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td> > </tr> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td>Patron category</td> > <td><input type="radio" name="Line" value="borrowers.categorycode" /></td> > <td><input type="radio" name="Column" value="borrowers.categorycode" /></td> >@@ -237,7 +234,7 @@ > <td><input type="radio" name="Column" value="itemtype" /></td> > <td ><!-- TMPL_VAR NAME="CGIItemType" --></td> > </tr> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td>Library</td> > <td><input type="radio" name="Line" value="branchcode" /></td> > <td><input type="radio" name="Column" value="branchcode" /></td> >@@ -252,7 +249,7 @@ > </tr> --> > <!--End Modified --> > <!-- TMPL_IF Name="hassort1" --> >- <tr class="hilighted"> >+ <tr class="highlight"> > <td>Sort1</td> > <td><input type="radio" name="Line" value="borrowers.sort1" /></td> > <td><input type="radio" name="Column" value="borrowers.sort1" /></td> >@@ -260,7 +257,7 @@ > </tr> > <!-- /TMPL_IF --> > <!-- TMPL_IF Name="hassort2" --> >- <!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> >+ <!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> > <td>Sort2</td> > <td><input type="radio" name="Line" value="borrowers.sort2" /></td> > <td><input type="radio" name="Column" value="borrowers.sort2" /></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl >index 22a39dc..df4a731 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl >@@ -23,7 +23,7 @@ > <th>count</th> > </tr> > <!-- TMPL_LOOP NAME="loopitemtype" --> >- <tr> >+ <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS --> > <td><!-- TMPL_VAR NAME="itemtype" --></td> > <td><!-- TMPL_VAR NAME="count" --></td> > </tr> >-- >1.5.6.5 >
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 2889
:
911
|
912
|
913
|
914
|
2157
|
2306
|
2307
|
30071
|
30790
|
31834
|
31858
|
31859
|
31866
|
31867