From fda19ba0938c5c91559239586d28e3cd729070ec Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sat, 8 Sep 2001 13:27:14 +0000
Subject: [PATCH] Places sorted, fixed several problems in Web Site generation

svn: r391
---
 gramps/src/HtmlDoc.py         |  1 +
 gramps/src/gramps_main.py     |  4 ++++
 gramps/src/plugins/WebPage.py | 28 ++++++++++++++++++----------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/gramps/src/HtmlDoc.py b/gramps/src/HtmlDoc.py
index 24cc7c8d1..69b436021 100644
--- a/gramps/src/HtmlDoc.py
+++ b/gramps/src/HtmlDoc.py
@@ -296,6 +296,7 @@ class HtmlDoc(TextDoc):
         self.f.write('<td valign="top"')
         if span > 1:
             self.f.write(' colspan="' + str(span) + '"')
+            self.col = self.col + 1
         else:
             self.f.write(' width="')
             self.f.write(str(self.tbl.get_column_width(self.col)))
diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py
index cb88c3dd2..0110bf99a 100755
--- a/gramps/src/gramps_main.py
+++ b/gramps/src/gramps_main.py
@@ -1891,6 +1891,10 @@ def load_places():
 
     index = 0
     places = database.getPlaceMap().values()
+
+    nlist = map(lambda x: (string.upper(x.get_title()),x),places)
+    nlist.sort()
+    places = map(lambda(key,x): x, nlist)
     
     for src in places:
         title = src.get_title()
diff --git a/gramps/src/plugins/WebPage.py b/gramps/src/plugins/WebPage.py
index e855f7358..ae0291065 100644
--- a/gramps/src/plugins/WebPage.py
+++ b/gramps/src/plugins/WebPage.py
@@ -96,7 +96,7 @@ class IndividualPage:
         self.doc = doc
         self.list = list
         self.private = private
-        self.alive = probably_alive(person) or restrict
+        self.alive = probably_alive(person) and restrict
         self.photos = (photos == 2) or (photos == 1 and not self.alive)
         self.usecomments = not uc
         self.dir = dir_name
@@ -292,6 +292,8 @@ class IndividualPage:
     #--------------------------------------------------------------------
     def write_facts(self):
 
+        if self.alive:
+            return
         self.doc.start_paragraph("EventsTitle")
         self.doc.write_text(_("Facts and Events"))
         self.doc.end_paragraph()
@@ -333,7 +335,7 @@ class IndividualPage:
     #--------------------------------------------------------------------
     def write_notes(self):
 
-        if self.person.getNote() == "":
+        if self.person.getNote() == "" or self.alive:
             return
         
         self.doc.start_paragraph("NotesTitle")
@@ -394,22 +396,26 @@ class IndividualPage:
             self.doc.start_cell("NormalCell",2)
             self.doc.start_paragraph("Spouse")
             if spouse:
-                self.doc.start_link("%s.html" % spouse.getId())
+                if spouse in self.list:
+                    self.doc.start_link("%s.html" % spouse.getId())
                 self.doc.write_text(spouse.getPrimaryName().getRegularName())
-                self.doc.end_link()
+                if spouse in self.list:
+                    self.doc.end_link()
             else:
                 self.doc.write_text(_("unknown"))
             self.doc.end_paragraph()
             self.doc.end_cell()
             self.doc.end_row()
             
-            for event in family.getEventList():
-                if event.getPrivacy() == 0:
-                    self.write_fam_fact(event)
+            if not self.alive:
+                for event in family.getEventList():
+                    if event.getPrivacy() == 0:
+                        self.write_fam_fact(event)
 
             child_list = family.getChildList()
             if len(child_list) > 0:
-
+                
+                self.doc.start_row()
                 self.doc.start_cell("NormalCell")
                 self.doc.start_paragraph("Label")
                 self.doc.write_text(_("Children"))
@@ -425,9 +431,11 @@ class IndividualPage:
                         first = 0
                     else:
                         self.doc.write_text('\n')
-                    self.doc.start_link("%s.html" % child.getId())
+                    if child in self.list:
+                        self.doc.start_link("%s.html" % child.getId())
                     self.doc.write_text(child.getPrimaryName().getRegularName())
-                    self.doc.end_link()
+                    if child in self.list:
+                        self.doc.end_link()
                 self.doc.end_paragraph()
                 self.doc.end_cell()
                 self.doc.end_row()