UI nit fixes - misaligned columns when viewing disabled services/packages

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 0af64e7..707972e 100755 (executable)
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -29,7 +29,7 @@ if ( $cgi->param('showdisabled') ) {
 my $colspan = $cgi->param('showdisabled') ? 2 : 3;
 print &table(), <<END;
       <TR>
 my $colspan = $cgi->param('showdisabled') ? 2 : 3;
 print &table(), <<END;
       <TR>

-        <TH COLSPAN=2>Package</TH>
+        <TH COLSPAN=$colspan>Package</TH>

         <TH>Comment</TH>
         <TH><FONT SIZE=-1>Freq.</FONT></TH>
         <TH><FONT SIZE=-1>Plan</FONT></TH>
         <TH>Comment</TH>
         <TH><FONT SIZE=-1>Freq.</FONT></TH>
         <TH><FONT SIZE=-1>Plan</FONT></TH>


@@ -90,7 +90,7 @@ END
 }
 
 print <<END;
 }
 
 print <<END;

-   <TR><TD COLSPAN=8><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>
+   <TR><TD COLSPAN=<%= $cgi->param('showdisabled') ? 8 : 9 %>><I><A HREF="${p}edit/part_pkg.cgi">Add a new package definition</A></I></TD></TR>

     </TABLE>
   </BODY>
 </HTML>
     </TABLE>
   </BODY>
 </HTML>

diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 4590dc8..07f1979 100755 (executable)
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -73,7 +73,7 @@ my $total = scalar(@part_svc);
 <% } %>
 
   <TR>
 <% } %>
 
   <TR>

-    <TD COLSPAN=6><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>
+    <TD COLSPAN=<%= $cgi->param('showdisabled') ? 6 : 7 %>><A HREF="<%= $p %>edit/part_svc.cgi"><I>Add a new service definition</I></A></TD>

   </TR>
 </TABLE>
 </BODY>
   </TR>
 </TABLE>
 </BODY>