From e231990b74456cba3358294ae30be1de6c021ef5 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Wed, 14 Apr 2010 04:38:19 +0000 Subject: [PATCH] Bug#3813: Removed ColumnPath and made ColumnDescription the hyperlink. Removed ColumnPath Element from all stylesheets. svn: r15107 --- src/data/Web_Basic-Ash.css | 8 ++------ src/data/Web_Basic-Cypress.css | 6 +----- src/data/Web_Basic-Lilac.css | 6 +----- src/data/Web_Basic-Peach.css | 6 +----- src/data/Web_Basic-Spruce.css | 6 +----- src/data/Web_Mainz.css | 6 +----- src/data/Web_Nebraska.css | 6 +----- src/data/Web_Visually.css | 6 +----- src/plugins/webreport/NarrativeWeb.py | 12 +++++------- 9 files changed, 14 insertions(+), 48 deletions(-) diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css index 6fd19b7d9..84419faf2 100644 --- a/src/data/Web_Basic-Ash.css +++ b/src/data/Web_Basic-Ash.css @@ -1088,20 +1088,16 @@ table.weblinks tr td { border-bottom: dashed 1px #000; } table.weblinks tr td.ColumnRowLabel { - width: 5%; + width: 6%; } table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* Subsections : Pedigree ----------------------------------------------------- */ .pedigreegen { diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css index da03b6063..5cdc1dc2d 100644 --- a/src/data/Web_Basic-Cypress.css +++ b/src/data/Web_Basic-Cypress.css @@ -1120,15 +1120,11 @@ table.weblinks tr td.ColumnRowLabel { table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* Subsections : Pedigree ----------------------------------------------------- */ .pedigreegen { diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css index f155a9c78..9cd78826c 100644 --- a/src/data/Web_Basic-Lilac.css +++ b/src/data/Web_Basic-Lilac.css @@ -1070,15 +1070,11 @@ table.weblinks tr td.ColumnRowLabel { table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* Subsections : Pedigree ----------------------------------------------------- */ .pedigreegen { diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css index 804b40800..6fc301ae7 100644 --- a/src/data/Web_Basic-Peach.css +++ b/src/data/Web_Basic-Peach.css @@ -1073,15 +1073,11 @@ table.weblinks tr td.ColumnRowLabel { table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* Subsections : Pedigree ----------------------------------------------------- */ .pedigreegen { diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css index 76d71fabf..1ef0ed508 100644 --- a/src/data/Web_Basic-Spruce.css +++ b/src/data/Web_Basic-Spruce.css @@ -1071,15 +1071,11 @@ table.weblinks tr td.ColumnRowLabel { table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* Subsections : Pedigree ----------------------------------------------------- */ .pedigreegen { diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index a0ac08bcd..2ab80d552 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -1073,15 +1073,11 @@ table.weblinks tr td.ColumnRowLabel { table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* SubSection : Pedigree ----------------------------------------------------- */ .pedigreegen { diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css index 231577a72..83945415a 100644 --- a/src/data/Web_Nebraska.css +++ b/src/data/Web_Nebraska.css @@ -1123,15 +1123,11 @@ table.weblinks tr td.ColumnRowLabel { table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* Subsections : Pedigree ----------------------------------------------------- */ div#pedigree { diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index 97de08893..ca52a41b2 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -1305,15 +1305,11 @@ table.weblinks tr td.ColumnRowLabel { table.weblinks tr td.ColumnType { width: 30%; } -table.weblinks tr td.ColumnPath { - background-color: #FFF; - width: 435; -} table.weblinks tr td.ColumnDescription { + background-color: #FFF; width: 30%; } - /* Subsections : Pedigree ----------------------------------------------------- */ div#pedigree { diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index cc3b6478a..d7a62c890 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -1436,10 +1436,9 @@ class BasePage(object): trow.extend( Html('th', label, class_ = "Column" + colclass, inline = True) for (label, colclass) in [ - (" ", "RowLabel"), - (THEAD, "Type"), - (_("Path"), "Path"), - (DESCRHEAD, "Description") ] + (" ", "RowLabel"), + (THEAD, "Type"), + (_("Link/ Description"), "Description") ] ) tbody = Html("tbody") @@ -1477,12 +1476,11 @@ class BasePage(object): if not uri.startswith("ftp://"): uri = "ftp://%(ftpsite)s" % { "ftpsite" : uri } - uri = Html("a", descr, href = uri) + descr = Html("a", descr, href = uri, title = html_escape(descr) ) 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