diff options
author | Zarino Zappia <mail@zarino.co.uk> | 2015-03-25 16:31:55 +0000 |
---|---|---|
committer | Dave Arter <davea@mysociety.org> | 2015-10-06 09:09:25 +0100 |
commit | 319b49f0206fda26d7cf0fdc71eed6c4195594ae (patch) | |
tree | 79d2d7c3fe1359e4c323b9f5fe20d2b8c2d4c61b /web | |
parent | da3229b5508c7f037eec594648e9062b2a872ec9 (diff) |
[Zurich] Add maps to Zurich admin report print view
- Includes a small map at the top of the first page and a second
full-width map on a separate page.
- upgrades tiles to the new 512px ones already used by JS
as implemented in https://github.com/mysociety/FixMyStreet-Commercial/issues/668
- Uses jQuery to clone a copy of the "noscript" map elsewhere into
the DOM, because the original is too far from where we need it.
- extracts maps/openlayers.html to call maps/noscript_map.html
- specialises the Zurich version to allow a richer structure to be
returned, including arbitrary sized map
- Map::Zurich now returns nearly arbitrary sized map tiles
- second larger map is prepared (only for admin/report_edit)
See mysociety/FixMyStreet-Commercial#677
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/zurich/base.scss | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss index b9c4f1134..9b3543116 100644 --- a/web/cobrands/zurich/base.scss +++ b/web/cobrands/zurich/base.scss @@ -247,6 +247,29 @@ h4.static-with-rule { border-radius: 0; } +.square-map__outer { + width: 100%; + height: 0; + padding-bottom: 100%; // 100% of parent WIDTH!! Makes a square element. + position: relative; +} + +.square-map__inner { + position: absolute; // Parent must keep its 0 height, so we need to create a new container for tiles. + top: 0; + left: 0; + right: 0; + bottom: 0; + + #drag .square-map__tile { + position: static; // override position:absolute + } +} + +#map_box { + top: 6em; // the default, 3em, overlaps the header +} + @media screen { dd.screen-no-space-after { margin-bottom: 0; @@ -263,18 +286,23 @@ h4.static-with-rule { .mappage.admin { .container { - padding: 0; + padding: 0; + position: relative; } .content { - overflow: auto; - font-size: 0.8em; - background: transparent url(/cobrands/zurich/admin-print-columns.gif) top center repeat-y; - min-height: 0 !important; // override hard-coded inline min-height style + overflow: auto; + font-size: 0.8em; + background: transparent url(/cobrands/zurich/admin-print-columns.gif) top center repeat-y; + min-height: 0 !important; // override hard-coded inline min-height style + + form { + @include clearfix; // because .admin-report-edit children are floated + } } #map_box { - display: none; // I am out of ideas for this element, so let's hide it for now + display: none; // Zurich has its own clone of the map, inside admin-report-edit--interact } } @@ -309,7 +337,17 @@ h4.static-with-rule { float: right; } + .map_clone { + -webkit-transform: none; + -ms-transform: none; + transform: none; + } + dd.print-no-space-after { margin-bottom: 0; } + + #print_report_map { + page-break-before: always; + } } |