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

Bug#4287: Beg#4601: Fixed

Browse Source 
and cleanup for NarrativeWeb for W3C compliance; IndividualPages
          still have errors in the Pedigree section -- this will require
          more than a simple tweak of code or style sheet elements.

svn: r16591
This commit is contained in:
Rob G. Healey 2011-02-09 06:26:01 +00:00
parent 6e50919487
commit 783619455f
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -788,8 +788,8 @@ class BasePage(object):
if showsrc: if showsrc:
addr_header.append([SHEAD, "Sources"]) addr_header.append([SHEAD, "Sources"])
trow.extend(Html("th", l, class_="Colummn" + c, inline=True) trow.extend(Html("th", label, class_="Colummn" + colclass, inline=True)
for l, c in addr_header) for label, colclass in addr_header)
# return table header row back to module # return table header row back to module
return trow return trow
@ -998,7 +998,7 @@ class BasePage(object):
home_person_name = self.get_name(center_person) home_person_name = self.get_name(center_person)
# carriage return was added by Stephane Charette to force it down one line # carriage return was added by Stephane Charette to force it down one line
msg += '<br/>' + _(' Created for <a href = "%s">%s</a>') % ( msg += '<br />' + _(' Created for <a href = "%s">%s</a>') % (
home_person_url, home_person_name) home_person_url, home_person_name)
# creation date # creation date
@ -1196,7 +1196,7 @@ class BasePage(object):
cs = True cs = True
cs = 'class = "CurrentSection"' if cs else "" cs = 'class = "CurrentSection"' if cs else ""
ul += (Html("li", attr = cs, inline = True) + ul += Html("li", attr = cs, inline = True) + (
Html("a", nav_text, href = url) Html("a", nav_text, href = url)
) )
@ -1837,7 +1837,7 @@ class BasePage(object):
# begin hyperlink # begin hyperlink
hyper = (Html("a", href = url, title = name) + hyper = (Html("a", href = url, title = name) +
Html("img", src=img_url, alt = name) ) Html("img", src = img_url, alt = name) )
thumbnail += hyper thumbnail += hyper
if usedescr: if usedescr:
@ -1868,9 +1868,10 @@ class BasePage(object):
def repository_link(self, handle, name, cindex, gid = None, up = False): def repository_link(self, handle, name, cindex, gid = None, up = False):
name = html_escape( name )
url = self.report.build_url_fname_html(handle, 'repo', up) url = self.report.build_url_fname_html(handle, 'repo', up)
# begin hyperlink # begin hyperlink
hyper = Html("a", html_escape(name), href = url, title = name) hyper = Html("a", name, href = url, title = name)
if not self.noid and gid: if not self.noid and gid:
hyper += Html("span", '[%s]' % gid, class_ = "grampsid", inline = True) hyper += Html("span", '[%s]' % gid, class_ = "grampsid", inline = True)
@ -1878,9 +1879,10 @@ class BasePage(object):
return hyper return hyper
def place_link(self, handle, name, gid = None, up = False): def place_link(self, handle, name, gid = None, up = False):
name = html_escape( name )
url = self.report.build_url_fname_html(handle, "plc", up) url = self.report.build_url_fname_html(handle, "plc", up)
hyper = Html("a", html_escape(name), href = url, title = name) hyper = Html("a", name, href = url, title = name)
if not self.noid and gid: if not self.noid and gid:
hyper += Html("span", " [%s]" % gid, class_ = "grampsid", inline = True) hyper += Html("span", " [%s]" % gid, class_ = "grampsid", inline = True)
@ -2043,9 +2045,9 @@ 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)
) trow += Html("th", _("Name"), class_ = "ColumnName", inline = True)
if showbirth: if showbirth:
trow += Html("th", BIRTH, class_ = "ColumnBirth", inline = True) trow += Html("th", BIRTH, class_ = "ColumnBirth", inline = True)
@ -3610,8 +3612,8 @@ class DownloadPage(BasePage):
tbody += trow tbody += trow
fname = os.path.basename(dlfname1) fname = os.path.basename(dlfname1)
tcell = ( Html("td", class_ = "Filename") + tcell = Html("td", class_ = "Filename") + (
Html("a", fname, href = dlfname1, alt = dldescr1) Html("a", fname, href = dlfname1, title = html_escape(dldescr1))
) )
trow += tcell trow += tcell
@ -3638,8 +3640,8 @@ class DownloadPage(BasePage):
tbody += trow tbody += trow
fname = os.path.basename(dlfname2) fname = os.path.basename(dlfname2)
tcell = ( Html("td", class_ = "Filename") + tcell = Html("td", class_ = "Filename") + (
Html("a", fname, href = dlfname2, alt = dldescr2) Html("a", fname, href = dlfname2, title = html_escape(dldescr2))
) )
trow += tcell trow += tcell