From 7a571795441747d92756c2c2c98f1e65d2c49f9c Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Thu, 3 Feb 2011 04:34:13 +0000 Subject: [PATCH] Changed the name of the navigation menus style sheet to confirm to current naming scheme. svn: r16548 --- src/plugins/webreport/NarrativeWeb.py | 5 ++--- src/plugins/webstuff/webstuff.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index cdbfab139..6e3f9a5ee 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -1166,7 +1166,7 @@ class BasePage(object): # Link to Navigation Menus stylesheet if CSS[self.report.css]["navigation"]: - fname = "/".join(["styles", "navigation-menus.css"]) + fname = "/".join(["styles", "narrative-menus.css"]) url = self.report.build_url_fname(fname, None, self.up) links += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet", indent = False) @@ -5813,7 +5813,6 @@ class NavWebReport(Report): self.copy_file(fname, "ancestortree.css", "styles") # copy screen style sheet - print(CSS[self.css]["filename"]) if CSS[self.css]["filename"]: fname = CSS[self.css]["filename"] self.copy_file(fname, _NARRATIVESCREEN, "styles") @@ -5824,7 +5823,7 @@ class NavWebReport(Report): fname = CSS["Navigation-Horizontal"]["filename"] else: fname = CSS["Navigation-Vertical"]["filename"] - self.copy_file(fname, "navigation-menus.css", "styles") + self.copy_file(fname, "narrative-menus.css", "styles") # copy Mapstraction style sheet if using Place Maps if self.placemappages or self.familymappages: diff --git a/src/plugins/webstuff/webstuff.py b/src/plugins/webstuff/webstuff.py index 0be3fb242..87c8731e1 100644 --- a/src/plugins/webstuff/webstuff.py +++ b/src/plugins/webstuff/webstuff.py @@ -55,7 +55,7 @@ def load_on_reg(dbstate, uistate, plugin): # Basic Blue style sheet with navigation menus ["Basic-Blue", 1, _("Basic-Blue"), - os.path.join(dir, "css", 'Web_Basic-Blue.css'), "Web_Navigation-Menus.css", [], []], + os.path.join(dir, "css", 'Web_Basic-Blue.css'), "narrative-menus.css", [], []], # Basic Cypress style sheet ["Basic-Cypress", 1, _("Basic-Cypress"), @@ -87,7 +87,7 @@ def load_on_reg(dbstate, uistate, plugin): # Visually Impaired style sheet with its navigation menus ["Visually Impaired", 1, _("Visually Impaired"), - os.path.join(dir, "css", 'Web_Visually.css'), "Web_Navigation-Menus.css", [], []], + os.path.join(dir, "css", 'Web_Visually.css'), "narrative-menus.css", [], []], # no style sheet option ["No style sheet",1, _("No style sheet"), [], None, [], []],