diff options
Diffstat (limited to 'templates/web/fixmybarangay')
| -rw-r--r-- | templates/web/fixmybarangay/faq/faq-en-gb.html | 54 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/footer.html | 38 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/report/_message_manager.html | 25 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/report/new/councils_text.html | 4 | ||||
| -rwxr-xr-x | templates/web/fixmybarangay/reports/index.html | 21 |
5 files changed, 118 insertions, 24 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 ‐ 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> diff --git a/templates/web/fixmybarangay/footer.html b/templates/web/fixmybarangay/footer.html index 88f18db4b..5bac32e98 100644 --- a/templates/web/fixmybarangay/footer.html +++ b/templates/web/fixmybarangay/footer.html @@ -75,6 +75,29 @@ </div> </div> <div style="display:none"> + <div id="detach-form-container" class="fancybox-popup"> + <p> + Are you sure you want to detach this message? + </p> + <p> + Message Manager probably thinks this message is a reply because + it came in from a number to which we'd recently sent an outward reply. + </p> + <p> + If you detach the message, it will appear as a new, available message (instead of being a reply). + </p> + <form action="/dummy" id="detach-form" onsubmit="event.returnValue = false; return false;" method="post" accept-charset="utf-8"> + <div style="display:none;"> + <input type="hidden" name="_method" value="POST"> + </div> + <input type="hidden" name="msg_id" id="detach_msg_id"> + <div class="submit"> + <input id="detach-submit" type="submit" value="Detach Message"> + </div> + </form> + </div> + </div> + <div style="display:none"> <div id="mm-help" style="font-size:90%;"> <h2> Accessing Message Manager from FixMyBarangay (FMB)</h2> <h3> @@ -125,14 +148,23 @@ </p> [% END %] <h3> - Replying to a message + <span class="demo_detach_btn">detach</span> Detaching a message ("not a reply") + </h3> + <p> + Message Manager tries to notice when an incoming message is a reply. Sometimes it guesses wrong. To detach a + message from its parent — that is, to mark it as <em>not a reply</em>, hover over the message and click + <span class="demo_detach_btn">detach</span>. + </p> + + <h3> + <span class="demo_reply_btn">reply</span> Replying to a message </h3> <p> You can send an SMS back to the original sender: just hover over the message and click <span class="demo_reply_btn">reply</span>. It will usually take a few minutes for the message to arrive. </p> <h3> - Getting message info + <span class="demo_info_btn">i</span> Getting message info </h3> <p> Hover over a message and click on its <span class="demo_info_btn">i</span> button to see when it was sent. @@ -140,7 +172,7 @@ actual number (instead the number is scrambled, but will be the <em>same scrambled number</em> on other messages they've sent). </p> <h3> - Hiding a message + <span class="demo_hide_btn">X</span> Hiding a message </h3> <p> If a message can't be used to create a report, you can hide it by hovering over it and clicking its <span class="demo_hide_btn">X</span> button. If you're not diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index 08f333cad..2860689be 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -109,19 +109,25 @@ $(document).ready(function() { $('#external_source_id').val(service_id); } - var dummy_reply_cleanup = function(data) { + var reply_cleanup = function(data) { reset_timeout(); $('#reply_text').val(''); dummy_busy = false; mm_refresh_messages(); } - var dummy_hide_cleanup = function(data) { + var hide_cleanup = function(data) { reset_timeout(); $('#reason_text').val(''); dummy_busy = false; } + var detach_cleanup = function(data) { + reset_timeout(); + dummy_busy = false; + mm_refresh_messages(); // refresh because detached message now appears in the list + } + var custom_tooltips; if (problem_id) { // this page is viewing, not creating custom_tooltips = {tt_radio: "Select before clicking 'Copy to Update' to add this message as an update"}; @@ -180,7 +186,7 @@ $(document).ready(function() { message_manager.reply( $('#reply_to_msg_id').val(), $('#reply_text').val(), - {callback:dummy_reply_cleanup}); + {callback:reply_cleanup}); } }); @@ -195,9 +201,20 @@ $(document).ready(function() { message_manager.hide( $('#hide_msg_id').val(), $('#reason_text').val(), - {callback:dummy_hide_cleanup}); + {callback:hide_cleanup}); } }); + + $('#detach-submit').click(function(e) { + e.preventDefault(); + if (! dummy_busy) { + dummy_busy = true; + message_manager.mark_as_not_a_reply( + $('#detach_msg_id').val(), + {callback:detach_cleanup}); + } + }); + $("a#reply").fancybox({onClosed: function(){dummy_busy=false;}}); // only show on problem display page diff --git a/templates/web/fixmybarangay/report/new/councils_text.html b/templates/web/fixmybarangay/report/new/councils_text.html index 24c54ea50..0001b0e68 100644 --- a/templates/web/fixmybarangay/report/new/councils_text.html +++ b/templates/web/fixmybarangay/report/new/councils_text.html @@ -1,5 +1,5 @@ <p> The information provided here will be displayed publicly on the site as well as being sent to the -relevant authority (DPWH, DEPW, or DPS). If you select the Fix Locally category then the -information will not be sent anywhere. +relevant authority (DPWH, DEPW, or DPS). +If you select a "bgy. will fix" category, then your report will be emailed to the barangay team. </p> diff --git a/templates/web/fixmybarangay/reports/index.html b/templates/web/fixmybarangay/reports/index.html index a99878c27..cda1fd6fd 100755 --- a/templates/web/fixmybarangay/reports/index.html +++ b/templates/web/fixmybarangay/reports/index.html @@ -7,10 +7,6 @@ [% loc('This is a summary of all reports on this site; select a particular barangay to see the reports sent there.') %] </p> -<p> - [%# (this will change when we have 'body' logic in place, meanwhile: hardcoded) %] - See also the <a href="/reports/dps">map of DPS reports</a>. -</p> </div> <table cellpadding="3" cellspacing="1" border="0" class="nicetable"> @@ -42,4 +38,21 @@ </tbody> </table> + +<p> +[%# (this will change when we have 'body' logic in place, meanwhile: hardcoded) %] +See also the maps of reports submitted to these departments: +</p> +<ul> +<li> +<a href="/reports/depw" title="Department of Engineering and Public Works">DEPW</a> — city road maintenance +</li> +<li> +<a href="/reports/dps" title="Department of Public Services">DPS</a> — streetlight maintenance +</li> +<li> +<a href="/reports/dpwh" title="Department of Public Works and Highways">DPWH</a> — national road maintenance +</li> +</ul> +</p> [% INCLUDE 'footer.html', pagefooter = 'yes' %] |