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

Bug#4601 -- W3C Validation part#1; cleanup of the core pages has been done.

Browse Source 
svn: r16563
This commit is contained in:
Rob G. Healey 2011-02-04 03:41:16 +00:00
parent 60e8c0c013
commit 3ec04c6edd
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,7 +522,7 @@ class BasePage(object):
linenb = 1 linenb = 1
else: else:
if linenb > 1: if linenb > 1:
linelist[-1] += '<br>' linelist[-1] += '<br />'
linelist.append(line) linelist.append(line)
linenb += 1 linenb += 1
if linenb > 1: if linenb > 1:
@ -1093,7 +1093,7 @@ class BasePage(object):
center_person.handle, "ppl", self.up) center_person.handle, "ppl", self.up)
person_name = self.get_name(center_person) person_name = self.get_name(center_person)
msg += _('<br>Created for <a href = "%s">%s</a>') % ( msg += _('<br />Created for <a href = "%s">%s</a>') % (
center_person_url, person_name) center_person_url, person_name)
# creation author # creation author
@ -1301,14 +1301,12 @@ class BasePage(object):
# begin image # begin image
image = Html("img") image = Html("img")
img_attr = '' image.attr = ''
if height: if height:
img_attr += 'height = "%d"' % height image.attr += 'height = "%d"' % height
img_attr += ' src = "%s" alt = "%s" title = "%s"' % (newpath, obj.get_description(),
obj.get_description() )
# add image attributes to image descr = html_escape(obj.get_description() )
image.attr = img_attr image.attr += ' src = "%s" alt = "%s"' % (newpath, descr )
# return an image # return an image
return image return image
@ -1826,7 +1824,7 @@ class BasePage(object):
if thumbnailUrl: if thumbnailUrl:
hyper += (Html("span", class_ = "thumbnail") + hyper += (Html("span", class_ = "thumbnail") +
Html("img", src = thumbnailUrl, alt = "Image of " + person_name) Html("img", src = thumbnailUrl, alt = "Image of " + person_name)
) )
else: else:
hyper.attr += ' class= "noThumb"' hyper.attr += ' class= "noThumb"'
@ -1859,8 +1857,8 @@ class BasePage(object):
with Html("div", class_ = "thumbnail") as thumbnail: with Html("div", class_ = "thumbnail") as thumbnail:
# begin hyperlink # begin hyperlink
hyper = Html("a", href = url, title = name) + ( hyper = Html("a", href = url, title = html_escape(name)) + (
Html("img", src = img_url, alt = name) Html("img", src = img_url)
) )
thumbnail += hyper thumbnail += hyper
@ -1885,7 +1883,7 @@ class BasePage(object):
with Html("div", class_ = "thumbnail") as thumbnail: with Html("div", class_ = "thumbnail") as thumbnail:
# begin hyperlink # begin hyperlink
hyper = Html("a", href = url, title = name) hyper = Html("a", href = url, title = html_escape(name))
thumbnail += hyper thumbnail += hyper
url = self.report.build_url_image("document.png", "images", up) url = self.report.build_url_image("document.png", "images", up)
@ -1913,7 +1911,7 @@ class BasePage(object):
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", name, href = url, title = name) hyper = Html("a", name, href = url, title = html_escape(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)
@ -1927,7 +1925,7 @@ class BasePage(object):
if found: if found:
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", html_escape(name), href = url, title = html_escape(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)
@ -2830,7 +2828,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):
@ -3061,7 +3059,7 @@ class MediaPage(BasePage):
ordered += Html("li", style = "left:%d%%; top:%d%%; width:%d%%; height:%d%%;" ordered += Html("li", style = "left:%d%%; top:%d%%; width:%d%%; height:%d%%;"
% (x, y, w, h)) + ( % (x, y, w, h)) + (
Html("a", name, href = linkurl) Html("a", name, href = linkurl)
) )
# display the image # display the image
if initial_image_path != newpath: if initial_image_path != newpath:
@ -3070,8 +3068,8 @@ class MediaPage(BasePage):
mediadisplay += Html("a", href = url) + ( mediadisplay += Html("a", href = url) + (
Html("img", width = new_width, Html("img", width = new_width,
height = new_height, src = url, height = new_height, src = url,
alt = html_escape(self.page_title), title = html_escape(self.page_title)) alt = html_escape(self.page_title))
) )
else: else:
dirname = tempfile.mkdtemp() dirname = tempfile.mkdtemp()
thmb_path = os.path.join(dirname, "document.png") thmb_path = os.path.join(dirname, "document.png")
@ -3339,7 +3337,7 @@ class SurnameListPage(BasePage):
def surname_link(self, fname, name, opt_val = None, up = False): def surname_link(self, fname, name, opt_val = None, up = False):
url = self.report.build_url_fname_html(fname, "srn", up) url = self.report.build_url_fname_html(fname, "srn", up)
hyper = Html("a", name, href = url, title = name, inline = True) hyper = Html("a", name, href = url, title = html_escape(name), inline = True)
if opt_val is not None: if opt_val is not None:
hyper += opt_val hyper += opt_val
@ -3678,7 +3676,7 @@ class MediaListPage(BasePage):
name = html_escape(name) name = html_escape(name)
# begin hyper link # begin hyper link
hyper = Html("a", name, href = url, title = name) hyper = Html("a", name, href = url, title = html_escape(name))
# return hyperlink to its callers # return hyperlink to its callers
return hyper return hyper
@ -3752,9 +3750,9 @@ class DownloadPage(BasePage):
tbody += trow tbody += trow
fname = os.path.basename(dlfname1) fname = os.path.basename(dlfname1)
tcell = ( Html("td", class_ = "ColumnFilename") + tcell = Html("td", class_ = "ColumnFilename") + (
Html("a", fname, href = dlfname1, title = dldescr1) Html("a", fname, href = dlfname1, title = html_escape(dldescr1))
) )
trow += tcell trow += tcell
dldescr1 = dldescr1 or "&nbsp;" dldescr1 = dldescr1 or "&nbsp;"
@ -3777,9 +3775,9 @@ class DownloadPage(BasePage):
tbody += trow tbody += trow
fname = os.path.basename(dlfname2) fname = os.path.basename(dlfname2)
tcell = ( Html("td", class_ = "ColumnFilename") + tcell = Html("td", class_ = "ColumnFilename") + (
Html("a", fname, href = dlfname2, alt = dldescr2) Html("a", fname, href = dlfname2, title = html_escape(dldescr2))
) )
trow += tcell trow += tcell
dldescr2 = dldescr2 or "&nbsp;" dldescr2 = dldescr2 or "&nbsp;"
@ -3829,6 +3827,7 @@ class ContactPage(BasePage):
with Html("div", id = 'researcher') as researcher: with Html("div", id = 'researcher') as researcher:
summaryarea += researcher summaryarea += researcher
if r.name: if r.name:
r.name = r.name.replace(',,,', '') r.name = r.name.replace(',,,', '')
researcher += Html("h3", r.name, inline = True) researcher += Html("h3", r.name, inline = True)
@ -3845,9 +3844,8 @@ class ContactPage(BasePage):
if r.country: if r.country:
researcher += Html("span", r.country, id = 'country', inline = True) researcher += Html("span", r.country, id = 'country', inline = True)
if r.email: if r.email:
researcher += ( Html("span", id = 'email') + researcher += Html("span", id = 'email') + (
Html("a", r.email, href = 'mailto:%s?subject="from Gramps Web Site"' Html("a", r.email, href = 'mailto:%s' % r.email, inline = True)
% r.email, inline = True)
) )
# add clear line for proper styling # add clear line for proper styling
@ -6944,9 +6942,9 @@ def alphabet_navigation(menu_set):
title_str = _("Alphabet Navigation Menu Item " + menu_item) title_str = _("Alphabet Navigation Menu Item " + menu_item)
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 = menu_item) hyper = Html("a", menu_item, href = "#%s" % menu_item)
hyper.attr += ' title = "%s"' % title_str hyper.attr += ' title = "%s"' % title_str
li += hyper li += hyper