From f8f747fad6e4ae6f2033b176e36a92a3214f0f15 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Mon, 19 Mar 2012 02:49:40 +0000 Subject: [PATCH] Bug#0005274: Narweb - Web Link, showing Url -- has been fixed as requested. svn: r19085 --- src/plugins/webreport/NarrativeWeb.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 0938f34b2..44cf19c07 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -2154,12 +2154,9 @@ 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: + with Html("table", class_ = "infolist") as table: section += table thead = Html("thead") @@ -2172,7 +2169,6 @@ class BasePage(object): Html('th', label, class_ = colclass, inline = True) for (label, colclass) in [ (_("Type"), "ColumnType"), - (_("Url"), "ColumnPath"), (_("Description"), "ColumnDescription") ] ) @@ -2204,12 +2200,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") ] )