From 6b921b3d97ac4e530ebb2ee814e317e8223aa6d2 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Thu, 21 Mar 2002 03:04:13 +0000
Subject: [PATCH] Built in web page templates, Date indicators

svn: r852
---
 gramps/src/Date.py            |   5 ++
 gramps/src/DateEdit.py        | 157 ++++++++++++++++++++++++++++++++++
 gramps/src/EditPerson.glade   |  57 ++++++++----
 gramps/src/EditPerson.py      |   2 +
 gramps/src/GrampsCfg.py       |   1 +
 gramps/src/RelImage.py        |   8 +-
 gramps/src/Report.py          |  98 +++++++++++++++++++--
 gramps/src/const.py           |   3 +-
 gramps/src/docgen/HtmlDoc.py  |   2 +-
 gramps/src/gramps.png         | Bin 1222 -> 1145 bytes
 gramps/src/gramps.xpm         | 133 ++++++++++++++++++----------
 gramps/src/gramps_main.py     |   1 +
 gramps/src/plugins.glade      |  11 +--
 gramps/src/plugins/WebPage.py |   2 +
 14 files changed, 398 insertions(+), 82 deletions(-)
 create mode 100644 gramps/src/DateEdit.py

diff --git a/gramps/src/Date.py b/gramps/src/Date.py
index e8d265c05..e2c97758e 100644
--- a/gramps/src/Date.py
+++ b/gramps/src/Date.py
@@ -179,6 +179,11 @@ class Date:
         """ Returns true if any part of the date is valid"""
         return self.start.year != UNDEF or self.start.month != UNDEF or self.start.day != UNDEF
 
+
+    def getIncomplete(self):
+        return self.range == 0 and self.start.year == UNDEF or \
+               self.start.month == UNDEF or self.start.day == UNDEF
+
     def getStopYear(self):
         if self.stop == None:
             self.stop = SingleDate()
diff --git a/gramps/src/DateEdit.py b/gramps/src/DateEdit.py
new file mode 100644
index 000000000..d3723d573
--- /dev/null
+++ b/gramps/src/DateEdit.py
@@ -0,0 +1,157 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2002  Donald N. Allingham
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+"""
+Adds autocompletion to a GtkEntry box, using the passed list of
+strings as the possible completions.
+"""
+
+import string
+import GdkImlib
+import Date
+
+_good = [
+    "10 10 24 1",
+    " 	c None",
+    ".	c #0EB40E",
+    "+	c #11A711",
+    "@	c #11A211",
+    "#	c #0DA10D",
+    "$	c #09CB09",
+    "%	c #0BCC0B",
+    "&	c #08CD08",
+    "*	c #098609",
+    "=	c #05E705",
+    "-	c #02F502",
+    ";	c #07E007",
+    ">	c #0A9D0A",
+    ",	c #01F901",
+    "'	c #00FF00",
+    ")	c #01F801",
+    "!	c #05E605",
+    "~	c #0AC40A",
+    "{	c #0AC30A",
+    "]	c #000000",
+    "^	c #099209",
+    "/	c #08CB08",
+    "(	c #033403",
+    "_	c #098509",
+    " .+++@#   ",
+    ".$%%%%&*  ",
+    "+%===-;>  ",
+    "+%=,')!~  ",
+    "+%='')!{] ",
+    "@%-))-;^] ",
+    "#&;!!;/(  ",
+    " _>~{^(]  ",
+    "    ]]    ",
+    "          "]
+
+_bad = [
+    "10 10 21 1",
+    " 	c None",
+    ".	c #A21818",
+    "+	c #A31818",
+    "@	c #9A1717",
+    "#	c #C80E0E",
+    "$	c #C90F0F",
+    "%	c #CA0C0C",
+    "&	c #E60606",
+    "*	c #F40202",
+    "=	c #DE0909",
+    "-	c #8F0D0D",
+    ";	c #F90101",
+    ">	c #FF0000",
+    ",	c #F80101",
+    "'	c #E50707",
+    ")	c #C20E0E",
+    "!	c #C10E0E",
+    "~	c #000000",
+    "{	c #810C0C",
+    "]	c #C80C0C",
+    "^	c #130202",
+    "  .++@    ",
+    " #$$$$%   ",
+    ".$&&&*=-  ",
+    "+$&;>,')  ",
+    "+$&>>,'!~ ",
+    "@$*,,*={~ ",
+    " %=''=]^  ",
+    "  -)!{^~  ",
+    "    ~~    ",
+    "          "]
+
+_caution = [
+    "10 10 21 1",
+    " 	c None",
+    ".	c #B0AF28",
+    "+	c #B2B028",
+    "@	c #A9A726",
+    "#	c #D1D017",
+    "$	c #D2D118",
+    "%	c #D2D114",
+    "&	c #EAEA0B",
+    "*	c #F6F604",
+    "=	c #E3E30F",
+    "-	c #979615",
+    ";	c #F9F902",
+    ">	c #FFFF00",
+    ",	c #F9F903",
+    "'	c #E9E90B",
+    ")	c #CACA18",
+    "!	c #C9C918",
+    "~	c #000000",
+    "{	c #898813",
+    "]	c #CFCF14",
+    "^	c #151504",
+    "  .++@    ",
+    " #$$$$%   ",
+    ".$&&&*=-  ",
+    "+$&;>,')  ",
+    "+$&>>,'!~ ",
+    "@$*,,*={~ ",
+    " %=''=]^  ",
+    "  -)!{^~  ",
+    "    ~~    ",
+    "          "]
+
+    
+class DateEdit:
+    def __init__(self,input,output):
+        self.input = input
+        self.output = output
+        self.checkval = Date.Date()
+        self.input.connect('focus-out-event',self.check)
+        self.good = GdkImlib.create_image_from_xpm(_good)
+        self.bad = GdkImlib.create_image_from_xpm(_bad)
+        self.caution = GdkImlib.create_image_from_xpm(_caution)
+        self.check(None,None)
+
+    def check(self,obj,val):
+        text = self.input.get_text()
+        self.checkval.set(text)
+        if not self.checkval.isValid():
+            self.output.load_imlib(self.bad)
+        elif self.checkval.getIncomplete():
+            self.output.load_imlib(self.caution)
+        else:
+            self.output.load_imlib(self.good)
+            
+        
diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade
index 7b4c1d251..0304901b3 100644
--- a/gramps/src/EditPerson.glade
+++ b/gramps/src/EditPerson.glade
@@ -177,7 +177,7 @@
 	      <class>GtkTable</class>
 	      <name>table16</name>
 	      <rows>2</rows>
