From 6ac9bbdf2cc96b0ac5c45cd62616bf6e2392e36f Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Sat, 6 Aug 2011 08:27:40 +0000
Subject: [PATCH] Fixed placement of button on Google-Markers.  Fixed
 navigation menu title within hyperlink.

svn: r17993
---
 src/plugins/webreport/NarrativeWeb.py       | 19 +++++++++----------
 src/plugins/webstuff/css/narrative-maps.css | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index e1ee77e67..db5e20e24 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -1277,10 +1277,9 @@ class BasePage(object):
                     cs = True 
 
             cs = 'class = "CurrentSection"' if cs else ""
-            ul += (Html("li", attr = cs, inline = True) +
-                   Html("a", nav_text, href = url, title = _("Main Navigation Item %s") % nav_text)
-                  )
-
+            ul += Html("li", attr = cs, inline = True) + (
+                   Html("a", nav_text, href =url, title =nav_text)
+            )
         navigation += ul
 
         # return navigation menu bar to its caller
@@ -4196,7 +4195,12 @@ class IndividualPage(BasePage):
                          "events and their places.  The list has been sorted in chronological "
                          "date order(if any?), and then by latitude/ longitude.  Clicking on the "
                         "place&#8217;s name in the References will take you to that place&#8217;s page.")
-            mapbackground += Html("p", msg, id = "description")     
+            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:
@@ -4261,11 +4265,6 @@ class IndividualPage(BasePage):
     map.addControl(controls['selector']);
     controls['selector'].activate();"""
 
-            # 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_
-
             with Html("div", class_ ="subsection", id ="references") as section:
                 mapbackground += section
                 section += Html("h4", _("References"), inline =True) 
diff --git a/src/plugins/webstuff/css/narrative-maps.css b/src/plugins/webstuff/css/narrative-maps.css
index e4910fc6a..05fb394a3 100644
--- a/src/plugins/webstuff/css/narrative-maps.css
+++ b/src/plugins/webstuff/css/narrative-maps.css
@@ -22,7 +22,15 @@
 # $Id$
 #
 #
-    geo-info Bubble
+    Family Map body element
+------------------------------------------------- */
+body#FamilyMap {
+    margin-left: 2px;
+    margin-right: 2px;
+    background-color: #FFF;
+}
+
+/*    geo-info Bubble
 ------------------------------------------------- */
 div#geo-info {
     font: bold 11px sans-serif;
@@ -31,10 +39,10 @@ div#geo-info {
 /*  map_canvas-- place map holder
 ------------------------------------------------- */
 div#map_canvas {
-    margin: 10px;
+    margin: 5px;
     border: solid 4px #00029D;
-    width: 1000px;
-    height: 600px;
+    width: 1200px;
+    height: 800px;
 }
 
 /*  button