Fixed Navigation Menus. Updated stylesheets.

svn: r14559
This commit is contained in:
Rob G. Healey
2010-03-02 01:16:46 +00:00
parent 05bceeff35
commit d6e4126cea
4 changed files with 98 additions and 92 deletions

View File

@@ -948,19 +948,21 @@ class BasePage(object):
url4 = self.report.build_url_image("favicon.ico", "images", self.up)
# create stylesheet and favicon links
links = [Html("link", href = url4, type = "image/x-icon", rel = "shortcut icon"),
links = Html("link", href = url4, type = "image/x-icon", rel = "shortcut icon") + (
Html("link", href = url1, type = "text/css", media = "screen", rel = "stylesheet"),
Html("link", href = url2, type = "text/css", media = "screen", rel = "stylesheet"),
Html("link", href = url3, type = "text/css", media = 'print', rel = "stylesheet") ]
Html("link", href = url3, type = "text/css", media = 'print', rel = "stylesheet")
)
if self.report.css in ["Web_Basic-Blue.css", "Web_Visually.css"]:
# Link to Navigation Menus stylesheet
fname = "/".join(["styles", "Web_Navigation-Menus.css"])
url = self.report.build_url_fname(fname, None, self.up)
links += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet")
links.extend( Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet") )
# add additional meta and link tags
head += (meta, links)
head += meta
head += links
# alpha event pages do not need these things
if key is not _ALPHAEVENT:
@@ -1004,8 +1006,8 @@ class BasePage(object):
navs = [
(self.report.index_fname, _("Html|Home"), self.report.use_home),
(self.report.intro_fname, _("Introduction"), self.report.use_intro),
(self.report.surname_fname, _("Surnames"), True),
('individuals', _("Individuals"), True),
(self.report.surname_fname, _("Surnames"), True),
('places', _("Places"), True),
('events', _("Events"), self.report.inc_events),
('media', _("Media"), self.create_media),