Cleanup on display_url_list() and WebLinks elements.
svn: r15524
This commit is contained in:
parent
fcf02507b5
commit
504b31e255
@ -1212,15 +1212,18 @@ div#WebLinks {
|
||||
margin : 0 auto;
|
||||
padding: 0;
|
||||
}
|
||||
table.weblinks tr td.ColumnRowLabel {
|
||||
width: 6%;
|
||||
table.WebLinks {
|
||||
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%;
|
||||
}
|
||||
table.weblinks tr td.ColumnDescription {
|
||||
width: 64%;
|
||||
}
|
||||
|
||||
/* Subsections : Pedigree
|
||||
----------------------------------------------------- */
|
||||
|
@ -1547,15 +1547,14 @@ class BasePage(object):
|
||||
trow.extend(
|
||||
Html('th', label, class_ = "Column" + colclass, inline = True)
|
||||
for (label, colclass) in [
|
||||
(" ", "RowLabel"),
|
||||
(THEAD, "Type"),
|
||||
(_("Link/ Description"), "Description") ]
|
||||
(THEAD, "Type"),
|
||||
(_("Web Path"), "Path"),
|
||||
(DESCRHEAD, "Description") ]
|
||||
)
|
||||
|
||||
tbody = Html("tbody")
|
||||
table += tbody
|
||||
|
||||
index = 0
|
||||
for url in urllist:
|
||||
|
||||
trow = Html("tr")
|
||||
@ -1565,13 +1564,6 @@ class BasePage(object):
|
||||
uri = url.get_path()
|
||||
descr = url.get_description()
|
||||
|
||||
if not descr:
|
||||
descr = uri
|
||||
|
||||
trow.extend(
|
||||
Html("td", index + 1, class_ = "ColumnRowLabel", inline = True)
|
||||
)
|
||||
|
||||
# Email address
|
||||
if _type == UrlType.EMAIL:
|
||||
if not uri.startswith("mailto:"):
|
||||
@ -1588,16 +1580,16 @@ class BasePage(object):
|
||||
if not uri.startswith("ftp://"):
|
||||
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(
|
||||
Html("td", data, class_ = "Column" + colclass)
|
||||
Html("td", data, class_ = "Column" + colclass, inline = True)
|
||||
for (data, colclass) in [
|
||||
(str(_type), "Type"),
|
||||
(uri, "Path"),
|
||||
(descr, "Description") ]
|
||||
)
|
||||
index += 1
|
||||
)
|
||||
|
||||
# return web links to its caller
|
||||
# return weblinks to its caller
|
||||
return section
|
||||
|
||||
def display_ind_sources(self, srcobj):
|
||||
|
Loading…
Reference in New Issue
Block a user