From 5aa5782130cccfc59ad0c912b233fb657ca558c6 Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Sun, 18 Apr 2010 16:58:04 +0000
Subject: [PATCH] 3863: Narrative Web report : missing description column

svn: r15221
---
 src/data/Web_Basic-Ash.css            | 15 +++++++++------
 src/data/Web_Basic-Blue.css           | 21 +++++++++++++--------
 src/data/Web_Basic-Cypress.css        | 15 +++++++++------
 src/data/Web_Basic-Lilac.css          | 15 +++++++++------
 src/data/Web_Basic-Peach.css          | 15 +++++++++------
 src/data/Web_Basic-Spruce.css         | 15 +++++++++------
 src/data/Web_Mainz.css                | 15 +++++++++------
 src/data/Web_Nebraska.css             | 15 +++++++++------
 src/data/Web_Print-Default.css        | 20 +++++++++-----------
 src/data/Web_Visually.css             | 17 ++++++++++-------
 src/plugins/webreport/NarrativeWeb.py | 16 +++++++++-------
 11 files changed, 104 insertions(+), 75 deletions(-)

diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css
index 550223ad7..3037624ba 100644
--- a/src/data/Web_Basic-Ash.css
+++ b/src/data/Web_Basic-Ash.css
@@ -531,19 +531,22 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #000;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 30%;
diff --git a/src/data/Web_Basic-Blue.css b/src/data/Web_Basic-Blue.css
index 5b776228b..21e1d9912 100644
--- a/src/data/Web_Basic-Blue.css
+++ b/src/data/Web_Basic-Blue.css
@@ -541,23 +541,28 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #5D835F;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    background-color: #D8F3D6;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    background-color: #D8F3D6;
-    width: 16%;
+    background-color: #FFF;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    background-color: #D8F3D6;
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
     background-color: #FFF;
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
+    background-color: #D8F3D6;
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
     background-color: #FFF;
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    background-color: #D8F3D6;
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css
index 9d6937fea..a313dc0f2 100644
--- a/src/data/Web_Basic-Cypress.css
+++ b/src/data/Web_Basic-Cypress.css
@@ -552,19 +552,22 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #000;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css
index 9469f778b..fb2887190 100644
--- a/src/data/Web_Basic-Lilac.css
+++ b/src/data/Web_Basic-Lilac.css
@@ -500,19 +500,22 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #000;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css
index 313ac7747..96effd41f 100644
--- a/src/data/Web_Basic-Peach.css
+++ b/src/data/Web_Basic-Peach.css
@@ -504,19 +504,22 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #000;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css
index 67e359d22..60c49f3ad 100644
--- a/src/data/Web_Basic-Spruce.css
+++ b/src/data/Web_Basic-Spruce.css
@@ -502,19 +502,22 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #000;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css
index 7ce2eb8bb..4250ba6d9 100644
--- a/src/data/Web_Mainz.css
+++ b/src/data/Web_Mainz.css
@@ -560,19 +560,22 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #000;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css
index 7482037f9..45092dfd9 100644
--- a/src/data/Web_Nebraska.css
+++ b/src/data/Web_Nebraska.css
@@ -539,19 +539,22 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #000;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Print-Default.css b/src/data/Web_Print-Default.css
index 91edeb38d..826102ffb 100644
--- a/src/data/Web_Print-Default.css
+++ b/src/data/Web_Print-Default.css
@@ -515,27 +515,25 @@ div#events table.eventlist tbody tr td.ColumnPlace a {
     padding: 2px 70px 2px 0px;
 }
 table.eventlist tbody tr td {
-    background-color: #FFF;
     border-bottom: dashed 1px #5D835F;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
-    background-color: #D8F3D6;
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
-    background-color: #FFF;
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    background-color: #FFF;
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    background-color: #D8F3D6;
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css
index 97fead9fe..b25338dac 100644
--- a/src/data/Web_Visually.css
+++ b/src/data/Web_Visually.css
@@ -538,23 +538,26 @@ table.eventlist tbody tr td {
     border-bottom: dashed 1px #5D835F;
 }
 table.eventlist tbody tr td.ColumnEvent {
-    width: 20%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnDate {
     background-color: #D8F3D6;
-    width: 16%;
+    width: 10%;
 }
 table.eventlist tbody tr td.ColumnPlace {
     background-color: #FFF;
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnDescription {
+    width: 20%;
+}
+table.eventlist tbody tr td.ColumnNotes {
+    background-color: #D8F3D6;
     width: 35%;
 }
 table.eventlist tbody tr td.ColumnSources {
     background-color: #FFF;
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    background-color: #D8F3D6;
-    width: 25%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index fbf5e2a2e..54fde03d7 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -567,20 +567,21 @@ class BasePage(object):
         # get place name
         place = None
         place_handle = evt.get_place_handle()
+        place_hyper = None
+        evt_desc = evt.get_description()
         if place_handle:
             place = db.get_place_from_handle(place_handle)
-
-        place_hyper = None
-        if place: 
-            place_name = ReportUtils.place_name(db, place_handle)
-            place_hyper = self.place_link(place_handle, place_name, up = up)
+            if place: 
+                place_name = ReportUtils.place_name(db, place_handle)
+                place_hyper = self.place_link(place_handle, place_name, up = up)
 
         # wrap it all up and return to its callers
         # position 0 = translatable label, position 1 = column class
         # position 2 = data
         info = [
                [DHEAD, "Date", _dd.display(evt.get_date_object() )],
-               [PHEAD, "Place", place_hyper] 
+               [PHEAD, "Place", place_hyper],
+               [DESCRHEAD, "Description", evt_desc] 
                ]
 
         # return event data information to its callers
@@ -4697,7 +4698,8 @@ class IndividualPage(BasePage):
                 (_EVENT, "Event"),
                 (DHEAD, "Date"),
                 (PHEAD, "Place"),
-                (NHEAD,  "Notes"),
+                (DESCRHEAD, "Description"),
+                (NHEAD, "Notes"),
                 (SHEAD, "Sources") ]
             )