Remove public/private badges on report form labels

6 files changed, 4 insertions, 17 deletions

diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 0fdccf163..72d912f85 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -7,7 +7,7 @@
 [% PROCESS "report/new/category_wrapper.html" %]
 [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
 
-    <label for="form_title">[% loc('Summarise the problem') %] [% INCLUDE 'report/public_label.html' %]</label>
+    <label for="form_title">[% loc('Summarise the problem') %]</label>
 [% IF field_errors.title %]
     <p class='form-error'>[% field_errors.title %]</p>
 [% END %]
@@ -17,7 +17,6 @@
     <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
     <label for="form_photo">
         <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
-        [% INCLUDE 'report/public_label.html' %]
     </label>
 
   [% IF field_errors.photo %]
@@ -41,7 +40,7 @@
 
 [% TRY %][% PROCESS 'report/new/after_photo.html' %][% CATCH file %][% END %]
 
-    <label for="form_detail">[% loc('Explain what’s wrong') %] [% INCLUDE 'report/public_label.html' %]</label>
+    <label for="form_detail">[% loc('Explain what’s wrong') %]</label>
 [% IF field_errors.detail %]
     <p class='form-error'>[% field_errors.detail %]</p>
 [% END %]
diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html
index add4fdbd3..0d0ceb11c 100644
--- a/templates/web/base/report/new/form_user_loggedin.html
+++ b/templates/web/base/report/new/form_user_loggedin.html
@@ -57,10 +57,6 @@
     <label for="form_phone">[% loc('Phone number (optional)') %]</label>
     <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone">
 
-    <div class="general-notes">
-        <p>[% loc('We never show your email address or phone number.') %]</p>
-    </div>
-
     <div class="form-txt-submit-box">
         <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
     </div>
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 0b2f3859e..87df57b00 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
@@ -24,9 +24,6 @@
 
     <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
     <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-    <div class="general-notes form-focus-hidden">
-        <p>[% loc('We never show your email address or phone number.') %]</p>
-    </div>
 
     <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
 
diff --git a/templates/web/base/report/new/form_user_loggedout_email.html b/templates/web/base/report/new/form_user_loggedout_email.html
index 4f816f8cc..e117bc275 100644
--- a/templates/web/base/report/new/form_user_loggedout_email.html
+++ b/templates/web/base/report/new/form_user_loggedout_email.html
@@ -1,6 +1,4 @@
-<label for="form_email">[% loc('Your email') %]
-    <span class="muted">([% loc('We never show your email') %])</span>
-</label>
+<label for="form_email">[% loc('Your email') %]</label>
 [% IF field_errors.email %]
     <p class='form-error'>[% field_errors.email %]</p>
 [% END %]
diff --git a/templates/web/base/report/public_label.html b/templates/web/base/report/public_label.html
deleted file mode 100644
index 2e00a79d2..000000000
--- a/templates/web/base/report/public_label.html
+++ /dev/null
@@ -1 +0,0 @@
-<span class="muted label-warning public-warning">[% loc('(public)') %]</span>
diff --git a/templates/web/base/report/update/form_user_loggedout_email.html b/templates/web/base/report/update/form_user_loggedout_email.html
index 95a3b5578..38f172148 100644
--- a/templates/web/base/report/update/form_user_loggedout_email.html
+++ b/templates/web/base/report/update/form_user_loggedout_email.html
@@ -1,6 +1,4 @@
-<label for="form_rznvy">[% loc('Your email' ) %]
-<span class="muted">([% loc('We never show your email') %])</span>
-</label>
+<label for="form_rznvy">[% loc('Your email' ) %]</label>
 [% IF field_errors.email %]
     <p class='form-error'>[% field_errors.email %]</p>
 [% END %]