Changed the name of the Horizontal and Vertical menus style sheets.

svn: r18173
This commit is contained in:
Rob G. Healey 2011-09-19 05:17:50 +00:00
parent a4ee67d53f
commit 7cb8c66272
7 changed files with 29 additions and 21 deletions

View File

@ -6501,12 +6501,12 @@ class NavWebReport(Report):
fname = CSS["behaviour"]["filename"]
self.copy_file(fname, "behaviour.css", "styles")
# copy Navigation Menu Layout style sheet if Blue or Visually is being used
# copy Menu Layout stylesheet if Blue or Visually is being used?
if CSS[self.css]["navigation"]:
if self.navigation == "Horizontal":
fname = CSS["Navigation-Horizontal"]["filename"]
fname = CSS["Horizontal-Menus"]["filename"]
else:
fname = CSS["Navigation-Vertical"]["filename"]
fname = CSS["Vertical-Menus"]["filename"]
self.copy_file(fname, "narrative-menus.css", "styles")
# copy narrative-maps if Place or Family Map pages?

View File

@ -1,4 +1,5 @@
# encoding: utf-8
# -*- coding: utf-8 -*-
#!/usr/bin/python
#
# Gramps - a GTK+/GNOME based genealogy program
#
@ -318,8 +319,8 @@ class WebCalReport(Report):
# copy Navigation Menu Layout if Blue or Visually is being used
if CSS[self.css]["navigation"]:
fname = CSS["Navigation-Horizontal"]["filename"]
self.copy_file(fname, "Web_Navigation-Menus.css", "styles")
fname = CSS["Horizontal-Menus"]["filename"]
self.copy_file(fname, "narrative-menus.css", "styles")
# copy print stylesheet
fname = CSS["Print-Default"]["filename"]
@ -415,13 +416,13 @@ class WebCalReport(Report):
fname = "/".join(subdirs + ["styles", _CALENDARPRINT])
links += Html("link",rel = "stylesheet", href = fname,type = "text/css", media = "print", indent = False)
# add horizontal menu if css == Blue or Visually because there is no menus
# add horizontal menu if css == Blue or Visually because there is no menus?
if CSS[self.css]["navigation"]:
# Link to Navigation Menus stylesheet
fname = "/".join(subdirs + ["styles", "Web_Navigation-Menus.css"])
fname = "/".join(subdirs + ["styles", "narrative-menus.css"])
links.extend(
Html("link", href = fname, type = "text/css", media = "screen", rel = "stylesheet")
Html("link", href =fname, type ="text/css", media ="screen", rel ="stylesheet")
)
# add meta tags and links to head section

View File

@ -14,11 +14,11 @@ DATAFILES = \
Web_Basic-Lilac.css \
Web_Basic-Peach.css \
Web_Basic-Spruce.css \
Web_Horizontal-Menus.css \
Web_Mainz.css \
Web_Navigation-Horizontal.css \
Web_Navigation-Vertical.css \
Web_Nebraska.css \
Web_Print-Default.css \
Web_Vertical-Menus.css \
Web_Visually.css

View File

@ -251,11 +251,18 @@ div#header {
font-style: italic;
}
p#user_header {
font-size:1.3em;
text-align:left;
font-size: .8em;
text-align: right;
color: #FFF;
margin:0;
padding:.2em 0 .6em 20px;
margin: 0 auto;
padding: .2em 0 .6em 20px;
}
#user_header a {
text-decoration: underline;
}
#user_header img {
float: right;
margin-right: 10px;
}
/* Footer

View File

@ -31,8 +31,8 @@ Style Name: Web_Navigation-Horizontal.css
----------------------------------------------------- */
body {
margin: 0 auto;
padding: 5px 2px 5px 2px;
width: 965px;
padding: 5px;
width: 969px;
}
/* Navigation

View File

@ -122,12 +122,12 @@ def load_on_reg(dbstate, uistate, plugin):
path_css('Web_Print-Default.css'), None, [], [] ],
# vertical navigation style sheet
["Navigation-Vertical", 0, "Navigation-Vertical",
path_css('Web_Navigation-Vertical.css'), None, [], [] ],
["Vertica-Menusl", 0, "",
path_css('Web_Vertical-Menus.css'), None, [], [] ],
# horizontal navigation style sheet
["Navigation-Horizontal", 0, "Navigation-Horizontal",
path_css('Web_Navigation-Horizontal.css'), None, [], []],
["Horizontal-Menus", 0, "",
path_css('Web_Horizontal-Menus.css'), None, [], []],
# GeoView style sheet with its image
["GeoView", 0, "GeoView",