5227: NarWeb, multiple persons are not seperated by comma

svn: r18153

src/plugins/webreport/NarrativeWeb.py

@@ -358,7 +358,7 @@ class BasePage(object):
         completes the person column for classes EventListPage and EventPage
 
         @param: tcell -- table cell from its caller
-        @param: first_person -- variable from its callers
+        @param: first_person -- Not used any more, done via css
         @param: handle_list -- handle list from the backlink of the event_handle
         """
         db = self.report.database
@@ -367,19 +367,16 @@ class BasePage(object):
 
             # personal event
             if classname == "Person":
-
                 _obj = db.get_person_from_handle(handle)
                 if _obj:
-
                     if check_person_database(_obj):
                         url = self.report.build_url_fname_html(handle, "ppl", up) 
-                        tcell += self.person_link(url, _obj, _NAME_STYLE_DEFAULT, gid = _obj.get_gramps_id() )
+                        tcell += Html("span", self.person_link(url, _obj,
+                            _NAME_STYLE_DEFAULT, gid=_obj.get_gramps_id()),
+                            class_="person", inline=True)
                     else:
-                        tcell += self.get_name(_obj)
-
-                    if not first_person:
-                        tcell += ", "
-                        first_person = False
+                        tcell += Html("span", self.get_name(_obj),
+                                      class_="person", inline=True)
 
             # family event
             else:
@@ -408,13 +405,12 @@ class BasePage(object):
                             slink = spouse_name
 
                     if spouse and husband:
-                        tcell += Html("span", hlink, class_ = "father fatherMother") + (
-                            Html("span", slink, class_ = "mother")
-                        )  
+                        tcell += Html("span", hlink, class_ = "father", inline=True)
+                        tcell += Html("span", slink, class_ = "mother", inline=True)
                     elif spouse:
-                        tcell += Html("span", slink, class_ = "mother")
+                        tcell += Html("span", slink, class_ = "mother", inline=True)
                     elif husband:
-                        tcell += Html("span", hlink, class_ = "father")
+                        tcell += Html("span", hlink, class_ = "father", inline=True)
 
         # return tcell, and first_person back to its callers
         return tcell, first_person
@@ -1819,7 +1815,7 @@ class BasePage(object):
                 person_name = person
 
             # 1. start building link to image or person
-            hyper = Html("a", href = url)
+            hyper = Html("a", href=url, inline=True)
 
             # 2. insert thumbnail if there is one, otherwise insert class = "noThumb"
             if thumbnailUrl:
@@ -2383,6 +2379,7 @@ class SurnamePage(BasePage):
                                             gid = partner.gramps_id)
                                     else:
                                         tcell += partner_name
+                                    first_family = False
                         else:
                             tcell += " "
 

src/plugins/webstuff/css/Web_Basic-Ash.css

@@ -502,6 +502,32 @@ table.individuallist tbody tr td.ColumnName a:hover {
 #EventList table.infolist tr.BeginLetter td {
     border-top:solid 1px rgb(204, 204, 204);
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */

src/plugins/webstuff/css/Web_Basic-Blue.css

@@ -657,6 +657,35 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate {
     border-top: solid 1px #000;
 }
     
+/* Events
+----------------------------------------------------- */
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #Gallery {

src/plugins/webstuff/css/Web_Basic-Cypress.css

@@ -499,6 +499,32 @@ table.individuallist tbody tr td.ColumnName a:hover {
 #EventList table.infolist tr.BeginLetter td {
     border-top: solid 1px #9DBF9D;
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */

src/plugins/webstuff/css/Web_Basic-Lilac.css

@@ -500,6 +500,32 @@ table.individuallist tbody tr td.ColumnName a:hover {
 #EventList table.infolist tr.BeginLetter td {
     border-top: solid 1px #B4B4CB;
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */

src/plugins/webstuff/css/Web_Basic-Peach.css

@@ -501,6 +501,32 @@ table.individuallist tbody tr td.ColumnName a:hover {
 #EventList table.infolist tr.BeginLetter td {
     border-top: solid 1px #FFC35E;
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */

src/plugins/webstuff/css/Web_Basic-Spruce.css

@@ -501,6 +501,32 @@ table.individuallist tbody tr td.ColumnName a:hover {
 #EventList table.infolist tr.BeginLetter td {
     border-top: solid 1px #BFD0EA;
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */

src/plugins/webstuff/css/Web_Mainz.css

@@ -516,6 +516,32 @@ table.individuallist tbody tr td.ColumnName a {
 #EventList table.infolist tr.BeginLetter td {
     border-top:solid 1px #D8C19F;
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */

src/plugins/webstuff/css/Web_Nebraska.css

@@ -499,6 +499,32 @@ table.individuallist tbody tr td.ColumnName a:hover {
 #EventList table.infolist tr.BeginLetter td {
     border-top: solid 1px #C1B398;
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */

src/plugins/webstuff/css/Web_Print-Default.css

@@ -295,6 +295,25 @@ table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents
 /* Individuals
 ----------------------------------------------------- */
 
+/* Events
+----------------------------------------------------- */
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
+
 /* Gallery
 ----------------------------------------------------- */
 #GalleryDetail h2 {

src/plugins/webstuff/css/Web_Visually.css

@@ -654,6 +654,32 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson {
 #EventList table.infolist tr.BeginLetter td {
     border-top: solid 1px #5D835F;
 }
+#EventList table.infolist tr td a,
+#EventDetail table.infolist tr td a {
+    display: inline;
+}
+#EventList table.infolist tr td span.father, 
+#EventList table.infolist tr td span.mother,
+#EventDetail table.infolist tr td span.father,
+#EventDetail table.infolist tr td span.mother {
+    display: block;
+}
+#EventList table.infolist tr td span.person:after,
+#EventList table.infolist tr td span.father:after,
+#EventList table.infolist tr td span.mother:after,
+#EventDetail table.infolist tr td span.person:after,
+#EventDetail table.infolist tr td span.father:after,
+#EventDetail table.infolist tr td span.mother:after {
+    content: ", ";
+}
+#EventList table.infolist tr td span.person:last-child:after,
+#EventList table.infolist tr td span.father:last-child:after,
+#EventList table.infolist tr td span.mother:last-child:after,
+#EventDetail table.infolist tr td span.person:last-child:after,
+#EventDetail table.infolist tr td span.father:last-child:after,
+#EventDetail table.infolist tr td span.mother:last-child:after {
+    content: "";
+}
 
 /* Gallery
 ----------------------------------------------------- */