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

Worked on bugs #4305 and #4486. Not all problems are complete yet, but see #4305 for explaination.

Browse Source 
svn: r16331
This commit is contained in:
Rob G. Healey 2011-01-03 02:39:27 +00:00
parent 0df382465c
commit 27ff0c989e
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/webreport/NarrativeWeb.py
View File

@ -504,17 +504,17 @@ class BasePage(object):
db = self.report.database db = self.report.database
# begin unordered list # begin unordered list
ul = Html("p") para = Html("p")
for notehandle in notelist: for notehandle in notelist:
ul.extend( para.extend(
Html("i", str(db.get_note_from_handle(notehandle).type)) Html("i", str(db.get_note_from_handle(notehandle).type))
) )
ul.extend( para.extend(
self.get_note_format(db.get_note_from_handle(notehandle)) self.get_note_format(db.get_note_from_handle(notehandle))
) )
# return note list to its callers # return note list to its callers
return ul return para
def display_event_row(self, evt, evt_ref, subdirs, hyp, omit): def display_event_row(self, evt, evt_ref, subdirs, hyp, omit):
""" """
@ -2043,7 +2043,7 @@ class IndividualListPage(BasePage):
thead += trow thead += trow
# show surname and first name # show surname and first name
trow += ( Html("th", _("Surname"), class_ = "ColumnSurname", inline = True) + trow += Html("th", _("Surname"), class_ = "ColumnSurname", inline = True) + (
Html("th", _("Name"), class_ = "ColumnName", inline = True) Html("th", _("Name"), class_ = "ColumnName", inline = True)
) )
@ -2690,7 +2690,7 @@ class EventListPage(BasePage):
url = self.report.build_url_fname_html(handle, "evt", up) url = self.report.build_url_fname_html(handle, "evt", up)
# return hyperlink to its caller # return hyperlink to its caller
return Html("a", grampsid, href = url, alt = grampsid, inline = True) return Html("a", grampsid, href = url, title = grampsid, inline = True)
class EventPage(BasePage): class EventPage(BasePage):
def __init__(self, report, title, event_handle): def __init__(self, report, title, event_handle):
@ -3410,7 +3410,6 @@ class SourcePage(BasePage):
(_("Author"), source.author), (_("Author"), source.author),
(_("Publication information"), source.pubinfo), (_("Publication information"), source.pubinfo),
(_("Abbreviation"), source.abbrev) ]: (_("Abbreviation"), source.abbrev) ]:
if val: if val:
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute"), Html("td", label, class_ = "ColumnAttribute"),
@ -4100,10 +4099,10 @@ class IndividualPage(BasePage):
return ol return ol
def child_ped(ol): def child_ped(ol):
ol += Html("li", class_ = "thisperson", inline = True) + self.name ol += Html("li", self.name, class_ = "thisperson", inline = True)
family = self.pedigree_family() family = self.pedigree_family()
if family: if family:
ol += Html("ol", class_ = "spouselist") + family ol += Html("ol", family, class_ = "spouselist")
return ol return ol
# End of helper functions # End of helper functions
@ -5117,7 +5116,7 @@ class AddressBookListPage(BasePage):
# create totals row for table # create totals row for table
trow = Html("tr", class_ = "Totals") + ( trow = Html("tr", class_ = "Totals") + (
Html("td", _("Total"), classs_ = "ColumnRowlabel", inline = True), Html("td", _("Total"), class_ = "ColumnRowlabel", inline = True),
Html("td", index, class_ = "ColumnName", inline = True), Html("td", index, class_ = "ColumnName", inline = True),
Html("td", countadd, class_ = "ColumnAddress", inline = True), Html("td", countadd, class_ = "ColumnAddress", inline = True),
Html("td", countres, class_ = "ColumnResidence", inline = True), Html("td", countres, class_ = "ColumnResidence", inline = True),
@ -6470,9 +6469,9 @@ def alphabet_navigation(menu_set, alphakey):
menu_item = sorted_alpha_index[index] menu_item = sorted_alpha_index[index]
if lang_country == "sv_SE" and menu_item == u'V': if lang_country == "sv_SE" and menu_item == u'V':
hyper = Html("a", "V,W", href = "#V,W", alt = "V,W") hyper = Html("a", "V,W", href = "#V,W", title = "V,W")
else: else:
hyper = Html("a", menu_item, href = "#%s" % menu_item, alt = html_escape(menu_item)) hyper = Html("a", menu_item, href = "#%s" % menu_item, title = html_escape(menu_item))
list += hyper list += hyper
# increase letter/ word in sorted_alpha_index # increase letter/ word in sorted_alpha_index