From c6e6383466a019f05d440313608f41678287691b Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Sat, 26 Nov 2011 03:12:05 +0000 Subject: [PATCH] Moved location of 'Drop Markers' button to bottom of the map instead of top. svn: r18501 --- src/plugins/webreport/NarrativeWeb.py | 15 +++++++-------- src/plugins/webstuff/css/narrative-maps.css | 5 ++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index e5d165688..d7f47b7b7 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -4989,9 +4989,9 @@ class IndividualPage(BasePage): function initialize() { var mapOptions = { - scrollwheel: false, - scaleControl: false, - backgroundColor: '#FFFFFF', + scrollwheel: true, + scaleControl: true, + backgroundColor: '#000000', zoom: %d, center: centre, mapTypeId: google.maps.MapTypeId.ROADMAP @@ -5032,15 +5032,14 @@ class IndividualPage(BasePage): "take you to that page’s page.") mapbackground += Html("p", msg, id = "description") - # if Google and Markers are selected, then add "Drop Markers" button? - if (self.mapservice == "Google" and self.googleopts == "Markers"): - button_ = Html("button", _("Drop Markers"), id ="drop", onclick ="drop()", inline =True) - mapbackground += button_ - # here is where the map is held in the CSS/ Page with Html("div", id ="map_canvas", inline =True) as canvas: mapbackground += canvas + # if Google and Markers are selected, then add "Drop Markers" button? + if (self.mapservice == "Google" and self.googleopts == "Markers"): + mapbackground += Html("button", _("Drop Markers"), id ="drop", onclick ="drop()", inline =True) + if self.mapservice == "OpenStreetMap": with Html("script", type ="text/javascript") as jsc: mapbackground += jsc diff --git a/src/plugins/webstuff/css/narrative-maps.css b/src/plugins/webstuff/css/narrative-maps.css index 9daeece59..92f8d9eec 100644 --- a/src/plugins/webstuff/css/narrative-maps.css +++ b/src/plugins/webstuff/css/narrative-maps.css @@ -39,8 +39,7 @@ button#drop { color: #FFF; font: bold .8em sans-serif; padding: 10px; - margin-top: 0px; - margin-bottom: 10px; + margin-top: 10px; margin-left: 10px; - border: solid 2px green; + border: solid 4px #00029D; }