fix broken tag for severity

[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 fb779401076bca77990c0433cab9cc4857495460..102d7fe66cc017dfa20d998ed11ab73306358cf2 100644 (file)
--- a/templates/en_US/cgi/short_bug_status.tmpl
+++ b/templates/en_US/cgi/short_bug_status.tmpl
@@ -1,47 +1,46 @@
 <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"><a href="javascript:extra_status_visible({html_escape($status{bug_num})})">{
-  my $output = qq(<span title="$status{severity}">);
+  [<font face="fixed"><span class="link" onclick="javascript:extra_status_visible({html_escape($status{bug_num})})">{
+  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;
-  }</a></font>]
+  length($output)?$output:'&nbsp;&nbsp;';
+  }</span></font>]
   [{package_links(package=>$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">
-  <!--<div style="float:right">[<a href="javascript:extra_status_visible(0)">X</a>]</div>-->
   <span>Reported by: {package_links(submitter=>$status{originator})};</span>
   <span>Date: {$status{date_text}};</span>
 { my $output = ''; 
@@ -49,8 +48,7 @@
      $output = q(<span>Owned by: ).package_links(owner=>$status{owner}).q(;</span>);
   }
   $output;
-}
-<span>Severity: {my $output = $status{severity};
+}<span>Severity: {my $output = $status{severity};
               if (isstrongseverity($status{severity})) {
                    $output = q(<em class="severity">).$status{severity}.q(</em>);
               }
@@ -62,14 +60,13 @@
     $output .= q(<span>Merged with ).join(qq(,\n),bug_links(bug=>$status{mergedwith_array})).qq(;</span>\n);
  }
  $output;
-}
-{my $output = '';
+}{my $output = '';
  if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
     $output .= '<a href="'.
          version_url(package => $status{package},
                      found   => $status{found_versions},
                      fixed   => $status{fixed_versions},
-                    ).'") ';
+                    ).'"> ';
  }
  if (@{$status{found_versions}}) {
     $output .= q(<span>Found in );
@@ -85,14 +82,32 @@
     $output .= qq(</a>);
  }
  $output;
-}
-{ my $output = '';
+}{ my $output = '';
+ if (length($status{forwarded})) {
+    $output = "<span><strong>Forwarded</strong> to " . 
+              join(', ',
+                  map {maybelink($_)}
+                   split /\,\s+/,$status{forwarded}
+                 ).";</span>\n";
+ }
+ $output;
+}{ my $output = '';
   if (length($status{done})) {
      $output .= q(<span><strong>Done:</strong> ).html_escape($status{done}).q(;</span> )
   }
   $output;
-}
-{ my $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 ).
         join(q(, ),
@@ -135,51 +150,5 @@
   if (exists $status{archived} and $status{archived}) {
      $output .= q(<span>Bug is archived. No further changes may be made.<span> )
   }
-  $output}
-<!--  <p>Package: {package_links(package=>$status{package},options=>\%options,class=>"submitter")}
-  {my $output = ''; my $showversions = '';
-   if (@{$status{found_versions}}) {
-     my @found = @{$status{found_versions}};
-     $showversions .= join ', ', map {html_escape($_)} @found;
-   }
-   if (@{$status{fixed_versions}}) {
-     $showversions .= '; ' if length $showversions;
-     $showversions .= '<strong>fixed</strong>: ';
-     my @fixed = @{$status{fixed_versions}};
-     $showversions .= join ', ', map {html_escape($_)} @fixed;
-   }
-   $output .= ' (<a href="'.
-         version_url(package => $status{package},
-                     found   => $status{found_versions},
-                     fixed   => $status{fixed_versions},
-                    ).qq{">$showversions</a>)} if length $showversions;
-   $output
-  };
-    Severity: {my $output = $status{severity};
-               if (isstrongseverity($status{severity})) {
-                  $output = q(<em class="severity">).$status{severity}.q(</em>);
-               }
-               $output;
-              };
-    Reported by: {package_links(submitter=>$status{originator},options=>\%options,class=>"submitter")}<a class="submitter" href="pkgreport.cgi?submitter=kbloom%40gmail.com">Ken Bloom &lt;kbloom@gmail.com&gt;</a>;
-    {@{$status{tags_array}}?q(Tags: ).html_escape(join(q(, ),@{$status{tags_array}})).q(; ):''}
-    {my $output = '';
-     if (@{$status{mergedwith_array}}) {
-        $output .= q(Merged with ).join(qq(,\n),bug_links(bug=>$status{mergedwith_array})).q(; )
-     }
-     $output;
-    }
-    { my $output = '';
-     if (@{$status{blockedby_array}}) {
-        $output .= q(Blocked by ).
-          bug_links(bug=>$status{blockedby_array}).q(; );
-     }
-     if (@{$status{blocks_array}}) {
-        $output .= q(Blocking ).
-         bug_links(bug=>$status{blocks_array}).q(; );
-     }
-     $output;
-    }
-    <strong>2 years and 238 days old</strong>;
-    <strong>Modified 1 year and 34 days ago</strong>.</p>--></div>
+  $output}</div>
 </div>