-	      <columns>4</columns>
+	      <columns>5</columns>
 	      <homogeneous>False</homogeneous>
 	      <row_spacing>0</row_spacing>
 	      <column_spacing>0</column_spacing>
@@ -310,6 +310,36 @@
 		</child>
 	      </widget>
 
+	      <widget>
+		<class>GtkButton</class>
+		<name>button99</name>
+		<border_width>1</border_width>
+		<tooltip>Invoke birth event editor</tooltip>
+		<can_focus>True</can_focus>
+		<signal>
+		  <name>clicked</name>
+		  <handler>on_edit_birth_clicked</handler>
+		  <object>editPerson</object>
+		  <last_modification_time>Tue, 02 Oct 2001 22:28:32 GMT</last_modification_time>
+		</signal>
+		<label>Edit</label>
+		<relief>GTK_RELIEF_NORMAL</relief>
+		<child>
+		  <left_attach>4</left_attach>
+		  <right_attach>5</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>3</xpad>
+		  <ypad>3</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
 	      <widget>
 		<class>GtkCombo</class>
 		<name>bpcombo</name>
@@ -322,7 +352,7 @@
 		<items></items>
 		<child>
 		  <left_attach>2</left_attach>
-		  <right_attach>4</right_attach>
+		  <right_attach>5</right_attach>
 		  <top_attach>1</top_attach>
 		  <bottom_attach>2</bottom_attach>
 		  <xpad>3</xpad>
@@ -348,32 +378,21 @@
 	      </widget>
 
 	      <widget>
-		<class>GtkButton</class>
-		<name>button99</name>
-		<border_width>1</border_width>
-		<tooltip>Invoke birth event editor</tooltip>
-		<can_focus>True</can_focus>
-		<signal>
-		  <name>clicked</name>
-		  <handler>on_edit_birth_clicked</handler>
-		  <object>editPerson</object>
-		  <last_modification_time>Tue, 02 Oct 2001 22:28:32 GMT</last_modification_time>
-		</signal>
-		<label>Edit</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
+		<class>GnomePixmap</class>
+		<name>birth_stat</name>
 		<child>
 		  <left_attach>3</left_attach>
 		  <right_attach>4</right_attach>
 		  <top_attach>0</top_attach>
 		  <bottom_attach>1</bottom_attach>
