Merge branch 'zurich'

Conflicts:
	locale/FixMyStreet.po
	locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
	locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
	locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
	locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po

3 files changed, 11 insertions, 3 deletions

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index d9360d0e2..b490c6177 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -61,7 +61,7 @@ $(function(){
     } else if (window.location.href.indexOf('oxfordshire') != -1) {
         cobrand = 'oxfordshire';
         is_small_map = true;
-    } else if (window.location.href.indexOf('zurich') != -1) {
+    } else if (window.location.href.indexOf('zurich') != -1 || window.location.href.indexOf('zueri') != -1) {
         cobrand = 'zurich';
     }
 
diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss
index c3246a1b1..a89aec2fd 100644
--- a/web/cobrands/zurich/base.scss
+++ b/web/cobrands/zurich/base.scss
@@ -40,6 +40,14 @@
         &:before {
             display: none;
         }
+        &#closed {
+            color: #1a1a1a;
+            background: #e25436;
+        }
+        &#progress {
+            color: #1a1a1a;
+            background: #f3d74b;
+        }
     }
 }
 
diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js
index 9fed68b8a..cfff686e6 100644
--- a/web/js/map-wmts-zurich.js
+++ b/web/js/map-wmts-zurich.js
@@ -93,7 +93,7 @@ $(function(){
         layer: "Hybrid",
         matrixSet: "nativeTileMatrixSet",
         requestEncoding: "REST",
-        url: "http://www.wmts.stadt-zuerich.ch/Hybrid/MapServer/WMTS/tile/",
+        url: "/maps/Hybrid/",
         style: "default",
         matrixIds: [
             //{ identifier: "0", matrixHeight: 2, matrixWidth: 2, scaleDenominator: 250000,  supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } },
@@ -112,7 +112,7 @@ $(function(){
         layer_options, OpenLayers.Util.applyDefaults({
             name: "Stadtplan",
             layer: "Stadtplan",
-            url:  "http://www.wmts.stadt-zuerich.ch/Stadtplan/MapServer/WMTS/tile/"
+            url:  "/maps/Stadtplan/"
         }, layer_options)
     ];