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

Fixed listing of internet addresses in display_url_list() and class InternetAddressBook.

Browse Source 
svn: r13512
This commit is contained in:
Rob G. Healey 2009-11-06 21:50:35 +00:00
parent e0dc1b74f3
commit 029a5a0026
1 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1268,16 +1268,40 @@ class BasePage(object):
descr = url.get_description() descr = url.get_description()
if not descr: if not descr:
descr = uri descr = uri
if url.get_type() == UrlType.EMAIL and not uri.startswith("mailto:"): _type = url.get_type()
ordered += Html("li") + Html("a",descr, href = 'mailto:%s' % url)
elif url.get_type() == UrlType.WEB_HOME and not uri.startswith("http://"): uri = url.get_path()
ordered += Html("li") + Html("a", descr, href = 'http://%s' % url) descr = url.get_description()
if not descr:
descr = uri
elif url.get_type() == UrlType.WEB_FTP and not uri.startswith("ftp://"): list = Html("li")
ordered += Html("li") + Html("a", descr, href = 'ftp://%s' % url) ordered += list
# Email address
if _type == UrlType.EMAIL:
if not uri.startswith("mailto:"):
list += Html("a",descr, href = 'mailto: %s' % uri)
else: else:
ordered += Html("li") + Html("a", descr, href = url) list += Html("a", descr, href = "%s" % uri)
# Web Site address
elif _type == UrlType.WEB_HOME:
if not uri.startswith("http://"):
list += Html("a", descr, href = 'http://%s' % uri)
else:
list += Html("a", href = "%s" % uri)
# FTP server address
elif _type == UrlType.WEB_FTP:
if not uri.startswith("ftp://"):
list += Html("a", descr, href = 'ftp://%s' % uri)
else:
list += Html("a", drscr, href = "%s" % uri)
# custom type
else:
list += Html("a", descr, href = uri)
# return web links to its caller # return web links to its caller
return section return section
@ -4588,7 +4612,8 @@ class InternetAddressBook(BasePage):
tbody += trow tbody += trow
# Internet link type # Internet link type
trow += Html("td", str(url.get_type() ), class_ = "ColumnType", inline = True) _type = url.get_type()
trow += Html("td", str(_type), class_ = "ColumnType", inline = True)
if first: if first:
trow.attr = 'class = "BeginName"' trow.attr = 'class = "BeginName"'
@ -4606,25 +4631,33 @@ class InternetAddressBook(BasePage):
if not descr: if not descr:
descr = uri descr = uri
if url.get_type() == UrlType.EMAIL and not uri.startswith("mailto:"): tcell = Html("td", class_ = "ColumnLink")
trow += Html("td", class_ = "ColumnLink") + ( trow += tcell
Html("a",descr, href = 'mailto: %s' % url)
)
elif url.get_type() == UrlType.WEB_HOME and not uri.startswith("http://"):
trow += Html("td", class_ = "ColumnLink") + (
Html("a", descr, href = 'http://%s' % url)
)
elif url.get_type() == UrlType.WEB_FTP and not uri.startswith("ftp://"):
trow += Html("td", class_ = "ColumnLink") + (
Html("a", descr, href = 'ftp://%s' % url)
)
# Email address
if _type == UrlType.EMAIL:
if not uri.startswith("mailto:"):
tcell += Html("a",descr, href = 'mailto: %s' % uri)
else: else:
trow += Html("td", class_ = "ColumnLink") + ( tcell += Html("a", descr, href = "%s" % uri)
Html("a", descr, href = url)
) # Web Site address
elif _type == UrlType.WEB_HOME:
if not uri.startswith("http://"):
tcell += Html("a", descr, href = 'http://%s' % uri)
else:
tcell += Html("a", href = "%s" % uri)
# FTP server address
elif _type == UrlType.WEB_FTP:
if not uri.startswith("ftp://"):
tcell += Html("a", descr, href = 'ftp://%s' % uri)
else:
tcell += Html("a", drscr, href = "%s" % uri)
# custom type
else:
tcell += Html("a", descr, href = uri)
# Add footer and clearline # Add footer and clearline
footer = self.write_footer() footer = self.write_footer()