diff options
author | Matthew Somerville <matthew@mysociety.org> | 2013-02-14 16:01:01 +0000 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2013-02-14 16:01:01 +0000 |
commit | f8fef5162bddb4e10f22f8ddce8314a585ec8b4b (patch) | |
tree | 14380c8644a9060b98cd79421449874cbebe5714 | |
parent | 92025d8724eb9affccae41c01d304548f40c5b78 (diff) |
Some admin things not using local functions.
-rw-r--r-- | templates/web/default/admin/list_updates.html | 2 | ||||
-rw-r--r-- | templates/web/default/admin/problem_row.html | 12 | ||||
-rw-r--r-- | templates/web/default/admin/report_edit.html | 8 | ||||
-rw-r--r-- | templates/web/default/admin/update_edit.html | 2 | ||||
-rw-r--r-- | templates/web/zurich/admin/list_updates.html | 2 | ||||
-rw-r--r-- | templates/web/zurich/admin/problem_row.html | 4 | ||||
-rw-r--r-- | templates/web/zurich/admin/report_edit-sdm.html | 2 | ||||
-rw-r--r-- | templates/web/zurich/admin/report_edit.html | 2 | ||||
-rw-r--r-- | templates/web/zurich/admin/update_edit.html | 2 | ||||
-rw-r--r-- | templates/web/zurich/report/_item.html | 2 |
10 files changed, 19 insertions, 19 deletions
diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html index 681337844..22f9aaf83 100644 --- a/templates/web/default/admin/list_updates.html +++ b/templates/web/default/admin/list_updates.html @@ -27,7 +27,7 @@ <td>[% update.state %]</td> <td>[% update.name | html %]</td> <td>[% update.user.email | html %]</td> - <td>[% PROCESS format_time time=update.created %]</td> + <td>[% PROCESS format_time time=update.created_local %]</td> <td>[% IF update.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% IF update.user.id == update.problem.user_id %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% IF update.user.belongs_to_body( update.problem.bodies_str ) %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html index 1533f8dd2..f3ab65397 100644 --- a/templates/web/default/admin/problem_row.html +++ b/templates/web/default/admin/problem_row.html @@ -20,14 +20,14 @@ <td>[% PROCESS value_or_nbsp value=problem.category %]</td> <td>[% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> <td>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]</td> - <td>[% PROCESS format_time time=problem.created %]</td> + <td>[% PROCESS format_time time=problem.created_local %]</td> <td>[% problem.state %]<small> - [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] - [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] - [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] - [%- IF problem.is_open %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small> + [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed_local %][% END -%] + [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate_local %][% END -%] + [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate_local %][% END -%] + [%- IF problem.is_open %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate_local %][% END -%]</small> </td> - <td>[% PROCESS format_time time=problem.whensent %]</td> + <td>[% PROCESS format_time time=problem.whensent_local %]</td> <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td> </tr> [%- END -%] diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index b76d1717a..18993a87c 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -38,10 +38,10 @@ <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% problem.name | html %]'></li> <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% problem.user.email | html %]'> [% PROCESS abuse_button %] [% PROCESS flag_button user=problem.user %]</li> <li>[% loc('Phone:') %] [% problem.user.phone | html %]</li> -<li>[% loc('Created:') %] [% PROCESS format_time time=problem.created %]</li> -<li>[% loc('Confirmed:') %] [% PROCESS format_time time=problem.confirmed no_time='-' %]</li> -<li>[% loc('Sent:') %] [% PROCESS format_time time=problem.whensent %] [% IF problem.state == 'confirmed' %]<input onclick="return confirm('[% loc('You really want to resend?') %]')" type="submit" name="resend" value="[% loc('Resend report') %]">[% END %]</li> -<li>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %]</li> +<li>[% loc('Created:') %] [% PROCESS format_time time=problem.created_local %]</li> +<li>[% loc('Confirmed:') %] [% PROCESS format_time time=problem.confirmed_local no_time='-' %]</li> +<li>[% loc('Sent:') %] [% PROCESS format_time time=problem.whensent_local %] [% IF problem.state == 'confirmed' %]<input onclick="return confirm('[% loc('You really want to resend?') %]')" type="submit" name="resend" value="[% loc('Resend report') %]">[% END %]</li> +<li>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate_local %]</li> <li>[% loc('Service:') %] [% problem.service %]</li> <li>[% loc('Cobrand:') %] [% problem.cobrand %]</li> <li>[% loc('Cobrand data:') %] [% problem.cobrand_data %]</li> diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html index 26d262f73..dde81641b 100644 --- a/templates/web/default/admin/update_edit.html +++ b/templates/web/default/admin/update_edit.html @@ -42,7 +42,7 @@ [% PROCESS abuse_button %] [% PROCESS flag_button user=update.user %]</li> <li>[% loc('Cobrand:') %] [% update.cobrand %]</li> <li>[% loc('Cobrand data:') %] [% update.cobrand_data %]</li> -<li>[% loc('Created:') %] [% PROCESS format_time time=update.created %]</li> +<li>[% loc('Created:') %] [% PROCESS format_time time=update.created_local %]</li> [% IF update.photo %] [% photo = update.get_photo_params %] diff --git a/templates/web/zurich/admin/list_updates.html b/templates/web/zurich/admin/list_updates.html index c475d839e..f486284e3 100644 --- a/templates/web/zurich/admin/list_updates.html +++ b/templates/web/zurich/admin/list_updates.html @@ -10,7 +10,7 @@ [% FOREACH update IN updates -%] <tr[% ' class="adminhidden"' IF update.state == 'hidden' || update.problem.state == 'hidden' %]> <td>[%- update.id %]</td> - <td>[% PROCESS format_date this_date=update.created %] [% update.created.hms %]</td> + <td>[% PROCESS format_date this_date=update.created_local %] [% update.created_local.hms %]</td> <td>[% update.text | html %]</td> </tr> [% END -%] diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html index f84d22711..7974915eb 100644 --- a/templates/web/zurich/admin/problem_row.html +++ b/templates/web/zurich/admin/problem_row.html @@ -18,8 +18,8 @@ </td> <td>[% PROCESS value_or_nbsp value=problem.title %]</td> <td>[% PROCESS value_or_nbsp value=problem.category %]</td> - <td>[% PROCESS format_date this_date=problem.created %]</td> - <td>[% PROCESS format_date this_date=problem.lastupdate %]</td> + <td>[% PROCESS format_date this_date=problem.created_local %]</td> + <td>[% PROCESS format_date this_date=problem.lastupdate_local %]</td> <td>[% states.${problem.state} %]</td> [% IF include_subdiv %] diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 39d74881c..54a78ace4 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -41,7 +41,7 @@ <li><span class="mock-label">[% loc('Email:') %]</span> [% problem.user.email | html %] [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] <li><span class="mock-label">[% loc('Phone:') %]</span> [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> -<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> +<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created_local %] [% problem.created_local.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 30416f4c0..07586604b 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -55,7 +55,7 @@ [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] </li> <li><span class="mock-label">[% loc('Phone:') %]</span> [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> -<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> +<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created_local %] [% problem.created_local.hms %]</li> [% IF problem.photo %] diff --git a/templates/web/zurich/admin/update_edit.html b/templates/web/zurich/admin/update_edit.html index ab40981a5..c2e427941 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_date this_date=update.created %] [% update.created.hms %]</li> +<li>[% loc('Created:') %] [% PROCESS format_date this_date=update.created_local %] [% update.created_local.hms %]</li> [% IF update.photo %] [% photo = update.get_photo_params %] diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html index cd44a1b67..ad503fc51 100644 --- a/templates/web/zurich/report/_item.html +++ b/templates/web/zurich/report/_item.html @@ -12,7 +12,7 @@ [% END %] <small>[% prettify_dt( problem.created_local, 'zurich' ) %] [%- IF dist %], [% dist %]km[% END %] - [%- IF include_lastupdate AND problem.created != problem.lastupdate AND problem.whensent != problem.lastupdate %], + [%- IF include_lastupdate AND problem.created_local != problem.lastupdate_local AND problem.whensent_local != problem.lastupdate_local %], [% tprintf('last updated %s', prettify_dt( problem.lastupdate_local, 'zurich' ) ) %] [%- END %] [% IF NOT no_fixed AND problem.is_fixed %] |