diff options
Diffstat (limited to 'templates/web/base')
-rw-r--r-- | templates/web/base/auth/sign_out.html | 2 | ||||
-rw-r--r-- | templates/web/base/contact/submit.html | 2 | ||||
-rw-r--r-- | templates/web/base/questionnaire/completed.html | 2 | ||||
-rw-r--r-- | templates/web/base/reports/_list-filters.html | 12 | ||||
-rw-r--r-- | templates/web/base/tokens/confirm_alert.html | 2 | ||||
-rw-r--r-- | templates/web/base/tokens/confirm_problem.html | 1 | ||||
-rw-r--r-- | templates/web/base/tokens/confirm_update.html | 1 |
7 files changed, 18 insertions, 4 deletions
diff --git a/templates/web/base/auth/sign_out.html b/templates/web/base/auth/sign_out.html index c95efacf5..1a468b278 100644 --- a/templates/web/base/auth/sign_out.html +++ b/templates/web/base/auth/sign_out.html @@ -5,6 +5,6 @@ <p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> </div> -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='signed out' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html index 4bf82dcd6..acb7caad9 100644 --- a/templates/web/base/contact/submit.html +++ b/templates/web/base/contact/submit.html @@ -16,6 +16,6 @@ [% END %] -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='contact form submitted' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/questionnaire/completed.html b/templates/web/base/questionnaire/completed.html index 32aa8bd68..280cc33b8 100644 --- a/templates/web/base/questionnaire/completed.html +++ b/templates/web/base/questionnaire/completed.html @@ -16,6 +16,6 @@ [% END %] </div> -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='questionnaire completed' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index 73afe64f4..ef7c7ad78 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -9,9 +9,21 @@ <option value="shortlisted"[% ' selected' IF filter_status.shortlisted %]>[% loc('Shortlisted') %]</option> <option value="unshortlisted"[% ' selected' IF filter_status.unshortlisted %]>[% loc('Unshortlisted') %]</option> [% END %] + [% IF c.user_exists AND c.user.is_superuser OR c.user.belongs_to_body(body.id) %] + <option value="confirmed"[% ' selected' IF filter_status.confirmed %]>[% loc('Open') %]</option> + <option value="investigating"[% ' selected' IF filter_status.investigating %]>[% loc('Investigating') %]</option> + <option value="in progress"[% ' selected' IF filter_status.in_progress %]>[% loc('In progress') %]</option> + <option value="action scheduled"[% ' selected' IF filter_status.action_scheduled %]>[% loc('Action scheduled') %]</option> + <option value="fixed"[% ' selected' IF filter_status.fixed %]>[% loc('Fixed reports') %]</option> + <option value="unable to fix"[% ' selected' IF filter_status.unable_to_fix %]>[% loc('No further action') %]</option> + <option value="not responsible"[% ' selected' IF filter_status.not_responsible %]>[% loc('Not responsible') %]</option> + <option value="internal referral"[% ' selected' IF filter_status.internal_referral %]>[% loc('Internal referral') %]</option> + <option value="duplicate"[% ' selected' IF filter_status.duplicate %]>[% loc('Duplicate') %]</option> + [% ELSE %] <option value="open"[% ' selected' IF filter_status.open %]>[% loc('Unfixed reports') %]</option> <option value="closed"[% ' selected' IF filter_status.closed %]>[% loc('Closed reports') %]</option> <option value="fixed"[% ' selected' IF filter_status.fixed %]>[% loc('Fixed reports') %]</option> + [% END %] </select> [% END %] diff --git a/templates/web/base/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html index f0ad12ff8..0154f0225 100644 --- a/templates/web/base/tokens/confirm_alert.html +++ b/templates/web/base/tokens/confirm_alert.html @@ -14,6 +14,6 @@ </div> -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='email alert set up' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index a4573b5e6..ff9882d4b 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -36,6 +36,7 @@ [% INCLUDE next_steps.html, just_interacted = 1, + utm_content = 'problem confirmed', share_url = c.cobrand.base_url_for_report(report) _ report.url, twitter_comment = loc('I just reported a problem on @fixmystreet') %] diff --git a/templates/web/base/tokens/confirm_update.html b/templates/web/base/tokens/confirm_update.html index 005a8a7ac..6b03308a5 100644 --- a/templates/web/base/tokens/confirm_update.html +++ b/templates/web/base/tokens/confirm_update.html @@ -20,6 +20,7 @@ END; [% INCLUDE next_steps.html, just_interacted = 1, + utm_content = 'update confirmed', share_url = c.cobrand.base_url_for_report(problem) _ problem.url, twitter_comment = loc('I just updated a problem on @fixmystreet') %] |