Bug 53833 - cloned_comment and status styles;

Bug 53825 - NAN red bg; Bug 53647 - email format; Bug 53705 - *** Bug XX marked as a duplicate *** in emails; git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@377 6955db30-a419-402b-8a0d-67ecbb4d7f56
2009-09-04 15:10:51 +00:00 · 2009-09-04 15:10:51 +00:00 · 78444d9292
parent 1f16e8aa9e
commit 78444d9292
9 changed files with 39 additions and 32 deletions
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@ -722,7 +722,7 @@ sub get_comments_by_bug {
                                        undef, ($id, $start));
    }

-    my $raw = 1; # Do not format comments which are not of type CMT_NORMAL.
+    my $raw = 0; # Do not format comments which are not of type CMT_NORMAL.
    my $comments = Bugzilla::Bug::GetComments($id, "oldest_to_newest", $start, $end, $raw);

    foreach my $comment (@$comments) {
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@ -118,6 +118,7 @@ if ($product_name eq '') {
            $vars->{'target'} = "enter_bug.cgi";
            $vars->{'format'} = $cgi->param('format');
            $vars->{'cloned_bug_id'} = $cgi->param('cloned_bug_id');
+            $vars->{'cloned_comment'} = $cgi->param('cloned_comment');

            print $cgi->header();
            $template->process("global/choose-classification.html.tmpl", $vars)
@ -150,6 +151,7 @@ if ($product_name eq '') {
        $vars->{'target'} = "enter_bug.cgi";
        $vars->{'format'} = $cgi->param('format');
        $vars->{'cloned_bug_id'} = $cgi->param('cloned_bug_id');
+        $vars->{'cloned_comment'} = $cgi->param('cloned_comment');

        print $cgi->header();
        $template->process("global/choose-product.html.tmpl", $vars)
--- a/post_bug.cgi
+++ b/post_bug.cgi
@ -145,6 +145,7 @@ push(@bug_fields, qw(
    bug_file_loc
    bug_severity
    bug_status
+    resolution
    dependson
    keywords
    short_desc
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@ -513,10 +513,10 @@ form#Create .comment {
 }

 /* Bug states  */
-.bz_st_unconfirmed { font-style: italic; }
-.bz_st_resolved { text-decoration: line-through; }
-.bz_st_verified { text-decoration: line-through; border: 1px dashed #2f6fab; background-color: #f9f9f9; line-height: 1.1em; }
-.bz_st_closed { text-decoration: line-through; border: 1px solid #2f6fab; background-color: #f9f9f9; line-height: 1.1em; }
+.bz_st_UNCONFIRMED, .bz_UNCONFIRMED td.first-child a { font-style: italic; }
+.bz_st_RESOLVED, .bz_RESOLVED td.first-child a { text-decoration: line-through; }
+.bz_st_VERIFIED, .bz_VERIFIED td.first-child a { text-decoration: line-through; border: 1px dashed #2f6fab; background-color: #f9f9f9; line-height: 1.1em; }
+.bz_st_CLOSED, .bz_CLOSED td.first-child a { text-decoration: line-through; border: 1px solid #2f6fab; background-color: #f9f9f9; line-height: 1.1em; }

 table.alcontent { width: 100%; }

@ -524,14 +524,3 @@ table.alcontent { width: 100%; }

 #field_container_see_also #see_also { max-width: 500px; }
 table.flag_table select { max-width: 400px; }
-
-/* Bug states in the list */
-.bz_CLOSED {
-    background-image: url(global/closedbg.gif);
-    background-repeat: repeat-x;
-    background-position: 0 50%;
-}
-
-.bz_RESOLVED td {
-    text-decoration: line-through;
-}
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@ -80,7 +80,9 @@ var flags = new Array([% product.components.size %]);
 function Create_onsubmit()
 {
  wt = parseFloat(document.Create.work_time.value.replace(',','.'));
-  if (wt != wt || wt < 0 || [% remind_about_worktime_newbug ? 1 : 0 %] && (!wt || wt == 0))
+  if (wt != wt || wt < 0)
+    wt = 0;
+  else if ([% remind_about_worktime_newbug ? 1 : 0 %] && (!wt || wt == 0))
  {
    wt = prompt("Please, verify working time:", "0");
    if (wt == null || wt == undefined || (""+wt).length <= 0)
@ -88,8 +90,8 @@ function Create_onsubmit()
      document.Create.work_time.focus();
      return false;
    }
-    document.Create.work_time.value = wt;
  }
+  document.Create.work_time.value = wt;
  return true;
 }

--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@ -128,7 +128,16 @@
      var new_time;
      var wt = parseFloat(document.changeform.work_time.value.replace(',','.'));
      if (wt != wt)
-          wt = 0;
+      {
+        document.changeform.work_time.style.backgroundColor = '#FFC0C0';
+        document.changeform.remaining_time.style.backgroundColor = '#FFC0C0';
+        wt = 0;
+      }
+      else
+      {
+        document.changeform.work_time.style.backgroundColor = '';
+        document.changeform.remaining_time.style.backgroundColor = '';
+      }

      // prevent negative values if work_time > fRemainingTime
      new_time = Math.max(fRemainingTime - wt, 0.0);
@ -146,23 +155,21 @@

  function changeform_onsubmit()
  {
-    wt = parseFloat(document.changeform.work_time.value.replace(',','.'));
-    if (wt != wt || [% remind_about_worktime ? 1 : 0 %] && (!wt || wt <= 0))
+    var wt = parseFloat(document.changeform.work_time.value.replace(',','.'));
+    var awt = wt;
+    if (wt != wt)
+      awt = 0;
+    else if ([% remind_about_worktime ? 1 : 0 %] && (!wt || wt <= 0))
    {
      awt = prompt("Please, verify working time:", !wt || wt != wt ? "0" : wt);
      if (awt == null || awt == undefined || (""+awt).length <= 0)
      {
-        if (wt != wt)
-        {
-          document.changeform.work_time.value = "0";
-          adjustRemainingTime();
-        }
        document.changeform.work_time.focus();
        return false;
      }
-      document.changeform.work_time.value = awt;
-      adjustRemainingTime();
    }
+    document.changeform.work_time.value = awt;
+    adjustRemainingTime();
    return true;
  }

@ -1134,7 +1141,7 @@
        [% PROCESS formattimeunit time_unit=bug.actual_time %] +
        <input name="work_time" id="work_time"
               value="0" size="3" maxlength="6"
-               onchange="adjustRemainingTime();">
+               onchange="adjustRemainingTime();" onkeyup="adjustRemainingTime();">
      </td>
      <td>
        <input name="remaining_time" id="remaining_time"
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@ -111,9 +111,9 @@ body { font-size: 10pt; }
 .difft.fv th { text-align: left; }
 /*-->*/
 </style>
-<body [% IF severity == 'blocker' OR severity == 'critical' %]style="background-color: #FFC0C0"[% END %]>
-<p><a href="[%+ urlbase %]show_bug.cgi?id=[% bugid %]">Bug [% bugid %]</a>
-(prod:[% product %].[% comp %], pri:[% priority %], sev:[% severity %], miles:[% targetmilestone %])</p>
+<body>
+<p><a style="font-size: 12pt;[% IF severity == 'blocker' OR severity == 'critical' %] color: red; font-weight: bold;[% END %]" href="[%+ urlbase %]show_bug.cgi?id=[% bugid %]">Bug [% bugid %] - [% summary | html %]</a></p>
+<div style="display: none">(prod:[% product %].[% comp %], pri:[% priority %], sev:[% severity %], miles:[% targetmilestone %])</div>

 [% IF new_comments AND new_comments.size > 0 %]
  [% FOR comment = new_comments %]
--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@ -18,6 +18,8 @@
 [%# INTERFACE:
  # classifications: an array of classification objects containing
  #                  at least one product accessible by the user.
+  # cloned_bug_id: ID of the bug being cloned.
+  # cloned_comment: ID of the comment being cloned.
  #%]

 [% IF target == "enter_bug.cgi" %]
@ -33,6 +35,7 @@
    <th align="right">
      <a href="[% target FILTER url_quote %]?classification=__all
            [% IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
+            [% IF cloned_comment.defined %]&amp;cloned_comment=[% cloned_comment FILTER url_quote %][% END -%]
            [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
      All</a>:
    </th>
@ -48,6 +51,7 @@
    <th align="right">
      <a href="[% target FILTER url_quote %]?classification=[% class.name FILTER url_quote -%]
            [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
+            [%- IF cloned_comment.defined %]&amp;cloned_comment=[% cloned_comment FILTER url_quote %][% END -%]
            [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
      [% class.name FILTER html %]</a>:
    </th>
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@ -24,6 +24,7 @@
  #                  product objects the user can enter bugs into.
  # target:   the script that displays this template.
  # cloned_bug_id: ID of the bug being cloned.
+  # cloned_comment: ID of the comment being cloned.
  # format:   the desired format to display the target.
  #%]

@ -55,6 +56,7 @@
      <th align="right" valign="top">
        <a href="[% target %]?product=[% p.name FILTER url_quote -%]
              [%- IF cloned_bug_id %]&amp;cloned_bug_id=[% cloned_bug_id FILTER url_quote %][% END -%] 
+              [%- IF cloned_comment.defined %]&amp;cloned_comment=[% cloned_comment FILTER url_quote %][% END -%]
              [%- IF format %]&amp;format=[% format FILTER url_quote %][% END %]">
        [% p.name FILTER html FILTER no_break %]</a>:&nbsp;
      </th>