From c3d079b018562ed5dde7d4b71020244dbcdb4efe Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Sat, 12 Sep 2009 03:52:42 +0000
Subject: [PATCH] Fixed style elements that has messed up the recent WebCal.

svn: r13194
---
 src/data/Web_Visually.css       | 12 +++---------
 src/plugins/webreport/WebCal.py | 27 +++++++++------------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css
index 2a935331f..7ab3a361d 100644
--- a/src/data/Web_Visually.css
+++ b/src/data/Web_Visually.css
@@ -323,17 +323,11 @@ div#alphabet ul li.letters a:hover {
     height: 52px;
 }
 body#WebCal #navigation, body#fullyearlinked #navigation {
-    position: fixed;
-    top: 100px;
     width: 100%;
-    height: 56px;
+    height: 42px;
 }
 #subnavigation {
-    position: fixed;
-    top: 136px;
     width: 100%;
-    height: 56px;
-    border-top: solid 2px #5D835F;
 }
 #navigation ul, #subnavigation ul {
     list-style:none;
@@ -1389,7 +1383,7 @@ div#pedigree {
 -------------------------------------------------------------------------------------------- */
 /* Calendar : General */
 body#WebCal {
-    padding: 172px 14px 0px 14px;
+    padding: 98px 14px 0px 14px;
     background-color: #542;
 }
 .calendar {
@@ -1533,7 +1527,7 @@ body#WebCal {
 
 /* Calendar : Full Year */
 body#fullyearlinked {
-    padding: 144px 14px 0px 14px;
+    padding: 98px 14px 0px 14px;
 }
 body#fullyearlinked div.content {
     width:963px;
diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py
index 2fe3a4d02..e18702c9b 100644
--- a/src/plugins/webreport/WebCal.py
+++ b/src/plugins/webreport/WebCal.py
@@ -77,6 +77,9 @@ from libhtmlconst import _CHARACTER_SETS, _CC, _COPY_OPTIONS
 # constants
 #
 #------------------------------------------------------------------------
+# full clear line for proper styling
+fullclear = Html("div", class_ = "fullclear", inline = True)
+
 # Web page filename extensions
 _WEB_EXT = ['.html', '.htm', '.shtml', '.php', '.php3', '.cgi']
 
@@ -363,10 +366,10 @@ class WebCalReport(Report):
         page, head, body = Html.page(title, self.encoding, xmllang)
 
         # GRAMPS favicon
-        fname1 =  '/'.join([subdirs] + ['images'] + ['favicon.ico'])
+        fname1 = os.path.join(subdirs, "images", "favicon.ico")
 
         # _CALENDARSCREEN stylesheet
-        fname2 = '/'.join([subdirs] + ['styles'] + [_CALENDARSCREEN])
+        fname2 = os.path.join(subdirs, "styles", _CALENDARSCREEN)
 
         # create additional meta tags
         meta = Html("meta", attr = _META1) + (
@@ -382,7 +385,7 @@ class WebCalReport(Report):
 
         # add printer stylesheet to webcalendar() and one_day() only
         if add_print:
-            fname = '/'.join([subdirs] + ['styles'] + [_CALENDARPRINT])
+            fname = os.path.join(subdirs, "styles", _CALENDARPRINT)
             links += Html("link",rel="stylesheet", href=fname,type="text/css",
                 media="print",indent = False)
 
@@ -870,13 +873,9 @@ class WebCalReport(Report):
             body += monthly_calendar 
 
             # create blank line for stylesheets
-            body += Html("div", class_ = "fullclear", inline = True)
-
             # create footer division section
             footer = self.write_footer(nr_up)
-
-            # add footer to WebCal
-            body += footer
+            body += (fullclear, footer)
 
             # send calendar page to web output
             mywriter(webcal, of)
@@ -949,13 +948,9 @@ class WebCalReport(Report):
             self.progress.step()
 
         # create blank line for stylesheets
-        body += Html("div", class_ = "fullclear", inline = True)
-
         # write footer section
         footer = self.write_footer(nr_up)
-
-        # add footer to body
-        body += footer
+        body += (fullclear, footer)
 
         # send calendar page to web output
         mywriter(yearglance, of)
@@ -1022,13 +1017,9 @@ class WebCalReport(Report):
         body += ol
 
         # create blank line for stylesheets
-        body += Html("div", class_ = "fullclear", inline = True)
-
         # write footer section
         footer = self.write_footer(nr_up)
-
-        # add footer to WebCal
-        body += footer
+        body += (fullclear, footer)
 
         # send calendar page to web output
         mywriter(oneday, od)