Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed placement of button on Google-Markers. Fixed navigation menu title within hyperlink.

Browse Source 
svn: r17993
This commit is contained in:
Rob G. Healey 2011-08-06 08:27:40 +00:00
parent 4027c75d52
commit 6ac9bbdf2c
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/webreport/NarrativeWeb.py
View File

@ -1277,10 +1277,9 @@ class BasePage(object):
cs = True cs = True
cs = 'class = "CurrentSection"' if cs else "" cs = 'class = "CurrentSection"' if cs else ""
ul += (Html("li", attr = cs, inline = True) + ul += Html("li", attr = cs, inline = True) + (
Html("a", nav_text, href = url, title = _("Main Navigation Item %s") % nav_text) Html("a", nav_text, href =url, title =nav_text)
) )
navigation += ul navigation += ul
# return navigation menu bar to its caller # return navigation menu bar to its caller
@ -4198,6 +4197,11 @@ class IndividualPage(BasePage):
"place’s name in the References will take you to that place’s page.") "place’s name in the References will take you to that place’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 # here is where the map is held in the CSS/ Page
with Html("div", id ="map_canvas", inline =True) as canvas: with Html("div", id ="map_canvas", inline =True) as canvas:
mapbackground += canvas mapbackground += canvas
@ -4261,11 +4265,6 @@ class IndividualPage(BasePage):
map.addControl(controls['selector']); map.addControl(controls['selector']);
controls['selector'].activate();""" 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: with Html("div", class_ ="subsection", id ="references") as section:
mapbackground += section mapbackground += section
section += Html("h4", _("References"), inline =True) section += Html("h4", _("References"), inline =True)

16
src/plugins/webstuff/css/narrative-maps.css
View File

@ -22,7 +22,15 @@
# $Id$ # $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 { div#geo-info {
font: bold 11px sans-serif; font: bold 11px sans-serif;
@ -31,10 +39,10 @@ div#geo-info {
/* map_canvas-- place map holder /* map_canvas-- place map holder
------------------------------------------------- */ ------------------------------------------------- */
div#map_canvas { div#map_canvas {
margin: 10px; margin: 5px;
border: solid 4px #00029D; border: solid 4px #00029D;
width: 1000px; width: 1200px;
height: 600px; height: 800px;
} }
/* button /* button