diff options
Diffstat (limited to 'templates')
6 files changed, 17 insertions, 9 deletions
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index 848d331d4..a39200c72 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -4,8 +4,8 @@ <input disabled type="text" value="[% c.user.email | html %]"> [% INCLUDE 'report/new/extra_name.html' %] + [% PROCESS 'user/_anonymity.html' anonymous = report.anonymous %] - [% name_public = report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %] <label for="form_name">[% loc('Name') %] [% TRY %] [% INCLUDE 'report/new/after_name.html' %] diff --git a/templates/web/base/report/new/form_user_loggedout_by_email.html b/templates/web/base/report/new/form_user_loggedout_by_email.html index a3e36dfa3..1ad07c540 100644 --- a/templates/web/base/report/new/form_user_loggedout_by_email.html +++ b/templates/web/base/report/new/form_user_loggedout_by_email.html @@ -2,8 +2,8 @@ <h5>[% loc('<strong>No</strong> Let me confirm my report by email') %]</h5> [% INCLUDE 'report/new/extra_name.html' %] + [% PROCESS 'user/_anonymity.html' anonymous = report.anonymous %] - [% name_public = report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %] <label for="form_name">[% loc('Name') %] [% TRY %] [% INCLUDE 'report/new/after_name.html' %] diff --git a/templates/web/base/report/update/form_name.html b/templates/web/base/report/update/form_name.html index 8311922e3..4cb3e516c 100644 --- a/templates/web/base/report/update/form_name.html +++ b/templates/web/base/report/update/form_name.html @@ -1,6 +1,7 @@ [% INCLUDE 'report/new/extra_name.html' %] -[% name_public = update.anonymous==0 OR (c.cobrand.default_show_name AND update.anonymous=='') %] +[% PROCESS 'user/_anonymity.html' anonymous = update.anonymous %] + <label for="form_name">[% loc('Name') %]</label> [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> diff --git a/templates/web/base/user/_anonymity.html b/templates/web/base/user/_anonymity.html new file mode 100644 index 000000000..cc3630f16 --- /dev/null +++ b/templates/web/base/user/_anonymity.html @@ -0,0 +1,11 @@ +[% + IF c.cobrand.default_show_name AND anonymous==''; + IF c.user_exists; + SET name_public = NOT c.user.latest_anonymity; + ELSE; + SET name_public = 1; + END; + ELSE; + SET name_public = anonymous==0; + END +%] diff --git a/templates/web/eastsussex/report/new/after_name.html b/templates/web/eastsussex/report/new/after_name.html index 26c213c1d..8b0fc9816 100644 --- a/templates/web/eastsussex/report/new/after_name.html +++ b/templates/web/eastsussex/report/new/after_name.html @@ -1,5 +1,3 @@ - <span id="name-public-warning" class="label-warning public-warning name-warning" - [% 'style="display:none"' UNLESS name_public %] - > + <span id="name-public-warning" class="label-warning public-warning name-warning"> [% loc('public') %] </span> diff --git a/templates/web/eastsussex/report/update-form.html b/templates/web/eastsussex/report/update-form.html index c2e445f22..e071ff8ce 100644 --- a/templates/web/eastsussex/report/update-form.html +++ b/templates/web/eastsussex/report/update-form.html @@ -193,9 +193,7 @@ [% name_public = update.anonymous==0 OR (c.cobrand.default_show_name AND update.anonymous=='') %] <label for="form_name">[% loc('Name') %] - <span id="name-public-warning" class="label-warning public-warning name-warning" - [% 'style="display:none"' UNLESS name_public %] - > + <span id="name-public-warning" class="label-warning public-warning name-warning"> [% loc('public') %] </span> </label> |