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

Using newpage() now. Cleanup, and code revisions.

Browse Source 
svn: r12384
This commit is contained in:
Rob G. Healey 2009-03-24 14:58:16 +00:00
parent 4f073eb270
commit 13d2d1c5ea
1 changed files with 53 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id: $ # $Id: WebCal.py 12238 2009-03-07 09:51:27Z s_charette $
""" """
Web Calendar generator. Web Calendar generator.
@ -433,7 +433,7 @@ class WebCalReport(Report):
# #
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
def write_header(self, nr_up, title, add_print=True): def write_header(self, nr_up, body_id, title, add_print=True):
""" """
This creates the header for the Calendars This creates the header for the Calendars
'nr_up' - number of directory levels up, started from current page, to the 'nr_up' - number of directory levels up, started from current page, to the
@ -481,9 +481,35 @@ class WebCalReport(Report):
# add stylesheet links to head section # add stylesheet links to head section
head += links head += links
# begin page body
new_body = Html('body', id = body_id)
# replace standard body element with custom one
page.replace(body, new_body)
# start header division section
headerdiv = Html('div', id="header", indent=True) + (
# page title
Html('h1', title, id = "SiteTitle", indent=True, inline=True),
)
# Created for ?
if self.author:
if self.email:
msg = _('Created for <a href="mailto:%(email)s?'
'subject=WebCal">%(author)s</a>') % {'email' : self.email,
'author' : self.author}
else:
msg = _('Created for %(author)s') % {'author' : self.author}
headerdiv += Html('p', msg, id="CreatorInfo", indent=True)
# add header division to body
new_body += headerdiv
# return to its caller # return to its caller
# either webcalendar(), year_glance(), or one_day() # either webcalendar(), year_glance(), or one_day()
return page, body return page, new_body
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
# #
@ -491,7 +517,7 @@ class WebCalReport(Report):
# #
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
def display_year_navs(self, nr_up, currentsection): def year_navigation(self, nr_up, currentsection):
""" """
This will create the year navigation menu bar This will create the year navigation menu bar
@ -564,7 +590,7 @@ class WebCalReport(Report):
# #
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
def display_month_navs(self, nr_up, year, currentsection, add_home): def month_navigation(self, nr_up, year, currentsection, add_home):
""" """
Will create and display the navigation menu bar Will create and display the navigation menu bar
@ -897,46 +923,18 @@ class WebCalReport(Report):
cal_fname = get_full_month_name(month) cal_fname = get_full_month_name(month)
of = self.create_file(cal_fname, str(year)) of = self.create_file(cal_fname, str(year))
# Add Header # Add xml, doctype, meta and stylesheets
webcal, body = self.write_header(nr_up, self.title_text) # body has already been added to webcal already once
webcal, body = self.write_header(nr_up, 'WebCal', self.title_text)
# Created for ?
if self.author:
if self.email:
msg = _('Created for <a href="mailto:%(email)s?'
'subject=WebCal">%(author)s</a>') % {'email' : self.email,
'author' : self.author}
else:
msg = _('Created for %(author)s') % {'author' : self.author}
# begin page body
body = Html('body', id = 'WebCal')
# start header division section
headerdiv = Html('div', id="header", indent=True) + (
# page title
Html('h1', self.title_text, id = "SiteTitle", indent=True, inline=True),
# Created for?
Html('p', msg, id="CreatorInfo", indent=True),
)
# add header section to body section
body += headerdiv
# create Year Navigation menu # create Year Navigation menu
if self.multiyear: if self.multiyear:
menu = self.display_year_navs(nr_up, str(year)) body += self.year_navigation(nr_up, str(year))
body += menu
# Create Month Navigation Menu # Create Month Navigation Menu
# identify currentsection for proper highlighting # identify currentsection for proper highlighting
currentsection = get_full_month_name(month) currentsection = get_full_month_name(month)
menu = self.display_month_navs(nr_up, year, currentsection, True) body += self.month_navigation(nr_up, year, currentsection, True)
# add menu to body section
body += menu
# build the calendar # build the calendar
monthly_calendar = self.calendar_build("wc", year, month) monthly_calendar = self.calendar_build("wc", year, month)
@ -962,20 +960,14 @@ class WebCalReport(Report):
body += monthly_calendar body += monthly_calendar
# create blank line for stylesheets # create blank line for stylesheets
clearline = Html('div', class_ = 'fullclear', indent=True, inline=True) body += Html('div', class_ = 'fullclear', indent=True, inline=True)
# add clear line # create footer division section
body += clearline
# write footer section
footer = self.write_footer(nr_up) footer = self.write_footer(nr_up)
# add footer to WebCal # add footer to WebCal
body += footer body += footer
# add body to page
webcal += body
# send calendar page to web output # send calendar page to web output
mywriter(webcal, of) mywriter(webcal, of)
@ -1009,40 +1001,16 @@ class WebCalReport(Report):
title = _("%(year)d, At A Glance") % {'year' : year} title = _("%(year)d, At A Glance") % {'year' : year}
# Create page header # Create page header
yearglance = self.write_header(nr_up, title, False) # body has already been added to yearglance already once
yearglance, body = self.write_header(nr_up, 'fullyearlinked', title, False)
# begin page body
body = Html('body', id = 'fullyearlinked')
# Created for ?
if self.author:
if self.email:
msg = _('Created for <a href="mailto:%(email)s?'
'subject=WebCal">%(author)s</a>') % {'email' : self.email,
'author' : self.author}
else:
msg = _('Created for %(author)s') % {'author' : self.author}
# start header division section
headdiv = Html('div', id="header", indent=True) + (
# page title
Html('h1', title, id = "SiteTitle", indent=True, inline=True),
# Created for?
Html('p', msg, id="CreatorInfo", indent=True)
)
# add header division to body
body += headdiv
# create Year Navigation menu # create Year Navigation menu
if self.multiyear: if self.multiyear:
body += self.display_year_navs(nr_up, str(year)) body += self.year_navigation(nr_up, str(year))
# Create Month Navigation Menu # Create Month Navigation Menu
# identify currentsection for proper highlighting # identify currentsection for proper highlighting
body += self.display_month_navs(nr_up, year, 'fullyearlinked', False) body += self.month_navigation(nr_up, year, 'fullyearlinked', False)
msg = (_('This calendar is meant to give you access ' msg = (_('This calendar is meant to give you access '
'to all your data at a glance compressed into one page. Clicking ' 'to all your data at a glance compressed into one page. Clicking '
@ -1071,10 +1039,7 @@ class WebCalReport(Report):
self.progress.step() self.progress.step()
# create blank line for stylesheets # create blank line for stylesheets
clearline = Html('div', class_ = 'fullclear', indent=True, inline=True) body += Html('div', class_ = 'fullclear', indent=True, inline=True)
# add clear line
body += clearline
# write footer section # write footer section
footer = self.write_footer(nr_up) footer = self.write_footer(nr_up)
@ -1082,9 +1047,6 @@ class WebCalReport(Report):
# add footer to body # add footer to body
body += footer body += footer
# add body to page
yearglance += body
# send calendar page to web output # send calendar page to web output
mywriter(yearglance, of) mywriter(yearglance, of)
@ -1115,7 +1077,6 @@ class WebCalReport(Report):
# break up event_date to get year, month, day for this day # break up event_date to get year, month, day for this day
year = event_date.get_year() year = event_date.get_year()
month = event_date.get_month() month = event_date.get_month()
day = event_date.get_day()
# Name the file, and create it (see code in calendar_build) # Name the file, and create it (see code in calendar_build)
# chose 'od' as I will be opening and closing more than one file # chose 'od' as I will be opening and closing more than one file
@ -1129,42 +1090,18 @@ class WebCalReport(Report):
title = _('One Day Within A Year') title = _('One Day Within A Year')
# create page header # create page header
oneday = self.write_header(nr_up, title) # body has already been added to oneday already once
oneday, body = self.write_header(nr_up, 'OneDay', title)
# begin page body
body = Html('body', id = 'OneDay')
# Created for ?
if self.author:
if self.email:
msg = _('Created for <a href="mailto:%(email)s?'
'subject=WebCal">%(author)s</a>') % {'email' : self.email,
'author' : self.author}
else:
msg = _('Created for %(author)s') % {'author' : self.author}
# start header division section
headdiv = Html('div', id='header', indent=True) + (
# page title
Html('h1', title, id = "SiteTitle", indent=True, inline=True),
# created for?
Html('p', msg, id="CreatorInfo", indent=True)
)
# add header division to body
body += headdiv
# create Year Navigation menu # create Year Navigation menu
if self.multiyear: if self.multiyear:
body += self.display_year_navs(nr_up, str(year)) body += self.year_navigation(nr_up, str(year))
# Create Month Navigation Menu # Create Month Navigation Menu
# identify currentsection for proper highlighting # identify currentsection for proper highlighting
# connect it back to year_glance() calendar # connect it back to year_glance() calendar
currentsection = 'fullyearlinked' currentsection = 'fullyearlinked'
body += self.display_month_navs(nr_up, year, currentsection, False) body += self.month_navigation(nr_up, year, currentsection, False)
# page date # page date
h3 = Html('h3', pg_date, indent=True,inline=True) h3 = Html('h3', pg_date, indent=True,inline=True)
@ -1182,10 +1119,7 @@ class WebCalReport(Report):
body += ol body += ol
# create blank line for stylesheets # create blank line for stylesheets
clearline = Html('div', class_ = 'fullclear', indent=True, inline=True) body += Html('div', class_ = 'fullclear', indent=True, inline=True)
# add clear line
body += clearline
# write footer section # write footer section
footer = self.write_footer(nr_up) footer = self.write_footer(nr_up)
@ -1193,9 +1127,6 @@ class WebCalReport(Report):
# add footer to WebCal # add footer to WebCal
body += footer body += footer
# add body to page
oneday += body
# send calendar page to web output # send calendar page to web output
mywriter(oneday, od) mywriter(oneday, od)
@ -1472,12 +1403,10 @@ class WebCalOptions(MenuReportOptions):
cright.set_help( _("The copyright to be used for the web files")) cright.set_help( _("The copyright to be used for the web files"))
menu.add_option(category_name, "cright", cright) menu.add_option(category_name, "cright", cright)
css = EnumeratedListOption(_('StyleSheet'), \ css = EnumeratedListOption(_('StyleSheet'), _CSS_FILES[0][1])
_CSS_FILES[0][1])
for style in _CSS_FILES: for style in _CSS_FILES:
css.add_item(style[1], style[0]) css.add_item(style[1], style[0])
css.set_help( _('The Style Sheet to be used ' css.set_help( _('The Style Sheet to be used for the web page'))
'for the web page'))
menu.add_option(category_name, "css", css) menu.add_option(category_name, "css", css)
def __add_content_options(self, menu): def __add_content_options(self, menu):
@ -1618,16 +1547,13 @@ class WebCalOptions(MenuReportOptions):
category_name = _('Advanced Options') category_name = _('Advanced Options')
encoding = EnumeratedListOption(_('Character set encoding'), \ encoding = EnumeratedListOption(_('Character set encoding'), _CHARACTER_SETS[0][1])
_CHARACTER_SETS[0][1])
for eopt in _CHARACTER_SETS: for eopt in _CHARACTER_SETS:
encoding.add_item(eopt[1], eopt[0]) encoding.add_item(eopt[1], eopt[0])
encoding.set_help( _('The encoding to be used for ' encoding.set_help( _('The encoding to be used for the web files'))
'the web files'))
menu.add_option(category_name, "encoding", encoding) menu.add_option(category_name, "encoding", encoding)
fullyear = BooleanOption(_('Create "Year At A Glance" ' fullyear = BooleanOption(_('Create "Year At A Glance" Calendar'), False)
'Calendar'), False)
fullyear.set_help(_('Whether to create A one-page mini calendar ' fullyear.set_help(_('Whether to create A one-page mini calendar '
'with dates highlighted')) 'with dates highlighted'))
menu.add_option(category_name, 'fullyear', fullyear) menu.add_option(category_name, 'fullyear', fullyear)