From f2bc982c3db5ae42540d07f8ed0fa60a79c96f3f Mon Sep 17 00:00:00 2001
From: SNoiraud <serge.noiraud@laposte.net>
Date: Fri, 28 Sep 2018 20:43:53 +0200
Subject: [PATCH] NarrativeWeb fixes

Space between place, description and the event note when there are
many sources.
Change the css order between print and screen.
The chosen theme can erase prior values.
Add a width for the source column in all themes.

Fixes #10810
---
 data/css/Web_Basic-Ash.css           | 4 ++++
 data/css/Web_Basic-Blue.css          | 2 +-
 data/css/Web_Basic-Cypress.css       | 4 ++++
 data/css/Web_Basic-Lilac.css         | 4 ++++
 data/css/Web_Basic-Peach.css         | 4 ++++
 data/css/Web_Basic-Spruce.css        | 4 ++++
 data/css/Web_Horizontal-Menus.css    | 1 -
 data/css/Web_Mainz.css               | 4 ++++
 data/css/Web_Nebraska.css            | 4 ++++
 gramps/plugins/webreport/basepage.py | 6 +++---
 10 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/data/css/Web_Basic-Ash.css b/data/css/Web_Basic-Ash.css
index be513004a..d58d6a828 100644
--- a/data/css/Web_Basic-Ash.css
+++ b/data/css/Web_Basic-Ash.css
@@ -330,6 +330,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
diff --git a/data/css/Web_Basic-Blue.css b/data/css/Web_Basic-Blue.css
index 3775627bc..fa6661ce9 100644
--- a/data/css/Web_Basic-Blue.css
+++ b/data/css/Web_Basic-Blue.css
@@ -489,7 +489,7 @@ table.eventlist tbody tr td.ColumnNotes {
     width: 20%;
 }
 table.eventlist tbody tr td.ColumnSources {
-    width: 17%;
+    width: 5%;
 }
 table.eventlist tbody tr td.ColumnPerson {
     width: 35%;
diff --git a/data/css/Web_Basic-Cypress.css b/data/css/Web_Basic-Cypress.css
index 41667a04e..9eb0e73a7 100644
--- a/data/css/Web_Basic-Cypress.css
+++ b/data/css/Web_Basic-Cypress.css
@@ -373,6 +373,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
diff --git a/data/css/Web_Basic-Lilac.css b/data/css/Web_Basic-Lilac.css
index d17608572..7baed2601 100644
--- a/data/css/Web_Basic-Lilac.css
+++ b/data/css/Web_Basic-Lilac.css
@@ -366,6 +366,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
diff --git a/data/css/Web_Basic-Peach.css b/data/css/Web_Basic-Peach.css
index 6e6b8d365..d86f7bb3b 100644
--- a/data/css/Web_Basic-Peach.css
+++ b/data/css/Web_Basic-Peach.css
@@ -366,6 +366,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
diff --git a/data/css/Web_Basic-Spruce.css b/data/css/Web_Basic-Spruce.css
index 489f136de..0b48e56e1 100644
--- a/data/css/Web_Basic-Spruce.css
+++ b/data/css/Web_Basic-Spruce.css
@@ -366,6 +366,10 @@ table.IndividualList td.ColumnSurname {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryNav {
diff --git a/data/css/Web_Horizontal-Menus.css b/data/css/Web_Horizontal-Menus.css
index cd8354806..3be0f908a 100644
--- a/data/css/Web_Horizontal-Menus.css
+++ b/data/css/Web_Horizontal-Menus.css
@@ -32,7 +32,6 @@ body {
     background-color: #00029D;
     color: #00029D;
     width: 100%;
-    padding: 0px 14px;
 }
 
 /*   Navigation Menus
diff --git a/data/css/Web_Mainz.css b/data/css/Web_Mainz.css
index b55acc20e..d26bafc95 100644
--- a/data/css/Web_Mainz.css
+++ b/data/css/Web_Mainz.css
@@ -312,6 +312,10 @@ table#SortByCount thead th.ColumnQuantity a:after {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 -----------------------------------------------------------------*/
 #GalleryNav {
diff --git a/data/css/Web_Nebraska.css b/data/css/Web_Nebraska.css
index 9a5141282..f42defcfe 100644
--- a/data/css/Web_Nebraska.css
+++ b/data/css/Web_Nebraska.css
@@ -576,6 +576,10 @@ table.relationships tbody tr td.ColumnPartner a:hover {
     content: "";
 }
 
+table.eventlist tbody tr td.ColumnSources {
+    width: 5%;
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #Gallery {  }
diff --git a/gramps/plugins/webreport/basepage.py b/gramps/plugins/webreport/basepage.py
index 1d2113396..1236ca4ad 100644
--- a/gramps/plugins/webreport/basepage.py
+++ b/gramps/plugins/webreport/basepage.py
@@ -676,7 +676,7 @@ class BasePage: # pylint: disable=C1001
         trow2 += Html("td", "", class_="ColumnEvent")
         # get event source references
         srcrefs = self.get_citation_links(event.get_citation_list()) or "&nbsp;"
-        trow += Html("td", srcrefs, class_="ColumnSources")
+        trow += Html("td", srcrefs, class_="ColumnSources", rowspan=2)
 
         # get event notes
         notelist = event.get_note_list()
@@ -1391,10 +1391,10 @@ class BasePage: # pylint: disable=C1001
         # create stylesheet and favicon links
         links = Html("link", type="image/x-icon",
                      href=url4, rel="shortcut icon") + (
+                         Html("link", type="text/css", href=url3,
+                              media='print', rel="stylesheet", indent=False),
                          Html("link", type="text/css", href=url2,
                               media="screen", rel="stylesheet", indent=False),
-                         Html("link", type="text/css", href=url3,
-                              media='print', rel="stylesheet", indent=False)
                          )
 
         # Link to Navigation Menus stylesheet