summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2017-02-17 18:12:27 +0100
committerDavid Lawrence <dkl@mozilla.com>2017-02-17 18:12:37 +0100
commite81dc874a529541cc39d7fe128c427babdc18f23 (patch)
treebf4c707560a6ba5bd4e366700c63bd7c9de3c7e4
parente184203da9763fc5d7c9363b7ebb950b07c7c3da (diff)
downloadbugzilla-e81dc874a529541cc39d7fe128c427babdc18f23.tar.gz
bugzilla-e81dc874a529541cc39d7fe128c427babdc18f23.tar.xz
Bug 1257608 - Convert all <button> elements to CSS styled <a> links
-rw-r--r--extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl5
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl5
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl7
-rw-r--r--extensions/BugModal/web/bug_modal.js7
4 files changed, 8 insertions, 16 deletions
diff --git a/extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl b/extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl
index a21e8a441..b096644c9 100644
--- a/extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug_modal/edit-top_actions.html.tmpl
@@ -16,7 +16,6 @@
END;
END;
%]
-<button type="button" class="minor button-link"
- data-href="page.cgi?id=attachment_bounty_form.html&amp;bug_id=[% bug.id FILTER none %]">
+| <a href="page.cgi?id=attachment_bounty_form.html&amp;bug_id=[% bug.id FILTER none %]">
[% has_bounty_attachment ? "Edit" : "Add" %] Bounty Tracking Attachment
-</button>
+</a>
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
index f5074dbfa..f046cf904 100644
--- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
@@ -7,6 +7,11 @@
#%]
<div id="comment-actions">
+ [% IF user.settings.comment_box_position.value == 'after_comments' %]
+ <button type="button" id="add-comment-btn" class="minor">Add Comment &darr;</button>
+ [% ELSE %]
+ <button type="button" id="bottom-btn" class="minor">Bottom &darr;</button>
+ [% END %]
<button type="button" id="comment-tags-btn" style="display:none" class="minor">Tags &#9662;</button>
<button type="button" id="view-menu-btn" class="minor">View &#9662;</button>
</div>
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index a33cc541a..4b23df786 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -1275,12 +1275,7 @@
[% IF user.id %]
<div id="top-actions">
- <button type="button" id="attachments-add-btn" class="minor">Attach File</button>
- [% IF user.settings.comment_box_position.value == 'after_comments' %]
- <button type="button" id="add-comment-btn" class="minor">Add Comment &darr;</button>
- [% ELSE %]
- <button type="button" id="bottom-btn" class="minor">Bottom &darr;</button>
- [% END %]
+ <a href="attachment.cgi?bugid=[% bug.id FILTER uri %]&amp;action=enter" id="attachments-add-link">Attach File</a>
[%+ Hook.process('top_actions') %]
<button type="submit" class="save-btn major" id="top-save-btn" style="display:none">Save Changes</button>
</div>
diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js
index 25a9d1a73..cfeec2271 100644
--- a/extensions/BugModal/web/bug_modal.js
+++ b/extensions/BugModal/web/bug_modal.js
@@ -804,13 +804,6 @@ $(function() {
tracking_flag_change(event.target);
});
- // add attachments
- $('#attachments-add-btn')
- .click(function(event) {
- event.preventDefault();
- window.location.href = 'attachment.cgi?bugid=' + BUGZILLA.bug_id + '&action=enter';
- });
-
// take button
$('.take-btn')
.click(function(event) {