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

Fixed a lot of string items, whereas href=; it becomes href = as an example. This was talked about a while back, and Brian or Benny made the point to code like this.

Browse Source 
svn: r13432
This commit is contained in:
Rob G. Healey 2009-10-27 15:40:15 +00:00
parent 7fe80cc10b
commit 77da65bc71
2 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,7 +276,7 @@ class BasePage(object):
This is the base class to write certain HTML pages. This is the base class to write certain HTML pages.
""" """
def __init__(self, report, title, gid=None): def __init__(self, report, title, gid = None):
""" """
report - instance of NavWebReport report - instance of NavWebReport
title - text for the <title> tag title - text for the <title> tag
@ -366,7 +366,7 @@ class BasePage(object):
for ref in gid_list: for ref in gid_list:
index, key = self.bibli.add_reference(ref) index, key = self.bibli.add_reference(ref)
id_ = "%d%s" % (index+1, key) id_ = "%d%s" % (index+1, key)
text = text + '<a href="#sref%s">%s</a>' % (id_, id_) text = text + '<a href = "#sref%s">%s</a>' % (id_, id_)
text = text + "</sup>" text = text + "</sup>"
# return citation list text to its callers # return citation list text to its callers
@ -501,7 +501,7 @@ class BasePage(object):
# return events table row to its callers # return events table row to its callers
return trow return trow
def event_link(self, eventtype, handle, gid=None, up=False): def event_link(self, eventtype, handle, gid = None, up=False):
""" createsa hyperlink for an event based on its type """ """ createsa hyperlink for an event based on its type """
url = self.report.build_url_fname_html(handle, 'evt', up) url = self.report.build_url_fname_html(handle, 'evt', up)
@ -509,7 +509,7 @@ class BasePage(object):
# if event pages are being created, then hyperlink the event type # if event pages are being created, then hyperlink the event type
if self.inc_events: if self.inc_events:
evt_hyper = Html("a", eventtype, href=url, title=eventtype) evt_hyper = Html("a", eventtype, href = url, title=eventtype)
if not self.noid and gid: if not self.noid and gid:
evt_hyper += Html("span", " [%s] " % gid, class_ = "grampsid", evt_hyper += Html("span", " [%s] " % gid, class_ = "grampsid",
inline = True) inline = True)
@ -521,7 +521,7 @@ class BasePage(object):
else: else:
return eventtype return eventtype
def get_event_data(self, evt, evt_ref, showplc, showdescr, showsrc, shownote, subdirs, hyp, gid=None): def get_event_data(self, evt, evt_ref, showplc, showdescr, showsrc, shownote, subdirs, hyp, gid = None):
""" """
retrieve event data from event and evt_ref retrieve event data from event and evt_ref
@ -667,7 +667,7 @@ class BasePage(object):
# return table to its callers # return table to its callers
return table return table
def source_link(self, handle, hyper_name, name, gid=None, up=False): def source_link(self, handle, hyper_name, name, gid = None, up=False):
url = self.report.build_url_fname_html(handle, 'src', up) url = self.report.build_url_fname_html(handle, 'src', up)
@ -886,14 +886,14 @@ class BasePage(object):
note = db.get_note_from_gramps_id(footer_note) note = db.get_note_from_gramps_id(footer_note)
note_text = self.get_note_format(note) note_text = self.get_note_format(note)
user_footer = Html("div", id='user_footer') user_footer = Html("div", id = 'user_footer')
footer += user_footer footer += user_footer
# attach note # attach note
user_footer += note_text user_footer += note_text
value = _dd.display(date.Today()) value = _dd.display(date.Today())
msg = _('Generated by <a href="%(homepage)s">' msg = _('Generated by <a href = "%(homepage)s">'
'GRAMPS</a> on %(date)s') % { 'GRAMPS</a> on %(date)s') % {
'date': value, 'homepage' : const.URL_HOMEPAGE 'date': value, 'homepage' : const.URL_HOMEPAGE
} }
@ -908,11 +908,11 @@ class BasePage(object):
self.up) self.up)
home_person_name = self.get_name(home_person) home_person_name = self.get_name(home_person)
msg += _(' Created for <a href="%s">%s</a>') % ( msg += _(' Created for <a href = "%s">%s</a>') % (
home_person_url, home_person_name) home_person_url, home_person_name)
# creation date # creation date
footer += Html("p", msg, id='createdate') footer += Html("p", msg, id = 'createdate')
# get copyright license for all pages # get copyright license for all pages
copy_nr = self.report.copyright copy_nr = self.report.copyright
@ -929,7 +929,7 @@ class BasePage(object):
fname = "/".join(["images", "somerights20.gif"]) fname = "/".join(["images", "somerights20.gif"])
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
text = _CC[copy_nr] % {'gif_fname' : url} text = _CC[copy_nr] % {'gif_fname' : url}
footer += Html("p", text, id='copyright') footer += Html("p", text, id = 'copyright')
# return footer to its callers # return footer to its callers
return footer return footer
@ -982,10 +982,10 @@ class BasePage(object):
url5 = self.report.build_url_image('favicon.ico', 'images', self.up) url5 = self.report.build_url_image('favicon.ico', 'images', self.up)
# create stylesheet and favicon links # create stylesheet and favicon links
links = [Html("link", href=url5, type="image/x-icon", rel="shortcut icon"), links = [Html("link", href = url5, type = "image/x-icon", rel = "shortcut icon"),
Html("link", href=url1, type="text/css", media="screen", rel="stylesheet"), Html("link", href = url1, type = "text/css", media = "screen", rel = "stylesheet"),
Html("link", href=url3, type="text/css", media="screen", rel="stylesheet"), Html("link", href = url3, type = "text/css", media = "screen", rel = "stylesheet"),
Html("link", href=url4, type="text/css", media='print', rel="stylesheet") Html("link", href = url4, type = "text/css", media = 'print', rel = "stylesheet")
] ]
# add additional meta and link tags # add additional meta and link tags
@ -993,8 +993,8 @@ class BasePage(object):
head += links head += links
# begin header section # begin header section
headerdiv = (Html("div", id='header') + headerdiv = (Html("div", id = 'header') +
Html('h1', html_escape(self.title_str), id='SiteTitle', inline = True) Html('h1', html_escape(self.title_str), id = 'SiteTitle', inline = True)
) )
body += headerdiv body += headerdiv
@ -1003,7 +1003,7 @@ class BasePage(object):
note = db.get_note_from_gramps_id(header_note) note = db.get_note_from_gramps_id(header_note)
note_text = self.get_note_format(note) note_text = self.get_note_format(note)
user_header = Html("div", id='user_header') user_header = Html("div", id = 'user_header')
headerdiv += user_header headerdiv += user_header
# attach note # attach note
@ -1042,7 +1042,7 @@ class BasePage(object):
('repositories', _("Repositories"), inc_repos), ('repositories', _("Repositories"), inc_repos),
] ]
navigation = Html("div", id='navigation') navigation = Html("div", id = 'navigation')
ul = Html('ul') ul = Html('ul')
navs = ((u, n) for u, n, c in navs if c) navs = ((u, n) for u, n, c in navs if c)
@ -1085,7 +1085,7 @@ class BasePage(object):
cs = cs and 'class="CurrentSection"' or '' cs = cs and 'class="CurrentSection"' or ''
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)
) )
navigation += ul navigation += ul
@ -1254,15 +1254,15 @@ class BasePage(object):
if not descr: if not descr:
descr = uri descr = uri
if url.get_type() == UrlType.EMAIL and not uri.startswith("mailto:"): if url.get_type() == UrlType.EMAIL and not uri.startswith("mailto:"):
ordered += Html("li") + Html("a",descr, href='mailto:%s' % url) ordered += Html("li") + Html("a",descr, href = 'mailto:%s' % url)
elif url.get_type() == UrlType.WEB_HOME and not uri.startswith("http://"): elif url.get_type() == UrlType.WEB_HOME and not uri.startswith("http://"):
ordered += Html("li") + Html("a", descr, href='http://%s' % url) ordered += Html("li") + Html("a", descr, href = 'http://%s' % url)
elif url.get_type() == UrlType.WEB_FTP and not uri.startswith("ftp://"): elif url.get_type() == UrlType.WEB_FTP and not uri.startswith("ftp://"):
ordered += Html("li") + Html("a", descr, href='ftp://%s' % url) ordered += Html("li") + Html("a", descr, href = 'ftp://%s' % url)
else: else:
ordered += Html("li") + Html("a", descr, href=url) ordered += Html("li") + Html("a", descr, href = url)
# return web links to its caller # return web links to its caller
return section return section
@ -1348,12 +1348,12 @@ class BasePage(object):
# Note. 'path' already has a filename extension # Note. 'path' already has a filename extension
url = self.report.build_url_fname(path, None, self.up) url = self.report.build_url_fname(path, None, self.up)
list += self.person_link(url, name, None, gid=gid) list += self.person_link(url, name, None, gid = gid)
# return references division to its caller # return references division to its caller
return section return section
def person_link(self, url, person, name_style, first=True, gid=None, thumbnailUrl=None): def person_link(self, url, person, name_style, first=True, gid = None, thumbnailUrl=None):
""" """
creates a hyperlink for a person creates a hyperlink for a person
@ -1377,7 +1377,7 @@ class BasePage(object):
person_name = person person_name = person
# 1. start building link to image or person # 1. start building link to image or person
hyper = Html("a", href=url) hyper = Html("a", href = url)
# 2. insert thumbnail if there is one, otherwise insert class = "noThumb" # 2. insert thumbnail if there is one, otherwise insert class = "noThumb"
if thumbnailUrl: if thumbnailUrl:
@ -1408,7 +1408,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=name) +
Html('img', src=img_url, alt=name) ) Html('img', src=img_url, alt=name) )
thumbnail += hyper thumbnail += hyper
@ -1438,21 +1438,21 @@ class BasePage(object):
# return thumbnail division to its callers # return thumbnail division to its callers
return thumbnail return thumbnail
def repository_link(self, handle, name, cindex, gid=None, up=False): def repository_link(self, handle, name, cindex, gid = None, up=False):
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", html_escape(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)
# return hyperlink to its callers # return hyperlink to its callers
return hyper return hyper
def place_link(self, handle, name, gid=None, up=False): def place_link(self, handle, name, gid = None, up=False):
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=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)
@ -1505,7 +1505,7 @@ class IndividualListPage(BasePage):
msg = _("This page contains an index of all the individuals in the " msg = _("This page contains an index of all the individuals in the "
"database, sorted by their last names. Selecting the person&#8217;s " "database, sorted by their last names. Selecting the person&#8217;s "
"name will take you to that person&#8217;s individual page.") "name will take you to that person&#8217;s individual page.")
individuallist += Html("p", msg, id='description') individuallist += Html("p", msg, id = 'description')
# add alphabet navigation # add alphabet navigation
alpha_nav = alphabet_navigation(db, person_handle_list, _PERSON) alpha_nav = alphabet_navigation(db, person_handle_list, _PERSON)
@ -1568,7 +1568,7 @@ class IndividualListPage(BasePage):
tcell = Html("td", class_ = "ColumnName") tcell = Html("td", class_ = "ColumnName")
trow += tcell trow += tcell
url = self.report.build_url_fname_html(person.handle, 'ppl') url = self.report.build_url_fname_html(person.handle, 'ppl')
tcell += self.person_link(url, person, False, gid=person.gramps_id) tcell += self.person_link(url, person, False, gid = person.gramps_id)
# birth column # birth column
if showbirth: if showbirth:
@ -1621,7 +1621,7 @@ class IndividualListPage(BasePage):
url = self.report.build_url_fname_html( url = self.report.build_url_fname_html(
partner_handle, 'ppl') partner_handle, 'ppl')
tcell += self.person_link(url, partner, True, tcell += self.person_link(url, partner, True,
gid=partner.gramps_id) gid = partner.gramps_id)
else: else:
tcell += partner_name tcell += partner_name
first_family = False first_family = False
@ -1694,7 +1694,7 @@ class SurnamePage(BasePage):
msg = _("This page contains an index of all the individuals in the " msg = _("This page contains an index of all the individuals in the "
"database with the surname of %s. Selecting the person&#8217;s name " "database with the surname of %s. Selecting the person&#8217;s name "
"will take you to that person&#8217;s individual page.") % surname "will take you to that person&#8217;s individual page.") % surname
surnamedetail += Html("p", msg, id='description') surnamedetail += Html("p", msg, id = 'description')
# begin surname table and thead # begin surname table and thead
with Html("table", class_ = "infolist surname") as surname_table: with Html("table", class_ = "infolist surname") as surname_table:
@ -1730,7 +1730,7 @@ class SurnamePage(BasePage):
trow = Html("tr") trow = Html("tr")
tcell = Html("td", class_ = "ColumnName") tcell = Html("td", class_ = "ColumnName")
url = self.report.build_url_fname_html(person.handle, 'ppl', True) url = self.report.build_url_fname_html(person.handle, 'ppl', True)
tcell += self.person_link(url, person, False, gid=person.gramps_id) tcell += self.person_link(url, person, False, gid = person.gramps_id)
trow += tcell trow += tcell
# birth column # birth column
@ -1779,7 +1779,7 @@ class SurnamePage(BasePage):
url = self.report.build_url_fname_html( url = self.report.build_url_fname_html(
partner_handle, 'ppl', True) partner_handle, 'ppl', True)
tcell += self.person_link(url, partner, True, tcell += self.person_link(url, partner, True,
gid=partner.gramps_id) gid = partner.gramps_id)
else: else:
tcell += partner_name tcell += partner_name
else: else:
@ -1844,7 +1844,7 @@ class PlaceListPage(BasePage):
msg = _("This page contains an index of all the places in the " msg = _("This page contains an index of all the places in the "
"database, sorted by their title. Clicking on a place&#8217;s " "database, sorted by their title. Clicking on a place&#8217;s "
"title will take you to that place&#8217;s page.") "title will take you to that place&#8217;s page.")
placelist += Html("p", msg, id='description') placelist += Html("p", msg, id = 'description')
# begin alphabet navigation # begin alphabet navigation
alpha_nav = alphabet_navigation(db, place_handles, _PLACE) alpha_nav = alphabet_navigation(db, place_handles, _PLACE)
@ -1935,7 +1935,7 @@ class PlacePage(BasePage):
placedetail += Html('h3', html_escape(self.page_title.strip())) placedetail += Html('h3', html_escape(self.page_title.strip()))
# begin summaryarea division and places table # begin summaryarea division and places table
with Html("div", id='summaryarea') as summaryarea: with Html("div", id = 'summaryarea') as summaryarea:
placedetail += summaryarea placedetail += summaryarea
with Html("table", class_ = "infolist place") as table: with Html("table", class_ = "infolist place") as table:
@ -2083,7 +2083,7 @@ class EventListPage(BasePage):
# get person's hyperlink # get person's hyperlink
url = self.report.build_url_fname_html(person.handle, 'ppl', subdirs) url = self.report.build_url_fname_html(person.handle, 'ppl', subdirs)
person_hyper = self.person_link(url, person, True, first, gid=person.gramps_id) person_hyper = self.person_link(url, person, True, first, gid = person.gramps_id)
# begin table row # begin table row
trow = Html("tr") trow = Html("tr")
@ -2116,7 +2116,7 @@ class EventListPage(BasePage):
# get partner hyperlink # get partner hyperlink
url = self.report.build_url_fname_html(partner.handle, 'ppl', subdirs) url = self.report.build_url_fname_html(partner.handle, 'ppl', subdirs)
partner_hyper = self.person_link(url, partner, True, gid=partner.gramps_id) partner_hyper = self.person_link(url, partner, True, gid = partner.gramps_id)
trow += Html("td", partner_hyper, class_ = "ColumnPartner") trow += Html("td", partner_hyper, class_ = "ColumnPartner")
# return EventList row to its caller # return EventList row to its caller
@ -2180,7 +2180,7 @@ class EventPage(BasePage):
# get person hyperlink # get person hyperlink
url = self.report.build_url_fname_html(person.handle, 'ppl', self.up) url = self.report.build_url_fname_html(person.handle, 'ppl', self.up)
person_hyper = self.person_link(url, person, True, gid=person.gramps_id) person_hyper = self.person_link(url, person, True, gid = person.gramps_id)
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", _('Person'), class_ = "ColumnAttribute", inline = True), Html("td", _('Person'), class_ = "ColumnAttribute", inline = True),
Html("td", person_hyper, class_ = "ColumnPerson") Html("td", person_hyper, class_ = "ColumnPerson")
@ -2190,7 +2190,7 @@ class EventPage(BasePage):
# display partner if type is either Marriage or Divorce # display partner if type is either Marriage or Divorce
if partner is not None: if partner is not None:
url = self.report.build_url_fname_html(partner.handle, 'ppl', self.up) url = self.report.build_url_fname_html(partner.handle, 'ppl', self.up)
partner_hyper = self.person_link(url, partner, True, gid=partner.gramps_id) partner_hyper = self.person_link(url, partner, True, gid = partner.gramps_id)
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", _('Partner'), class_ = "ColumnAttribute", inline = True), Html("td", _('Partner'), class_ = "ColumnAttribute", inline = True),
Html("td", partner_hyper, class_ = "ColumnPartner") Html("td", partner_hyper, class_ = "ColumnPartner")
@ -2315,14 +2315,14 @@ class MediaPage(BasePage):
body += mediadetail body += mediadetail
# gallery navigation # gallery navigation
gallerynav = Html("div", id='GalleryNav') gallerynav = Html("div", id = 'GalleryNav')
mediadetail += gallerynav mediadetail += gallerynav
if prev: if prev:
gallerynav += self.gallery_nav_link(prev, _('Previous'), True) gallerynav += self.gallery_nav_link(prev, _('Previous'), True)
data = _('<strong id = "GalleryCurrent">%(page_number)d</strong> of ' data = _('<strong id = "GalleryCurrent">%(page_number)d</strong> of '
'<strong id = "GalleryTotal">%(total_pages)d</strong>' ) % { '<strong id = "GalleryTotal">%(total_pages)d</strong>' ) % {
'page_number' : page_number, 'total_pages' : total_pages } 'page_number' : page_number, 'total_pages' : total_pages }
gallerynav += Html("span", data, id='GalleryPages') gallerynav += Html("span", data, id = 'GalleryPages')
if next: if next:
gallerynav += self.gallery_nav_link(next, _('Next'), True) gallerynav += self.gallery_nav_link(next, _('Next'), True)
@ -2331,12 +2331,12 @@ class MediaPage(BasePage):
missingimage = Html("span", errormsg, class_ = "MissingImage") missingimage = Html("span", errormsg, class_ = "MissingImage")
# begin summaryarea division # begin summaryarea division
summaryarea = Html("div", id='summaryarea') summaryarea = Html("div", id = 'summaryarea')
mediadetail += summaryarea mediadetail += summaryarea
if mime_type: if mime_type:
if mime_type.startswith("image/"): if mime_type.startswith("image/"):
if not target_exists: if not target_exists:
mediadisplay = Html("div", id='GalleryDisplay') + \ mediadisplay = Html("div", id = 'GalleryDisplay') + \
missingimage missingimage
summaryarea += mediadisplay summaryarea += mediadisplay
else: else:
@ -2392,13 +2392,13 @@ class MediaPage(BasePage):
(name, x, y, w, h, linkurl) = _region_items.pop() (name, x, y, w, h, linkurl) = _region_items.pop()
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:
url = self.report.build_url_fname(newpath, None, self.up) url = self.report.build_url_fname(newpath, None, self.up)
mediadisplay += Html("a", href=url) + ( mediadisplay += Html("a", href = url) + (
Html('img', width=new_width, height=new_height, src=url, Html('img', width=new_width, height=new_height, src=url,
alt=html_escape(self.page_title)) alt=html_escape(self.page_title))
) )
@ -2421,12 +2421,12 @@ class MediaPage(BasePage):
path = os.path.join('images', 'document.png') path = os.path.join('images', 'document.png')
os.rmdir(dirname) os.rmdir(dirname)
mediadisplay = Html("div", id='GalleryDisplay') mediadisplay = Html("div", id = 'GalleryDisplay')
summaryarea += mediadisplay summaryarea += mediadisplay
if target_exists: if target_exists:
# TODO. Convert disk path to URL # TODO. Convert disk path to URL
url = self.report.build_url_fname(newpath, None, self.up) url = self.report.build_url_fname(newpath, None, self.up)
hyper = Html("a", href=url) hyper = Html("a", href = url)
# TODO. Mixup url and path # TODO. Mixup url and path
# path = convert_disk_path_to_url(path) # path = convert_disk_path_to_url(path)
url = self.report.build_url_fname(path, None, self.up) url = self.report.build_url_fname(path, None, self.up)
@ -2439,7 +2439,7 @@ class MediaPage(BasePage):
else: else:
mediadisplay += missingimage mediadisplay += missingimage
else: else:
mediadisplay = Html("div", id='GalleryDisplay') mediadisplay = Html("div", id = 'GalleryDisplay')
summaryarea += mediadisplay summaryarea += mediadisplay
url = self.report.build_url_image('document.png', 'images', self.up) url = self.report.build_url_image('document.png', 'images', self.up)
mediadisplay += Html('img', src=url, alt=html_escape(self.page_title)) mediadisplay += Html('img', src=url, alt=html_escape(self.page_title))
@ -2545,7 +2545,7 @@ class MediaPage(BasePage):
url = self.report.build_url_fname_html(handle, 'img', up) url = self.report.build_url_fname_html(handle, 'img', up)
name = html_escape(name) name = html_escape(name)
hyper = Html("a", name, id=name, href=url, title=name, inline = True) hyper = Html("a", name, id = name, href = url, title=name, inline = True)
# return hyperlink to its callers # return hyperlink to its callers
return hyper return hyper
@ -2626,7 +2626,7 @@ class SurnameListPage(BasePage):
'surnames in the database. Selecting a link ' 'surnames in the database. Selecting a link '
'will lead to a list of individuals in the ' 'will lead to a list of individuals in the '
'database with this same surname.') 'database with this same surname.')
surnamelist += Html("p", msg, id='description') surnamelist += Html("p", msg, id = 'description')
# add alphabet navigation... # add alphabet navigation...
# only if surname list not surname count # only if surname list not surname count
@ -2641,7 +2641,7 @@ class SurnameListPage(BasePage):
table_id = 'SortByName' table_id = 'SortByName'
# begin surnamelist table and table head # begin surnamelist table and table head
with Html("table", class_ = "infolist surnamelist", id=table_id) as table: with Html("table", class_ = "infolist surnamelist", id = table_id) as table:
surnamelist += table surnamelist += table
thead = Html("thead") thead = Html("thead")
@ -2655,13 +2655,13 @@ class SurnameListPage(BasePage):
fname = self.report.surname_fname + self.ext fname = self.report.surname_fname + self.ext
tcell = Html("th", class_ = "ColumnSurname", inline = True) tcell = Html("th", class_ = "ColumnSurname", inline = True)
trow += tcell trow += tcell
hyper = Html("a", _('Surname'), href=fname) hyper = Html("a", _('Surname'), href = fname)
tcell += hyper tcell += hyper
fname = "surnames_count" + self.ext fname = "surnames_count" + self.ext
tcell = Html("th", class_ = "ColumnQuantity", inline = True) tcell = Html("th", class_ = "ColumnQuantity", inline = True)
trow += tcell trow += tcell
hyper = Html("a", _('Number of People'), href=fname) hyper = Html("a", _('Number of People'), href = fname)
tcell += hyper tcell += hyper
# begin table body # begin table body
@ -2723,7 +2723,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) hyper = Html("a", name, href = url, title=name)
if opt_val is not None: if opt_val is not None:
hyper += opt_val hyper += opt_val
@ -2831,7 +2831,7 @@ class SourceListPage(BasePage):
msg = _("This page contains an index of all the sources in the " msg = _("This page contains an index of all the sources in the "
"database, sorted by their title. Clicking on a source&#8217;s " "database, sorted by their title. Clicking on a source&#8217;s "
"title will take you to that source&#8217;s page.") "title will take you to that source&#8217;s page.")
sourceslist += Html("p", msg, id='description') sourceslist += Html("p", msg, id = 'description')
# begin sourcelist table and table head # begin sourcelist table and table head
with Html("table", class_ = "infolist sourcelist") as table: with Html("table", class_ = "infolist sourcelist") as table:
@ -2962,7 +2962,7 @@ class MediaListPage(BasePage):
"the title will take you to that media object&#8217;s page. " "the title will take you to that media object&#8217;s page. "
"If you see media size densions above an image, click on the " "If you see media size densions above an image, click on the "
"image to see the full sized version. ") "image to see the full sized version. ")
section += Html("p", msg, id='description') section += Html("p", msg, id = 'description')
# begin gallery table and table head # begin gallery table and table head
with Html("table", class_ = "infolist gallerylist") as table: with Html("table", class_ = "infolist gallerylist") as table:
@ -3022,7 +3022,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=name)
# return hyperlink to its callers # return hyperlink to its callers
return hyper return hyper
@ -3095,12 +3095,12 @@ class DownloadPage(BasePage):
tbody = Html("tbody") tbody = Html("tbody")
table += tbody table += tbody
trow = Html("tr", id='Row01') trow = Html("tr", id = 'Row01')
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, alt=dldescr1)
) )
trow += tcell trow += tcell
@ -3123,12 +3123,12 @@ class DownloadPage(BasePage):
if dlfname2: if dlfname2:
# begin row #2 # begin row #2
trow = Html("tr", id='Row02') trow = Html("tr", id = 'Row02')
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, alt=dldescr2)
) )
trow += tcell trow += tcell
@ -3138,7 +3138,7 @@ class DownloadPage(BasePage):
copyright = self.get_copyright_license(dlcopy) or "&nbsp;" copyright = self.get_copyright_license(dlcopy) or "&nbsp;"
trow += Html("td", copyright, class_ = "License", inline = True) trow += Html("td", copyright, class_ = "License", inline = True)
tcell = Html("td", id='Col04', class_ = "Modified", inline = True) tcell = Html("td", id = 'Col04', class_ = "Modified", inline = True)
trow += tcell trow += tcell
if os.path.exists(dlfname2): if os.path.exists(dlfname2):
modified = os.stat(dlfname2).st_mtime modified = os.stat(dlfname2).st_mtime
@ -3170,7 +3170,7 @@ class ContactPage(BasePage):
body += section body += section
# begin summaryarea division # begin summaryarea division
with Html("div", id='summaryarea') as summaryarea: with Html("div", id = 'summaryarea') as summaryarea:
section += summaryarea section += summaryarea
contactimg = report.add_image('contactimg', 200) contactimg = report.add_image('contactimg', 200)
@ -3180,24 +3180,24 @@ class ContactPage(BasePage):
# get researcher information # get researcher information
r = Utils.get_researcher() r = Utils.get_researcher()
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)
if r.addr: if r.addr:
researcher += Html("span", r.addr, id='streetaddress') researcher += Html("span", r.addr, id = 'streetaddress')
text = "".join([r.city, r.state, r.postal]) text = "".join([r.city, r.state, r.postal])
if text: if text:
city = Html("span", r.city, id='city', inline = True) city = Html("span", r.city, id = 'city', inline = True)
state = Html("span", r.state, id='state', inline = True) state = Html("span", r.state, id = 'state', inline = True)
postal = Html("span", r.postal, id='postalcode', inline = True) postal = Html("span", r.postal, id = 'postalcode', inline = True)
researcher += (city, state, postal) researcher += (city, state, postal)
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?subject="from GRAMPS Web Site"'
% r.email, inline = True) % r.email, inline = True)
) )
@ -3248,7 +3248,7 @@ class IndividualPage(BasePage):
indivdetpage, body = self.write_header(self.sort_name) indivdetpage, body = self.write_header(self.sort_name)
# begin individualdetail division # begin individualdetail division
with Html("div", class_ = "content", id='IndividualDetail') as individualdetail: with Html("div", class_ = "content", id = 'IndividualDetail') as individualdetail:
body += individualdetail body += individualdetail
# display a person's general data # display a person's general data
@ -3629,7 +3629,7 @@ class IndividualPage(BasePage):
section_title = Html('h3', self.get_name(self.person), inline = True) section_title = Html('h3', self.get_name(self.person), inline = True)
# begin summaryarea division # begin summaryarea division
with Html("div", id='summaryarea') as summaryarea: with Html("div", id = 'summaryarea') as summaryarea:
# begin general details table # begin general details table
with Html("table", class_ = "infolist") as table: with Html("table", class_ = "infolist") as table:
@ -3843,7 +3843,7 @@ class IndividualPage(BasePage):
list = Html("li") list = Html("li")
if child_handle in self.ind_list: if child_handle in self.ind_list:
url = self.report.build_url_fname_html(child_handle, 'ppl', True) url = self.report.build_url_fname_html(child_handle, 'ppl', True)
list += self.person_link(url, child, True, gid=gid) list += self.person_link(url, child, True, gid = gid)
else: else:
list += self.get_name(child) list += self.get_name(child)
@ -3864,7 +3864,7 @@ class IndividualPage(BasePage):
gid = person.gramps_id gid = person.gramps_id
if handle in self.ind_list: if handle in self.ind_list:
url = self.report.build_url_fname_html(handle, 'ppl', True) url = self.report.build_url_fname_html(handle, 'ppl', True)
tcell2 += self.person_link(url, person, True, gid=gid) tcell2 += self.person_link(url, person, True, gid = gid)
else: else:
person_name = self.get_name(person) person_name = self.get_name(person)
tcell2 += person_name tcell2 += person_name
@ -4219,7 +4219,7 @@ class IndividualPage(BasePage):
if partner_handle: if partner_handle:
if partner_handle in self.ind_list: if partner_handle in self.ind_list:
url = self.report.build_url_fname_html(partner_handle, 'ppl', True) url = self.report.build_url_fname_html(partner_handle, 'ppl', True)
tcell += self.person_link(url, partner, True, gid=partner.gramps_id) tcell += self.person_link(url, partner, True, gid = partner.gramps_id)
else: else:
tcell += partner_name tcell += partner_name
@ -4376,7 +4376,7 @@ class RepositoryListPage(BasePage):
msg = _("This page contains an index of all the repositories in the " msg = _("This page contains an index of all the repositories in the "
"database, sorted by their title. Clicking on a repositories&#8217;s " "database, sorted by their title. Clicking on a repositories&#8217;s "
"title will take you to that repositories&#8217;s page.") "title will take you to that repositories&#8217;s page.")
repositorylist += Html("p", msg, id='description') repositorylist += Html("p", msg, id = 'description')
# begin repositories table and table head # begin repositories table and table head
with Html("table", class_ = "infolist repolist") as table: with Html("table", class_ = "infolist repolist") as table:
@ -5675,7 +5675,7 @@ def first_letter(string):
letter = normalize('NFKC', unicode(string))[0].upper() letter = normalize('NFKC', unicode(string))[0].upper()
else: else:
letter = u' ' letter = u' '
# See : http://www.gramps-project.org/bugs/view.php?id=2933 # See : http://www.gramps-project.org/bugs/view.php?id = 2933
(lang_country, modifier ) = locale.getlocale() (lang_country, modifier ) = locale.getlocale()
if lang_country == "sv_SE" and (letter == u'W' or letter == u'V'): if lang_country == "sv_SE" and (letter == u'W' or letter == u'V'):
letter = u'V,W' letter = u'V,W'
@ -5719,7 +5719,7 @@ def alphabet_navigation(db, handle_list, key):
# % words or names are only to be distinguished by 'v' or % 'w', 'v' is # % words or names are only to be distinguished by 'v' or % 'w', 'v' is
# % placed before 'w'. # % placed before 'w'.
# #
# See : http://www.gramps-project.org/bugs/view.php?id=2933 # See : http://www.gramps-project.org/bugs/view.php?id = 2933
# #
(lang_country, modifier ) = locale.getlocale() (lang_country, modifier ) = locale.getlocale()
@ -5762,10 +5762,10 @@ def alphabet_navigation(db, handle_list, key):
title_str = _("Surnames") if key == 0 else _("Places") title_str = _("Surnames") if key == 0 else _("Places")
if lang_country == "sv_SE" and ltr == u'V': if lang_country == "sv_SE" and ltr == u'V':
title_str += _(" starting with %s") % "V,W" title_str += _(" starting with %s") % "V,W"
hyper = Html("a", "V,W", href="#V,W") hyper = Html("a", "V,W", href = "#V,W")
else: else:
title_str += _(" starting with %s") % ltr title_str += _(" starting with %s") % ltr
hyper = Html("a", ltr, href="#%s" % ltr) hyper = Html("a", ltr, href = "#%s" % ltr)
hyper.attr += " title = %s" % title_str hyper.attr += " title = %s" % title_str
list += hyper list += hyper

