aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/zurich/admin/index-dm.html29
-rw-r--r--templates/web/zurich/report/updates.html18
2 files changed, 42 insertions, 5 deletions
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index 62c073640..6ece5385b 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -4,8 +4,27 @@
<h2>New reports</h2>
[% INCLUDE list, problems = unconfirmed.all %]
-<h2>Reports needing attention</h2>
-[% INCLUDE list, problems = approval.all %]
+<h2>Updates needing attention</h2>
+<table cellspacing="0" cellpadding="2" border="1">
+ <tr>
+ <th>[% loc('ID') %]</th>
+ <th>[% loc('Problem ID') %]</th>
+ <th>[% loc('Category') %]</th>
+ <th>[% loc('Text') %]</th>
+ <th>[% loc('Created') %]</th>
+ <th>*</th>
+ </tr>
+[%- FOR update IN approval.all %]
+ <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]>
+ <td>[% update.id %]</td>
+ <td>[% update.problem.id %]</td>
+ <td>[% update.problem.category %]</td>
+ <td>[% update.text %]</td>
+ <td>[% PROCESS format_time time=update.created %]</td>
+ <td><a href="[% c.uri_for( 'update_edit', update.id ) %]">[% loc('Edit') %]</a></td>
+ </tr>
+[%- END -%]
+</table>
<h2>All reports</h2>
[% INCLUDE list, problems = other.all %]
@@ -24,9 +43,9 @@
[%- FOR problem IN problems %]
<tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]>
<td>[% problem.id %]</td>
- <td>[% PROCESS value_or_nbsp value=problem.title %]</td>
- <td>[% problem.category %]</td>
- <td>[% PROCESS format_time time=problem.created %]</td>
+ <td>[% PROCESS value_or_nbsp value=problem.title %]</td>
+ <td>[% problem.category %]</td>
+ <td>[% PROCESS format_time time=problem.created %]</td>
<td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
</tr>
[%- END -%]
diff --git a/templates/web/zurich/report/updates.html b/templates/web/zurich/report/updates.html
new file mode 100644
index 000000000..60a26b6da
--- /dev/null
+++ b/templates/web/zurich/report/updates.html
@@ -0,0 +1,18 @@
+[% FOREACH update IN updates %]
+[% INCLUDE 'report/update.html' %]
+[% END %]
+
+[% BLOCK meta_line %]
+
+ [%- IF update.user.from_body;
+ user_name = update.user.name | html;
+ body = update.user.body;
+ %]
+ [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, body, prettify_epoch( update.confirmed_local.epoch ) ) -%]
+ [%- ELSE %]
+ [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%]
+ [%- END -%]
+ [%- ", " _ loc( 'reopened' ) IF update.problem_state == 'confirmed' %]
+ [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state AND update.problem_state != 'confirmed' %]
+[% END %]
+