Skip to content

bugzilla
bugzilla
Commit 674e7090 authored by Dave Lawrence's avatar Dave Lawrence
Browse files
Options

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
parent 190b8649
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 78 deletions
skins/standard/global.css
View file @ 674e7090
...@@ -286,7 +286,7 @@ div#docslinks { ...@@ -286,7 +286,7 @@ div#docslinks {
} }
.bz_comment_text { .bz_comment_text {
max-width: 60em; width: 50em;
} }
.bz_comment_user, .bz_comment_time, .bz_comment_number, .bz_comment_user, .bz_comment_time, .bz_comment_number,
...@@ -299,6 +299,14 @@ div#docslinks { ...@@ -299,6 +299,14 @@ div#docslinks {
float: right; 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 { .bz_collapse_comment {
text-decoration: none; text-decoration: none;
} }
...@@ -547,19 +555,6 @@ input.required, select.required, span.required_explanation { ...@@ -547,19 +555,6 @@ input.required, select.required, span.required_explanation {
margin-left: -1px; 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 */ /* Form Validation */
/*******************/ /*******************/
...@@ -580,4 +575,4 @@ form th { ...@@ -580,4 +575,4 @@ form th {
} }
th.left { th.left {
text-align: left; text-align: left;
} }
\ No newline at end of file
skins/standard/show_bug.css
View file @ 674e7090
...@@ -66,6 +66,10 @@ table#flags { ...@@ -66,6 +66,10 @@ table#flags {
vertical-align: top; vertical-align: top;
} }
.bz_group_visibility_section {
margin-left: 1em;
}
.bz_group_visibility_section .instructions { .bz_group_visibility_section .instructions {
font-style: italic; font-style: italic;
} }
......
template/en/default/bug/comments.html.tmpl
View file @ 674e7090
...@@ -55,28 +55,11 @@ ...@@ -55,28 +55,11 @@
[% sort_order = "oldest_to_newest" %] [% sort_order = "oldest_to_newest" %]
[% END %] [% END %]
<!-- This auto-sizes the comments and positions the collapse/expand links <!-- This auto-sizes the comments and positions the collapse/expand links
above the coments. --> to the right. -->
<table class="bz_comment_table" cellpadding="0" cellspacing="0"> <table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
[% 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> <td>
[% FOREACH comment = comments %] [% FOREACH comment = comments %]
[% IF comment.count >= start_at %] [% IF comment.count >= start_at %]
[% PROCESS a_comment %] [% PROCESS a_comment %]
...@@ -98,6 +81,21 @@ ...@@ -98,6 +81,21 @@
[% Hook.process("aftercomments") %] [% Hook.process("aftercomments") %]
</td> </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> </tr></table>
[%############################################################################%] [%############################################################################%]
......
template/en/default/bug/edit.html.tmpl
View file @ 674e7090
...@@ -119,54 +119,43 @@ ...@@ -119,54 +119,43 @@
</tr> </tr>
</table> </table>
<div id="bz_big_form_parts"> <table id="bz_big_form_parts" cellspacing="0" cellpadding="0"><tr>
<div id="left"> <td>
[% IF user.is_timetracker %] [% IF user.is_timetracker %]
<div id="timetracking"> [% PROCESS section_timetracking %]
[% PROCESS section_timetracking %] [% END %]
</div>
[% END %]
<div id="attachments">
[%# *** Attachments *** %]
[% PROCESS attachment/list.html.tmpl [%# *** Attachments *** %]
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 attachment/list.html.tmpl
<div id="comment_box"> attachments = bug.attachments
[% PROCESS comment_box %] bugid = bug.bug_id
</div> num_attachment_flag_types = bug.num_attachment_flag_types
[% END %] show_attachment_flags = bug.show_attachment_flags
%]
[%# *** Additional Comments *** %] [% IF user.settings.comment_box_position.value == 'before_comments' %]
<div id="comments"> [% PROCESS comment_box %]
[% PROCESS bug/comments.html.tmpl [% END %]
comments = bug.comments </td>
mode = user.id ? "edit" : "show" <td>
%] [% PROCESS section_restrict_visibility %]
</div> </td>
</tr></table>
[% IF user.settings.comment_box_position.value == 'after_comments' %] [%# *** Additional Comments *** %]
<div id="comment_box"> <div id="comments">
[% PROCESS comment_box %] [% PROCESS bug/comments.html.tmpl
</div> comments = bug.comments
[% END %] mode = user.id ? "edit" : "show"
</div> %]
</div>
<div id="right"> [% IF user.settings.comment_box_position.value == 'after_comments' %]
<div id="restrict_visibility"> <hr>
[% PROCESS section_restrict_visibility %] [% PROCESS comment_box %]
</div> [% END %]
</div>
<div style="clear:both;"></div>
</div>
</form> </form>
[%############################################################################%] [%############################################################################%]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment