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

Moved footer section in stylesheet to match other stylesheets. Added #alphabet navigation to stylesheet. Changed newpage() to Html.page(), remove indent=True, and added indent=False where needed for indentation styling for human readability in web browsers.

Browse Source 
svn: r12403
This commit is contained in:
Rob G. Healey
2009-04-03 00:04:29 +00:00
parent 6ab1803266
commit c468933edd
2 changed files with 167 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
src/data/Web_Visually.css
View File

@@ -189,7 +189,7 @@ span.preposition {
height:1.5cm; height:1.5cm;
padding:0 0 .9em 0; padding:0 0 .9em 0;
background-color:#542; background-color:#542;
border-bottom:solid 4px #6AF364; border-bottom:solid 2px #6AF364;
} }
#SiteTitle { #SiteTitle {
color:#FFF; color:#FFF;
@@ -206,6 +206,97 @@ p#user_header {
background-color:#542; background-color:#542;
} }
/* Footer
----------------------------------------------------- */
#footer {
clear:both;
height:1.5cm;
width:100%;
font-size:12px;
line-height:130%;
font-family:sans-serif;
color:#FFF;
margin:0;
padding:0;
background-color:#542;
border-top:solid 2px #6AF364;
}
#footer a, #footer a:visited {
text-decoration:none;
color:#FFF;
}
#footer a:hover {
text-decoration:underline;
}
#footer img {
border:0;
margin:0 auto;
vertical-align:middle;
}
#footer p#createdate {
float:left;
width:40%;
text-align:left;
margin-left:10px;
color:#FFF;
}
#footer p#copyright {
float:right;
width:40%;
text-align:right;
color:#FFF;
margin-right:10px;
}
#footer p#copyright img {
margin-right:10px;
}
#user_footer {
width:70%;
float:left;
margin:1em;
}
#user_footer p {
font:normal 1em/1.2em serif;
color:#6AF364;
margin:0;
padding:0;
}
/* Alphabet Navigation
----------------------------------------------------- */
#alphabet {
padding:0;
margin:0;
}
#alphabet ul {
list-style:none;
min-width:770px;
height:24px;
margin:0;
padding:0 0 0 9px;
background-color:#6AF364;
border-bottom:solid 2px #000;
}
#alphabet ul li.letters {
margin:0;
float:left;
}
.letters:after {
content:" |";
}
#alphabet ul li.letters a {
display:block;
float:left;
font:bold 16px/100% sans;
color:#000;
margin:0;
padding:5px 5px;
}
#alphabet ul li.letters a:hover {
background-color:#22822A;
color:#FFF;
}
/* Navigation /* Navigation
----------------------------------------------------- */ ----------------------------------------------------- */
#navigation, #subnavigation { #navigation, #subnavigation {
@@ -985,62 +1076,6 @@ div#pedigree {
display:none; display:none;
} }
/* Footer
----------------------------------------------------- */
#footer {
clear:both;
height:1.5cm;
width:100%;
font-size:12px;
line-height:130%;
font-family:sans-serif;
color:#FFF;
margin:0;
padding:0;
background-color:#542;
border-top:solid 4px #6AF364;
}
#footer a, #footer a:visited {
text-decoration:none;
color:#FFF;
}
#footer a:hover {
text-decoration:underline;
}
#footer img {
border:0;
margin:0 auto;
vertical-align:middle;
}
#footer p#createdate {
float:left;
width:40%;
text-align:left;
margin-left:10px;
color:#FFF;
}
#footer p#copyright {
float:right;
width:40%;
text-align:right;
color:#FFF;
margin-right:10px;
}
#footer p#copyright img {
margin-right:10px;
}
#user_footer {
width:70%;
float:left;
margin:1em;
}
#user_footer p {
font:normal 1em/1.2em serif;
color:#6AF364;
margin:0;
padding:0;
}
/* Calendar Styles /* Calendar Styles
-------------------------------------------------------------------------------------------- */ -------------------------------------------------------------------------------------------- */
/* Calendar : General */ /* Calendar : General */

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

