summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Pyrzak <guy.pyrzak@gmail.com>2011-06-29 07:03:53 +0200
committerGuy Pyrzak <guy.pyrzak@gmail.com>2011-06-29 07:03:53 +0200
commitfb13a2bb7f8802336f8b1d38e3d133af5f5bd501 (patch)
tree38ea8a91e87466a4ff3e765cedc131f77c4ad5a6
parentd6661a06f7a23885746d34df5452b22df5d95c6f (diff)
downloadbugzilla-fb13a2bb7f8802336f8b1d38e3d133af5f5bd501.tar.gz
bugzilla-fb13a2bb7f8802336f8b1d38e3d133af5f5bd501.tar.xz
Bug 652427: Going back to the new bug page loses the description if possible duplicates have been searched for
r=mkanat, r=mkanat
-rw-r--r--js/bug.js6
-rw-r--r--skins/standard/enter_bug.css2
-rw-r--r--template/en/default/bug/create/create.html.tmpl2
-rw-r--r--template/en/default/global/header.html.tmpl3
4 files changed, 8 insertions, 5 deletions
diff --git a/js/bug.js b/js/bug.js
index ab3322ccd..06ef03da1 100644
--- a/js/bug.js
+++ b/js/bug.js
@@ -88,11 +88,11 @@ YAHOO.bugzilla.dupTable = {
formatCcButton: function(el, oRecord, oColumn, oData) {
var url = 'process_bug.cgi?id=' + oRecord.getData('id')
+ '&addselfcc=1&token=' + escape(oData);
- var button = document.createElement('button');
- button.setAttribute('type', 'button');
+ var button = document.createElement('a');
+ button.setAttribute('href', url);
button.innerHTML = YAHOO.bugzilla.dupTable.addCcMessage;
- button.onclick = function() { window.location = url; return false; };
el.appendChild(button);
+ new YAHOO.widget.Button(button);
},
init_ds: function() {
var new_ds = new YAHOO.util.XHRDataSource("jsonrpc.cgi");
diff --git a/skins/standard/enter_bug.css b/skins/standard/enter_bug.css
index bb8b05034..88d9e9e85 100644
--- a/skins/standard/enter_bug.css
+++ b/skins/standard/enter_bug.css
@@ -68,3 +68,5 @@
}
/* Make the Add Me to CC button never wrap. */
#possible_duplicates .yui-dt-col-update_token { white-space: nowrap; }
+
+form#Create #possible_duplicates td { vertical-align: middle; } \ No newline at end of file
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 29d79863f..3bb5b3a87 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -30,7 +30,7 @@
[% PROCESS global/header.html.tmpl
title = title
- yui = [ 'autocomplete', 'calendar', 'datatable' ]
+ yui = [ 'autocomplete', 'calendar', 'datatable', 'button' ]
style_urls = [ 'skins/standard/attachment.css',
'skins/standard/enter_bug.css' ]
javascript_urls = [ "js/attachment.js", "js/util.js",
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index c7c104e29..b36ce37d2 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -1,4 +1,4 @@
-[%# The contents of this file are subject to the Mozilla Public
+ [%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
@@ -53,6 +53,7 @@
autocomplete => 1,
calendar => 1,
datatable => 1,
+ button => 1,
} %]
[%# Note: This is simple dependency resolution--you can't have dependencies