aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--locale/FixMyStreetMobileApp.po18
-rw-r--r--locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po18
-rw-r--r--src/css/fms.css2
-rw-r--r--src/js/views/around.js20
-rw-r--r--src/templates/en/around.html3
-rw-r--r--templates/around.html3
6 files changed, 45 insertions, 19 deletions
diff --git a/locale/FixMyStreetMobileApp.po b/locale/FixMyStreetMobileApp.po
index 38ae830..11900db 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-09-17 17:25+0100\n"
+"POT-Creation-Date: 2013-09-18 18:01+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:47
+#: templates/around.html:50
msgid "Confirm Location"
msgstr ""
@@ -193,7 +193,7 @@ msgstr ""
msgid "Oh dear - we can't detect an internet connection. However you can still start a report now and complete it later, by going to 'drafts' when you're back online."
msgstr ""
-#: templates/submit_confirm.html:23 templates/submit_name.html:26
+#: templates/submit_confirm.html:21 templates/submit_name.html:26
msgid "Optionally enter your phone number"
msgstr ""
@@ -249,7 +249,7 @@ msgstr ""
msgid "Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box below"
msgstr ""
-#: templates/strings.js:8 templates/submit_confirm.html:20 templates/submit_name.html:23
+#: templates/strings.js:8 templates/submit_confirm.html:18 templates/submit_name.html:23
msgid "Please enter your name"
msgstr ""
@@ -277,7 +277,7 @@ msgstr ""
msgid "Remove Photo"
msgstr ""
-#: templates/submit_confirm.html:31 templates/submit_password.html:15
+#: templates/submit_confirm.html:29 templates/submit_password.html:15
msgid "Report"
msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
msgid "Report Created"
msgstr ""
-#: templates/around.html:44
+#: templates/around.html:47
msgid "Reposition Report Here"
msgstr ""
@@ -309,7 +309,11 @@ msgstr ""
msgid "Send confirmation email"
msgstr ""
-#: templates/submit_confirm.html:27 templates/submit_name.html:31 templates/submit_password.html:33
+#: templates/around.html:44
+msgid "Set Report Location"
+msgstr ""
+
+#: templates/submit_confirm.html:25 templates/submit_name.html:31 templates/submit_password.html:33
msgid "Show my name publicly"
msgstr ""
diff --git a/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po b/locale/en_GB.UTF-8/LC_MESSAGES/FixMyStreetMobileApp.po
index 8570110..0825560 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-09-17 17:25+0100\n"
+"POT-Creation-Date: 2013-09-18 18:01+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:47
+#: templates/around.html:50
msgid "Confirm Location"
msgstr ""
@@ -208,7 +208,7 @@ msgid ""
"back online."
msgstr ""
-#: templates/submit_confirm.html:23 templates/submit_name.html:26
+#: templates/submit_confirm.html:21 templates/submit_name.html:26
msgid "Optionally enter your phone number"
msgstr ""
@@ -268,7 +268,7 @@ msgid ""
"wish your name to be shown on the site, untick the box below"
msgstr ""
-#: templates/strings.js:8 templates/submit_confirm.html:20
+#: templates/strings.js:8 templates/submit_confirm.html:18
#: templates/submit_name.html:23
msgid "Please enter your name"
msgstr ""
@@ -297,7 +297,7 @@ msgstr ""
msgid "Remove Photo"
msgstr ""
-#: templates/submit_confirm.html:31 templates/submit_password.html:15
+#: templates/submit_confirm.html:29 templates/submit_password.html:15
msgid "Report"
msgstr ""
@@ -305,7 +305,7 @@ msgstr ""
msgid "Report Created"
msgstr ""
-#: templates/around.html:44
+#: templates/around.html:47
msgid "Reposition Report Here"
msgstr ""
@@ -329,7 +329,11 @@ msgstr ""
msgid "Send confirmation email"
msgstr ""
-#: templates/submit_confirm.html:27 templates/submit_name.html:31
+#: templates/around.html:44
+msgid "Set Report Location"
+msgstr ""
+
+#: templates/submit_confirm.html:25 templates/submit_name.html:31
#: templates/submit_password.html:33
msgid "Show my name publicly"
msgstr ""
diff --git a/src/css/fms.css b/src/css/fms.css
index 7131bad..d8d4563 100644
--- a/src/css/fms.css
+++ b/src/css/fms.css
@@ -548,11 +548,13 @@
#reposition,
#view-my-reports,
#login-options,
+ #locate-here,
#mark-here {
display: block;
z-index: 3000;
}
+ #locate-here .ui-btn-text,
#mark-here .ui-btn-text{
font-size:1.2em;
padding: 0.5em 0;
diff --git a/src/js/views/around.js b/src/js/views/around.js
index 0ac3b8b..fff6908 100644
--- a/src/js/views/around.js
+++ b/src/js/views/around.js
@@ -18,6 +18,7 @@
'vclick #cancel': 'onClickCancel',
'vclick #confirm-map': 'onClickReport',
'vclick #mark-here': 'onClickMark',
+ 'vclick #locate-here': 'onClickMark',
'vclick #reposition': 'onClickReposition',
'vclick a.address': 'goAddress',
'submit #postcodeForm': 'search'
@@ -208,6 +209,7 @@
$('#view-my-reports').hide();
$('#login-options').hide();
$('#mark-here').hide();
+ $('#locate-here').hide();
$('#postcodeForm').hide();
if ( fixmystreet.map ) {
fixmystreet.markers.setVisibility(false);
@@ -215,11 +217,19 @@
fixmystreet.bbox_strategy.deactivate();
}
} else {
- $('#cancel').hide().removeClass('ui-btn-left');
+ if ( FMS.currentDraft.isPartial() ) {
+ $('#cancel').addClass('ui-btn-left').show();
+ $('#view-my-reports').hide();
+ $('#login-options').hide();
+ $('#locate-here').show();
+ } else {
+ $('#cancel').hide().removeClass('ui-btn-left');
+ $('#view-my-reports').show();
+ $('#login-options').show();
+ $('#mark-here').show();
+ $('#locate-here').hide();
+ }
$('#confirm-map').hide();
- $('#view-my-reports').show();
- $('#login-options').show();
- $('#mark-here').show();
$('#postcodeForm').show();
$('#reposition').hide();
if ( fixmystreet.map ) {
@@ -257,7 +267,6 @@
fixmystreet_activate_drag();
// force pins to be refetched and displayed
fixmystreet.bbox_strategy.update({force: true});
- this.displayButtons(false);
if ( this.model.isPartial() ) {
FMS.clearCurrentDraft();
} else {
@@ -271,6 +280,7 @@
this.model.set('lat', null);
this.model.set('lon', null);
}
+ this.displayButtons(false);
},
decrementDraftCount: function() {
diff --git a/src/templates/en/around.html b/src/templates/en/around.html
index bf37f2e..47bc329 100644
--- a/src/templates/en/around.html
+++ b/src/templates/en/around.html
@@ -40,6 +40,9 @@
<a id="mark-here" data-role="button" data-theme="a" class="map-bottom-btn">
New Report Here
</a>
+ <a id="locate-here" data-role="button" data-theme="a" class="map-bottom-btn">
+ Set Report Location
+ </a>
<a id="reposition" data-role="button" data-theme="c" class="map-bottom-btn nodisplay">
Reposition Report Here
</a>
diff --git a/templates/around.html b/templates/around.html
index a1db2f0..6fb6ca9 100644
--- a/templates/around.html
+++ b/templates/around.html
@@ -40,6 +40,9 @@
<a id="mark-here" data-role="button" data-theme="a" class="map-bottom-btn">
[% loc('New Report Here') %]
</a>
+ <a id="locate-here" data-role="button" data-theme="a" class="map-bottom-btn">
+ [% loc('Set Report Location') %]
+ </a>
<a id="reposition" data-role="button" data-theme="c" class="map-bottom-btn nodisplay">
[% loc('Reposition Report Here') %]
</a>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 15:08:29 +0000