From e5b231ef6bb24183364831562e681e88c85302f8 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Thu, 10 Dec 2009 06:50:21 +0000 Subject: [PATCH] Fixed all of the stylesheets, NarrativeWeb, and WebCal with the proper use of the header from Brian Matherly. svn: r13749 --- src/data/GeoView.css | 46 +++++++++---------- src/data/Web_Basic-Ash.css | 50 +++++++++------------ src/data/Web_Basic-Cypress.css | 49 +++++++++----------- src/data/Web_Basic-Lilac.css | 49 +++++++++----------- src/data/Web_Basic-Peach.css | 48 ++++++++++---------- src/data/Web_Basic-Spruce.css | 48 +++++++++----------- src/data/Web_Mainz.css | 52 ++++++++++------------ src/data/Web_Nebraska.css | 48 +++++++++----------- src/data/Web_Print-Default.css | 46 +++++++++---------- src/data/Web_Visually.css | 47 +++++++++----------- src/data/behaviour.css | 46 +++++++++---------- src/plugins/webreport/NarrativeWeb.py | 64 +++++++++------------------ src/plugins/webreport/WebCal.py | 2 +- 13 files changed, 266 insertions(+), 329 deletions(-) diff --git a/src/data/GeoView.css b/src/data/GeoView.css index 75721729c..3a3c1f903 100644 --- a/src/data/GeoView.css +++ b/src/data/GeoView.css @@ -1,35 +1,31 @@ /* +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2009 Serge Noiraud +# +# 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 +# + ---------------------------------------------------------------------------- GeoView Style Sheet Style Name: GeoView Style Author: Serge Noiraud (2009) ---------------------------------------------------------------------------- -This file was created for the GeoView usage. ----------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. - -Go to to learn more! - -License ----------------------------------------------------------------------------- -Copyright 2009 Serge Noiraud - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . ----------------------------------------------------------------------------- +This file was created for GeoView usage. # $Id: $ diff --git a/src/data/Web_Basic-Ash.css b/src/data/Web_Basic-Ash.css index 1680f9f37..5af7c9ccc 100644 --- a/src/data/Web_Basic-Ash.css +++ b/src/data/Web_Basic-Ash.css @@ -1,38 +1,32 @@ /* -************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. Healey +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Basic-Ash Stylesheet Style Author: Jason M. Simanek (2008) Note: Adapted from GRAMPS original Modern Style stylesheet ************************************************************************************************** -This website was created with GRAMPS --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional - -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. - -Go to to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008 Jason M. Simanek -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . --------------------------------------------------------------------------------------------------- Color Palette -------------------------------------------------------------------------------------------------- diff --git a/src/data/Web_Basic-Cypress.css b/src/data/Web_Basic-Cypress.css index 88f723f4a..3a82bb2d8 100644 --- a/src/data/Web_Basic-Cypress.css +++ b/src/data/Web_Basic-Cypress.css @@ -1,37 +1,32 @@ /* -************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. Healey +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Basic - Cypress Style Author: Jason Simanek (2008) Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Tranquil' stylesheet ************************************************************************************************** -This website was created with GRAMPS --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. - -Go to to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008 Jason M. Simanek -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . --------------------------------------------------------------------------------------------------- Color Palette -------------------------------------------------------------------------------------------------- diff --git a/src/data/Web_Basic-Lilac.css b/src/data/Web_Basic-Lilac.css index 7463a0d8b..92e642d7a 100644 --- a/src/data/Web_Basic-Lilac.css +++ b/src/data/Web_Basic-Lilac.css @@ -1,37 +1,32 @@ /* -************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. Healey +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Basic - Lilac Style Author: Jason M. Simanek (2008) Note: Adapted from GRAMPS original Modern Style stylesheet with colors from the original 'Business' stylesheet ************************************************************************************************** -This website was created with GRAMPS --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. - -Go to to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008 Jason M. Simanek -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . --------------------------------------------------------------------------------------------------- Color Palette -------------------------------------------------------------------------------------------------- diff --git a/src/data/Web_Basic-Peach.css b/src/data/Web_Basic-Peach.css index 9608ae530..84eb713e0 100644 --- a/src/data/Web_Basic-Peach.css +++ b/src/data/Web_Basic-Peach.css @@ -1,6 +1,27 @@ /* -************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. Healey + +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Basic-Peach Stylesheet @@ -8,30 +29,7 @@ Style Author: Jason M. Simanek (2008) Note: Adapted from GRAMPS original Modern Style stylesheet with a new orange color scheme. ************************************************************************************************** -This website was created with GRAMPS --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. -Go to to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008 Jason M. Simanek -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . -------------------------------------------------------------------------------------------------- Color Palette diff --git a/src/data/Web_Basic-Spruce.css b/src/data/Web_Basic-Spruce.css index 0a8e65437..f0c1969a9 100644 --- a/src/data/Web_Basic-Spruce.css +++ b/src/data/Web_Basic-Spruce.css @@ -1,37 +1,33 @@ /* -************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. Healey +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Basic-Spruce Stylesheet Style Author: Jason M. Simanek (2008) Note: Adapted from GRAMPS original Modern Style stylesheet with a new blue color scheme. - ************************************************************************************************** -This website was created with GRAMPS --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. -Go to to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008 Jason M. Simanek -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . -------------------------------------------------------------------------------------------------- Color Palette diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index 69b81be5e..3c4e699d7 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -1,37 +1,33 @@ /* ----------------------------------------------------------------------------- +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. healey +# +# 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 +# + +******************************************************************************* GRAMPS Cascading Style Sheet Style Name: Mainz Style Author: Jason Simanek (2008) +******************************************************************************* ---------------------------------------------------------------------------- -This website was created with GRAMPS ----------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. - -Go to to learn more! - -License ----------------------------------------------------------------------------- -Copyright 2008 Jason M. Simanek -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . ----------------------------------------------------------------------------- - Color Palette ---------------------------------------------------------------------------- diff --git a/src/data/Web_Nebraska.css b/src/data/Web_Nebraska.css index 9506a060a..3ee219918 100644 --- a/src/data/Web_Nebraska.css +++ b/src/data/Web_Nebraska.css @@ -1,36 +1,32 @@ /* -************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. Healey +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Nebraska Default Stylesheet Style Author: Jason M. Simanek (2008) - ************************************************************************************************** -This website was created with GRAMPS --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. -Go to to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008 Jason M. Simanek -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . -------------------------------------------------------------------------------------------------- Color Palette diff --git a/src/data/Web_Print-Default.css b/src/data/Web_Print-Default.css index 742b72abe..0f37a7ddc 100644 --- a/src/data/Web_Print-Default.css +++ b/src/data/Web_Print-Default.css @@ -1,34 +1,32 @@ ./* - ************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008-2009 Jason M. Simanek +# Copyright 2009 Stephane Charette +# Copyright (c) 2008-2009 Rob G. Healey +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Printer Default stylesheet Style Author: Jason M. Simanek (2008) ************************************************************************************************** -This website was created with GRAMPS -http://www.gramps-project.org --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional genealogy program, -and a wiki open to all. It is a community project, created, developed and governed by genealogists. -Go to http://gramps-project.org to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008-2009 Rob G. Healey -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 GRAMPS. If not, -see . -------------------------------------------------------------------------------------------------- Color Palette -------------------------------------------------------------------------------------------------- diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index cb67559e0..fd7bbb332 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -1,34 +1,31 @@ ./* - ************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008-2009 Rob G. Healey +# Copyright 2009 Stephane Charette +# +# 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 +# + ************************************************************************************************** GRAMPS Cascading Style Sheet Style Name: Visually Impaired Stylesheet Style Author: Jason M. Simanek (2008) -************************************************************************************************** -This website was created with GRAMPS -http://www.gramps-project.org --------------------------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional genealogy program, -and a wiki open to all. It is a community project, created, developed and governed by genealogists. +*************************************************************************************************** -Go to http://gramps-project.org to learn more! - --------------------------------------------------------------------------------------------------- -Copyright 2008-2009 Rob G. Healey -Copyright 2009 Stephane Charette - -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 GRAMPS. If not, -see . -------------------------------------------------------------------------------------------------- Color Palette -------------------------------------------------------------------------------------------------- diff --git a/src/data/behaviour.css b/src/data/behaviour.css index 45a594e4c..381293e2d 100644 --- a/src/data/behaviour.css +++ b/src/data/behaviour.css @@ -1,31 +1,29 @@ /* -------------------------------------------------------------------------------- +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2009 Stephane Charette and Jason Simanek +# +# 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 +# + +************************************************************************************************** GRAMPS cascading style sheet for common behaviour independant of styles Style Name: n/a (used by many different styles) Style Author: Stephane Charette and Jason Simanek -------------------------------------------------------------------------------- -GRAMPS is a Free Software Project for Genealogy, offering a professional -genealogy program, and a wiki open to all. It is a community project, created, -developed and governed by genealogists. - -Go to to learn more! - -License -------------------------------------------------------------------------------- -Copyright 2009 Stephane Charette and Jason Simanek -This file is part of the GRAMPS program. - -GRAMPS 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, version 2 of the License. - -GRAMPS 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 -GRAMPS. If not, see . -------------------------------------------------------------------------------- +************************************************************************************************** ------------- Image Gallery diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 43f1c8978..79e0b128a 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -14,7 +14,7 @@ # 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, +# 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. @@ -2295,13 +2295,12 @@ class PlacePage(BasePage): self.XHTMLWriter(placepage, of) class EventListPage(BasePage): - def __init__(self, report, title, event_types, event_handle_list, ind_list): + def __init__(self, report, title, event_types, event_handle_list): """ Will create the event list page @param: event_types: a list of the type in the events database for this class @param: event_handle_list -- a list of event handles - #psram: ind_list -- person handles for this database """ BasePage.__init__(self, report, title) db = report.database @@ -2315,7 +2314,7 @@ class EventListPage(BasePage): msg = _("This page contains an index of all the events in the database, sorted by their " "type, Gramps id, and date (if one is present), Clicking on an " - "event’s Gramps ID will load a page of those type of events.") + "event’s Gramps ID will load a page for that event.") eventlist += Html("p", msg, id = "description") # get alphabet navigation for class EventListPage @@ -2350,6 +2349,9 @@ class EventListPage(BasePage): evt_type = _("%(eventtype)s") % {'eventtype' : evt_type} first_event = True + # sort the datalist by gramps id, date, and event handle + datalist.sort() + for (gid, date, event_handle) in datalist: event = db.get_event_from_handle(event_handle) @@ -5125,11 +5127,8 @@ class NavWebReport(Report): self.place_pages(place_list, source_list) # build classes EventListPage and EventPage - # build the events dictionary only if event pages are being created? if self.inc_events: - event_dict, event_types, event_handle_list = [], [], [] - self.build_events(ind_list, event_dict, event_types, event_handle_list) - self.event_pages(event_dict, event_types, event_handle_list, ind_list) + self.event_pages(ind_list) # build classes SourceListPage and SourcePage self.source_pages(source_list) @@ -5225,16 +5224,15 @@ class NavWebReport(Report): from_path = os.path.join(const.IMAGE_DIR, fname) self.copy_file(from_path, fname, "images") - def build_events(self, ind_list, event_dict, event_types, event_handle_list): + def build_events(self, ind_list): """ build a list of events for classes EventListPage and EventPage @param: ind_list = list of handles for persons in this database - @param: event_dict = a list of events from ind_list - @param: event_types -- will hold the difrferent event types for this database - @param: event_handle_list -- a list of event handles to be sorted by type """ db = self.database + event_types = [] + event_handle_list = [] for person_handle in ind_list: person = db.get_person_from_handle(person_handle) @@ -5253,18 +5251,9 @@ class NavWebReport(Report): for evt_ref in family.get_event_ref_list(): event = db.get_event_from_handle(evt_ref.ref) - # get event type - evt_type = event.type.xml_str() - - # get event types for class EventsListPage - etype = None - for xtype in EventType._DATAMAP: - if xtype[2] == evt_type: - etype = xtype[1] - break - - if etype is not None: - event_types.append(etype) + # get the event type + etype = str(event.type) + event_types.append(etype) event_handle_list.append(evt_ref.ref) # get sot date as year/month/day, 2009/09/09, @@ -5282,18 +5271,8 @@ class NavWebReport(Report): event = db.get_event_from_handle(evt_ref.ref) # get event type - evt_type = event.type.xml_str() - - # get event types for class EventsListPage - etype = None - _type = event.type.xml_str() - for xtype in EventType._DATAMAP: - if xtype[2] == _type: - etype = xtype[1] - break - - if etype is not None: - event_types.append(etype) + etype = str(event.type) + event_types.append(etype) event_handle_list.append(evt_ref.ref) # get sot date as year/month/day, see above for further info @@ -5429,22 +5408,21 @@ class NavWebReport(Report): PlacePage(self, self.title, place, source_list, place_list) self.progress.step() - def event_pages(self, event_dict, event_types, event_handle_list, ind_list): + def event_pages(self, ind_list): """ a dump of all the events sorted by event type, date, and surname for classes EventListPage and EventPage - - @param: event_dict -- all the data for class EventPage - @param: event_types -- a list of all the event types in this database - @param: event_handle_list -- a list of the event handles in the database to be used """ # set up progress bar for event pages; using ind list because it was taking too long at the end event_handles = self.database.get_event_handles() self.progress.set_pass(_("Creating event pages"), len(event_handles)) + # gather the information that we will need for these two classes + event_dict, event_types, event_handle_list = self.build_events(ind_list) + # send all data to the events list page - EventListPage(self, self.title, event_types, event_handle_list, ind_list) + EventListPage(self, self.title, event_types, event_handle_list) for (person, event_list) in event_dict: @@ -6290,7 +6268,7 @@ def alphabet_navigation(menu_set, alphakey): return None num_ltrs = len(sorted_alpha_index) - num_of_cols = 34 if alphakey is not _ALPHAEVENT else 9 + num_of_cols = 34 if alphakey is not _ALPHAEVENT else 10 num_of_rows = ((num_ltrs // num_of_cols) + 1) # begin alphabet navigation division diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py index 7d30701b8..ef84dbf49 100644 --- a/src/plugins/webreport/WebCal.py +++ b/src/plugins/webreport/WebCal.py @@ -11,7 +11,7 @@ # 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, +# 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.