From: mkanat%bugzilla.org <> Date: Wed, 19 Nov 2008 11:33:05 +0000 (+0000) Subject: Bug 452732: Re-organize the comment headers to make them look better and be more... X-Git-Tag: bugzilla-3.3.1~76 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9cc253262438ce20df7cda1b767a4020a854f77;p=thirdparty%2Fbugzilla.git Bug 452732: Re-organize the comment headers to make them look better and be more readable Patch By Max Kanat-Alexander r=wicked, a=mkanat --- diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css index 179d8f790c..d918b63019 100644 --- a/skins/contrib/Dusk/global.css +++ b/skins/contrib/Dusk/global.css @@ -139,7 +139,9 @@ hr { font-size: 10pt; } -/* comments */ +/************/ +/* Comments */ +/************/ #comments th { font-size: 9pt; @@ -171,26 +173,21 @@ hr { font-size: 9pt; } -.bz_first_comment { -} - -.bz_comment_head, -.bz_first_comment_head { +.bz_comment_head, .bz_first_comment_head { margin: 0; padding: 0; background-color: transparent; font-weight: bold; } +.bz_comment_user { + margin-left: 0; +} + .bz_comment.bz_private { background-color: #f0e8e8; border-color: #f8c8ba; } -.bz_comment_head i, -.bz_first_comment_head i { - font-style: normal; -} - .comment_rule { display: none; } diff --git a/skins/standard/global.css b/skins/standard/global.css index 16406afba5..8a7d910670 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -240,6 +240,10 @@ div#docslinks { color: #a0a0a0; } +/************/ +/* Comments */ +/************/ + .bz_comment { margin-bottom: 2em; } @@ -260,18 +264,44 @@ div#docslinks { width: 50em; } -.bz_first_comment { +.bz_comment_user, .bz_comment_time, .bz_comment_number, +.bz_private_checkbox, .bz_comment_actions +{ + margin: 0 .5em; +} + +.bz_comment_actions, .bz_comment_number, .bz_private_checkbox { + float: right; +} + +.bz_collapse_comment { + text-decoration: none; +} + +.bz_private_checkbox input { + margin: 0; + vertical-align: middle; } .bz_comment_head, .bz_first_comment_head { + padding-top: .1em; + padding-bottom: .1em; + padding-left: .5em; background-color: #e0e0e0; } + +.bz_comment_user_images img { + vertical-align: bottom; +} + .bz_comment_hilite pre { background-color: lightgreen; margin: 0; padding: 1em 0; } +/** End Comments **/ + .bz_default_hidden { display: none; } diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 127f4a5fb7..1e8ee8c546 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -69,13 +69,13 @@ } function collapse_comment(link, comment) { - link.innerHTML = "(+)"; + link.innerHTML = "[+]"; link.title = "Expand the comment."; comment.className = "collapsed"; } function expand_comment(link, comment) { - link.innerHTML = "(-)"; + link.innerHTML = "[-]"; link.title = "Collapse the comment"; comment.className = ""; } @@ -84,9 +84,10 @@ * won't display this link */ function addCollapseLink(count) { - document.write(' (-) '); + '); return false;" title="Collapse the comment.">[-]<\/a> '); } //--> @@ -150,56 +151,64 @@ [% " bz_first_comment" IF count == description %]"> [% IF count == description %] [% class_name = "bz_first_comment_head" %] - [% comment_label = "" %] - [% comment_link = "Description" %] - [% decoration = "" %] + [% comment_label = "Description" %] [% ELSE %] [% class_name = "bz_comment_head" %] - [% comment_label = "Comment" %] - [% comment_link = "#" _ count %] - [% decoration = '-------' %] + [% comment_label = "Comment " _ count %] [% END %] - - [%# Do not filter decoration as it's a real HTML tag. No XSS risk. %] - [% decoration FILTER none %] - [% comment_label FILTER html %] - - [% comment_link FILTER html %] From - - - - [% FOREACH group = comment.author.direct_group_membership %] - [% NEXT UNLESS group.icon_url %] - [% group.name FILTER html %] - [% END %] - - [%+ comment.time FILTER time %] +
[% IF mode == "edit" %] - + + + [% END %] - [%+ decoration FILTER none %] - - - [% IF mode == "edit" && isinsider %] - - - - - - [% END %] + + [% IF mode == "edit" && isinsider %] +
+ + + +
+ [% END %] + + + + [%- comment_label FILTER html %] + + + + + + + + + + [% FOREACH group = comment.author.direct_group_membership %] + [% NEXT UNLESS group.icon_url %] + [% group.name FILTER html %] + [% END %] + + + + [%+ comment.time FILTER time %] + +
+ [% IF user.in_group(Param('timetrackinggroup')) && (comment.work_time > 0 || comment.work_time < 0) %]