diff --git a/src/plugins/lib/libhtmlconst.py b/src/plugins/lib/libhtmlconst.py
index 01c7809a5..2f23edefe 100644
--- a/src/plugins/lib/libhtmlconst.py
+++ b/src/plugins/lib/libhtmlconst.py
@@ -123,7 +123,7 @@ _COPY_OPTIONS = [
openstreet_jsc = """
OpenLayers.Lang.setCode("%s");
- map = new OpenLayers.Map("map_canvas");
+ map = new OpenLayers.Map("place_canvas");
var osm = new OpenLayers.Layer.OSM()
map.addLayer(osm);
@@ -155,7 +155,7 @@ function initialize() {
mapTypeId: google.maps.MapTypeId.ROADMAP,
center: myLatlng
};
- var map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
+ var map = new google.maps.Map(document.getElementById("place_canvas"), mapOptions);
var marker = new google.maps.Marker({
map: map,
diff --git a/src/plugins/webstuff/css/Web_Basic-Blue.css b/src/plugins/webstuff/css/Web_Basic-Blue.css
index bddd1f63b..c9c5532a6 100644
--- a/src/plugins/webstuff/css/Web_Basic-Blue.css
+++ b/src/plugins/webstuff/css/Web_Basic-Blue.css
@@ -55,6 +55,13 @@ body {
/* General Elements
================================================= */
+button#FamilyMap, button#Next, button#Prev {
+ background-color: purple;
+ color: #FFF;
+ font: bold .8em sans-serif;
+ padding: 10px;
+ border: solid 2px #00029D;
+}
div {
margin: 0;
padding: 0;
diff --git a/src/plugins/webstuff/css/narrative-maps.css b/src/plugins/webstuff/css/narrative-maps.css
index 92f8d9eec..46af927fc 100644
--- a/src/plugins/webstuff/css/narrative-maps.css
+++ b/src/plugins/webstuff/css/narrative-maps.css
@@ -23,23 +23,34 @@
###################################################### */
body#FamilyMap {
background-color: #000;
- margin-left: 7px;
- margin-right: 7px;
- width: 965px;
-}
-div#map_canvas {
- margin-left: 10px;
- margin-right: 10px;
- border: solid 4px #000;
- width: 931px;
- height: 800px;
+ padding: 0 14px;
+ width: 965px;
}
button#drop {
background-color: purple;
- color: #FFF;
- font: bold .8em sans-serif;
- padding: 10px;
- margin-top: 10px;
- margin-left: 10px;
- border: solid 4px #00029D;
+ color: #FFF;
+ font: bold .8em sans-serif;
+ padding: 10px;
+ margin-top: 10px;
+ margin-left: 10px;
+ border: solid 4px #00029D;
+}
+
+/* Family Maps
+------------------------------------------------------ */
+div#map_canvas {
+ margin-left: 10px;
+ margin-right: 10px;
+ border: solid 4px #000;
+ width: 931px;
+ height: 800px;
+}
+
+/* Place Maps
+------------------------------------------------------ */
+div#place_canvas {
+ margin-left: 210px;
+ border: solid 4px #000;
+ width: 500px;
+ height: 400px;
}
diff --git a/src/plugins/webstuff/images/Makefile.am b/src/plugins/webstuff/images/Makefile.am
index 0f90f1b71..839d52eaf 100644
--- a/src/plugins/webstuff/images/Makefile.am
+++ b/src/plugins/webstuff/images/Makefile.am
@@ -4,6 +4,9 @@
# If not using GNU make, then list all .py files individually
DATAFILES = \
+ blue_marker.jpg \
+ purple_marker.jpg \
+ red_marker.jpg \
blank.gif \
crosshairs.png \
document.png \
diff --git a/src/plugins/webstuff/images/blue_marker.png b/src/plugins/webstuff/images/blue_marker.png
new file mode 100644
index 000000000..57c8097aa
Binary files /dev/null and b/src/plugins/webstuff/images/blue_marker.png differ
diff --git a/src/plugins/webstuff/images/purple_marker.png b/src/plugins/webstuff/images/purple_marker.png
new file mode 100644
index 000000000..9f27f12b6
Binary files /dev/null and b/src/plugins/webstuff/images/purple_marker.png differ
diff --git a/src/plugins/webstuff/images/red_marker.png b/src/plugins/webstuff/images/red_marker.png
new file mode 100644
index 000000000..f9dfd63e6
Binary files /dev/null and b/src/plugins/webstuff/images/red_marker.png differ
diff --git a/src/plugins/webstuff/webstuff.py b/src/plugins/webstuff/webstuff.py
index 5ddc04bdc..f7dae609c 100644
--- a/src/plugins/webstuff/webstuff.py
+++ b/src/plugins/webstuff/webstuff.py
@@ -96,9 +96,6 @@ def load_on_reg(dbstate, uistate, plugin):
["Visually Impaired", 1, _("Visually Impaired"),
path_css('Web_Visually.css'), "narrative-menus.css", [], [] ],
- # no style sheet option
- ["No style sheet",1, _("No style sheet"), [], None, [], [] ],
-
# ancestor tree style sheet and its images
["ancestortree", 0, "ancestortree",
path_css("ancestortree.css"), None,
@@ -137,12 +134,10 @@ def load_on_reg(dbstate, uistate, plugin):
path_img("gramps-geo-birth.png"),
path_img("gramps-geo-death.png"),
path_img("gramps-geo-mainmap.png"),
- path_img("gramps-geo-marriage.png")],
+ path_img("gramps-geo-marriage.png")], [] ],
- [path_js("mapstraction", "mxn.core.js"),
- path_js("mapstraction", "mxn.googlev3.core.js"),
- path_js("mapstraction", "mxn.js"),
- path_js("mapstraction", "mxn.openlayers.core.js")]],
+ # no style sheet option
+ ["No style sheet",1, _("No style sheet"), [], None, [], [] ],
# all other images for use in NarrativeWeb
['All Images', 0, 'All Images', None, None,
@@ -161,17 +156,11 @@ def load_on_reg(dbstate, uistate, plugin):
['Document', 0, 'Document',
path_img("document.png"), None, [], []],
- # Google core javascript
- ["Google Core", 0, "Google Core",
- path_js("mapstraction", "mxn.google.core.js"), None, [], []],
-
- # Google Earth core javascript
- ["Google Earth", 0, "Google Earth",
- path_js("mapstraction", "mxn.googleearth.core.js"), None, [], []],
-
- # Google GeoCoder javascript
- ["Google GeoCoder", 0, "Google GeoCoder",
- path_js("mapstraction", "mxn.google.geocoder.js"), None, [], []],
+ # markers for use in NarrativeWeb's Family Maps
+ ["FamilyMaps", 0, "", [], None,
+ [path_img("blue_marker.png"),
+ path_img("purple_marker.png"),
+ path_img("red_marker.png")], [] ],
]