X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fticket_summary.html;h=94043bfb63aa3f6201e762a8f1ba989e77f3f3cd;hb=36245fa05ae5d9fb0ef893cdfe5ad98f88fd7e77;hp=0d1c5e99a3716d6b10f7f51c7fb3815fafdecf94;hpb=12f4cc4b100b849de3584d5d1a2376cebcd8729f;p=freeside.git

diff --git a/fs_selfservice/FS-SelfService/cgi/ticket_summary.html b/fs_selfservice/FS-SelfService/cgi/ticket_summary.html
index 0d1c5e99a..94043bfb6 100644
--- a/fs_selfservice/FS-SelfService/cgi/ticket_summary.html
+++ b/fs_selfservice/FS-SelfService/cgi/ticket_summary.html
@@ -1,17 +1,17 @@
 <SCRIPT TYPE="text/javascript" SRC="overlibmws.js"></SCRIPT>
 <TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 BGCOLOR="#eeeeee">
-<TR><TH BGCOLOR="#ff6666" COLSPAN=8>Open Tickets</TH></TR>
+<TR><TH BGCOLOR="#ff6666" COLSPAN=16>Open Tickets</TH></TR>
 <TR>
 <%=
-my $col1 = "ffffff";
-my $col2 = "dddddd";
+my $col1 = $stripe1_bgcolor || "#ffffff";
+my $col2 = $stripe2_bgcolor || "#dddddd";
 my $col = $col1;
 
 my $can_set_priority = 
   grep { exists($_->{'_selfservice_priority'}) } @tickets;
 if ( $can_set_priority ) {
+
   $OUT .= qq!<FORM ACTION="$selfurl" METHOD="POST">! .
-          qq!<INPUT TYPE="hidden" NAME="session" VALUE="$session_id">! .
           qq!<INPUT TYPE="hidden" NAME="action" VALUE="ticket_priority">!;
 }
 $date_format ||= '%Y-%m-%d';
@@ -22,43 +22,55 @@ my $date_formatter = sub {
 };
 
 my @titles = ('#', qw(Subject Queue Status Created Due));
-push @titles, 'Estimated<BR>Minutes';
+push @titles, 'Estimated<BR>Hours';
 push @titles, 'Priority';
 
-$OUT .= join("\n", map { "<TH VALIGN=\"top\">$_</TH>" } @titles) . '</TR>';
+$box_bgcolor ||= '#c0c0c0';
+my $th = qq(<TH BGCOLOR="$box_bgcolor");
+
+$OUT .= join("\n", map { "$th VALIGN=\"top\">$_</TH>$th>&nbsp;</TH>" } @titles)
+      . '</TR>';
 
 foreach my $ticket ( @tickets ) {
   my $id = $ticket->{'id'};
-  my $td = qq!<TD BGCOLOR="#$col">!;
+  my $td = qq!<TD BGCOLOR="$col">!;
+  my $space = $td.'&nbsp;</TD>';
   my $link = qq!<A HREF="${url}tktview;ticket_id=$id">!;
-  $OUT .= '<TR>' . $td . $link . $id . '</A></TD>'.
-$td. $link . $ticket->{'subject'} . '</A></TD>'.
-$td. $ticket->{'queue'} . '</TD>'.
-$td. $ticket->{'status'} . '</TD>'.
-$td. $date_formatter->($ticket->{'created'}) . '</TD>'.
-$td. $date_formatter->($ticket->{'due'}) . '</TD>'.
-qq!<TD BGCOLOR="#$col" ALIGN="right">!. ($ticket->{'timeestimated'} || '') 
-.  '</TD>'.
-qq!<TD BGCOLOR="#$col" ALIGN="right">!;
+  $OUT .= '<TR>' . 
+$td. $link . $id . '</A></TD>'. $space .
+$td. $link . $ticket->{'subject'} . '</A></TD>'. $space .
+$td. $ticket->{'queue'} . '</TD>'. $space .
+$td. $ticket->{'status'} . '</TD>'. $space .
+$td. $date_formatter->($ticket->{'created'}) . '</TD>'. $space .
+$td. $date_formatter->($ticket->{'due'}) . '</TD>'. $space .
+qq!<TD BGCOLOR="$col" ALIGN="right">!. 
+  ($ticket->{'timeestimated'} ? 
+    sprintf('%.1f', $ticket->{'timeestimated'} / 60.0) # .1f?
+  : ''
+  ) .  '</TD>'. $space .
+qq!<TD BGCOLOR="$col" ALIGN="right">!;
   if ( $can_set_priority ) {
     $OUT .= '<INPUT TYPE="hidden" NAME="ticket'.$id.'" VALUE="1">' .
             '<INPUT TYPE="text" SIZE=4 NAME="priority'.$id.'"' .
             'VALUE="'.$ticket->{'_selfservice_priority'}.'"></TD>';
     if ( exists($ticket_error{$id}) ) {
       # display error message compactly
-      $OUT .= '<TD><FONT COLOR="#ff0000" onmouseover="'.
+      $OUT .= $td. '<FONT COLOR="#ff0000" onmouseover="'.
               "return overlib('".$ticket_error{$id}."', AUTOSTATUS, WRAP);" .
               '" onmouseout="nd();">*</FONT></TD>';
+    } else {
+      $OUT .= $td.'</TD>';
     }
   }
   else {
-    $OUT .= ($ticket->{'content'} || $ticket->{'priority'}) . '</TD>';
+    $OUT .= ($ticket->{'content'} || $ticket->{'priority'}) . '</TD>'.
+            $td.'</TD>';
   }
   $OUT .= '</TR>';
   $col = $col eq $col1 ? $col2 : $col1;
 } #foreach my $ticket
 if ( $can_set_priority ) {
-  $OUT .= '<TR><TD COLSPAN=8 ALIGN="right">
+  $OUT .= '<TR><TD COLSPAN=16 ALIGN="right">
 <INPUT TYPE="submit" VALUE="Save changes"></TD></TR></FORM>';
 }
 %>