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

NarrativeWeb: changed the name of the navigation menus stylesheet to match other stylesheet naming.

Browse Source 
svn: r15708
This commit is contained in:
Rob G. Healey 2010-08-12 02:26:26 +00:00
parent 961c1e4ca9
commit 264d6145be
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gen/plug/report/_constants.py
View File

@ -67,7 +67,7 @@ CSS_FILES = [
# id, user selectable, translated_name, fullpath, navigation target name, additional files
# "default" is used as default
["Basic-Ash", 1, _("Basic-Ash"), os.path.join(const.DATA_DIR, 'Web_Basic-Ash.css'), None, []],
["Basic-Blue", 1, _("Basic-Blue"), os.path.join(const.DATA_DIR, 'Web_Basic-Blue.css'), "Web_Navigation-Menus.css", []],
["Basic-Blue", 1, _("Basic-Blue"), os.path.join(const.DATA_DIR, 'Web_Basic-Blue.css'), "navigation-menus.css", []],
["Basic-Cypress", 1, _("Basic-Cypress"), os.path.join(const.DATA_DIR, 'Web_Basic-Cypress.css'), None, []],
["Basic-Lilac", 1, _("Basic-Lilac"), os.path.join(const.DATA_DIR, 'Web_Basic-Lilac.css'), None, []],
["Basic-Peach", 1, _("Basic-Peach"), os.path.join(const.DATA_DIR, 'Web_Basic-Peach.css'), None, []],
@ -78,7 +78,7 @@ CSS_FILES = [
os.path.join(const.IMAGE_DIR, "Web_Mainz_Mid.png"),
os.path.join(const.IMAGE_DIR, "Web_Mainz_MidLight.png")]],
["Nebraska", 1, _("Nebraska"), os.path.join(const.DATA_DIR, 'Web_Nebraska.css'), None, []],
["Visually Impaired", 1, _("Visually Impaired"), os.path.join(const.DATA_DIR, 'Web_Visually.css'), "Web_Navigation-Menus.css", []],
["Visually Impaired", 1, _("Visually Impaired"), os.path.join(const.DATA_DIR, 'Web_Visually.css'), "navigation-menus.css", []],
["No style sheet",1, _("No style sheet"), '', None, []],
["behaviour", 0, "Behaviour", os.path.join(const.DATA_DIR, 'behaviour.css'), None, []],
["default", 0, _("Basic-Ash"), os.path.join(const.DATA_DIR, 'Web_Basic-Ash.css'), None, []],

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

@ -1149,12 +1149,10 @@ class BasePage(object):
if CSS[self.report.css]["navigation"]: # in ["Web_Basic-Blue.css", "Web_Visually.css"]:
fname = "/".join(["styles", CSS[self.report.css]["navigation"]])
url = self.report.build_url_fname(fname, None, self.up)
links.extend(
Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet", indent = False)
)
links += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet", indent = False)
# add additional meta and link tags
head += meta
head += links
head += (meta, links)
# begin header section
headerdiv = (Html("div", id = 'header') +
@ -5715,7 +5713,7 @@ class NavWebReport(Report):
fname = CSS["Navigation-Horizontal"]["filename"] #"Web_Navigation-Horizontal.css")
else:
fname = CSS["Navigation-Vertical"]["filename"] # "Web_Navigation-Vertical.css")
self.copy_file(fname, "Web_Navigation-Menus.css", "styles")
self.copy_file(fname, "navigation-menus.css", "styles")
# copy Mapstraction style sheet if using Place Maps
if self.placemappages or self.familymappages:
@ -6366,7 +6364,7 @@ class NavWebOptions(MenuReportOptions):
[_("Horizontal -- No Change"), "Horizontal"],
[_("Vertical"), "Vertical"]
]
self.__navigation = EnumeratedListOption(_("Navigation Layout"), _nav_opts[0][1])
self.__navigation = EnumeratedListOption(_("Navigation Menu Layout"), _nav_opts[0][1])
for layout in _nav_opts:
self.__navigation.add_item(layout[1], layout[0])
self.__navigation.set_help(_("Choose which layout for the Navigation Menus."))