diff options
| -rw-r--r-- | skins/standard/global.css | 25 | ||||
| -rw-r--r-- | skins/standard/show_bug.css | 4 | ||||
| -rw-r--r-- | template/en/default/bug/comments.html.tmpl | 40 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 73 |
4 files changed, 64 insertions, 78 deletions
diff --git a/skins/standard/global.css b/skins/standard/global.css index 5b1aa532e..51d7c29db 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -286,7 +286,7 @@ div#docslinks { } .bz_comment_text { - max-width: 60em; + width: 50em; } .bz_comment_user, .bz_comment_time, .bz_comment_number, @@ -299,6 +299,14 @@ div#docslinks { float: right; } +.bz_collapse_expand_comments { + padding: 0; + margin: 0 0 0 1em; + list-style-type: none; +} +.bz_collapse_expand_comments li { + margin-bottom: .5em; +} .bz_collapse_comment { text-decoration: none; } @@ -547,19 +555,6 @@ input.required, select.required, span.required_explanation { margin-left: -1px; } -#bz_big_form_parts #left { - float: left; - min-width: 55em; - margin-right: 1em; - margin-bottom: 1em; -} - -#bz_big_form_parts #right { - float: left; - width: auto; - max-width: 35em; -} - /*******************/ /* Form Validation */ /*******************/ @@ -580,4 +575,4 @@ form th { } th.left { text-align: left; -} +}
\ No newline at end of file diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css index fe2e6abb3..b776b60bc 100644 --- a/skins/standard/show_bug.css +++ b/skins/standard/show_bug.css @@ -66,6 +66,10 @@ table#flags { vertical-align: top; } +.bz_group_visibility_section { + margin-left: 1em; +} + .bz_group_visibility_section .instructions { font-style: italic; } 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> [%############################################################################%] |