add additional space after owned by: span (closes #670411)

[debbugs.git] / templates / en_US / cgi / short_bug_status.tmpl

diff --git a/templates/en_US/cgi/short_bug_status.tmpl b/templates/en_US/cgi/short_bug_status.tmpl
index 30345797f09989ad92608fa1352185a503b4b407..821a4594d9cd4d217bc86105fbf34c9f433a98ea 100644 (file)
--- a/templates/en_US/cgi/short_bug_status.tmpl
+++ b/templates/en_US/cgi/short_bug_status.tmpl
@@ -1,51 +1,54 @@
 <div class="shortbugstatus">
   <a href="{html_escape(bug_links(bug=>$status{bug_num},links_only=>1))}"{length($status{done})?' style="text-decoration:line-through"':''}>#{html_escape($status{bug_num})}</a>
   [<font face="fixed"><span class="link" onclick="javascript:extra_status_visible({html_escape($status{bug_num})})">{
-  my $output = qq(<span title="$status{severity}">);
+  my $output = qq(<abbr title="$status{severity}">);
   my $temp = $status{severity};
   $temp = substr $temp,0,1;
   if (isstrongseverity($status{severity})){
-     $temp = q(<em class="severity">).uc($temp).q(</em);
+     $temp = q(<em class="severity">).uc($temp).q(</em>);
   }
-  $output .= $temp.qq(</span>);
-  $output;
+  $output .= $temp.qq(</abbr>);
+  length($output)?$output:'&nbsp;&nbsp;';
   }|{
   my $output = '';
   for my $tag (@{$status{tags_array}}) {
      next unless exists $config{tags_single_letter}{$tag};
-     $output .= q(<span title=").$tag.q(">).$config{tags_single_letter}{$tag}.q(</span>);
+     $output .= q(<abbr title=").$tag.q(">).$config{tags_single_letter}{$tag}.q(</abbr>);
   }
-  $output;
+  length($output)?$output:'&nbsp;&nbsp;';
   }|{
   my $output = '';
   if (@{$status{mergedwith_array}}) {
-     $output .= qq(<span title="merged">=</span>);
+     $output .= qq(<abbr title="merged">=</abbr>);
   }
   if (@{$status{fixed_versions}}) {
-     $output .= qq(<span title="fixed versions">☺</span>);
+     $output .= qq(<abbr title="fixed versions">☺</abbr>);
   }
   if (@{$status{blockedby_array}}) {
-     $output .= qq(<span title="blocked by">┫</span>);
+     $output .= qq(<abbr title="blocked by">♙</abbr>);
   }
   if (@{$status{blocks_array}}) {
-     $output .= qq(<span title="blocks">┣</span>);
+     $output .= qq(<abbr title="blocks">♔</abbr>);
   }
   if (length($status{forwarded})) {
-     $output .= qq(<span title="forwarded">↝</span>);
+     $output .= qq(<abbr title="forwarded">↝</abbr>);
   }
   if ($status{archived}) {
-     $output .= qq(<span title="archived">♲</span>);
+     $output .= qq(<abbr title="archived">♲</abbr>);
   }
-  $output;
+  if (length $status{affects}){
+     $output .= qq(<abbr title="affects">☣</abbr>);
+  }
+  length($output)?$output:'&nbsp;&nbsp;';
   }</span></font>]
-  [{package_links(package=>$status{package},options=>\%options,class=>"submitter")}]
+  [{package_links(package=>[split /,/,$status{package}],options=>\%options,class=>"submitter")}]
   <a href="{html_escape(bug_links(bug=>$status{bug_num},links_only=>1))}">{html_escape($status{subject})}</a>
   <div id="extra_status_{html_escape($status{bug_num})}" class="shortbugstatusextra">
   <span>Reported by: {package_links(submitter=>$status{originator})};</span>
   <span>Date: {$status{date_text}};</span>
 { my $output = ''; 
   if (defined $status{owner} and length $status{owner}) {
-     $output = q(<span>Owned by: ).package_links(owner=>$status{owner}).q(;</span>);
+     $output = q(<span>Owned by: ).package_links(owner=>$status{owner}).qq(;</span>\n);
   }
   $output;
 }<span>Severity: {my $output = $status{severity};
@@ -96,6 +99,17 @@
      $output .= q(<span><strong>Done:</strong> ).html_escape($status{done}).q(;</span> )
   }
   $output;
+}{ my $output = '';
+   my $days = $status{archive_days};
+   if ($days >= 0 and defined $status{location} and $status{location} ne 'archive') {
+       $output .= "<span><strong>Can be archived" .
+          ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) .
+              ";</strong></span>\n";
+   }
+   elsif (defined $status{location} and $status{location} eq 'archived') {
+       $output .= "<span><strong>Archived</strong></span>;\n";
+   }
+   $output;
 }{ my $output = '';
   if (@{$status{blockedby_array}}) {
      $output .= q(<span>Fix blocked by ).