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

Bug#0005274: Narweb - Web Link, showing Url -- has been fixed as requested.

Browse Source 
svn: r19085
This commit is contained in:
Rob G. Healey 2012-03-19 02:49:40 +00:00
parent a226f070c7
commit f8f747fad6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2154,12 +2154,9 @@ class BasePage(object):
# begin web links division # begin web links division
with Html("div", class_ = "subsection", id = "WebLinks") as section: with Html("div", class_ = "subsection", id = "WebLinks") as section:
# begin web title
section += Html("h4", _("Web Links"), inline = True) section += Html("h4", _("Web Links"), inline = True)
# begin weblinks table with Html("table", class_ = "infolist") as table:
with Html("table", class_ = "infolist weblinks") as table:
section += table section += table
thead = Html("thead") thead = Html("thead")
@ -2172,7 +2169,6 @@ class BasePage(object):
Html('th', label, class_ = colclass, inline = True) Html('th', label, class_ = colclass, inline = True)
for (label, colclass) in [ for (label, colclass) in [
(_("Type"), "ColumnType"), (_("Type"), "ColumnType"),
(_("Url"), "ColumnPath"),
(_("Description"), "ColumnDescription") (_("Description"), "ColumnDescription")
] ]
) )
@ -2204,12 +2200,14 @@ class BasePage(object):
if not (uri.startswith("ftp://") or uri.startswith("ftps://")): if not (uri.startswith("ftp://") or uri.startswith("ftps://")):
uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri } uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri }
uri = Html("a", uri, href = uri, title = html_escape(descr)) descr = Html("p", html_escape(descr)) + (
Html("a", _(" [Click to Go]"), href = uri, title = uri)
)
trow.extend( trow.extend(
Html("td", data, class_ = colclass, inline = True) Html("td", data, class_ = colclass, inline = True)
for (data, colclass) in [ for (data, colclass) in [
(str(_type), "ColumnType"), (str(_type), "ColumnType"),
(uri, "ColumnPath"),
(descr, "ColumnDescription") (descr, "ColumnDescription")
] ]
) )