4 files changed, 27 insertions, 22 deletions

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 68b12c323..48ae83103 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -684,6 +684,10 @@ $.extend(fixmystreet.set_up, {
       $originalInput.hide();
 
       $dropzone.insertAfter($originalInput);
+      var default_message = translation_strings.upload_default_message;
+      if ($("html").hasClass("mobile")) {
+        default_message = translation_strings.upload_default_message_mobile;
+      }
       var photodrop = new Dropzone($dropzone[0], {
         url: '/photo/upload',
         paramName: 'photo',
@@ -695,7 +699,7 @@ $.extend(fixmystreet.set_up, {
         resizeHeight: 2048,
         resizeQuality: 0.6,
         acceptedFiles: 'image/jpeg,image/pjpeg,image/gif,image/tiff,image/png',
-        dictDefaultMessage: translation_strings.upload_default_message,
+        dictDefaultMessage: default_message,
         dictCancelUploadConfirmation: translation_strings.upload_cancel_confirmation,
         dictInvalidFileType: translation_strings.upload_invalid_file_type,
         dictMaxFilesExceeded: translation_strings.upload_max_files_exceeded,
@@ -833,10 +837,8 @@ $.extend(fixmystreet.set_up, {
 
   map_controls: function() {
     //add links container (if its not there)
-    if (fixmystreet.cobrand != 'zurich') {
-        if ($('#sub_map_links').length === 0) {
-            $('<p class="sub-map-links" id="sub_map_links" />').insertAfter($('#map'));
-        }
+    if ($('#sub_map_links').length === 0) {
+        $('<p class="sub-map-links" id="sub_map_links" />').insertAfter($('#map'));
     }
 
     if ($('.mobile').length) {
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 6f1aba817..a9e0da128 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -810,7 +810,6 @@ ul.error {
     background-repeat: no-repeat;
     color: #333 !important;
     padding: 1em;
-    text-transform: uppercase;
     font-size: 0.6875em;
     font-family: $meta-font;
     font-weight: normal;
@@ -1699,15 +1698,18 @@ html.js #map .noscript {
   display: none;
 }
 
-// OpenLayers fix for navigation being top right
-// Left and right so that zoom can be left, pan right.
 #fms_pan_zoom {
-  top: 0.5em; // This will be overridden in JS if there's a full screen map with banner
-  #{$left}: 0.5em;
+  top: 0.5em;
   #{$right}: 0.5em;
 }
 
-// Openlayers map controls (overrides)
+#fms_pan_zoom_panup,
+#fms_pan_zoom_pandown,
+#fms_pan_zoom_panleft,
+#fms_pan_zoom_panright {
+    display: none;
+}
+
 #fms_pan_zoom_panup,
 #fms_pan_zoom_pandown,
 #fms_pan_zoom_panleft,
@@ -1755,13 +1757,13 @@ html.js #map .noscript {
 #fms_pan_zoom_zoomin {
   background-position: -84px 0;
   padding-top: 44px;
-  #{$left}: 0;
+  #{$right}: 0;
   top: 0;
 }
 #fms_pan_zoom_zoomout {
   background-position: -120px 100%;
   padding-top: 44px;
-  #{$left}: 0;
+  #{$right}: 0;
   top: 44px;
 }
 
@@ -2071,10 +2073,9 @@ img.pin {
   background-color: #333;
   border-radius: 0.25em;
   padding: 0.25em;
-  // Offset from top same as fms_pan_zoom, from left so as not
-  // to appear on top of zoom buttons (0.5em, 36px, 0.5em)
+  // Offset from top and left same as fms_pan_zoom
   top: 0.5em;
-  #{$left}: 3.25em;
+  #{$left}: 0.5em;
   .map-reporting & {
     // Same as fms_pan_zoom above, leaving space for the top bar when reporting
     top: 2.75em;
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 2d3592e77..fcbb193bc 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -553,6 +553,13 @@ body.authpage {
 #fms_pan_zoom_panup,
 #fms_pan_zoom_pandown,
 #fms_pan_zoom_panleft,
+#fms_pan_zoom_panright {
+    display: block;
+}
+
+#fms_pan_zoom_panup,
+#fms_pan_zoom_pandown,
+#fms_pan_zoom_panleft,
 #fms_pan_zoom_panright,
 #fms_pan_zoom_zoomin,
 #fms_pan_zoom_zoomout,
@@ -563,14 +570,12 @@ body.authpage {
   }
 }
 
-// push zoom back over to right
+// indent zoom to line up with pan
 #fms_pan_zoom_zoomin {
-  #{$left}: auto;
   #{$right}: 30px;
   top: 130px;
 }
 #fms_pan_zoom_zoomout {
-  #{$left}: auto;
   #{$right}: 30px;
   top: 174px;
 }
@@ -724,8 +729,6 @@ body.authpage {
   height: 64px;
   width: 64px;
   background-color: rgba(0, 0, 0, 0.7);
-  // Reset the base left, as zoom buttons now elsewhere
-  #{$left}: 0.5em;
 }
 
 .big-green-banner {
diff --git a/web/cobrands/tfl/js.js b/web/cobrands/tfl/js.js
index a217d3984..248162597 100644
--- a/web/cobrands/tfl/js.js
+++ b/web/cobrands/tfl/js.js
@@ -1,7 +1,6 @@
 (function(){
 
 translation_strings.name.validName = 'Please enter your full name, Transport for London needs this information – if you do not wish your name to be shown on the site, untick the box below';
-translation_strings.upload_default_message = 'Drag photo here to upload or <u>browse files</u>';
 translation_strings.incident_date = { date: 'Enter a date in the format dd/mm/yyyy' };
 translation_strings.time = 'Enter a time in the format hh:mm';