aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/emptyhomes/css.css18
-rw-r--r--web/cobrands/fixmystreet/_layout.scss53
-rw-r--r--web/cobrands/stevenage/layout.scss2
-rw-r--r--web/cobrands/zurich/_colours.scss9
-rw-r--r--web/cobrands/zurich/layout.scss44
-rw-r--r--web/js/map-OpenLayers.js16
-rw-r--r--web/js/map-OpenStreetMap.js4
-rw-r--r--web/js/map-bing-ol.js7
8 files changed, 88 insertions, 65 deletions
diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css.css
index 97d0e1192..da9afd104 100644
--- a/web/cobrands/emptyhomes/css.css
+++ b/web/cobrands/emptyhomes/css.css
@@ -168,8 +168,8 @@ a:hover, a:active {
clear: both;
font-size: 83%;
border-top: solid 2em #ffffff;
- background-color: #80AE7D;
- color: #FFFFFF;
+ background-color: #fe6500;
+ color: #000;
margin: 2em 0 1em 0;
padding: 20px;
overflow: auto;
@@ -185,20 +185,24 @@ a:hover, a:active {
}
#emptyhomes-footer a {
- color: #FFFFFF;
+ color: #000;
}
#mysociety #postcodeForm {
- background-color: #80AE7D;
+ background-color: #B1BECF;
color: #000000;
font-size: 130%;
}
#mysociety #front_stats div {
- background-color: #80AE7D;
+ vertical-align: middle;
+ background-color: #B1BECF;
+ color: #000000;
+ padding: 0.5em;
+ width: 7em;
+}
+#mysociety #front_stats div a {
color: #000000;
- /*padding: 0.5em 0; */
- width: 9em;
}
#mysociety #problem_form {
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 80ac35edc..07f944ffa 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -981,6 +981,59 @@ body.frontpage {
}
}
+// Admin tables
+
+$table_border_color: #ccc;
+$table_heading_bg_col: #595959;
+$table_heading_border_col: #7a7a7a;
+$table_heading_col: #fff;
+$table_heading_underline_col: #393939;
+$button_col: #fff;
+$button_bg_col: #a1a1a1; // also search bar (tables)
+
+.admin {
+ table {
+ width: 100%;
+ font-size: 0.9em;
+ border: 1px solid $table_border_color;
+ border-collapse: collapse;
+ margin-bottom: 1em;
+ th, td {
+ padding: 0.666em 0.5em;
+ border: 1px solid $table_border_color;
+ }
+ th {
+ color: white;
+ background-color: $table_heading_bg_col;
+ border-bottom: 2px solid $table_heading_underline_col;
+ border-left: 1px solid $table_heading_border_col;
+ border-right: 1px solid $table_heading_border_col;
+ a:link, a:visited {
+ color: white;
+ }
+ }
+ td.record-id {
+ text-align: center;
+ font-weight: bold;
+ }
+ tr.filter-row td {
+ display: none; /* TODO: reveal when filtering is implemented */
+ padding: 4px 4px 4px 40px;
+ background-color: $button_bg_col;
+ background-image: url('search-icon-white.png');
+ background-position: 14px center;
+ background-repeat: no-repeat;
+ border-bottom: 2px solid $table_border_color;
+ }
+ tr.filter-row td input[type=text] {
+ background-color: #e1e1e1;
+ width: 16em;
+ @include border-radius(4px);
+ border: none;
+ padding: 3px 0.5em;
+ }
+ }
+}
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index 542cffd96..a46c15875 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -1,5 +1,5 @@
@import "colours";
-@import "../fixmystreet/layout";
+@import "../fixmystreet/_layout";
// d523b431 - "Stevenage Home page styles"
// 2a23e09f - Moved menu on map page and reverted to full header.
diff --git a/web/cobrands/zurich/_colours.scss b/web/cobrands/zurich/_colours.scss
index 73fb36577..e2a2587f0 100644
--- a/web/cobrands/zurich/_colours.scss
+++ b/web/cobrands/zurich/_colours.scss
@@ -16,12 +16,3 @@ $col_fixed_label_dark: #4B8304;
$mobile_menu_tab_bg_col: #FFFFFF; // the white border and tab on mobile site
$mobile_header_blue: #366AB6; // close match to Zurich logo_portal.jpg
-// Zurich admin tables:
-
-$table_border_color: #ccc;
-$table_heading_bg_col: #595959;
-$table_heading_border_col: #7a7a7a;
-$table_heading_col: #fff;
-$table_heading_underline_col: #393939;
-$button_col: #fff;
-$button_bg_col: #a1a1a1; // also search bar (tables)
diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss
index 46ea45856..2b16636b9 100644
--- a/web/cobrands/zurich/layout.scss
+++ b/web/cobrands/zurich/layout.scss
@@ -1,5 +1,5 @@
@import "colours";
-@import "../fixmystreet/layout";
+@import "../fixmystreet/_layout";
@import "zurich";
// Things to override from parent stylesheet
@@ -286,48 +286,6 @@ body.mappage.admin .content {
#zurich-footer {
margin: 2em auto 3em auto;
}
-
- table {
- width: 100%;
- font-size: 0.9em;
- border: 1px solid $table_border_color;
- border-collapse: collapse;
- margin-bottom: 1em;
- th, td {
- padding: 0.666em 0.5em;
- border: 1px solid $table_border_color;
- }
- th {
- color: white;
- background-color: $table_heading_bg_col;
- border-bottom: 2px solid $table_heading_underline_col;
- border-left: 1px solid $table_heading_border_col;
- border-right: 1px solid $table_heading_border_col;
- a:link, a:visited {
- color: white;
- }
- }
- td.record-id {
- text-align: center;
- font-weight: bold;
- }
- tr.filter-row td {
- display: none; /* TODO: reveal when filtering is implemented */
- padding: 4px 4px 4px 40px;
- background-color: $button_bg_col;
- background-image: url('search-icon-white.png');
- background-position: 14px center;
- background-repeat: no-repeat;
- border-bottom: 2px solid $table_border_color;
- }
- tr.filter-row td input[type=text] {
- background-color: #e1e1e1;
- width: 16em;
- @include border-radius(4px);
- border: none;
- padding: 3px 0.5em;
- }
- }
}
.admin-nav-wrapper {
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index e28a4d982..62e94ed29 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -411,7 +411,7 @@ OpenLayers.Control.PanZoomFMS = OpenLayers.Class(OpenLayers.Control.PanZoom, {
/* Overriding Permalink so that it can pass the correct zoom to OSM */
OpenLayers.Control.PermalinkFMS = OpenLayers.Class(OpenLayers.Control.Permalink, {
- updateLink: function() {
+ _updateLink: function(alter_zoom) {
var separator = this.anchor ? '#' : '?';
var href = this.base;
if (href.indexOf(separator) != -1) {
@@ -430,7 +430,11 @@ OpenLayers.Control.PermalinkFMS = OpenLayers.Class(OpenLayers.Control.Permalink,
center = this.map.getLonLatFromViewPortPx(p);
}
- href += separator + OpenLayers.Util.getParameterString(this.createParams(center, this.map.getZoom()+fixmystreet.zoomOffset));
+ var zoom = this.map.getZoom();
+ if ( alter_zoom ) {
+ zoom += fixmystreet.zoomOffset;
+ }
+ href += separator + OpenLayers.Util.getParameterString(this.createParams(center, zoom));
// Could use mlat/mlon here as well if we are on a page with a marker
if (this.anchor && !this.element) {
window.location.href = href;
@@ -438,6 +442,14 @@ OpenLayers.Control.PermalinkFMS = OpenLayers.Class(OpenLayers.Control.Permalink,
else {
this.element.href = href;
}
+ },
+ updateLink: function() {
+ this._updateLink(0);
+ }
+});
+OpenLayers.Control.PermalinkFMSz = OpenLayers.Class(OpenLayers.Control.PermalinkFMS, {
+ updateLink: function() {
+ this._updateLink(1);
}
});
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 54bf95964..9b8916946 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -7,8 +7,8 @@ function set_map_config(perm) {
new OpenLayers.Control.ArgParser(),
//new OpenLayers.Control.LayerSwitcher(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.Permalink(permalink_id),
- new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'),
+ new OpenLayers.Control.PermalinkFMS(permalink_id),
+ new OpenLayers.Control.PermalinkFMSz('osm_link', 'http://www.openstreetmap.org/'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
}
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 6d86663f0..34ea255e8 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -16,9 +16,14 @@ function set_map_config(perm) {
new OpenLayers.Control.Attribution(),
new OpenLayers.Control.ArgParser(),
fixmystreet.nav_control,
- new OpenLayers.Control.Permalink(permalink_id),
+ new OpenLayers.Control.PermalinkFMS(permalink_id),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
+ /* Linking back to around from report page, keeping track of map moves */
+ if ( fixmystreet.page == 'report' ) {
+ fixmystreet.controls.push( new OpenLayers.Control.PermalinkFMS('key-tool-problems-nearby', '/around') );
+ }
+
if (fixmystreet.map_type) {
tile_base = fixmystreet.map_type;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 14:14:13 +0000