diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-11-22 15:53:36 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2018-11-26 12:49:23 +0000 |
| commit | d04d807989eaedb1bd46d08bf80e1b42ed7800ae (patch) | |
| tree | bab6a4db9c010df881b1435e5ccbfae35273cdd0 /templates | |
| parent | df2db75e7cd8733d557f625559b8757c523a214a (diff) | |
Improve update display on admin report edit page.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/admin/list_updates.html | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/templates/web/base/admin/list_updates.html b/templates/web/base/admin/list_updates.html index a28c4ff81..b23cd7ca3 100644 --- a/templates/web/base/admin/list_updates.html +++ b/templates/web/base/admin/list_updates.html @@ -9,24 +9,25 @@ <th>[% loc('Council') %]</th> <th>[% loc('Cobrand') %]</th> <th>[% loc('State') %]</th> - <th>[% loc('Text') %]</th> <th>*</th> </tr> [% FOREACH update IN updates -%] <tr[% ' class="adminhidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> - <td>[%- IF update.state == 'confirmed' && update.problem.state != 'hidden' -%] - [%- cobrand_data = update.cobrand_data; - cobrand_data = c.data_for_generic_update IF !update.cobrand; - IF cobrand_data; + <td rowspan=2> + [%~ IF update.state == 'confirmed' && update.problem.state != 'hidden' -%] + [%- cobrand_data = update.cobrand_data; + cobrand_data = c.data_for_generic_update IF !update.cobrand; + IF cobrand_data; uri = c.uri_for_email( '/report', update.problem.id, cobrand_data ); - ELSE; + ELSE; uri = c.uri_for_email( '/report', update.problem.id ); - END; - %] - <a href="[% uri %]#update_[% update.id %]" class="admin-offsite-link">[% update.id %]</a> - [%- ELSE %] - [%- update.id %] - [%- END -%]</td> + END; + %] + <a href="[% uri %]#update_[% update.id %]" class="admin-offsite-link">[% update.id %]</a> + [%- ELSE %] + [%- update.id %] + [%- END ~%] + </td> <td>[% PROCESS value_or_nbsp value=update.name %] <br>[% PROCESS value_or_nbsp value=update.user.email %] <br>[% loc('Anonymous') %]: [% IF update.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] @@ -38,13 +39,15 @@ [% loc('Created:') %] [% PROCESS format_time time=update.created %] <br>[% loc('Confirmed:') %] [% PROCESS format_time time=update.confirmed %] </small></td> - <td>[% update.text | html %]</td> - <td> + <td rowspan=2> [% IF c.user.has_permission_to('report_edit', update.problem.bodies_str_ids) %] <a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a> [% END %] </td> </tr> + <tr> + <td colspan=5>[% update.text | html %]</td> + </tr> [% END -%] </table> |