aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2013-08-15 16:33:29 +0100
committerStruan Donald <struan@exo.org.uk>2013-08-15 16:33:29 +0100
commit9f0d317bd4b1e46e88b3427c1217f914ddddcd3f (patch)
tree37f007ea567d4f0cf613507d5622746c6dbd8b88
parente6f671d6f814fe1bed518ffb2858b72f3b85b71f (diff)
Add in test version warning to initial map page
Warning to say that reports will not be sent to the council to avoid confusion in advance of beta testing Fixes #94
-rw-r--r--locale/FixMyStreetMobileApp.po12
-rw-r--r--locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po12
-rw-r--r--src/css/fms.css16
-rw-r--r--src/js/app.js5
-rw-r--r--src/templates/en/around.html5
-rw-r--r--templates/around.html5
6 files changed, 47 insertions, 8 deletions
diff --git a/locale/FixMyStreetMobileApp.po b/locale/FixMyStreetMobileApp.po
index d5f2693..c1f83d9 100644
--- a/locale/FixMyStreetMobileApp.po
+++ b/locale/FixMyStreetMobileApp.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: struan@mysociety.org\n"
-"POT-Creation-Date: 2013-08-09 15:48+0100\n"
+"POT-Creation-Date: 2013-08-15 15:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -57,7 +57,7 @@ msgstr ""
msgid "Complete report now"
msgstr ""
-#: templates/around.html:43
+#: templates/around.html:48
msgid "Confirm Location"
msgstr ""
@@ -157,7 +157,7 @@ msgstr ""
msgid "More than one location matched that name. Select one below or try entering street name and area, or a postcode."
msgstr ""
-#: templates/around.html:37
+#: templates/around.html:42
msgid "New Report Here"
msgstr ""
@@ -269,7 +269,7 @@ msgstr ""
msgid "Report Created"
msgstr ""
-#: templates/around.html:40
+#: templates/around.html:45
msgid "Reposition Report Here"
msgstr ""
@@ -321,6 +321,10 @@ msgstr ""
msgid "Take a new photo"
msgstr ""
+#: templates/around.html:32
+msgid "Test version. Reports will not be sent to the council."
+msgstr ""
+
#: templates/sent.html:13
msgid "Thanks. Your report will be sent to the authorities immediately."
msgstr ""
diff --git a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
index d8f52f1..4fbf035 100644
--- a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
+++ b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: struan@mysociety.org\n"
-"POT-Creation-Date: 2013-08-09 15:48+0100\n"
+"POT-Creation-Date: 2013-08-15 15:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -58,7 +58,7 @@ msgstr ""
msgid "Complete report now"
msgstr ""
-#: templates/around.html:43
+#: templates/around.html:48
msgid "Confirm Location"
msgstr ""
@@ -164,7 +164,7 @@ msgid ""
"street name and area, or a postcode."
msgstr ""
-#: templates/around.html:37
+#: templates/around.html:42
msgid "New Report Here"
msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
msgid "Report Created"
msgstr ""
-#: templates/around.html:40
+#: templates/around.html:45
msgid "Reposition Report Here"
msgstr ""
@@ -342,6 +342,10 @@ msgstr ""
msgid "Take a new photo"
msgstr ""
+#: templates/around.html:32
+msgid "Test version. Reports will not be sent to the council."
+msgstr ""
+
#: templates/sent.html:13
msgid "Thanks. Your report will be sent to the authorities immediately."
msgstr ""
diff --git a/src/css/fms.css b/src/css/fms.css
index f1d5179..afc7ba6 100644
--- a/src/css/fms.css
+++ b/src/css/fms.css
@@ -635,6 +635,22 @@
background-image: url(images/icons-36-black.png);
}
}
+
+ div.testing {
+ position: absolute;
+ left: 0px;
+ right: 0px;
+ top: 40px;
+ width: 100%;
+ padding: 3px;
+ text-align: center;
+ font-size: 12px;
+ background-color: red;
+ color: white;
+ font-weight: bold;
+ text-shadow: none;
+ margin-bottom: 5px;
+ }
/* drafts screen */
#drafts {
diff --git a/src/js/app.js b/src/js/app.js
index 660f689..43218c1 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -51,6 +51,7 @@ var tpl = {
isAndroid: false,
iPhoneModel: 0,
uploadTimeout: CONFIG.UPLOAD_TIMEOUT || 120000,
+ testing: 0,
currentDraft: new FMS.Draft(),
allDrafts: new FMS.Drafts(),
@@ -241,6 +242,10 @@ var tpl = {
FMS.usedBefore = 1;
}
+ if ( CONFIG.TESTING ) {
+ FMS.testing = 1;
+ }
+
document.addEventListener('pause', function() { FMS.locator.stopTracking(); FMS.saveCurrentDraft(); }, false);
document.addEventListener('resume', onResume, false);
document.addEventListener('backbutton', function(e) { FMS.router.back(e); }, true);
diff --git a/src/templates/en/around.html b/src/templates/en/around.html
index 39c513d..f172dac 100644
--- a/src/templates/en/around.html
+++ b/src/templates/en/around.html
@@ -27,6 +27,11 @@
<div class="frontpage-menu">
<form class="inputcard" name="postcodeForm" id="postcodeForm">
<input type="search" id="pc" name="pc" placeholder="Search or scroll the map">
+ <% if ( FMS.testing ) { %>
+ <div class="testing">
+ Test version. Reports will not be sent to the council.
+ </div>
+ <% } %>
</form>
<a data-role="none" id="relocate" class="nodisplay"></a>
diff --git a/templates/around.html b/templates/around.html
index 395857d..38a2f7a 100644
--- a/templates/around.html
+++ b/templates/around.html
@@ -27,6 +27,11 @@
<div class="frontpage-menu">
<form class="inputcard" name="postcodeForm" id="postcodeForm">
<input type="search" id="pc" name="pc" placeholder="[% loc('Search or scroll the map') %]">
+ <% if ( FMS.testing ) { %>
+ <div class="testing">
+ [% loc('Test version. Reports will not be sent to the council.') %]
+ </div>
+ <% } %>
</form>
<a data-role="none" id="relocate" class="nodisplay"></a>