From 89596f632a1e00a84f9a59b713088e7a771c3726 Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Thu, 8 Aug 2013 12:30:10 +0100
Subject: add user name admin hint

---
 templates/web/default/admin/user-form.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'templates/web/default/admin/user-form.html')

diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html
index 9c60ec940..d2aae953e 100644
--- a/templates/web/default/admin/user-form.html
+++ b/templates/web/default/admin/user-form.html
@@ -2,7 +2,17 @@
     <input type="hidden" name="token" value="[% token %]" >
     <input type="hidden" name="submit" value="1" >
     <ul class="no-bullets">
-        <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'></li>
+        <li>
+          <div class="admin-hint">
+            <p>
+              [% loc(
+                "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.
+                Names are not necessarily unique.")
+              %]
+            </p>
+          </div>
+          [% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'>
+        </li>
         <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% user.email | html %]'></li>
         <li>[% loc('Body:') %] <select id='body' name='body'>
             <option value=''>[% loc('No body') %]</option>
-- 
cgit v1.2.3


From 7e54687f09249978abf784e729ffc6e243627e9d Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Thu, 8 Aug 2013 12:31:22 +0100
Subject: add user body hint

---
 templates/web/default/admin/user-form.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'templates/web/default/admin/user-form.html')

diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html
index d2aae953e..2ba7aeb03 100644
--- a/templates/web/default/admin/user-form.html
+++ b/templates/web/default/admin/user-form.html
@@ -14,11 +14,23 @@
           [% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'>
         </li>
         <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% user.email | html %]'></li>
-        <li>[% loc('Body:') %] <select id='body' name='body'>
+        <li>
+          <div class="admin-hint">
+            <p>
+              [% loc(
+                "Normal (public) users should not be associated with any <strong>body</strong>.<br>
+                Authorised staff users can be associated with the body they represent.<br>
+                Depending on the implementation, staff users may have access to the dashboard (summary of
+                activity across their body), the ability to hide reports or set special report statuses.")
+              %]
+            </p>
+          </div>
+          [% loc('Body:') %] <select id='body' name='body'>
             <option value=''>[% loc('No body') %]</option>
         [% FOR body IN bodies %]
             <option value="[% body.id %]"[% ' selected' IF body.id == user.from_body.id %]>[% body.name %]</option>
         [% END %]
+        </li>
         </select>
       [% IF c.cobrand.moniker != 'zurich' %]
         <li>[% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]></li>
-- 
cgit v1.2.3


From 3adf4caf5404cf972847946de5a85aaff06048ab Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Thu, 8 Aug 2013 13:07:32 +0100
Subject: add flagged user hint

also updated flagged page to indicate that flagged user's reports are automatically hidden (by send_reports)
---
 templates/web/default/admin/user-form.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'templates/web/default/admin/user-form.html')

diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html
index 2ba7aeb03..2f9d1269e 100644
--- a/templates/web/default/admin/user-form.html
+++ b/templates/web/default/admin/user-form.html
@@ -33,7 +33,19 @@
         </li>
         </select>
       [% IF c.cobrand.moniker != 'zurich' %]
-        <li>[% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]></li>
+        <li>
+          <div class="admin-hint">
+            <p>
+              [% loc("Mark abusive users as <strong>flagged</strong>.") %]
+              <br>
+              [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %]
+              <br>
+              [% tprintf(loc("Flagged users are listed on the <a href='%s'>flagged</a> page."), c.uri_for( 'flagged' )) %]
+            </p>
+          </div>
+          
+          [% loc('Flagged:') %] <input type="checkbox" id="flagged" name="flagged"[% user.flagged ? ' checked' : '' %]>
+        </li>
       [% END %]
     </ul>
     <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" >
-- 
cgit v1.2.3


From 007f413b4db284ca74bc6b40b82e3424e48482da Mon Sep 17 00:00:00 2001
From: Dave Whiteland <dave@mysociety.org>
Date: Thu, 15 Aug 2013 17:02:26 +0100
Subject: update langauge describing flagging

Correct the incorrect assertion that this has any affect: it doesn't (but adding to the abuse table does)
---
 templates/web/default/admin/user-form.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/web/default/admin/user-form.html')

diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html
index 2f9d1269e..489752d8c 100644
--- a/templates/web/default/admin/user-form.html
+++ b/templates/web/default/admin/user-form.html
@@ -36,11 +36,11 @@
         <li>
           <div class="admin-hint">
             <p>
-              [% loc("Mark abusive users as <strong>flagged</strong>.") %]
-              <br>
-              [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %]
+              [% loc("Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>.") %]
               <br>
               [% tprintf(loc("Flagged users are listed on the <a href='%s'>flagged</a> page."), c.uri_for( 'flagged' )) %]
+              <br>
+              [% loc("You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create.") %]
             </p>
           </div>
           
-- 
cgit v1.2.3