-		  <xpad>3</xpad>
-		  <ypad>3</ypad>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
 		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
+		  <xshrink>True</xshrink>
 		  <yshrink>False</yshrink>
 		  <xfill>True</xfill>
-		  <yfill>False</yfill>
+		  <yfill>True</yfill>
 		</child>
 	      </widget>
 	    </widget>
diff --git a/gramps/src/EditPerson.py b/gramps/src/EditPerson.py
index b0e72243d..816886a3f 100644
--- a/gramps/src/EditPerson.py
+++ b/gramps/src/EditPerson.py
@@ -50,6 +50,7 @@ from RelLib import *
 import ImageSelect
 import sort
 import AutoComp
+from DateEdit import DateEdit
 
 from intl import gettext
 _ = gettext
@@ -598,6 +599,7 @@ class EditPerson:
             self.bdate.set_text(self.birth.getDate())
             self.bplace.set_text(self.birth.getPlaceName())
             self.dplace.set_text(prev_dtext)
+        self.bdate_check = DateEdit(self.bdate,self.get_widget("birth_stat"))
 
         # Update death with new values, make sure birth values don't change
         if (self.update_death):
diff --git a/gramps/src/GrampsCfg.py b/gramps/src/GrampsCfg.py
index c2eab05ef..509b60448 100644
--- a/gramps/src/GrampsCfg.py
+++ b/gramps/src/GrampsCfg.py
@@ -384,6 +384,7 @@ def loadConfig(call):
     make_path(os.path.expanduser("~/.gramps"))
     make_path(os.path.expanduser("~/.gramps/filters"))
     make_path(os.path.expanduser("~/.gramps/plugins"))
+    make_path(os.path.expanduser("~/.gramps/templates"))
 
 #-------------------------------------------------------------------------
 #
diff --git a/gramps/src/RelImage.py b/gramps/src/RelImage.py
index 3ed68639a..f32d3c11f 100644
--- a/gramps/src/RelImage.py
+++ b/gramps/src/RelImage.py
@@ -57,11 +57,13 @@ def import_media_object(filename,path,base):
     if not os.path.exists(filename):
         GnomeErrorDialog(_("Could not import %s\nThe file has been moved or deleted") % filename)
         return ""
+
+    ext = os.path.splitext(filename)[1]
     
     type = Utils.get_mime_type(filename)
     if type[0:5] == "image":
-        name = "%s/%s.jpg" % (path,base)
-        base = "%s.jpg" % (base)
+        name = "%s/%s%s" % (path,base,ext)
+        #base = "%s%s" % (base,ext)
 
         thumb = "%s/.thumb" % (path)
 
@@ -76,7 +78,7 @@ def import_media_object(filename,path,base):
             return ""
         
         try:
-            path = "%s/%s" % (thumb,base)
+            path = "%s/%s.jpg" % (thumb,base)
             mk_thumb(filename,path,const.thumbScale)
         except:
             GnomeErrorDialog(_("Error creating the thumbnail : %s"))
diff --git a/gramps/src/Report.py b/gramps/src/Report.py
index a404c43f1..766bb5d8f 100644
--- a/gramps/src/Report.py
+++ b/gramps/src/Report.py
@@ -30,6 +30,16 @@ import Plugins
 
 _ = intl.gettext
 
+#-------------------------------------------------------------------------
+#
+# 
+#
+#-------------------------------------------------------------------------
+try:
+    from xml.sax import make_parser,handler,SAXParseException
+except:
+    from _xmlplus.sax import make_parser,handler,SAXParseException
+
 from TextDoc import *
 from StyleEditor import *
 
@@ -40,6 +50,13 @@ from gtk import *
 from gnome.ui import *
 import libglade
 
+_default_template = _("Default Template")
+_user_template = _("User Defined Template")
+
+_template_map = {
+    _user_template : None
+    }
+
 #------------------------------------------------------------------------
 #
 # The Report base class.  This is a base class for generating
