From 6bfd0b0e8de08270e9ac5a302dfe6796080ba75e Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Mon, 19 Mar 2012 03:35:00 +0000 Subject: [PATCH] Bug#0005274: Narweb - Web Link, showing Url --> has now been fixed. svn: r19086 --- src/plugins/webreport/NarrativeWeb.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 9c9cf18b2..37ad94757 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -2159,11 +2159,8 @@ class BasePage(object): # begin web links division with Html("div", class_ = "subsection", id = "WebLinks") as section: - - # begin web title section += Html("h4", _("Web Links"), inline = True) - # begin weblinks table with Html("table", class_ = "infolist weblinks") as table: section += table @@ -2177,7 +2174,6 @@ class BasePage(object): Html('th', label, class_ = colclass, inline = True) for (label, colclass) in [ (_("Type"), "ColumnType"), - (_("Url"), "ColumnPath"), (_("Description"), "ColumnDescription") ] ) @@ -2209,12 +2205,14 @@ class BasePage(object): if not (uri.startswith("ftp://") or uri.startswith("ftps://")): 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( Html("td", data, class_ = colclass, inline = True) for (data, colclass) in [ (str(_type), "ColumnType"), - (uri, "ColumnPath"), (descr, "ColumnDescription") ] )