aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Whiteland <dave@mysociety.org>2012-12-10 00:49:16 +0000
committerDave Whiteland <dave@mysociety.org>2012-12-10 00:49:16 +0000
commit1583bbfd261de7072638a5d265ba3ff00cec0dd6 (patch)
tree559e4505aab6a3eada8ffe8a4b04cf95c25916d2
parentd5f98ccb99e1b620dc770dc8861f964843586a93 (diff)
custom MM help text depending on whether or not this is a creation page or just a report-viewing page
-rw-r--r--templates/web/fixmybarangay/footer.html43
-rw-r--r--templates/web/fixmybarangay/report/_message_manager.html2
2 files changed, 33 insertions, 12 deletions
diff --git a/templates/web/fixmybarangay/footer.html b/templates/web/fixmybarangay/footer.html
index 966abacd8..88f18db4b 100644
--- a/templates/web/fixmybarangay/footer.html
+++ b/templates/web/fixmybarangay/footer.html
@@ -91,18 +91,39 @@
If you want to see any other messages, you'll need to have a manager or admin account on Message Manager: click on the
<a href="[% c.config.MESSAGE_MANAGER_URL %]">admin</a> link to get there.
</p>
- <h3>
- Creating a new report from a message
- </h3>
<p>
- If you want to use a message to create a problem report, you'll need to select it first. Click on the radio button. When the message
- is selected, it will go bright green. Now when you click on the map, the report will be used to create the report.
- </p>
- <p>
- To stop two people replying to a message at the same time, if anyone else has just started working on it, you'll see a message
- warning you, and you won't be able to select the radio button. Normally, if nobody works with a message, such a lock is released
- after about 3 minutes.
- </p>
+ [% IF global.is_fmb_creation_page %]
+ <h3>
+ Creating a new report from a message
+ </h3>
+ <p>
+ If you want to use a message to create a problem report, you'll need to select it first. Click on the radio button. When the message
+ is selected, it will go bright green. Now when you click on the map, the report will be used to create the report.
+ </p>
+ <p>
+ To stop two people replying to a message at the same time, if anyone else has just started working on it, you'll see a message
+ warning you, and you won't be able to select the radio button. Normally, if nobody works with a message, such a lock is released
+ after about 3 minutes.
+ </p>
+ [% ELSE %]
+ <p>
+ Click <strong>show messages for this report</strong> to see
+ the message (or messages) that contributed to this report. Often this will be a single message
+ if the problem was submitted by SMS. But it will also include any messages that have been
+ added as updates, as well as any replies that were sent back by barangay staff.
+ As well as letting you review the background to the report, this also lets you reply (for example,
+ to notify the original reporter that the problem has been fixed).
+ </p>
+ <h3>
+ Adding a message as an update to this report
+ </h3>
+ <p>
+ If you want to add this message's contents as an update to this report, you'll need to select it first. Click
+ on the radio button. When the message is selected, it will go bright green. Now when you click on the
+ <strong>COPY&nbsp;TO&nbsp;UPDATE</strong> button, the message text will be added to this report's update text.
+ You can edit the text before clicking <strong>POST</strong>.
+ </p>
+ [% END %]
<h3>
Replying to a message
</h3>
diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html
index d24f1185a..5f6b515e5 100644
--- a/templates/web/fixmybarangay/report/_message_manager.html
+++ b/templates/web/fixmybarangay/report/_message_manager.html
@@ -198,7 +198,6 @@ $(document).ready(function() {
{callback:dummy_hide_cleanup});
}
});
-
$("a#reply").fancybox({onClosed: function(){dummy_busy=false;}});
// only show on problem display page
@@ -289,5 +288,6 @@ $(document).ready(function() {
</script>
[% global.want_fmb_hidden_dialogs = 1 %]
+[% global.is_fmb_creation_page = problem.id? 0 : 1 %]
[% END %]