Added markers for birth, death, and census marks in Family Maps. Changed division id for place page maps to distinguish the different maps. Other changes which affect new markers.
svn: r18522
This commit is contained in:
parent
d561e4bd61
commit
606bd5d59d
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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 \
|
||||
|
BIN
src/plugins/webstuff/images/blue_marker.png
Normal file
BIN
src/plugins/webstuff/images/blue_marker.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.3 KiB |
BIN
src/plugins/webstuff/images/purple_marker.png
Normal file
BIN
src/plugins/webstuff/images/purple_marker.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.9 KiB |
BIN
src/plugins/webstuff/images/red_marker.png
Normal file
BIN
src/plugins/webstuff/images/red_marker.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 33 KiB |
@ -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")], [] ],
|
||||
|
||||
]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user