diff options
| -rw-r--r-- | skins/standard/global.css | 29 | ||||
| -rw-r--r-- | template/en/default/attachment/list.html.tmpl | 100 |
2 files changed, 77 insertions, 52 deletions
diff --git a/skins/standard/global.css b/skins/standard/global.css index 7504cb0fb..bd558d5c5 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -281,6 +281,35 @@ dl dl > dt { border-top: none; } +/* Style of the attachment table */ +#attachment_table { + border-collapse: collapse; + width: 40em; + border: 1px solid #333333; +} + +#attachment_table th, .bz_attach_footer { + background-color: #E0E0E0; + color: black; +} + +#attachment_table td { + border: 1px solid #333333; +} + +.bz_attach_extra_info { + font-size: smaller; +} + +.bz_attach_flags, .bz_attach_footer { + white-space: nowrap; +} + +.bz_attach_view_hide { + float: right; + padding-left: 1em; +} + .box { border: 1px solid black; color: black; diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl index 154cb98b1..275e92df2 100644 --- a/template/en/default/attachment/list.html.tmpl +++ b/template/en/default/attachment/list.html.tmpl @@ -51,18 +51,13 @@ </script> <br> -<table id="attachment_table" cellspacing="0" cellpadding="4" border="1"> +<table id="attachment_table" cellspacing="0" cellpadding="4"> <tr> - <th bgcolor="#cccccc" align="left"><a name="a0" id="a0">Attachment</a></th> - <th bgcolor="#cccccc" align="left">Type</th> - <th bgcolor="#cccccc" align="left">Creator</th> - <th bgcolor="#cccccc" align="left">Created</th> - <th bgcolor="#cccccc" align="left">Size</th> - [% IF show_attachment_flags %] - <th bgcolor="#cccccc" align="left">Flags</th> - [% END %] - <th bgcolor="#cccccc" align="left">Actions</th> + <th colspan="[% show_attachment_flags ? 3 : 2 %]" align="left"> + <a name="a0" id="a0">Attachments</a> + </th> </tr> + [% count = 0 %] [% has_obsolete_attachments = 0 %] @@ -73,39 +68,43 @@ <tr class="[% "bz_private" IF attachment.isprivate %][%-%] [%+ "bz_tr_obsolete" IF attachment.isobsolete %]"> <td valign="top"> - <a name="a[% count %]" href="attachment.cgi?id=[% attachment.id %]">[% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %]</a> - </td> - - <td valign="top"> - [% IF attachment.ispatch %] - <i>patch</i> - [% ELSIF attachment.isurl %] - <i>url</i> - [% ELSE %] - [% attachment.contenttype FILTER html %] - [% END %] - </td> - - <td valign="top"> - <a href="mailto:[% attachment.attacher.email FILTER html %]"> - [% attachment.attacher.name || attachment.attacher.login FILTER html %] - </a> - </td> - <td valign="top"> - <a href="#attach_[% attachment.id %]">[% attachment.attached FILTER time %]</a> - </td> - <td valign="top"> [% IF attachment.datasize %] - [% attachment.datasize FILTER unitconvert %] - [% ELSE %] - <em>deleted</em> + <a name="a[% count %]" href="attachment.cgi?id=[% attachment.id %]" + title="View the content of the attachment"> [% END %] + [% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %] + [% "</a>" IF attachment.datasize %] + + <span class="bz_attach_extra_info"> + [% IF attachment.datasize %] + ([% attachment.datasize FILTER unitconvert %], + [% IF attachment.ispatch %] + <i>patch</i>) + [% ELSIF attachment.isurl %] + <i>url</i>) + [% ELSE %] + [%+ attachment.contenttype FILTER html %]) + [% END %] + [% ELSE %] + (<em>deleted</em>) + [% END %] + + <br> + <a href="#attach_[% attachment.id %]" + title="Go to the comment associated with the attachment"> + [%- attachment.attached FILTER time %]</a>, + + <a href="mailto:[% attachment.attacher.email FILTER html %]" + title="Write an email to the creator of the attachment"> + [% attachment.attacher.name || attachment.attacher.login FILTER html %] + </a> + </span> </td> [% IF show_attachment_flags %] - <td valign="top"> + <td class="bz_attach_flags" valign="top"> [% IF attachment.flags.size == 0 %] - <i>none</i> + <i>no flag</i> [% ELSE %] [% FOREACH flag = attachment.flags %] [% flag.setter.nick FILTER html %]: @@ -129,22 +128,19 @@ [% END %] [% END %] - <tr> - <td colspan="[% show_attachment_flags ? 6 : 5 %]"> - <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.) + <tr class="bz_attach_footer"> + <td colspan="[% show_attachment_flags ? 3 : 2 %]"> + [% IF attachments.size %] + <span class="bz_attach_view_hide"> + [% IF has_obsolete_attachments %] + <a href="#a0" onClick="return toggle_display(this);">Hide Obsolete</a> | + [% END %] + <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a> + </span> + [% END %] + <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Add an attachment</a> + (proposed patch, testcase, etc.) </td> - [% IF attachments.size %] - <td> - <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a> - [% IF has_obsolete_attachments %] - <br><a href="#a0" onClick="return toggle_display(this);">Hide Obsolete</a> - [% END %] - </td> - [% ELSE %] - <td class="bz_disabled"> - View All - </td> - [% END %] </tr> </table> <br> |