diff options
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/bug/comments.html.tmpl | 40 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 73 |
2 files changed, 63 insertions, 50 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 61d1c67e0..2ea0c3c4c 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -55,11 +55,28 @@ [% sort_order = "oldest_to_newest" %] [% END %] -<!-- This auto-sizes the comments and positions the collapse/expand links - to the right. --> -<table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr> +<!-- 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> <td> - [% FOREACH comment = comments %] [% IF comment.count >= start_at %] [% PROCESS a_comment %] @@ -81,21 +98,6 @@ [% 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 683d6ed4a..9af8ee627 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -119,43 +119,54 @@ </tr> </table> - <table id="bz_big_form_parts" cellspacing="0" cellpadding="0"><tr> - <td> - [% IF user.is_timetracker %] - [% PROCESS section_timetracking %] - [% END %] + <div id="bz_big_form_parts"> + <div id="left"> + [% IF user.is_timetracker %] + <div id="timetracking"> + [% PROCESS section_timetracking %] + </div> + [% END %] - [%# *** Attachments *** %] + <div id="attachments"> + [%# *** Attachments *** %] - [% 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 - %] + [% 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> - [% 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 == 'before_comments' %] + <div id="comment_box"> + [% PROCESS comment_box %] + </div> + [% END %] - [%# *** Additional Comments *** %] - <div id="comments"> - [% PROCESS bug/comments.html.tmpl - comments = bug.comments - mode = user.id ? "edit" : "show" - %] - </div> + [%# *** 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 == 'after_comments' %] + <div id="comment_box"> + [% PROCESS comment_box %] + </div> + [% END %] + </div> - [% IF user.settings.comment_box_position.value == 'after_comments' %] - <hr> - [% PROCESS comment_box %] - [% END %] + <div id="right"> + <div id="restrict_visibility"> + [% PROCESS section_restrict_visibility %] + </div> + </div> + <div style="clear:both;"></div> + </div> </form> [%############################################################################%] |