Bug 2889: Removed toggle variable from currency.tmpl. Used template __odd__ instead.

Removed toggle variable from currency.tmpl and currency.pl.  Used template __odd_ variable instead.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

diff --git a/admin/currency.pl b/admin/currency.pl
index 145dc3f..0a237bc 100755 (executable)
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -165,7 +165,6 @@ if ($op eq 'add_form') {
 
        my ($count,$results)=StringSearch($searchfield,'web');
        my @loop;
-       my $toggle = 0;
        for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
                my %row = (
                        currency => $results->[$i]{'currency'},
@@ -173,7 +172,6 @@ if ($op eq 'add_form') {
                          symbol => $results->[$i]{'symbol'},
                   timestamp => format_date($results->[$i]{'timestamp'}),
                );
-               ($i % 2) and $row{toggle} = 1;
                push @loop, \%row;
        }
        $template->param(loop => \@loop);

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index bfe3623..4dfdd04 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -204,12 +204,12 @@
                        <th colspan="2">&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="loop" -->
-               <!-- TMPL_IF NAME="toggle" -->
-               <tr class="highlight"><td class="highlight">
+               <!-- TMPL_UNLESS NAME="__odd__" -->
+               <tr class="highlight">
                <!-- TMPL_ELSE -->
-               <tr><td>
-               <!-- /TMPL_IF -->
-                           <!-- TMPL_VAR NAME="currency" --></td>
+               <tr>
+               <!-- /TMPL_UNLESS -->
+                       <td><!-- TMPL_VAR NAME="currency" --></td>
                        <td><!-- TMPL_VAR NAME="rate" --></td>
                        <td><!-- TMPL_VAR NAME="symbol" --></td>
                        <td><!-- TMPL_VAR NAME="timestamp" --></td>