summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-09-18 18:50:41 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-09-18 18:50:41 +0200
commit674e70900d55c2d403ce88f9b6a0761b778ef104 (patch)
treeb5d700400dab5625acea6186f35feffd6269dd26 /template/en/default
parent190b8649d0669b9445b143d40b5a44f2fff819dc (diff)
downloadbugzilla-674e70900d55c2d403ce88f9b6a0761b778ef104.tar.gz
bugzilla-674e70900d55c2d403ce88f9b6a0761b778ef104.tar.xz
Bug 578434 - Bug group checkboxes lay out poorly beside attachment field
- Backed out to make adjustments on screen size before the groups drop down https://bugzilla.mozilla.org/show_bug.cgi?id=578464
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/bug/comments.html.tmpl40
-rw-r--r--template/en/default/bug/edit.html.tmpl73
2 files changed, 50 insertions, 63 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 2ea0c3c4c..61d1c67e0 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -55,28 +55,11 @@
[% sort_order = "oldest_to_newest" %]
[% END %]
-<!-- This auto-sizes the comments and positions the collapse/expand links
- above the coments. -->
-<table class="bz_comment_table" cellpadding="0" cellspacing="0">
-[% IF mode == "edit" %]
- <tr>
- <td>
- <div class="bz_collapse_expand_comments">
- <a href="#" onclick="toggle_all_comments('collapse');
- return false;">Collapse All Comments</a> |
- <a href="#" onclick="toggle_all_comments('expand');
- return false;">Expand All Comments</a>
- [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
- | <span class="bz_add_comment"><a href="#"
- onclick="return goto_add_comments('bug_status_bottom');">
- Add Comment</a></span>
- [% END %]
- </div>
- </td>
- </tr>
-[% END %]
-<tr>
+<!-- This auto-sizes the comments and positions the collapse/expand links
+ to the right. -->
+<table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
<td>
+
[% FOREACH comment = comments %]
[% IF comment.count >= start_at %]
[% PROCESS a_comment %]
@@ -98,6 +81,21 @@
[% Hook.process("aftercomments") %]
</td>
+<td>
+ [% IF mode == "edit" %]
+ <ul class="bz_collapse_expand_comments">
+ <li><a href="#" onclick="toggle_all_comments('collapse');
+ return false;">Collapse All Comments</a></li>
+ <li><a href="#" onclick="toggle_all_comments('expand');
+ return false;">Expand All Comments</a></li>
+ [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
+ <li class="bz_add_comment"><a href="#"
+ onclick="return goto_add_comments('bug_status_bottom');">
+ Add Comment</a></li>
+ [% END %]
+ </ul>
+ [% END %]
+</td>
</tr></table>
[%############################################################################%]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 9af8ee627..683d6ed4a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -119,54 +119,43 @@
</tr>
</table>
- <div id="bz_big_form_parts">
- <div id="left">
- [% IF user.is_timetracker %]
- <div id="timetracking">
- [% PROCESS section_timetracking %]
- </div>
- [% END %]
-
- <div id="attachments">
- [%# *** Attachments *** %]
+ <table id="bz_big_form_parts" cellspacing="0" cellpadding="0"><tr>
+ <td>
+ [% IF user.is_timetracker %]
+ [% PROCESS section_timetracking %]
+ [% END %]
- [% PROCESS attachment/list.html.tmpl
- attachments = bug.attachments
- bugid = bug.bug_id
- num_attachment_flag_types = bug.num_attachment_flag_types
- show_attachment_flags = bug.show_attachment_flags
- %]
- </div>
+ [%# *** Attachments *** %]
- [% IF user.settings.comment_box_position.value == 'before_comments' %]
- <div id="comment_box">
- [% PROCESS comment_box %]
- </div>
- [% END %]
+ [% PROCESS attachment/list.html.tmpl
+ attachments = bug.attachments
+ bugid = bug.bug_id
+ num_attachment_flag_types = bug.num_attachment_flag_types
+ show_attachment_flags = bug.show_attachment_flags
+ %]
- [%# *** Additional Comments *** %]
- <div id="comments">
- [% PROCESS bug/comments.html.tmpl
- comments = bug.comments
- mode = user.id ? "edit" : "show"
- %]
- </div>
+ [% IF user.settings.comment_box_position.value == 'before_comments' %]
+ [% PROCESS comment_box %]
+ [% END %]
+ </td>
+ <td>
+ [% PROCESS section_restrict_visibility %]
+ </td>
+ </tr></table>
- [% IF user.settings.comment_box_position.value == 'after_comments' %]
- <div id="comment_box">
- [% PROCESS comment_box %]
- </div>
- [% END %]
- </div>
+ [%# *** Additional Comments *** %]
+ <div id="comments">
+ [% PROCESS bug/comments.html.tmpl
+ comments = bug.comments
+ mode = user.id ? "edit" : "show"
+ %]
+ </div>
- <div id="right">
- <div id="restrict_visibility">
- [% PROCESS section_restrict_visibility %]
- </div>
- </div>
+ [% IF user.settings.comment_box_position.value == 'after_comments' %]
+ <hr>
+ [% PROCESS comment_box %]
+ [% END %]
- <div style="clear:both;"></div>
- </div>
</form>
[%############################################################################%]