Bug 2889: Removed toggle variable from roadtype.pl and .tmpl.

Removed toggle variable from roadtype.pl and roadtype.tmpl.  Corrected typo in class definition in roadtype.tmpl and add highlighting through the templated __odd__ variable.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

diff --git a/admin/roadtype.pl b/admin/roadtype.pl
index 5441eb9..afd3636 100755 (executable)
--- a/admin/roadtype.pl
+++ b/admin/roadtype.pl
@@ -141,20 +141,10 @@ if ($op eq 'add_form') {
        $template->param(else => 1);
        my @loop;
        my ($count,$results)=StringSearch($searchfield,'web');
-       my $toggle = 0;
        for (my $i=0; $i < $count; $i++){
                my %row = (roadtypeid => $results->[$i]{'roadtypeid'},
-                               road_type => $results->[$i]{'road_type'},
-                               toggle => $toggle );    
+                               road_type => $results->[$i]{'road_type'});
                push @loop, \%row;
-               if ( $toggle eq 0 )
-               {
-                       $toggle = 1;
-               }
-               else
-               {
-                       $toggle = 0;
-               }
        }
        $template->param(loop => \@loop);
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
index 20f8134..703c7bb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
@@ -141,11 +141,11 @@
                        <th colspan="2">&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="loop" -->
-               <!-- TMPL_IF NAME="toggle" -->
-               <tr class="hilighted">
+               <!-- TMPL_UNLESS NAME="__odd__" -->
+               <tr class="highlight">
                <!-- TMPL_ELSE -->
                <tr>
-               <!-- /TMPL_IF -->
+               <!-- /TMPL_UNLESS -->
                        <td><!-- TMPL_VAR NAME="road_type" --></td>
                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">Edit</a></td>
                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;roadtypeid=<!-- TMPL_VAR NAME="roadtypeid" -->">Delete</a></td>