@@ -35,7 +35,7 @@ Refactoring. This is an ongoing job until this plugin is in a better shape.
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
import os, codecs, shutil import os, codecs, shutil
import time, datetime, calendar import datetime, calendar
from gettext import gettext as _ from gettext import gettext as _
from gettext import ngettext from gettext import ngettext
@@ -65,10 +65,9 @@ import GrampsLocale
from QuestionDialog import WarningDialog from QuestionDialog import WarningDialog
from Utils import probably_alive from Utils import probably_alive
from DateHandler import displayer as _dd from DateHandler import displayer as _dd
from DateHandler import parser as _dp
import libholiday import libholiday
from libhtml import Html, newpage from libhtml import Html
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@@ -272,13 +271,23 @@ class WebCalReport(Report):
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
# #
# Adds Birthdays and Anniversaries # Adds Birthdays, Anniversaries, and holidays
# #
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
def add_day_item(self, text, year, month, day, event): def add_day_item(self, text, year, month, day, event):
"""
adds birthdays, anniversaries, and holidays to their perspective lists
text -- line to be added
year, month, day -- date to add the text to
event -- one of 'BirthDay', 'Anniversary', or 'Holiday'
"""
# This may happen for certain "about" dates.
# Use first day of the month
if day == 0: if day == 0:
# This may happen for certain "about" dates. day = 1
day = 1 # Use first day of the month
# determine which dictionary to use??? # determine which dictionary to use???
if event in ['Birthday', 'Anniversary']: if event in ['Birthday', 'Anniversary']:
@@ -432,7 +441,7 @@ class WebCalReport(Report):
const.URL_HOMEPAGE) const.URL_HOMEPAGE)
_META2 = 'name="author" content="%s"' % self.author _META2 = 'name="author" content="%s"' % self.author
page, head, body = newpage(title=title, encoding=self.encoding, lang=xmllang) page, head, body = Html.page(title=title, encoding=self.encoding, lang=xmllang)
# GRAMPS favicon # GRAMPS favicon
fname1 = '/'.join([subdirs] + ['images'] + ['favicon.ico']) fname1 = '/'.join([subdirs] + ['images'] + ['favicon.ico'])
@@ -441,34 +450,31 @@ class WebCalReport(Report):
fname2 = '/'.join([subdirs] + ['styles'] + [_CALENDARSCREEN]) fname2 = '/'.join([subdirs] + ['styles'] + [_CALENDARSCREEN])
# create additional meta tags # create additional meta tags
meta = Html('meta', attr = _META1, indent = True) + ( meta = Html('meta', attr = _META1) + (
Html('meta', attr = _META2) Html('meta', attr = _META2,indent=False)
) )
# links for GRAMPS favicon and stylesheets # links for GRAMPS favicon and stylesheets
links = Html('link',rel='shortcut icon', href=fname1,type='image/x-icon',indent=True) + ( links = Html('link',rel='shortcut icon', href=fname1,type='image/x-icon') + (
Html('link',rel='stylesheet', href=fname2,type='text/css',media='screen') Html('link',rel='stylesheet', href=fname2,type='text/css',media='screen',indent=False)
) )
# 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 = '/'.join([subdirs] + ['styles'] + [_CALENDARPRINT])
links += Html('link',rel='stylesheet', href=fname,type='text/css',media='print') links += Html('link',rel='stylesheet', href=fname,type='text/css',media='print',indent=False)
# add additional meta tags and stylesheet links to head section # add additional meta tags and stylesheet links to head section
head += (meta, links) head += (meta, links)
# begin page body
new_body = Html('body', id = body_id)
# replace standard body element with custom one # replace standard body element with custom one
page.replace(body, new_body) body.attr = 'id="%s"' % body_id
# start header division section # start header division section
headerdiv = Html('div', id="header", indent=True) + ( headerdiv = Html('div', id="header") + (
# page title # page title
Html('h1', title, id = "SiteTitle", indent=True, inline=True), Html('h1', title, id = "SiteTitle",inline=True),
) )
# Created for ? # Created for ?
@@ -479,13 +485,13 @@ class WebCalReport(Report):
'author' : self.author} 'author' : self.author}
else: else:
msg = _('Created for %(author)s') % {'author' : self.author} msg = _('Created for %(author)s') % {'author' : self.author}
headerdiv += Html('p', msg, id="CreatorInfo", indent=True) headerdiv += Html('p', msg, id="CreatorInfo")
# add header division to body # add header division to body
new_body += headerdiv body += headerdiv
# return to its caller; either webcalendar(), year_glance(), or one_day() # return to its caller; either webcalendar(), year_glance(), or one_day()
return page, new_body return page, body
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
# #
@@ -516,9 +522,9 @@ class WebCalReport(Report):
nrows = get_num_of_rows(num_years, years_in_row) nrows = get_num_of_rows(num_years, years_in_row)
for rows in range(0, nrows): for rows in range(0, nrows):
yearnav = Html('div', id="navigation", indent=True) yearnav = Html('div', id="navigation")
ul = Html('ul', indent=True) ul = Html('ul')
cols = 1 cols = 1
while (cols <= years_in_row and cal_year <= self.end_year): while (cols <= years_in_row and cal_year <= self.end_year):
url = '' url = ''
@@ -537,10 +543,10 @@ class WebCalReport(Report):
# Figure out if we need <li class="CurrentSection"> or just plain <li> # Figure out if we need <li class="CurrentSection"> or just plain <li>
cs = str(cal_year) == currentsection and 'class="CurrentSection"' or '' cs = str(cal_year) == currentsection and 'class="CurrentSection"' or ''
ul += Html('li', attr=cs , indent=True, inline=True) + ( ul += Html('li', attr=cs ,inline=True) + (
# create hyperlink # create hyperlink
Html('a', str(cal_year), href = url, indent=True, inline=True) Html('a', str(cal_year), href = url,inline=True)
) )
# increase columns # increase columns
@@ -584,8 +590,8 @@ class WebCalReport(Report):
# Add a link for year_glance() if requested # Add a link for year_glance() if requested
navs.append(('fullyearlinked', _('Year Glance'), self.fullyear)) navs.append(('fullyearlinked', _('Year Glance'), self.fullyear))
monthnav = Html('div', id="subnavigation", indent=True) monthnav = Html('div', id="subnavigation")
ul = Html('ul', indent=True) ul = Html('ul')
navs = [(u, n) for u, n, c in navs if c] navs = [(u, n) for u, n, c in navs if c]
for url_fname, nav_text in navs: for url_fname, nav_text in navs:
@@ -616,10 +622,10 @@ class WebCalReport(Report):
# Figure out if we need <li class="CurrentSection"> or just plain <li> # Figure out if we need <li class="CurrentSection"> or just plain <li>
cs = url_fname == currentsection and 'class="CurrentSection"' or '' cs = url_fname == currentsection and 'class="CurrentSection"' or ''
ul += Html('li', attr = cs, indent=True, inline=True) + ( ul += Html('li', attr = cs,inline=True) + (
# create hyperlink # create hyperlink
Html('a', nav_text, href = url,indent=True,inline=True) Html('a', nav_text, href = url,inline=True)
) )
# add ul to monthnav # add ul to monthnav
@@ -677,23 +683,23 @@ class WebCalReport(Report):
th_txt = '%s %d' % (month_name, year) th_txt = '%s %d' % (month_name, year)
# begin calendar table # begin calendar table
cal_table = Html('table', class_='calendar', id = month_name, indent=True) cal_table = Html('table', class_='calendar', id = month_name)
# begin table head, <thead> # begin table head, <thead>
thead = Html('thead', indent=True) thead = Html('thead')
tr = Html('tr', indent=True) tr = Html('tr')
th = Html('th', th_txt, class_ ='monthName', colspan=7, indent=True, inline=True) th = Html('th', th_txt, class_ ='monthName', colspan=7,inline=True)
# add them together now # add them together now
tr += th tr += th
thead += tr thead += tr
# Calendar weekday names header # Calendar weekday names header
weekday_names = Html('tr', indent=True) weekday_names = Html('tr')
for day_col in range(7): for day_col in range(7):
dayclass = get_class_for_daycol(day_col) dayclass = get_class_for_daycol(day_col)
dayname = get_name_for_daycol(day_col) dayname = get_name_for_daycol(day_col)
th = Html('th', class_ =dayclass, indent=True, inline=True) + ( th = Html('th', class_ =dayclass,inline=True) + (
Html('abbr', dayname[0], title=dayname) Html('abbr', dayname[0], title=dayname)
) )
@@ -707,7 +713,7 @@ class WebCalReport(Report):
cal_table += thead cal_table += thead
# begin table body # begin table body
tbody = Html('tbody', indent=True) tbody = Html('tbody')
# get first of the month and month information # get first of the month and month information
current_date, current_ord, monthinfo = get_first_day_of_month(year, month) current_date, current_ord, monthinfo = get_first_day_of_month(year, month)
@@ -718,7 +724,7 @@ class WebCalReport(Report):
week = monthinfo[week_row] week = monthinfo[week_row]
# if you look this up in wikipedia, the first week is called week0 # if you look this up in wikipedia, the first week is called week0
tr = Html('tr', class_ = 'week%d' % week_row, indent=True) tr = Html('tr', class_ = 'week%d' % week_row)
# begin calendar day column # begin calendar day column
for day_col in range(0, 7): for day_col in range(0, 7):
@@ -730,8 +736,8 @@ class WebCalReport(Report):
# start the beginning variable for <td>, table cell # start the beginning variable for <td>, table cell
tdid = "%s%02d" % (abbr_month_name, day) tdid = "%s%02d" % (abbr_month_name, day)
# adds date for all pieces of this calendar building # add calendar date division
datediv = Html('div', day, class_ ='date',indent=True,inline=True) datediv = Html('div', day, class_='date',inline=True)
# a day in the previous or next month # a day in the previous or next month
if day == 0: if day == 0:
@@ -747,10 +753,10 @@ class WebCalReport(Report):
specclass = "next " + dayclass specclass = "next " + dayclass
# continue table cell, <td>, without id tag # continue table cell, <td>, without id tag
td = Html('td', class_ = specclass, indent=True,inline=True) + ( td = Html('td', class_ = specclass,inline=True) + (
# adds date for previous and next month days # adds date for previous and next month days
Html('div', specday, class_ = 'date',indent=True,inline=True) Html('div', specday, class_ = 'date',inline=True)
) )
# add table cell, <td>, to table row, <tr> # add table cell, <td>, to table row, <tr>
@@ -776,7 +782,7 @@ class WebCalReport(Report):
if day_list: if day_list:
hilightday = 'highlight ' + dayclass hilightday = 'highlight ' + dayclass
td = Html('td', id=tdid, class_ = hilightday, indent=True) td = Html('td', id=tdid, class_ = hilightday)
# Year at a Glance # Year at a Glance
if cal == "yg": if cal == "yg":
@@ -790,7 +796,7 @@ class WebCalReport(Report):
# create hyperlink to one_day() # create hyperlink to one_day()
fname_date = full_month_name + '/' + fname_date fname_date = full_month_name + '/' + fname_date
ahref = Html('a', datediv, href=fname_date, indent=True, inline=True) ahref = Html('a', datediv, href=fname_date,inline=True)
# add hyperlink to table cell, <td> # add hyperlink to table cell, <td>
td += ahref td += ahref
@@ -802,10 +808,10 @@ class WebCalReport(Report):
else: else:
# continue table cell, <td>, without id tag # continue table cell, <td>, without id tag
td = Html('td', class_ = hilightday, indent=True,inline=True) + ( td = Html('td', class_ = hilightday,inline=True) + (
# adds date division # adds date division
Html('div', day, class_ = 'date',indent=True,inline=True) Html('div', day, class_ = 'date',inline=True)
) )
# WebCal # WebCal
@@ -815,9 +821,9 @@ class WebCalReport(Report):
td += datediv td += datediv
# list the events # list the events
ul = Html('ul', indent=True) ul = Html('ul')
for nyears, date, text, event in day_list: for nyears, date, text, event in day_list:
ul += Html('li', text, indent=True, inline=False if event == 'Anniversary' ul += Html('li', text,inline=False if event == 'Anniversary'
else True) else True)
# add events to table cell, <td> # add events to table cell, <td>
@@ -827,18 +833,18 @@ class WebCalReport(Report):
else: else:
# create empty day with date # create empty day with date
td = Html('td', class_ = dayclass, indent=True, inline=True) + ( td = Html('td', class_ = dayclass,inline=True) + (
# adds date division # adds date division
Html('div', day, class_ = 'date',indent=True,inline=True) Html('div', day, class_ = 'date',inline=True)
) )
# nothing for this month # nothing for this month
else: else:
td = Html('td', class_ = dayclass, indent=True) + ( td = Html('td', class_ = dayclass) + (
# adds date division # adds date division
Html('div', day, class_ = 'date',indent=True,inline=True) Html('div', day, class_ = 'date',inline=True)
) )
# add table cell, <td>, to table row, <tr> # add table cell, <td>, to table row, <tr>
@@ -855,10 +861,10 @@ class WebCalReport(Report):
if cal == "yg": if cal == "yg":
# Fill up till we have 6 rows, so that the months align properly # Fill up till we have 6 rows, so that the months align properly
for i in range(nweeks, 6): for i in range(nweeks, 6):
six_weeks = Html('tr', class_ = 'week%d' % (i + 1), indent=True) + ( six_weeks = Html('tr', class_ = 'week%d' % (i + 1)) + (
# create table cell, <td> # create table cell, <td>
Html('td', colspan=7, indent=True,inline=True) Html('td', colspan=7,inline=True)
) )
# add extra weeks to tbody if needed # add extra weeks to tbody if needed
@@ -920,9 +926,9 @@ class WebCalReport(Report):
note = note or "&nbsp;" note = note or "&nbsp;"
# table foot section # table foot section
cal_note = Html('tfoot', indent=True) cal_note = Html('tfoot')
tr = Html('tr', indent=True) tr = Html('tr')
td = Html('td', note, colspan=7, indent=True, inline=True) td = Html('td', note, colspan=7,inline=True)
# add table cell to table row # add table cell to table row
# add table row to table foot section # add table row to table foot section
@@ -936,7 +942,7 @@ class WebCalReport(Report):
body += monthly_calendar body += monthly_calendar
# create blank line for stylesheets # create blank line for stylesheets
body += Html('div', class_ = 'fullclear', indent=True, inline=True) 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)
@@ -994,10 +1000,10 @@ class WebCalReport(Report):
'that date, if there are any!\n')) 'that date, if there are any!\n'))
# page description # page description
descriptdiv = Html('div', class_ = 'content',indent=True) + ( descriptdiv = Html('div', class_ = 'content') + (
# message line # message line
Html('p', msg, id='description', indent=True) Html('p', msg, id='description')
) )
# add description to body # add description to body
@@ -1015,7 +1021,7 @@ class WebCalReport(Report):
self.progress.step() self.progress.step()
# create blank line for stylesheets # create blank line for stylesheets
body += Html('div', class_ = 'fullclear', indent=True, inline=True) 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)
@@ -1076,19 +1082,19 @@ class WebCalReport(Report):
# set date display as in user prevferences # set date display as in user prevferences
pg_date = _dd.display(event_date) pg_date = _dd.display(event_date)
body += Html('h3', pg_date, indent=True,inline=True) body += Html('h3', pg_date,inline=True)
# list the events # list the events
ol = Html('ol', indent=True) ol = Html('ol')
for nyears, date, text, event in day_list: for nyears, date, text, event in day_list:
ol += Html('li', text, indent=True, inline=False if event == 'Anniversary' ol += Html('li', text,inline=False if event == 'Anniversary'
else True) else True)
# add ordered list to body section # add ordered list to body section
body += ol body += ol
# create blank line for stylesheets # create blank line for stylesheets
body += Html('div', class_ = 'fullclear', indent=True, inline=True) 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)
@@ -1214,14 +1220,12 @@ class WebCalReport(Report):
""" """
# begin calendar footer # begin calendar footer
footer = Html('div', id = 'footer', indent=True) footer = Html('div', id = 'footer')
# Display date as user set in preferences # Display date as user set in preferences
value = _dp.parse(time.strftime('%b %d %Y'))
value = _dd.display(value)
msg = _('Generated by <a href="http://gramps-project.org">' msg = _('Generated by <a href="http://gramps-project.org">'
'GRAMPS</a> on %(date)s') % {'date' : value} 'GRAMPS</a> on %(date)s') % {'date' : _dd.display(gen.lib.date.Today())}
p = Html('p', msg, id = 'createdate', indent=True) p = Html('p', msg, id = 'createdate')
# add Generated by? to footer # add Generated by? to footer
footer += p footer += p
@@ -1239,7 +1243,7 @@ class WebCalReport(Report):
else: else:
text = "&copy; %s %s" % (self.today.get_year(), self.author) text = "&copy; %s %s" % (self.today.get_year(), self.author)
p = Html('p', text, id = 'copyright', indent=True) p = Html('p', text, id = 'copyright')
# add copyright to footer # add copyright to footer
footer += p footer += p
@@ -1522,7 +1526,7 @@ class WebCalOptions(MenuReportOptions):
menu.add_option(category_name, 'fullyear', fullyear) menu.add_option(category_name, 'fullyear', fullyear)
makeoneday = BooleanOption(_('Create one day event pages for' makeoneday = BooleanOption(_('Create one day event pages for'
'Year At A Glance calendar'), False) ' Year At A Glance calendar'), False)
makeoneday.set_help(_('Whether to create one day pages or not')) makeoneday.set_help(_('Whether to create one day pages or not'))
menu.add_option(category_name, 'makeoneday', makeoneday) menu.add_option(category_name, 'makeoneday', makeoneday)
@@ -1770,12 +1774,6 @@ def get_day_list(event_date, holiday_list, bday_anniv_list):
# initialize day_list # initialize day_list
day_list = [] day_list = []
##################################################################
# holiday on this day
# '...' signifies an incomplete date for an event. See add_day_item()
holiday_list = [(t, e, d) for t, e, d in holiday_list
if d != '...']
################################################################## ##################################################################
# birthday/ anniversary on this day # birthday/ anniversary on this day
# '...' signifies an incomplete date for an event. See add_day_item() # '...' signifies an incomplete date for an event. See add_day_item()