@@ -567,17 +584,48 @@ class ReportDialog:
             table.attach(GtkLabel(_("Page Count")),2,1,3,2,FILL,FILL,pad,pad)
             table.attach(self.pagecount_menu,3,2,4,2,xpadding=pad,ypadding=pad)
 
+    def html_file_enable(self,obj):
+        text = obj.get_text()
+        if _template_map.has_key(text):
+            if _template_map[text]:
+                self.html_fileentry.set_sensitive(0)
+            else:
+                self.html_fileentry.set_sensitive(1)
+        else:
+            self.html_fileentry.set_sensitive(0)
+            
     def setup_html_frame(self):
         """Set up the html frame of the dialog.  This sole purpose of
         this function is to grab a pointer for later use in the parse
         html frame function."""
 
-        hbox = GtkHBox()
-        hbox.set_border_width(ReportDialog.border_pad)
-        hbox.pack_start(GtkLabel(_("Template")),0,0,5)
+        table = GtkTable(2,2)
+        self.html_frame.add(table)
+        l = GtkLabel(_("Template"))
+        pad = ReportDialog.border_pad
+        l.set_alignment(1.0,0.5)
+        table.attach(l,0,1,0,1,FILL,FILL,pad,pad)
+        self.template_combo = GtkCombo()
+
+        template_list = [ _default_template ]
+        tlist = _template_map.keys()
+        tlist.sort()
+        
+        for template in tlist:
+            if template != _user_template:
+                template_list.append(template)
+        template_list.append(_user_template)
+        
+        self.template_combo.set_popdown_strings(template_list)
+        self.template_combo.entry.set_editable(0)
+        self.template_combo.entry.connect('changed',self.html_file_enable)
+        
+        table.attach(self.template_combo,1,2,0,1,FILL|EXPAND,FILL|EXPAND,pad,pad)
+
+        table.attach(GtkLabel(_("User Template")),0,1,1,2,FILL,FILL,pad,pad)
         self.html_fileentry = GnomeFileEntry(_("HTML Template"),_("Choose File"))
-        hbox.add(self.html_fileentry)
-        self.html_frame.add(hbox)
+        self.html_fileentry.set_sensitive(0)
+        table.attach(self.html_fileentry,1,2,1,2,FILL|EXPAND,FILL|EXPAND,pad,pad)
 
     def setup_report_options_frame(self):
         """Set up the report options frame of the dialog.  This
@@ -751,7 +799,15 @@ class ReportDialog:
         retrieves a value whether or not the file entry box is
         displayed on the screen.  The subclass will know whether this
         entry was enabled.  This is for simplicity of programming."""
