diff options
Diffstat (limited to 'templates')
5 files changed, 45 insertions, 12 deletions
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index 95fc9d751..d657be450 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -6,9 +6,9 @@ [% INCLUDE form_as %] </div> [% ELSE %] - [% can_contribute_as_another_user = c.user.has_permission_to("contribute_as_another_user", bodies.keys) %] - [% can_contribute_as_anonymous_user = c.user.has_permission_to("contribute_as_anonymous_user", bodies.keys) %] - [% can_contribute_as_body = c.user.from_body AND c.user.has_permission_to("contribute_as_body", bodies.keys) %] + [% can_contribute_as_another_user = c.user.has_permission_to("contribute_as_another_user", bodies_ids) %] + [% can_contribute_as_anonymous_user = c.user.has_permission_to("contribute_as_anonymous_user", bodies_ids) %] + [% can_contribute_as_body = c.user.from_body AND c.user.has_permission_to("contribute_as_body", bodies_ids) %] [% IF can_contribute_as_another_user OR can_contribute_as_anonymous_user OR can_contribute_as_body %] [% INCLUDE form_as %] [% END %] @@ -61,7 +61,7 @@ <input class="form-control" type="text" value="[% report.user.email | html %]" name="email" id="form_email"> [% END %] -[% IF c.user.has_permission_to("report_inspect", bodies.keys) OR c.user.has_permission_to("report_mark_private", bodies.keys) %] +[% IF c.user.has_permission_to("report_inspect", bodies_ids) OR c.user.has_permission_to("report_mark_private", bodies_ids) %] <div class="checkbox-group"> <input type="checkbox" name="non_public" id="form_non_public" value="1"[% ' checked' IF report.non_public %]> <label class="inline" for="form_non_public">[% loc('Private') %] </label> diff --git a/templates/web/bathnes/report/new/roads_message.html b/templates/web/bathnes/report/new/roads_message.html new file mode 100644 index 000000000..3060f16da --- /dev/null +++ b/templates/web/bathnes/report/new/roads_message.html @@ -0,0 +1,7 @@ +<div id="js-roads-responsibility" class="box-warning hidden"> + <strong>Not maintained by Bath & North East Somerset Council</strong> + <div id="js-not-a-road" class="hidden js-responsibility-message"> + <p>The location you have selected doesn't appear to be on <span class="js-roads-asset" data-original="a road">a road</span> that Bath & North East Somerset Council maintain.</p> + <p>Please select <span class="js-roads-asset" data-original="a road">a road</span> on which to make a report.</p> + </div> +</div> diff --git a/templates/web/fixmystreet-uk-councils/report/_updates_disallowed_message.html b/templates/web/fixmystreet-uk-councils/report/_updates_disallowed_message.html new file mode 100644 index 000000000..3a2dda03e --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/report/_updates_disallowed_message.html @@ -0,0 +1,17 @@ +[% cfg = c.cobrand.feature("updates_allowed") ~%] +[% IF cfg.match('reporter') AND (NOT cfg.match('open') OR problem.is_open) %] + <p> + Only the original reporter may leave updates. + [% IF NOT c.user_exists %] + If you made the original report please + <a href="/auth?r=report/[% problem.id %]">log in</a> + to leave an update. + [% END %] + </p> +[% ELSE %] + <p>[% loc('This report is now closed to updates.') %] + [% tprintf(loc('You can <a href="%s">make a new report in the same location</a>.'), + c.uri_for( '/report/new', { longitude = longitude, latitude = latitude } ) + ) %] + </p> +[% END %] diff --git a/templates/web/fixmystreet.com/report/_updates_disallowed_message.html b/templates/web/fixmystreet.com/report/_updates_disallowed_message.html new file mode 100644 index 000000000..d2d9cf83b --- /dev/null +++ b/templates/web/fixmystreet.com/report/_updates_disallowed_message.html @@ -0,0 +1,17 @@ +[% cfg = c.cobrand.updates_disallowed_config(problem).0 ~%] +[% IF cfg.match('reporter') AND (NOT cfg.match('open') OR problem.is_open) %] + <p> + Only the original reporter may leave updates. + [% IF NOT c.user_exists %] + If you made the original report please + <a href="/auth?r=report/[% problem.id %]">log in</a> + to leave an update. + [% END %] + </p> +[% ELSE %] + <p>[% loc('This report is now closed to updates.') %] + [% tprintf(loc('You can <a href="%s">make a new report in the same location</a>.'), + c.uri_for( '/report/new', { longitude = longitude, latitude = latitude } ) + ) %] + </p> +[% END %] diff --git a/templates/web/isleofwight/report/_updates_disallowed_message.html b/templates/web/isleofwight/report/_updates_disallowed_message.html deleted file mode 100644 index af56f73b1..000000000 --- a/templates/web/isleofwight/report/_updates_disallowed_message.html +++ /dev/null @@ -1,8 +0,0 @@ -<p> - Only the original reporter may leave updates. - [% IF NOT c.user_exists %] - If you made the original report please - <a href="/auth?r=report/[% problem.id %]">log in</a> - to leave an update. - [% END %] -</p> |