updated/removed TODOs from FixMyBarangay FAQ

1 files changed, 43 insertions, 11 deletions

diff --git a/templates/web/fixmybarangay/faq/faq-en-gb.html b/templates/web/fixmybarangay/faq/faq-en-gb.html
index 320a7528e..771569e23 100644
--- a/templates/web/fixmybarangay/faq/faq-en-gb.html
+++ b/templates/web/fixmybarangay/faq/faq-en-gb.html
@@ -54,7 +54,8 @@ the problem.</dd>
         <dd>
             You can use your email address and set a password right away, but your 
             account won't be enabled as a <em>staff account</em> until one of the
-            system administrators has checked it. TODO: contact details.
+            system administrators has checked it. If you're not sure who to contact, try
+            <a href="mailto:[% c.config.CONTACT_EMAIL %]">[% c.config.CONTACT_EMAIL %]</a>.
         </dd>
         <dt>I've forgotten my password, what do I do?</dt>
         <dd>
@@ -68,10 +69,32 @@ the problem.</dd>
             or quit the browser (just closing the window without quitting the browser is not enough).
         </dd>
         <dt>Reporting</dt>
-        <dd>TODO</dd>
+        <dd><p>
+            To make a new report, start by clicking on the button for either barangay <em>BSN</em> or <em>Luz</em>.
+            </p>
+            <ul>
+                <li>
+                    <strong>To create a standalone report</strong> simply click on the map where the problem is. 
+                </li>
+                <li>
+                    <strong>To create a report from a text message</strong> log into Message Manager (see below),
+                    then select the message you want to use (click on the radio button). When the message has gone
+                    green, you can click on the map and the message will automatically be used to create the report.
+                    You can edit the text, but that report will be associated with that incoming message.
+                </li>
+            </ul>
+            <p>
+                Once you've placed the pin, but before you press <em>Submit</em>, you can drag or reposition the pin
+                if you want to change its position.
+            </p>
+            <p>
+                Choose the category for this report &dash; obviously, this helps FixMyBarangay decide to which 
+                department the report will be sent.
+            </p>
+        </dd>
         <dt>How do I see the SMS messages people have sent?</dt>
-        <dd>When you look at the barangay problems, click on "Problems via text"
-            (or, if you're viewing a specific report, click "Show messages") to see the
+        <dd>When you look at the barangay problems, click on <em>Problems via text</em>
+            (or, if you're viewing a specific report, click <em>Show messages</em>) to see the
             currently available messages. You'll need a username and password
             for the Message Manager (your manager will have told you what these
             are). Note that you can only see messages that have not yet been used to 
@@ -82,31 +105,40 @@ the problem.</dd>
             No, it's a separate account (some FMB users don't have any access to the SMS messages).
             Your manager will tell you what your login for Message Manager system is, if you have one.
         </dd>
-        <dt>I tried to work with a message but it said "lock not granted". What's up?</dt>
+        <dt>I tried to work with a message but it said "Someone is working with that message right now!" What's up?</dt>
         <dd>
-            This means another staff member is working on the message. To prevent you both creating
+            This means another staff member has a "lock" on the message. To prevent you both creating
             a report, or sending a reply, we use a first-come-first-serve locking mechanism.
             Collisions like this are rare, but if they do happen, try again a few minutes later
             because the lock may have expired by then.
         </dd>
         <dt>Can I delete a message?</dt>
         <dd>
-            Yes. Click on the red cross when you hover over it (although really you're only hiding it). 
-            You need an <em>administrator</em> account in the Message Manager to be able to see the 
+            Yes. Click on the red cross when you hover over it (although really you're only hiding it so
+            it never gets shown within FixMyBarangay). 
+            You need a manager's account in the Message Manager to be able to see any 
             messages that have been hidden, so hiding them is as good as deleting them.
         </dd>
         <dt>It looks like an incoming message is wrongly shown as a reply. Can I fix it?</dt>
         <dd>
             FixMyBarangay tries to recognise SMS replies, and automatically matches them to the right thread. If it 
-            gets this wrong, the reply may appear as a new "available" message, or a new message might be
-            mistaken for a reply. You need to ask an administrator to log into Message Manager to sort this out for you.
+            gets this wrong you can click on the <em>detach</em> button. The message will then be a new "available"
+            message. If Message Manager got it wrong the other way round, and missed a reply, you can fix this too
+            but you need to log into Message Manager with a manager's account to do it.
         </dd>
         <dt>How do the replies get back to the original sender?</dt>
         <dd>
             Although you're replying from within FixMyBarangay, the replies are sent by SMS.
-            There may be a delay of a few minutes between the moment you press <strong>reply</strong>
+            There may be a delay of a several minutes between the moment you press <strong>reply</strong>
             and the message's arrival.
         </dd>
+        <dt>How can I tell the original sender their problem has been fixed?</dt>
+        <dd>
+            Go to the report. If the report is marked "this report was submitted by SMS", you can send a reply.
+            Click on <em>Show Messages</em>. When the messages appear, click on <em>Show messages for
+            <strong>this</strong> report</em>. Hover over the message you want to send the message to, and 
+            click <em>Reply</em>.
+        </dd>
 
     <h2><a name="organisation"></a>Organisation Questions</h2>
     <dl>