Added ftps:// to list of url.startswith() in display_url_list().

svn: r15575
This commit is contained in:
Rob G. Healey 2010-06-17 04:47:32 +00:00
parent f5ef3abf53
commit c5f30ccc3a
2 changed files with 15 additions and 11 deletions

View File

@ -1161,21 +1161,21 @@ div#summaryarea {
background-color: #FFF;
}
div#summaryarea table.infolist {
margin:0;
padding:0;
background-color:#FFF;
margin: 0;
padding: 0;
background-color: #FFF;
}
div#summaryarea table.infolist tr td, div#summaryarea table.infolist tr td p {
font:normal .9em/1.2em sans-serif;
vertical-align:top;
font: normal .9em/1.2em sans-serif;
vertical-align: top;
}
div#summaryarea table.infolist tr td a, div#summaryarea table.infolist tr td p a {
display:inline;
}
div#summaryarea table.infolist tbody tr td.ColumnAttribute {
width:14%;
width: 14%;
color: #696969;
padding-left:20px;
padding-left: 20px;
}
/* Subsections : Weblinks
@ -1187,6 +1187,9 @@ div#WebLinks {
table.WebLinks {
width: 100%;
}
table.WebLinks tbody tr td {
color: #000;
}
table.weblinks tbody tr td.ColumnType {
width: 15%;
}

View File

@ -1622,9 +1622,9 @@ class BasePage(object):
trow.extend(
Html('th', label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [
(THEAD, "Type"),
(_("Web Path"), "Path"),
(DESCRHEAD, "Description") ]
(THEAD, "Type"),
(_("Url"), "Path"),
(DESCRHEAD, "Description") ]
)
tbody = Html("tbody")
@ -1652,7 +1652,8 @@ class BasePage(object):
# FTP server address
elif _type == UrlType.WEB_FTP:
if not uri.startswith("ftp://"):
if not (uri.startswith("ftp://") or
uri.startswith("ftps://")):
uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri }
uri = Html("a", uri, href = uri, title = html_escape(uri))