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

Cleanup on display_url_list() and WebLinks elements.

Browse Source 
svn: r15524
This commit is contained in:
Rob G. Healey 2010-06-04 03:33:14 +00:00
parent fcf02507b5
commit 504b31e255
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/data/Web_Basic-Blue.css
View File

@ -1212,15 +1212,18 @@ div#WebLinks {
margin : 0 auto; margin : 0 auto;
padding: 0; padding: 0;
} }
table.weblinks tr td.ColumnRowLabel { table.WebLinks {
width: 6%; width: 100%;
} }
table.weblinks tr td.ColumnType { table.weblinks tbody tr td.ColumnType {
width: 15%;
}
table.WebLinks tbody tr td.ColumnPath {
width: 50%;
}
table.weblinks tbody tr td.ColumnDescription {
width: 30%; width: 30%;
} }
table.weblinks tr td.ColumnDescription {
width: 64%;
}
/* Subsections : Pedigree /* Subsections : Pedigree
----------------------------------------------------- */ ----------------------------------------------------- */

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

@ -1547,15 +1547,14 @@ class BasePage(object):
trow.extend( trow.extend(
Html('th', label, class_ = "Column" + colclass, inline = True) Html('th', label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [ for (label, colclass) in [
(" ", "RowLabel"),
(THEAD, "Type"), (THEAD, "Type"),
(_("Link/ Description"), "Description") ] (_("Web Path"), "Path"),
(DESCRHEAD, "Description") ]
) )
tbody = Html("tbody") tbody = Html("tbody")
table += tbody table += tbody
index = 0
for url in urllist: for url in urllist:
trow = Html("tr") trow = Html("tr")
@ -1565,13 +1564,6 @@ class BasePage(object):
uri = url.get_path() uri = url.get_path()
descr = url.get_description() descr = url.get_description()
if not descr:
descr = uri
trow.extend(
Html("td", index + 1, class_ = "ColumnRowLabel", inline = True)
)
# Email address # Email address
if _type == UrlType.EMAIL: if _type == UrlType.EMAIL:
if not uri.startswith("mailto:"): if not uri.startswith("mailto:"):
@ -1588,16 +1580,16 @@ class BasePage(object):
if not uri.startswith("ftp://"): if not uri.startswith("ftp://"):
uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri } uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri }
descr = Html("a", descr, href = uri, title = html_escape(descr)) uri = Html("a", uri, href = uri, title = html_escape(uri))
trow.extend( trow.extend(
Html("td", data, class_ = "Column" + colclass) Html("td", data, class_ = "Column" + colclass, inline = True)
for (data, colclass) in [ for (data, colclass) in [
(str(_type), "Type"), (str(_type), "Type"),
(uri, "Path"),
(descr, "Description") ] (descr, "Description") ]
) )
index += 1
# return web links to its caller # return weblinks to its caller
return section return section
def display_ind_sources(self, srcobj): def display_ind_sources(self, srcobj):