3863: Narrative Web report : missing description column

svn: r15221

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 30%;

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;
+    background-color: #FFF;
-    width: 16%;
+    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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    background-color: #D8F3D6;
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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: 10%;
-    width: 16%;
 }
 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: 5%;
-    width: 12%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    background-color: #D8F3D6;
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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%;
+    width: 5%;
-}
-table.eventlist tbody tr td.ColumnNotes {
-    background-color: #D8F3D6;
-    width: 25%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;

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)
-
+            if place: 
-        place_hyper = None
+                place_name = ReportUtils.place_name(db, place_handle)
-        if place: 
+                place_hyper = self.place_link(place_handle, place_name, up = up)
-            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") ]
             )