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

Moved Contact out to the main line Drop down menu. Clean up of the web page output.

Browse Source 
svn: r18772
This commit is contained in:
Rob G. Healey 2012-01-26 09:09:36 +00:00
parent d1fd5c1d94
commit f09cdee321
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1695,11 +1695,9 @@ class BasePage(object):
_create_media_link = False _create_media_link = False
welcome = [ welcome = [
(self.report.index_fname, _("Html | Home"), self.report.use_home), (self.report.index_fname, _("Html |Home"), self.report.use_home),
(self.report.intro_fname, _("Introduction"), self.report.use_intro) (self.report.intro_fname, _("Introduction"), self.report.use_intro)
] ]
# Remove menu sections if they are not being created?
welcome = ((url_text, nav_text) for url_text, nav_text, cond in welcome if cond) welcome = ((url_text, nav_text) for url_text, nav_text, cond in welcome if cond)
welcome = [[url, text] for url, text in welcome] welcome = [[url, text] for url, text in welcome]
@ -1708,8 +1706,6 @@ class BasePage(object):
(self.report.surname_fname, _("Surnames"), True), (self.report.surname_fname, _("Surnames"), True),
("families", _("Families"), self.report.inc_families) ("families", _("Families"), self.report.inc_families)
] ]
# Remove menu sections if they are not being created?
personal = ((url_text, nav_text) for url_text, nav_text, cond in personal if cond) personal = ((url_text, nav_text) for url_text, nav_text, cond in personal if cond)
personal = [[url, text] for url, text in personal] personal = [[url, text] for url, text in personal]
@ -1719,8 +1715,6 @@ class BasePage(object):
("sources", _("Sources"), True), ("sources", _("Sources"), True),
("repositories", _("Repositories"), inc_repos) ("repositories", _("Repositories"), inc_repos)
] ]
# Remove menu sections if they are not being created?
navs1 = ((url_text, nav_text) for url_text, nav_text, cond in navs1 if cond) navs1 = ((url_text, nav_text) for url_text, nav_text, cond in navs1 if cond)
navs1 = [[url, text] for url, text in navs1] navs1 = [[url, text] for url, text in navs1]
@ -1728,21 +1722,22 @@ class BasePage(object):
("media", _("Media"), _create_media_link), ("media", _("Media"), _create_media_link),
("thumbnails", _("Thumbnails"), True) ("thumbnails", _("Thumbnails"), True)
] ]
# Remove menu sections if they are not being created?
media = ((url_text, nav_text) for url_text, nav_text, cond in media if cond) media = ((url_text, nav_text) for url_text, nav_text, cond in media if cond)
media = [[url, text] for url, text in media] media = [[url, text] for url, text in media]
misc = [ misc = [
('download', _("Download"), self.report.inc_download), ('download', _("Download"), self.report.inc_download),
("addressbook", _("Address Book"), self.report.inc_addressbook), ("addressbook", _("Address Book"), self.report.inc_addressbook)
('contact', _("Contact"), self.report.use_contact)
] ]
# Remove menu sections if they are not being created?
misc = ((url_text, nav_text) for url_text, nav_text, cond in misc if cond) misc = ((url_text, nav_text) for url_text, nav_text, cond in misc if cond)
misc = [[url, text] for url, text in misc] misc = [[url, text] for url, text in misc]
contact = [
('contact', _("Contact"), self.report.use_contact)
]
contact = ((url_text, nav_text) for url_text, nav_text, cond in contact if cond)
contact = [[url, text] for url, text in contact]
# begin navigation menu division... # begin navigation menu division...
with Html("div", class_ = "wrapper", id = "nav", role = "navigation") as navigation: with Html("div", class_ = "wrapper", id = "nav", role = "navigation") as navigation:
with Html("div", class_ = "container") as container: with Html("div", class_ = "container") as container:
@ -1756,7 +1751,7 @@ class BasePage(object):
unordered1 = Html("ul") unordered1 = Html("ul")
for url_fname, nav_text in welcome: for url_fname, nav_text in welcome:
unordered1.extend( unordered1.extend(
Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text)) Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text), inline = True)
) )
list += unordered1 list += unordered1
unordered += list unordered += list
@ -1769,7 +1764,7 @@ class BasePage(object):
unordered1 = Html("ul") unordered1 = Html("ul")
for url_fname, nav_text in personal: for url_fname, nav_text in personal:
unordered1.extend( unordered1.extend(
Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text)) Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text), inline = True)
) )
list += unordered1 list += unordered1
unordered += list unordered += list
@ -1777,19 +1772,18 @@ class BasePage(object):
if len(navs1): if len(navs1):
for url_fname, nav_text in navs1: for url_fname, nav_text in navs1:
unordered.extend( unordered.extend(
Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text)) Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text), inline = True)
) )
if len(media): if len(media):
list = Html("li") + ( list = Html("li") + (
Html("a", _("Media | Gallery"), href = "#", title = _("Media | Gallery"), inline = True) Html("a", _("Media |Gallery"), href = "#", title = _("Media | Gallery"), inline = True)
) )
unordered1 = Html("ul") unordered1 = Html("ul")
for url_fname, nav_text in media: for url_fname, nav_text in media:
unordered1.extend( unordered1.extend(
Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text)) Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text), inline = True)
) )
list += unordered1 list += unordered1
unordered += list unordered += list
@ -1802,13 +1796,17 @@ class BasePage(object):
unordered1 = Html("ul") unordered1 = Html("ul")
for url_fname, nav_text in misc: for url_fname, nav_text in misc:
unordered1.extend( unordered1.extend(
Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text)) Html("li", self.get_nav_menu_hyperlink(url_fname, nav_text), inline = True)
) )
list += unordered1 list += unordered1
unordered += list unordered += list
if len(contact):
unordered.extend(
Html("li", self.get_nav_menu_hyperlink("contact", _("Contact")), inline = True)
)
container += unordered container += unordered
navigation += container navigation += container
return navigation return navigation
def add_image(self, option_name, height = 0): def add_image(self, option_name, height = 0):

2
src/plugins/webstuff/css/Web_DropDown-Menus.css
View File

@ -28,7 +28,7 @@ Style Name: Fade-Menus Style Sheet
Body Element Body Element
------------------------------------------------------ */ ------------------------------------------------------ */
body { body {
background-color: #00029D; background-color: #FFF;
color: #00029D; color: #00029D;
width: 100%; width: 100%;
} }