From f699c5cee77d93109028b0c855910e17d474028e Mon Sep 17 00:00:00 2001
From: "Rob G. Healey"
Date: Sat, 14 Mar 2009 21:30:04 +0000
Subject: [PATCH] Fixed link statements in write_header(). Changed
id="CurrentSection" to "class="currentSection". Patch from Jason Simanek.
svn: r12345
---
src/data/Web_Basic-Ash.css | 6 +-
src/data/Web_Basic-Cypress.css | 4 +-
src/data/Web_Basic-Lilac.css | 6 +-
src/data/Web_Basic-Peach.css | 6 +-
src/data/Web_Basic-Spruce.css | 6 +-
src/data/Web_Mainz.css | 6 +-
src/data/Web_Nebraska.css | 6 +-
src/data/Web_Visually.css | 23 ++-----
src/plugins/webreport/NarrativeWeb.py | 89 ++++++++++++++-------------
src/plugins/webreport/WebCal.py | 19 +++---
10 files changed, 79 insertions(+), 92 deletions(-)
diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css
index 2291b4a2d..dadaab7d8 100644
--- a/src/data/Web_Basic-Ash.css
+++ b/src/data/Web_Basic-Ash.css
@@ -212,7 +212,7 @@ a:visited {
background-color:#CCC;
border-bottom:solid 1px #000;
}
-#navigation ul li#CurrentSection a, #subnavigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
padding-bottom:4px;
border-top:solid 1px #999;
border-right:solid 1px #999;
@@ -220,10 +220,10 @@ a:visited {
border-bottom:solid 1px #FFF;
background-color:#FFF;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
background-color:#FFF;
}
-#subnavigation ul li#CurrentSection a {
+#subnavigation ul li.CurrentSection a {
border-width:0 0 1px 0;
}
diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css
index 9f300e972..47e7e5f64 100644
--- a/src/data/Web_Basic-Cypress.css
+++ b/src/data/Web_Basic-Cypress.css
@@ -209,7 +209,7 @@ a:visited {
border-top:solid 1px #454;
border-bottom:solid 1px #000;
}
-#navigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a {
color:#454;
padding-bottom:4px;
border-top:solid 1px #7C8F7C;
@@ -218,7 +218,7 @@ a:visited {
border-bottom:solid 1px #FFF;
background-color:#FFF;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
padding-top:5px;
background-color:#FFF;
}
diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css
index 3d8c2d991..678da82b7 100644
--- a/src/data/Web_Basic-Lilac.css
+++ b/src/data/Web_Basic-Lilac.css
@@ -210,7 +210,7 @@ a:visited {
background-color:#B4B4CB;
border-bottom:solid 1px #000;
}
-#navigation ul li#CurrentSection a, #subnavigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
padding-bottom:4px;
border-top:solid 1px #669;
border-right:solid 1px #669;
@@ -218,10 +218,10 @@ a:visited {
border-bottom:solid 1px #FAFAFF;
background-color:#FAFAFF;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
background-color:#FAFAFF;
}
-#subnavigation ul li#CurrentSection a {
+#subnavigation ul li.CurrentSection a {
border-width:0 0 1px 0;
}
diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css
index 73d08ae6b..260a79fc1 100644
--- a/src/data/Web_Basic-Peach.css
+++ b/src/data/Web_Basic-Peach.css
@@ -211,7 +211,7 @@ a:visited {
background-color:#FFC35E;
border-bottom:solid 1px #36220B;
}
-#navigation ul li#CurrentSection a, #subnavigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
padding-bottom:4px;
border-top:solid 1px #8C581C;
border-right:solid 1px #8C581C;
@@ -219,10 +219,10 @@ a:visited {
border-bottom:solid 1px #FFFBE7;
background-color:#FFFBE7;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
background-color:#FFFBE7;
}
-#subnavigation ul li#CurrentSection a {
+#subnavigation ul li.CurrentSection a {
border-width:0 0 1px 0;
}
diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css
index 31f96e432..0a14b2a42 100644
--- a/src/data/Web_Basic-Spruce.css
+++ b/src/data/Web_Basic-Spruce.css
@@ -211,7 +211,7 @@ a:visited {
background-color:#BFD0EA;
border-bottom:solid 1px #000;
}
-#navigation ul li#CurrentSection a, #subnavigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
padding-bottom:4px;
border-top:solid 1px #7CA3DD;
border-right:solid 1px #7CA3DD;
@@ -219,10 +219,10 @@ a:visited {
border-bottom:solid 1px #FFF;
background-color:#FFF;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
background-color:#FFF;
}
-#subnavigation ul li#CurrentSection a {
+#subnavigation ul li.CurrentSection a {
border-width:0 0 1px 0;
}
diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css
index af147176b..ce72523ee 100644
--- a/src/data/Web_Mainz.css
+++ b/src/data/Web_Mainz.css
@@ -232,7 +232,7 @@ a:visited {
#navigation ul li a:hover, #subnavigation ul li a:hover {
background-color:#FFFFE7;
}
-#navigation ul li#CurrentSection a, #subnavigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
font-family:Georgia, serif;
font-weight:bold;
font-style:italic;
@@ -242,12 +242,12 @@ a:visited {
border-width:1px 1px 0 1px;
border-color:#7D5925;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
}
#subnavigation {
background-image:url(../images/Web_Mainz_Mid.png);
}
-#subnavigation ul li#CurrentSection a {
+#subnavigation ul li.CurrentSection a {
border-width:0 0 1px 0;
}
diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css
index 6a1812d99..1e8dccd78 100644
--- a/src/data/Web_Nebraska.css
+++ b/src/data/Web_Nebraska.css
@@ -236,7 +236,7 @@ p#user_header {
background-color:#C1B398;
border-bottom:solid 1px #542;
}
-#navigation ul li#CurrentSection a, #subnavigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
font-size:19px;
margin-top:-6px;
padding-top:11px;
@@ -246,10 +246,10 @@ p#user_header {
border-bottom:solid 1px #FFF;
background-color:#FFF;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
background-color:#FFF;
}
-#subnavigation ul li#CurrentSection a {
+#subnavigation ul li.CurrentSection a {
border-width:0 0 1px 0;
}
diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css
index 4a978d901..acb52494a 100644
--- a/src/data/Web_Visually.css
+++ b/src/data/Web_Visually.css
@@ -1,5 +1,5 @@
/*
-**************************************************************************************************
+ **************************************************************************************************
Copyright Holder and License
**************************************************************************************************
GRAMPS Cascading Style Sheet
@@ -105,13 +105,6 @@ img {
.content div.snapshot div.thumbnail p {
display:none;
}
-.fullclear {
- width:100%;
- height:1px;
- margin:0;
- padding:0;
- clear:both;
-}
/* General Text
----------------------------------------------------- */
@@ -246,7 +239,7 @@ p#user_header {
background-color:#C1B398;
border-bottom:solid 1px #453619;
}
-#navigation ul li#CurrentSection a, #subnavigation ul li#CurrentSection a {
+#navigation ul li.CurrentSection a, #subnavigation ul li.CurrentSection a {
font-weight:bold;
font-size:16px;
margin-top:-6px;
@@ -258,10 +251,10 @@ p#user_header {
background-color:#FFF;
color:#000;
}
-#navigation ul li#CurrentSection a:hover {
+#navigation ul li.CurrentSection a:hover {
background-color:#FFF;
}
-#subnavigation ul li#CurrentSection a {
+#subnavigation ul li.CurrentSection a {
border-width:0 0 1px 0;
}
@@ -1027,14 +1020,6 @@ div#pedigree {
#footer p#copyright img {
margin-right:10px;
}
-#footer p#quality {
- width:100%;
- text-align:center;
- color:#FFF;
-}
-#footer p#quality img {
- float:center;
-}
#user_footer {
width:70%;
float:left;
diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 27b1e1731..50efcfae7 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -379,12 +379,13 @@ class BasePage:
def write_header(self, of, title):
"""
- Note. 'title' is used as currentsection in the navigation links.
+ Note. 'title' is used as currentsection in the navigation links and
+ as part of the header title.
"""
of.write('\n')
of.write('\n')
xmllang = Utils.xml_lang()
of.write('\n' % url)
+ of.write('\t\n' % url)
# Link to screen stylesheet
url = self.report.build_url_fname(_NARRATIVESCREEN, "styles", self.up)
- of.write('\t\n' % url)
+ of.write('\t\n' % url)
# Link to printer stylesheet
url = self.report.build_url_fname(_NARRATIVEPRINT, "styles", self.up)
- of.write('\t\n' % url)
+ of.write('\t\n' % url)
# Link to GRAMPS favicon
url = self.report.build_url_image('favicon.ico', 'images', self.up)
- of.write('\t\n' % url)
+ of.write('\t\n' % url)
of.write('\n\n')
of.write('
\n') # Terminated in write_footer()
@@ -453,47 +454,47 @@ class BasePage:
of.write('\t
\n')
of.write('\t\t
\n')
- for url_fname, nav_text, cond in navs:
- if cond:
+ navs = [(u, n) for u, n, c in navs if c]
+ for url_fname, nav_text in navs:
- if not url_fname.endswith(self.ext):
- url_fname += self.ext
+ if not url_fname.endswith(self.ext):
+ url_fname += self.ext
- if self.up:
- # TODO. Check if build_url_fname can be used.
- url_fname = '/'.join(['..']*3 + [url_fname])
+ if self.up:
+ # TODO. Check if build_url_fname can be used.
+ url_fname = '/'.join(['..']*3 + [url_fname])
- # TODO. Move this logic to a higher level (caller of write_header).
+ # TODO. Move this logic to a higher level (caller of write_header).
- # Define 'currentsection' to correctly set navlink item CSS id
- # 'CurrentSection' for Navigation styling.
- # Use 'self.report.cur_fname' to determine 'CurrentSection' for individual
- # elements for Navigation styling.
+ # Define 'currentsection' to correctly set navlink item CSS id
+ # 'CurrentSection' for Navigation styling.
+ # Use 'self.report.cur_fname' to determine 'CurrentSection' for individual
+ # elements for Navigation styling.
- # Figure out if we need
of just plain
- cs = False
- if nav_text == currentsection:
+ # Figure out if we need
of just plain
+ cs = False
+ if nav_text == currentsection:
+ cs = True
+ elif nav_text == _('Surnames'):
+ if "srn" in self.report.cur_fname:
+ cs = True
+ elif _('Surnames') in currentsection:
+ cs = True
+ elif nav_text == _('Individuals'):
+ if "ppl" in self.report.cur_fname:
+ cs = True
+ elif nav_text == _('Sources'):
+ if "src" in self.report.cur_fname:
+ cs = True
+ elif nav_text == _('Places'):
+ if "plc" in self.report.cur_fname:
+ cs = True
+ elif nav_text == _('Gallery'):
+ if "img" in self.report.cur_fname:
cs = True
- elif nav_text == _('Surnames'):
- if "srn" in self.report.cur_fname:
- cs = True
- elif _('Surnames') in currentsection:
- cs = True
- elif nav_text == _('Individuals'):
- if "ppl" in self.report.cur_fname:
- cs = True
- elif nav_text == _('Sources'):
- if "src" in self.report.cur_fname:
- cs = True
- elif nav_text == _('Places'):
- if "plc" in self.report.cur_fname:
- cs = True
- elif nav_text == _('Gallery'):
- if "img" in self.report.cur_fname:
- cs = True
- cs = cs and ' id="CurrentSection"' or ''
- of.write('\t\t\t
\n') # End Navigation Menu
diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py
index 40736b65c..f8a55c1b7 100644
--- a/src/plugins/webreport/WebCal.py
+++ b/src/plugins/webreport/WebCal.py
@@ -392,7 +392,7 @@ class WebCalReport(Report):
url += self.ext
# Figure out if we need
or just plain
- cs = url_fname == currentsection and ' id="CurrentSection"' or ''
+ cs = url_fname == currentsection and ' class="CurrentSection"' or ''
of.write('\t\t