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

Fixed style elements that has messed up the recent WebCal.

Browse Source 
svn: r13194
This commit is contained in:
Rob G. Healey
2009-09-12 03:52:42 +00:00
parent 79efac73da
commit c3d079b018
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/data/Web_Visually.css
View File

@@ -323,17 +323,11 @@ div#alphabet ul li.letters a:hover {
height: 52px; height: 52px;
} }
body#WebCal #navigation, body#fullyearlinked #navigation { body#WebCal #navigation, body#fullyearlinked #navigation {
position: fixed;
top: 100px;
width: 100%; width: 100%;
height: 56px; height: 42px;
} }
#subnavigation { #subnavigation {
position: fixed;
top: 136px;
width: 100%; width: 100%;
height: 56px;
border-top: solid 2px #5D835F;
} }
#navigation ul, #subnavigation ul { #navigation ul, #subnavigation ul {
list-style:none; list-style:none;
@@ -1389,7 +1383,7 @@ div#pedigree {
-------------------------------------------------------------------------------------------- */ -------------------------------------------------------------------------------------------- */
/* Calendar : General */ /* Calendar : General */
body#WebCal { body#WebCal {
padding: 172px 14px 0px 14px; padding: 98px 14px 0px 14px;
background-color: #542; background-color: #542;
} }
.calendar { .calendar {
@@ -1533,7 +1527,7 @@ body#WebCal {
/* Calendar : Full Year */ /* Calendar : Full Year */
body#fullyearlinked { body#fullyearlinked {
padding: 144px 14px 0px 14px; padding: 98px 14px 0px 14px;
} }
body#fullyearlinked div.content { body#fullyearlinked div.content {
width:963px; width:963px;

27
src/plugins/webreport/WebCal.py
View File

@@ -77,6 +77,9 @@ from libhtmlconst import _CHARACTER_SETS, _CC, _COPY_OPTIONS
# constants # constants
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# full clear line for proper styling
fullclear = Html("div", class_ = "fullclear", inline = True)
# Web page filename extensions # Web page filename extensions
_WEB_EXT = ['.html', '.htm', '.shtml', '.php', '.php3', '.cgi'] _WEB_EXT = ['.html', '.htm', '.shtml', '.php', '.php3', '.cgi']
@@ -363,10 +366,10 @@ class WebCalReport(Report):
page, head, body = Html.page(title, self.encoding, xmllang) page, head, body = Html.page(title, self.encoding, xmllang)
# GRAMPS favicon # GRAMPS favicon
fname1 = '/'.join([subdirs] + ['images'] + ['favicon.ico']) fname1 = os.path.join(subdirs, "images", "favicon.ico")
# _CALENDARSCREEN stylesheet # _CALENDARSCREEN stylesheet
fname2 = '/'.join([subdirs] + ['styles'] + [_CALENDARSCREEN]) fname2 = os.path.join(subdirs, "styles", _CALENDARSCREEN)
# create additional meta tags # create additional meta tags
meta = Html("meta", attr = _META1) + ( meta = Html("meta", attr = _META1) + (
@@ -382,7 +385,7 @@ class WebCalReport(Report):
# add printer stylesheet to webcalendar() and one_day() only # add printer stylesheet to webcalendar() and one_day() only
if add_print: 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", links += Html("link",rel="stylesheet", href=fname,type="text/css",
media="print",indent = False) media="print",indent = False)
@@ -870,13 +873,9 @@ class WebCalReport(Report):
body += monthly_calendar body += monthly_calendar
# create blank line for stylesheets # create blank line for stylesheets
body += Html("div", class_ = "fullclear", inline = True)
# create footer division section # create footer division section
footer = self.write_footer(nr_up) footer = self.write_footer(nr_up)
body += (fullclear, footer)
# add footer to WebCal
body += footer
# send calendar page to web output # send calendar page to web output
mywriter(webcal, of) mywriter(webcal, of)
@@ -949,13 +948,9 @@ class WebCalReport(Report):
self.progress.step() self.progress.step()
# create blank line for stylesheets # create blank line for stylesheets
body += Html("div", class_ = "fullclear", inline = True)
# write footer section # write footer section
footer = self.write_footer(nr_up) footer = self.write_footer(nr_up)
body += (fullclear, footer)
# add footer to body
body += footer
# send calendar page to web output # send calendar page to web output
mywriter(yearglance, of) mywriter(yearglance, of)
@@ -1022,13 +1017,9 @@ class WebCalReport(Report):
body += ol body += ol
# create blank line for stylesheets # create blank line for stylesheets
body += Html("div", class_ = "fullclear", inline = True)
# write footer section # write footer section
footer = self.write_footer(nr_up) footer = self.write_footer(nr_up)
body += (fullclear, footer)
# add footer to WebCal
body += footer
# send calendar page to web output # send calendar page to web output
mywriter(oneday, od) mywriter(oneday, od)