From 060274acb08c811d2df622664ae1c376a52e399e Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@redhat.com>
Date: Apr 05 2011 22:35:22 +0000
Subject: minor fixes to the rpmlist page


---

diff --git a/www/kojiweb/rpmlist.chtml b/www/kojiweb/rpmlist.chtml
index 3386413..9e4dd6b 100644
--- a/www/kojiweb/rpmlist.chtml
+++ b/www/kojiweb/rpmlist.chtml
@@ -12,11 +12,11 @@ buildrootID=$buildroot.id #slurp
 
 #def getColspan()
   #if $type == 'component'
-"colspan=3"
+colspan="3" #slurp
   #elif $type == 'image'
-"colspan=2"
+colspan="2" #slurp
   #else
-"colspan=1"
+  #pass
   #end if
 #end def
 
@@ -54,11 +54,11 @@ buildrootID=$buildroot.id #slurp
     </tr>
     <tr class="list-header">
       <th><a href="rpmlist?$getID()&order=$util.toggleOrder($self, 'nvr')$util.passthrough($self, 'type')">NVR</a> $util.sortImage($self, 'nvr')</th>
-      #if $type == 'component'
+      #if $type in ['component', 'image']
       <th><a href="rpmlist?$getID()&order=$util.toggleOrder($self, 'external_repo_name')$util.passthrough($self, 'type')">Origin</a> $util.sortImage($self, 'external_repo_name')</th>
+      #end if
+      #if $type == 'component'
       <th><a href="rpmlist?$getID()&order=$util.toggleOrder($self, 'is_update')$util.passthrough($self, 'type')">Update?</a> $util.sortImage($self, 'is_update')</th>
-      #elif $type == 'image'
-      <th><a href="rpmlist?$getID()&order=$util.toggleOrder($self, 'external_repo_name')$util.passthrough($self, 'type')">Origin</a> $util.sortImage($self, 'external_repo_name')</th>
       #end if
     </tr>
     #if $len($rpms) > 0
@@ -66,11 +66,13 @@ buildrootID=$buildroot.id #slurp
     <tr class="$util.rowToggle($self)">
       #set $epoch = ($rpm.epoch != None and $str($rpm.epoch) + ':' or '')
       <td><a href="rpminfo?rpmID=$rpm.id">$rpm.name-$epoch$rpm.version-$rpm.release.${rpm.arch}.rpm</a></td>
+      #if $type in ['component', 'image']
       #if $rpm.external_repo_id == 0
       <td>internal</td>
       #else
       <td><a href="externalrepoinfo?extrepoID=$rpm.external_repo_id">$rpm.external_repo_name</a></td>
       #end if
+      #end if
       #if $type == 'component'
       #set $update = $rpm.is_update and 'yes' or 'no'
       <td class="$update">$util.imageTag($update)</td>
@@ -79,11 +81,11 @@ buildrootID=$buildroot.id #slurp
     #end for
     #else
     <tr class="row-odd">
-      <td colspan="#if $type == 'component' then '3' else '1'#">No RPMs</td>
+      <td $getColspan()>No RPMs</td>
     </tr>
     #end if
     <tr>
-      <td class="paginate" colspan="#if $type == 'component' then '3' else '1'#">
+      <td class="paginate" $getColspan()>
         #if $len($rpmPages) > 1
         <form class="pageJump" action="">
           Page: