aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2013-01-31 18:11:49 +0000
committerMatthew Somerville <matthew@mysociety.org>2013-01-31 18:11:49 +0000
commite21a75ae9a64a3a05fabff90f5543ad669d15778 (patch)
treec4feef40fc3d0098977ea07c4db486001c588edc
parent34223cdcd952b213688089a7a49245ef578ced17 (diff)
Correct date formatting for remaining Zurich admin dates.
-rw-r--r--templates/web/zurich/admin/list_updates.html2
-rw-r--r--templates/web/zurich/admin/report_edit-sdm.html4
-rw-r--r--templates/web/zurich/admin/report_edit.html5
-rw-r--r--templates/web/zurich/admin/update_edit.html2
4 files changed, 7 insertions, 6 deletions
diff --git a/templates/web/zurich/admin/list_updates.html b/templates/web/zurich/admin/list_updates.html
index e8b8a059b..7a78d4c63 100644
--- a/templates/web/zurich/admin/list_updates.html
+++ b/templates/web/zurich/admin/list_updates.html
@@ -9,7 +9,7 @@
[% FOREACH update IN updates -%]
<tr[% ' class="adminhidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]>
<td>[%- update.id %]</td>
- <td>[% PROCESS format_time time=update.created %]</td>
+ <td>[% PROCESS format_date this_date=update.created %] [% update.created.hms %]</td>
<td>[% update.text | html %]</td>
</tr>
[% END -%]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index cbf28470b..faad3ec55 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -19,7 +19,7 @@
%]
[% END %]
</li>
-<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %])
+<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %]
([%
SET safe = problem.postcode | html;
tprintf( loc('originally entered: &ldquo;%s&rdquo;'), safe )
@@ -31,7 +31,7 @@
<li>[% loc('Email:') %] [% problem.user.email | html %]
[% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %]
<li>[% loc('Phone:') %] [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li>
-<li>[% loc('Created:') %] [% PROCESS format_time time=problem.created %]</li>
+<li>[% loc('Created:') %] [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li>
[% IF problem.photo %]
[% photo = problem.get_photo_params %]
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 176c0d620..7fdaeabff 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -40,7 +40,7 @@
</li>
[% END %]
-<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %])
+<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %]
([%
SET safe = problem.postcode | html;
tprintf( loc('originally entered: &ldquo;%s&rdquo;'), safe )
@@ -52,7 +52,8 @@
[% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %]
</li>
<li>[% loc('Phone:') %] [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li>
-<li>[% loc('Created:') %] [% PROCESS format_time time=problem.created %]</li>
+<li>[% loc('Created:') %] [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li>
+
[% IF problem.photo %]
[% photo = problem.get_photo_params %]
diff --git a/templates/web/zurich/admin/update_edit.html b/templates/web/zurich/admin/update_edit.html
index d5c62c020..ab40981a5 100644
--- a/templates/web/zurich/admin/update_edit.html
+++ b/templates/web/zurich/admin/update_edit.html
@@ -26,7 +26,7 @@
[% END %]
</li>
-<li>[% loc('Created:') %] [% PROCESS format_time time=update.created %]</li>
+<li>[% loc('Created:') %] [% PROCESS format_date this_date=update.created %] [% update.created.hms %]</li>
[% IF update.photo %]
[% photo = update.get_photo_params %]