\n')
-
- # FIXME. Do we want an empty GRAMPSinfo div below if no self.linkhome?
- msg = ""
+ of.write('
\n\n')
# Begin Navigation Menu
- of.write(' \n') # End Navigation Menu
divid = ''
if content_divid:
@@ -666,9 +667,12 @@ class BasePage:
of.write('\t\n')
def person_link(self, of, url, name, gid=None, thumbnailUrl=None):
- of.write('' % url)
+ of.write('')
if thumbnailUrl:
- of.write('\n')
db = self.report.database
if self.linkhome:
@@ -370,26 +373,24 @@ class BasePage:
if home_person:
home_person_url = self.report.build_url_fname_html(home_person.handle, 'ppl', self.up)
home_person_name = home_person.get_primary_name().get_regular_name()
- msg = _('Created for %s') % (home_person_url, home_person_name)
- of.write('
\n')
+ of.write('%s
\n' % msg)
- of.write(' %s
\n' % html_escape(self.title_str)) + of.write('\t%s
\n' % html_escape(self.title_str)) header = self.report.options['headernote'] if header: note = db.get_note_from_gramps_id(header) - of.write('') + of.write('\t
') of.write(note.get()) of.write('
\n') - of.write('\t' % thumbnailUrl) + of.write('
\n' % (divclass, top, xoff+1))
- of.write('\t\t\t\t
\n')
of.write('\t\t\t\n' % (top+_SHADOW, xoff+_SHADOW))
def extend_line(self, of, y0, x0):
@@ -2012,8 +2015,10 @@ class IndividualPage(BasePage):
# table head
of.write('\t\t\t\n')
+ of.write('\t\t\t\t')
+ divclass = "unknown"
+ of.write('\t\t\t
\n')
+ of.write('\n\t\t\t\n' % (divclass, col, top, xoff+1))
+ of.write('\t\t\t\t')
if person.handle in self.ind_list:
thumbnailUrl = None
- if self.use_gallery and col < 3:
+ if self.use_gallery and col < 5:
photolist = person.get_media_list()
if photolist:
photo_handle = photolist[0].get_reference_handle()
@@ -1795,8 +1799,7 @@ class IndividualPage(BasePage):
self.person_link(of, url, person_name, thumbnailUrl=thumbnailUrl)
else:
of.write(_nd.display(person))
- of.write('
\n')
- of.write('\t\t\t- \n')
+ else:
+ of.write('\t\t\t\t\t\t \n')
for notehandle in notelist:
note = db.get_note_from_handle(notehandle)
if note:
@@ -2088,11 +2097,9 @@ class IndividualPage(BasePage):
else:
# TODO. Decide what to do with multiline notes.
txt = u" ".join(note_text.split("\n"))
- if not done_first_note:
- of.write('\t\t\t\t\t\t
- %s \n' % txt) - if done_first_note: + if notelist: of.write('\t\t\t\t\t\t
- %s \n' % text) - # "WebCal" needs more spacing than "Year At A Glance" - if cal == 'wc': - of.write('
- ') - else: - of.write('
- ') - of.write('%s\n' % text) + of.write('\t
- \n')
txt = txt or ' '
of.write('\t\t\t\t\t\t\t
') if self.email != '': - msg = _('Created for %(author)s\n') % { + msg = _('Created for %(author)s\n') % { 'email' : self.email, 'author' : self.author} else: msg = _('Created for %(author)s\n') % {'author' : self.author} - of.write('%s' % msg) - of.write(' \n') # end GRAMPSinfo - of.write(' \n') # end header + of.write('%s
\n' % msg) + of.write('\n') # end header # adjust the months being created if self.partyear is True # and year is eequal to current year, then start_month is current month @@ -619,22 +621,22 @@ class WebCalReport(Report): if not self.multiyear: th_txt = '%s %d' % (month_name, year) of.write('\n\n' % month_name) - of.write('| %s | \n' % th_txt) - of.write('||||||
|---|---|---|---|---|---|---|
| %s | \n' % th_txt) + of.write('\t\t||||||
|---|---|---|---|---|---|---|
| %s | \n' % (dayclass, get_name_for_daycol(day_col))) - of.write('%s | \n' % (dayclass, get_name_for_daycol(day_col))) + of.write('\t\t\n') + of.write('\t\n') # begin table body - of.write(' \n') + of.write('\t\n') # Compute the first day to display for this month. # It can also be a day in the previous month. @@ -659,7 +661,7 @@ class WebCalReport(Report): nweeks = len(monthinfo) for week_row in range(0, nweeks): week = monthinfo[week_row] - of.write('|||||
| \n' % specclass) - - # span class is used here to differentiate between previous/next days versus calendar days - of.write(' %d\n' % specday) - of.write(' | \n') + of.write('\t\t\t\t\n' % (day, dayclass))
- of.write(' %d \n' % day)
- of.write(' | \n')
+ of.write('\t\t\t\n' % (day, dayclass))
+ of.write('\t\t\t\t %d \n' % day)
+ of.write('\t\t\t | \n')
else:
thisday = datetime.date.fromordinal(current_ord)
- of.write(' \n'
+ of.write('\t\t\t\t\n'
% (shrt_month, day, lng_month, shrt_month, day, self.ext, shrt_month, day))
- of.write(' %d \n' % day)
+ of.write('\t\t\t\t\t%d \n' % day)
+ of.write('\t\t\t\t\n')
# WebCal
elif cal == 'wc':
- of.write(' %d \n' % day)
+ of.write('\t\t\t\t%d \n' % day)
# year_glance() and print_page() both need this to itemize the list
self.one_day(of, evt_date, cal, holiday_list, bday_anniv_list)
@@ -715,21 +716,21 @@ class WebCalReport(Report):
# no holiday/ bday/ anniversary this day
else:
of.write('class="%s">\n' % dayclass)
- of.write(' %d \n' % day)
+ of.write('\t\t\t\t%d \n' % day)
# no holiday/ bday/ anniversary this month
else:
of.write('class="%s">\n' % dayclass)
- of.write(' %d \n' % day)
+ of.write('\t\t\t\t%d \n' % day)
- # close the day/ column
- of.write(' | \n')
+ # close the day/ column
+ of.write('\t\t\t\n')
# change day number
current_ord += 1
# close the week/ row
- of.write(' |||
\n') - of.write(_(' This calendar is meant to give you access to all your data at a glance ' - 'compressed into one page. Clicking on a red square will take you to a ' + of.write('
\n') + of.write(_('This calendar is meant to give you access to all your data at a glance ' + 'compressed into one page. Clicking on a red square will take you to a ' 'page that shows all the events for that date!\n')) - of.write('
\n\n') + of.write('\n\n') for month in range(self.start_month, (self.end_month + 1)): @@ -1103,25 +1089,25 @@ class WebCalReport(Report): # Note. The week rows are filled up to make them all 6 weeks long. nweeks = len(calendar.monthcalendar(self.year, month)) for i in range(nweeks+1, 7): - of.write('