diff options
Diffstat (limited to 'extensions/BugModal')
3 files changed, 6 insertions, 13 deletions
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 ↓</button> + [% ELSE %] + <button type="button" id="bottom-btn" class="minor">Bottom ↓</button> + [% END %] <button type="button" id="comment-tags-btn" style="display:none" class="minor">Tags ▾</button> <button type="button" id="view-menu-btn" class="minor">View ▾</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 ↓</button> - [% ELSE %] - <button type="button" id="bottom-btn" class="minor">Bottom ↓</button> - [% END %] + <a href="attachment.cgi?bugid=[% bug.id FILTER uri %]&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) { |