5227: NarWeb, multiple persons are not seperated by comma

svn: r18152

src/plugins/webreport/NarrativeWeb.py

@@ -359,7 +359,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
@@ -368,20 +368,17 @@ class BasePage(object):
 
             # personal event
             if classname == "Person":
-
                 _obj = db.get_person_from_handle(handle)
                 if _obj:
                     person_name = self.get_name(_obj)
                     if check_person_database(handle, ppl_hnd_list):
                         url = self.report.build_url_fname_html(handle, "ppl", up) 
-                        tcell += self.person_link(url, _obj, _NAME_STYLE_DEFAULT,
+                        tcell += Html("span", self.person_link(url, _obj,
-                            gid = _obj.get_gramps_id() )
+                            _NAME_STYLE_DEFAULT, gid=_obj.get_gramps_id()),
+                            class_="person", inline=True)
                     else:
-                        tcell += person_name
+                        tcell += Html("span", person_name, class_="person",
-
+                                      inline=True)
-                    if not first_person:
-                        tcell += ", "
-                        first_person = False
 
             # family event
             else:
@@ -415,13 +412,12 @@ class BasePage(object):
                             slink = spouse_name
 
                     if spouse and husband:
-                        tcell += Html("span", hlink, class_ = "father fatherMother") + (
+                        tcell += Html("span", hlink, class_ = "father", inline=True)
-                            Html("span", slink, class_ = "mother")
+                        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
@@ -2040,7 +2036,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:
@@ -2604,6 +2600,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

@@ -534,6 +534,32 @@ table.relationships tbody tr td.ColumnRowLabel a {
 #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

@@ -681,6 +681,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

@@ -518,6 +518,32 @@ table.relationships tbody tr td.columnPartner {
 #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

@@ -519,6 +519,32 @@ table.relationships tbody tr td.ColumnPartner {
 #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

@@ -520,6 +520,32 @@ table.relationships tbody tr td.ColumnPartner {
 #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

@@ -520,6 +520,32 @@ table.relationships tbody tr td.ColumnPartner {
 #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

@@ -535,6 +535,32 @@ table.relationships tbody tr td.ColumnPartner {
 #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

@@ -521,6 +521,32 @@ table.relationships tbody tr td.ColumnPartner 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

@@ -327,6 +327,25 @@ table.relationships tbody tr td.ColumnRowLabel a {
     background: none;
 }
 
+/* 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

@@ -678,6 +678,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
 ----------------------------------------------------- */