-        self.template_name = self.html_fileentry.get_full_path(0)
+
+        text = self.template_combo.entry.get_text()
+        if _template_map.has_key(text):
+            if text == _user_template:
+                self.template_name = self.html_fileentry.get_full_path(0)
+            else:
+                self.template_name = "%s/%s" % (const.template_dir,_template_map[text])
+        else:
+            self.template_name = None
 
     def parse_report_options_frame(self):
         """Parse the report options frame of the dialog.  Save the
@@ -942,3 +998,33 @@ class DrawReportDialog(ReportDialog):
     def make_document(self):
         """Create a document of the type requested by the user."""
         self.doc = self.format(self.selected_style,self.paper,self.orien)
+
+class TemplateParser(handler.ContentHandler):
+    def __init__(self,data,path):
+        handler.ContentHandler.__init__(self)
+        self.data = data
+        self.path = path
+    
+    def setDocumentLocator(self,locator):
+        self.locator = locator
+
+    def startElement(self,tag,attrs):
+        if tag == "template":
+            self.data[attrs['title']] = "%s/%s" % (path,attrs['file'])
+            
+    def characters(self, data):
+        pass
+
+try:
+    parser = make_parser()
+    path = const.template_dir
+    parser.setContentHandler(TemplateParser(_template_map,path))
+    parser.parse("%s/templates.xml" % path)
+    parser = make_parser()
+    path = os.path.expanduser("~/.gramps/templates")
+    parser.setContentHandler(TemplateParser(_template_map,path))
+    parser.parse("%s/templates.xml" % path)
+except (IOError,OSError,SAXParseException):
+    pass
+
+
diff --git a/gramps/src/const.py b/gramps/src/const.py
index 046711d9e..651e526af 100644
--- a/gramps/src/const.py
+++ b/gramps/src/const.py
@@ -78,6 +78,7 @@ docgenDir      = "%s/docgen" % rootDir
 filtersDir     = "%s/filters" % rootDir
 dataDir        = "%s/data" % rootDir
 gtkrcFile      = "%s/gtkrc" % rootDir
+template_dir   = "%s/templates" % dataDir
 
 startup        = 1
 
@@ -87,7 +88,7 @@ startup        = 1
 #
 #-------------------------------------------------------------------------
 progName     = "gramps"
-version      = "0.7.2"
+version      = "0.7.3pre"
 copyright    = "© 2001 Donald N. Allingham"
 authors      = ["Donald N. Allingham", "David Hampton"]
 comments     = _("GRAMPS (Genealogical Research and Analysis Management Programming System) is a personal genealogy program.")
diff --git a/gramps/src/docgen/HtmlDoc.py b/gramps/src/docgen/HtmlDoc.py
index d055820b0..eb5ba408c 100644
--- a/gramps/src/docgen/HtmlDoc.py
+++ b/gramps/src/docgen/HtmlDoc.py
@@ -45,7 +45,7 @@ _top = [
     '  <TITLE>\n',
     '  </TITLE>\n',
     '  <STYLE type="text/css">\n',
-    '  <!--\n',
+   '  <!--\n',
     '    BODY { background-color: #ffffff }\n',
     '    .parent_name { font-family: Arial; font-style: bold }\n',
     '    .child_name { font-family: Arial; font-style: bold }\n',
diff --git a/gramps/src/gramps.png b/gramps/src/gramps.png
index 5046d7b5b37672e9a3d1ee22f685453c4d22adaa..60b8d6820b612c307b9eb8a045b8f277826095d6 100644
GIT binary patch
delta 1117
zcmV-j1fu)K3Hb<+D}N6F01FQRlKBIr00007bV*G`2hsx*11}}baK}~v00bFHL_t(|
z+U=RkixgKB#(&jaiH?a8SJ|qd*##2`3IPX%NDzc<6#s=@x%SWKl?%m%E|iD}X%`xw
z8Hr&=GY_)JMo~r>9U+b~qZ9g3*M+CLPgmW#U9ahBVJ;NYJ%9E3&b{Y+-}!FC##rCs
zjUXN`f~)hX1mFQxpyI$~fIxyWqY{7z(5TmfG#4K|d3q192rL7}9|7<N@Bw}}^h-Fg
zV2n(;k$)K;-Ma=b4om>6K&!IO;41=ttd}8n@ZEE;6WA*EvYsnY0ow5_PXOP=kFQgI
zEd!`J&UF-s<A1=Hz&RIq(~F?5Zv8R~F$IetEMioEW5C-U%{alwhF=!_HR`oiN*4JB
zcnO5p{|_txJiPl`nn$#BLHH$r_khg+`wt)M&R+jae$4Hu+gAY&3X3c#Zf_nvdHP#m
zKd=M%EMXN}z*C{nplARgi;Mx=dn959uf{ImAK<kr=6{Z?${)aV$S?`%w=6o)E)qaE
zJME}YCV^LZd`gaRY?0@^lcVbB5{v}f3}28p0Hf|b4txcib%O6L!g*j0cm-S#2C6jb
zwRgi-;)-ICC7nXad=9{S;JF+CE8(;DjUS1mTt5p<-@g%4V!s6H?6Szztt)BnTLR{R
zC-Qw&ihtG#Ue(b~V5W!?dwM!^vdEGI4sbC8_)?VEBq(cE7HI*yf$zFX>;&&tVy&cU
zSfCR*Zv@zq0`Cgw=aE955fX5NH*O{N8ueNyBMY=G;My5ib6JXd4B+pH>$#P<3UJ`(
z6H1KYGcbAcvSxu7CA1-7(5o^r2c<|eD{-Y?Nq=q2XS9<3EA&S~zHgEjv@EsOPN<<p
znV6Y8O6-9fyhBO9u*_B<FYr>PmQm@Hwua(L>;&H{q6<n%&r1Lm%Tf=;Z~HbkWC!1k
zU`14PUVRTNW+nhfBj2wpexqJ%7HK66z~t}0rg_F23E;763QW!k)EzC~|M-)nYP_d1
zz<=ytcN1HQj$#3ul7^p~z%$@K`HW@u^=6dk2rk?Q+6-*#RiGVw#MH-H38PqG)&gG3
z;Y!3&WmWBHt@K}>1b%?2??hN2&Cb~8wp`A@BC&Sd3VyJu&!eO$C11^0gw0qxJ{Wu<
zQ}4>>YL0$>A=-}5Jh-!_roO6*Hi#ITO@A3$;;1L~fYvZfeLG<lE@kZJZJsz7mZ>)p
zsto)2ZNQn7{k+W+Gi*~I2JlM2Y|YTm+dMJrVd_oJem?4ny9(Ui1LF=BGR#f=S(>R2
zcjSVc{k-<X^l3^0c(sCsO?_;`zDPeGC4nUHrk^=W+g|rnFj@O~KWgezfG>S}-BuJ(
z@^+G`w}Llj&9>J|BZ0Ze`<a!vOxNTU@CCjUXIc`NkiV@_`JLDkE%_St1Kt1<SO(0f
j{?MJ;)NhQ9QE+?!ybqMkOR4vZ00000NkvXXu0mjfc-IZy

delta 1195
zcmV;c1XTO^2*wGJD}N9G01FTSts}j400007bV*G`2hj`<5hn_-(F#ET00d@9L_t(|
z+U=RWZW~7wg}>#$XeV)O$pK=+N(4Ja3N|TH=K%-<d4uo)@&qaK1Zjda^fLskjKGCo
zfr&d8Ns+>aC6S^;i$A-Y<_vH>SyDT@w8+8>ES5jRoqJ~PIe+KgC44xxdqg`JPn09B
z)Sc0e1zrQHIx8#2CP1unUfYr2E4^-KnP+f+F#Hm@1m5lf0K4-1{L7QIgMa$*2Y?5_
z7&rySl^qDa4(tW|?h$YwxQ#=;CE<va$DzleuIKLqKwcGz3`y?+p8|j7oZ}8Ka=TXB
zl8U4n18@WQIDcTShM8w0076yd2$%~5TFIs%=~c%ZSi1D9Z9zp2mA_McTnD25VE9<X
zybJ6Dw*;&ru!*Ge1US>{QUHpo$XCFz0zpBh()LrWtP8YZQZdn(G4L9glmQTxP?6uf
z_brnea|J)qqSTBar276s;7S9i7F3ZZz`r_wRiKMrw}10ACx^Zh$XVGGsu&V}6!5#I
z&W7PY8o;5O+KFaa096xEBS1xFI_D<0Ln?xM8h=?7K;%srX=@)VmF@xuz$ZpUED1**
ziGL5A|Gv04&H|9fNgaTSA=g6E=w4p{?F<!}iG0U8zf}x3fu}hE+>u(fEr1Xwbp~X?
zFBITZH-CSn)vtOgvJ?T&buKk7q%Wy!?#ep=dfiT(Qw5Gpzz%$(&t|&f1#i2kh4O!4
zM4(dEi9?<A!Z>Nw?7~zlyf8bJ)e6SCMs93>F#JaOeF%ImJ~hq#oxvR||KI)(KtU&M
znP6k1GKrURehQ{q`Na52UDuiBXm|i-#);2t;C~@9<~wOy+iGi;*i@Zqj^^BoL#*K1
z8BXkWc_gkC0^mDo+my$V|I{GI(}hGiJ#$TpUN<uC8JluqTGR)8C#{)@3P0uObvx%d
zMWkcjTNy3tq)S7}G%#+LHX$N%Ag&}9K++!!A4&xtN(uHQan%)0daBQ-%FWoz=V%3q
zZGT_vf^P+YK9bL*z~42`CCB<QQlPC2Cq4I6Xlim9&!t(jE0OVnkmG^w`Hl)XcDtY^
zD^y^qU9cV1r6<P<{U%-06DMAAb{qJ!OjGYH-m!e-TD=TqS$akl1GQea^CIBM+Cuk1
zrFiM4J~eslim@zJu_jdW3@I-OzwmbOhJWKgnNlJ(Tf595iIt31DeB~VK(#*@ey>LU
zplDN{1U^}F<6i`l(0B4Z-SgU-`qY#OpJ}!Bf#(ICyk#ocnSwui-%Y(E@6s!ci#mDS
z>vo=9cT=Aj`JI$>^5nXkdcUx$=BVdaIr-&vH}zIdow2!k-nDu&;7vwT?|R}Bfqww_
zW0OsN5i&avX9m=01qt2QiBj)tjk^Ur%Q<gmQ(qQ@<3g+ePu4j3!Z>kFzYi(qGMoBM
zfS4OF>zv#cesy~-;>4T$o7Dz<m6NCDF-}vp&_T|o{tEC9@Dg~w$-kIF8X7;X@``}t
z+N({FxGY!-iojICpKLmX%A{UJJS1o;@YWR~;Qr_y^WoU?@gFc$@3rEp&jSDe002ov
JPDHLkV1mtnGaCQ^

diff --git a/gramps/src/gramps.xpm b/gramps/src/gramps.xpm
index 9845ab35d..3063bc1f3 100644
--- a/gramps/src/gramps.xpm
+++ b/gramps/src/gramps.xpm
@@ -1,55 +1,100 @@
 /* XPM */
 static char * gramps_xpm[] = {
-"48 48 5 1",
+"48 48 50 1",
 " 	c None",
-".	c #999999",
-"+	c #FFFFCC",
-"@	c #000000",
-"#	c #CCCCCC",
-"                                                ",
-"                                                ",
+".	c #B39169",
+"+	c #E8D3B9",
+"@	c #E8D3B8",
+"#	c #E8D2B7",
+"$	c #E7D2B6",
+"%	c #E7D1B6",
+"&	c #E7D1B5",
+"*	c #E7D1B4",
+"=	c #000000",
+"-	c #E7D0B4",
+";	c #E6D0B3",
+">	c #EAD7BE",
+",	c #EAD6BE",
+"'	c #EAD6BD",
+")	c #E9D6BC",
+"!	c #E9D5BC",
+"~	c #E9D5BB",
+"{	c #E9D4BA",
+"]	c #E8D4B9",
+"^	c #E6CFB2",
+"/	c #E6CFB1",
+"(	c #E6CEB1",
+"_	c #E5CEB0",
+":	c #E5CDAF",
+"<	c #E5CDAE",
+"[	c #E5CCAE",
+"}	c #EBD9C1",
+"|	c #EBD8C1",
+"1	c #EBD8C0",
+"2	c #EAD8C0",
+"3	c #EAD7BF",
+"4	c #E4CCAD",
+"5	c #E4CCAC",
+"6	c #E4CBAC",
+"7	c #E4CBAB",
+"8	c #E4CAAA",
+"9	c #E3CAAA",
+"0	c #E3CAA9",
+"a	c #E3C9A9",
+"b	c #E3C9A8",
+"c	c #E3C8A7",
+"d	c #E2C8A7",
+"e	c #E2C8A6",
+"f	c #E2C7A6",
+"g	c #E2C7A5",
+"h	c #E2C7A4",
+"i	c #E2C6A4",
+"j	c #E1C6A3",
+"k	c #E1C5A2",
 "                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
 "                                  ..........    ",
-"                                  .++++++++.    ",
-"                                  .++++++++.    ",
-"                               @@@.++++++++.    ",
-"                               @##.++++++++.    ",
-"                               @# .++++++++.    ",
-"                  ..........   @# ..........    ",
-"                  .++++++++.   @#               ",
-"                  .++++++++.   @#               ",
-"               @@@.++++++++.@@@@#               ",
-"               @##.++++++++.###@# ..........    ",
-"               @# .++++++++.   @# .++++++++.    ",
-"               @# ..........   @# .++++++++.    ",
-"               @#              @@@.++++++++.    ",
-"               @#               ##.++++++++.    ",
-"               @#                 .++++++++.    ",
-"  ..........   @#                 ..........    ",
-"  .++++++++.   @#                               ",
-"  .++++++++.   @#                               ",
-"  .++++++++.@@@@#                               ",
-"  .++++++++.###@#                               ",
-"  .++++++++.   @#                 ..........    ",
-"  ..........   @#                 .++++++++.    ",
-"               @#                 .++++++++.    ",
-"               @#              @@@.++++++++.    ",
-"               @#              @##.++++++++.    ",
-"               @# ..........   @# .++++++++.    ",
-"               @# .++++++++.   @# ..........    ",
-"               @# .++++++++.   @#               ",
-"               @@@.++++++++.@@@@#               ",
-"                ##.++++++++.###@#               ",
-"                  .++++++++.   @# ..........    ",
-"                  ..........   @# .++++++++.    ",
-"                               @# .++++++++.    ",
-"                               @@@.++++++++.    ",
-"                                ##.++++++++.    ",
-"                                  .++++++++.    ",
-"                                  ..........    ",
+"                                  .+@@##$%&.    ",
+"                                  .@@##$%&*.=   ",
+"                               ===.@##$%&*-.=   ",
+"                               =  .##$%&*-;.=   ",
+"                               =  .#$%&*-;;.=   ",
+"                  ..........   =  ..........=   ",
+"                  .>,')!~~{.   =    ========    ",
+"                  .,')!~~{{.=  =                ",
+"               ===.')!~~{{].====                ",
+"               =  .)!~~{{]+.=  =  ..........    ",
+"               =  .!~~{{]+@.=  =  .;;^^/(__.    ",
+"               =  ..........=  =  .;^^/(__:.=   ",
+"               =    ========   ===.^^/(__::.=   ",
+"               =                  .^/(__::<.=   ",
+"               =                  ./(__::<[.=   ",
+"  ..........   =                  ..........=   ",
+"  .}|1233>,.   =                    ========    ",
+"  .|1233>,'.=  =                                ",
+"  .1233>,').====                                ",
+"  .233>,')!.=  =                                ",
+"  .33>,')!~.=  =                  ..........    ",
+"  ..........=  =                  .[4567789.    ",
+"    ========   =                  .45677890.=   ",
+"               =               ===.5677890a.=   ",
+"               =               =  .677890ab.=   ",
+"               =  ..........   =  .77890abb.=   ",
+"               =  .;;^^/(__.   =  ..........=   ",
+"               =  .;^^/(__:.=  =    ========    ",
+"               ===.^^/(__::.====                ",
+"                  .^/(__::<.=  =                ",
+"                  ./(__::<[.=  =  ..........    ",
+"                  ..........=  =  .bbcdefgh.    ",
+"                    ========   =  .bcdefghi.=   ",
+"                               ===.cdefghij.=   ",
+"                                  .defghijj.=   ",
+"                                  .efghijjk.=   ",
+"                                  ..........=   ",
+"                                    ========    ",
+"                                                ",
 "                                                ",
 "                                                ",
 "                                                ",
diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py
index 0818d339d..2c9c82851 100755
--- a/gramps/src/gramps_main.py
+++ b/gramps/src/gramps_main.py
@@ -44,6 +44,7 @@ import gtk
 import gnome.ui
 import GDK
 import GTK
+import GdkImlib
 import libglade
 
 #-------------------------------------------------------------------------
diff --git a/gramps/src/plugins.glade b/gramps/src/plugins.glade
index fb7140e85..08d664d59 100644
--- a/gramps/src/plugins.glade
+++ b/gramps/src/plugins.glade
@@ -146,14 +146,9 @@
 	  </child>
 
 	  <widget>
-	    <class>GtkPixmap</class>
-	    <name>image</name>
-	    <filename>gramps.xpm</filename>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <build_insensitive>True</build_insensitive>
+	    <class>GnomePixmap</class>
+	    <name>pixmap1</name>
+	    <filename>gramps.png</filename>
 	    <child>
 	      <padding>10</padding>
 	      <expand>False</expand>
diff --git a/gramps/src/plugins/WebPage.py b/gramps/src/plugins/WebPage.py
index 2b82214e6..f71470048 100644
--- a/gramps/src/plugins/WebPage.py
+++ b/gramps/src/plugins/WebPage.py
@@ -690,12 +690,14 @@ class WebReport(Report):
         doc.end_paragraph()
     
         person_list.sort(sort.by_last_name)
+        doc.write_text('<div class="PersonIndex">')
         for person in person_list:
             name = person.getPrimaryName().getName()
             doc.start_link("%s.html" % person.getId())
             doc.write_text(name)
             doc.end_link()
             doc.newline()
+        doc.write_text('<div class="PersonIndex"/>')
         doc.close()
         
     def write_report(self):