8
src/plugins/webreport/webplugins.gpr.py
View File

@ -35,8 +35,8 @@ plg.version = '1.0'
plg.status = STABLE plg.status = STABLE
plg.fname = 'NarrativeWeb.py' plg.fname = 'NarrativeWeb.py'
plg.ptype = REPORT plg.ptype = REPORT
plg.authors = ["Donald N. Allingham"] plg.authors = ["Donald N. Allingham", "Rob G. Healey"]
plg.authors_email = ["don@gramps-project.org"] plg.authors_email = ["don@gramps-project.org", "robhealey1@gmail.com"]
plg.category = CATEGORY_WEB plg.category = CATEGORY_WEB
plg.reportclass = 'NavWebReport' plg.reportclass = 'NavWebReport'
plg.optionclass = 'NavWebOptions' plg.optionclass = 'NavWebOptions'
@ -57,8 +57,8 @@ plg.version = '1.0'
plg.status = STABLE plg.status = STABLE
plg.fname = 'WebCal.py' plg.fname = 'WebCal.py'
plg.ptype = REPORT plg.ptype = REPORT
plg.authors = ["Thom Sturgill"] plg.authors = ["Thom Sturgill", "Rob G. Healey"]
plg.authors_email = ["thsturgill@yahoo.com"] plg.authors_email = ["thsturgill@yahoo.com", "robhealey1@gmail.com"]
plg.category = CATEGORY_WEB plg.category = CATEGORY_WEB
plg.reportclass = 'WebCalReport' plg.reportclass = 'WebCalReport'
plg.optionclass = 'WebCalOptions' plg.optionclass = 'WebCalOptions'