6 files changed, 59 insertions, 8 deletions
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 1d0f88166..5805f5e16 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -30,7 +30,7 @@ var fixmystreet = {
 </script>
 <div id="map_box" aria-hidden="true">
     [% pre_map %]
-    <div id="map"><noscript>
+    <div id="map"><div class="noscript">
         <div id="drag"><[% map.img_type %]
             alt="NW map tile" id="t2.2"
             name="tile_[% map.x_tile - 1 %].[% map.y_tile - 1 %]"
@@ -50,7 +50,7 @@ var fixmystreet = {
             style="top:256px; left:256px;"></div>
         <div id="pins">[% FOR pin IN map.pins %][% INCLUDE pin %][% END %]</div>
         [% INCLUDE compass %]
-    </noscript></div>
+    </div></div>
     [% IF map.copyright %]
     <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div>
     [% END %]
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 5376d77f4..f8da9f211 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -17,9 +17,9 @@
     <input type="hidden" name="submit" value="1" >
 
 <ul class="no-bullets">
-<li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li>
+<li class="report-edit-action"><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li>
 
-<li><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=[% problem.local_coords.0 %]&Nord=[% problem.local_coords.1 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li>
+<li class="report-edit-action"><a href="http://webgis.intra.stzh.ch/AV_Online/Direct.asp?Map=AV&Search=Koord&West=[% problem.local_coords.0 %]&Nord=[% problem.local_coords.1 %]&B=300" target="_blank">Standort in AV-Online anzeigen</a></li>
 
 [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %]
     <li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %]
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 20d41b8bd..78ed678f6 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -14,7 +14,7 @@
 [% SET start = c.config.ADMIN_BASE_URL IF admin %]
 
         <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
-        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="screen and (min-width:48em)">
         [% extra_css %]
         <!--[if (lt IE 9) & (!IEMobile)]>
             <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 1a13972e4..7917c4a46 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1009,6 +1009,13 @@ input.final-submit {
   }
 }
 
+// The map's static image fallback is visible by default.
+// Hide it if javascript has loaded. (We show it again when
+// the page is printed.)
+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 {
@@ -1735,5 +1742,43 @@ table.nicetable {
 }
 
 
+@media print {
+  body {
+    padding: 3em;
+  }
+
+  #main-nav,
+  #nav-link,
+  .admin-nav,
+  .olControlAttribution,
+  .olControlPanZoom,
+  #sub_map_links,
+  #fms_pan_zoom,
+  .report-edit-action,
+  .olMapViewport {
+    display: none !important;
+  }
+
+  #map_box {
+    position: static !important;
+    height: 256px !important;
+    width: auto !important;
+    background: #f1eee9 !important; // cream colour to match OSM image
+  }
+
+  #map {
+    -webkit-transform: scale(0.5);
+    -ms-transform: scale(0.5);
+    transform: scale(0.5);
+    -webkit-transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    transform-origin: 0 0;
+  }
+
+  html.js #map .noscript {
+    display: block;
+  }
+}
+
 @import "_admin";
 @import "_fixedthead";
diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss
index 559d97a27..10eed0b11 100644
--- a/web/cobrands/zurich/base.scss
+++ b/web/cobrands/zurich/base.scss
@@ -178,3 +178,12 @@ h4.static-with-rule {
         }
     }
 }
+
+@media print {
+    #site-header .container {
+        position: relative;
+    }
+    #site-logo {
+        top: 0;
+    }
+}
diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss
index d22d753ca..d0b24b49c 100644
--- a/web/cobrands/zurich/layout.scss
+++ b/web/cobrands/zurich/layout.scss
@@ -111,9 +111,6 @@ body.mappage {
         padding-top: 18px;
         background: #fff url(logo_portal.x.jpg) top left repeat-x;
     }
-    #site-logo {
-        margin-left: 10px;
-    }
     .content {
       margin-top: 1em;
     }