summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bug_form.pl15
-rw-r--r--template/en/default/bug/edit.html.tmpl2
-rw-r--r--template/en/default/global/header.html.tmpl10
3 files changed, 23 insertions, 4 deletions
diff --git a/bug_form.pl b/bug_form.pl
index fb6a60112..b04208bdf 100644
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -19,6 +19,7 @@
#
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Dave Miller <justdave@syndicomm.com>
+# Vaskin Kissoyan <vkissoyan@yahoo.com>
use diagnostics;
use strict;
@@ -83,7 +84,7 @@ sub show_bug {
bug_file_loc, short_desc, target_milestone,
qa_contact, status_whiteboard,
date_format(creation_ts,'%Y-%m-%d %H:%i'),
- groupset, delta_ts, sum(votes.count)
+ groupset, delta_ts, sum(votes.count), delta_ts calc_disp_date
FROM bugs LEFT JOIN votes USING(bug_id), products, components
WHERE bugs.bug_id = $id
AND bugs.product_id = products.id
@@ -99,15 +100,25 @@ sub show_bug {
}
my $value;
+ my $disp_date;
my @row = FetchSQLData();
foreach my $field ("bug_id", "alias", "product", "version", "rep_platform",
"op_sys", "bug_status", "resolution", "priority",
"bug_severity", "component", "assigned_to", "reporter",
"bug_file_loc", "short_desc", "target_milestone",
"qa_contact", "status_whiteboard", "creation_ts",
- "groupset", "delta_ts", "votes")
+ "groupset", "delta_ts", "votes","calc_disp_date")
{
$value = shift(@row);
+ if ($field eq "calc_disp_date") {
+ # Convert MySQL timestamp (_ts) to datetime format(%Y-%m-%d %H:%i)
+ $disp_date = substr($value,0,4) . '-';
+ $disp_date .= substr($value,4,2) . '-';
+ $disp_date .= substr($value,6,2) . ' ';
+ $disp_date .= substr($value,8,2) . ':';
+ $disp_date .= substr($value,10,2);
+ $value = $disp_date;
+ }
$bug{$field} = defined($value) ? $value : "";
}
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 699ee55ac..502952ef2 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -17,6 +17,7 @@
# Rights Reserved.
#
# Contributor(s): Gervase Markham <gerv@gerv.net>
+ # Vaskin Kissoyan <vkissoyan@yahoo.com>
#%]
[% filtered_desc = bug.short_desc FILTER html %]
@@ -25,6 +26,7 @@
title = "Bug $bug.bug_id - $bug.short_desc"
h1 = "Bugzilla Bug $bug.bug_id"
h2 = filtered_desc
+ h3 = "Last modified: $bug.calc_disp_date"
header_html = navigation_links
%]
[% END %]
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index d4cd092f9..7e20de953 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -17,6 +17,7 @@
# Rights Reserved.
#
# Contributor(s): Gervase Markham <gerv@gerv.net>
+ # Vaskin Kissoyan <vkissoyan@yahoo.com>
#%]
[%# INTERFACE:
@@ -24,6 +25,7 @@
# title: string. Page title.
# h1: string. Main page header.
# h2: string. Page subheader.
+ # h3: string. Right-aligned subheader.
# bgcolor: string. the page's background color ("#rrggbb").
# onload: string. JavaScript code to run when the page finishes loading.
# header_html: string. Any other HTML to go inside the <head> tags.
@@ -40,6 +42,7 @@
[% DEFAULT
h1 = title
h2 = ""
+ h3 = ""
bgcolor = "#ffffff"
onload = ""
%]
@@ -85,7 +88,7 @@
[% INCLUDE global/banner.html.tmpl %]
[% IF h1 || h2 %]
- <table border="0" cellspacing="0">
+ <table border="0" cellspacing="0" width="100%">
<tr>
<td valign="top" align="left">
<table border="0" cellpadding="0" cellspacing="2">
@@ -96,8 +99,11 @@
</tr>
</table>
</td>
- <td valign="middle">&nbsp;</td>
+ <td valign="middle" align="left">&nbsp;</td>
<td valign="middle" align="left">[% h2 %]</td>
+ [% IF h3 %]
+ <td valign="middle" align="right">[% h3 %]</td>
+ [% END %]
</tr>
</table>
[% END %]