From a6d8438b3145ed13b98a1b36e6d814691612f5fd Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Tue, 2 Mar 2010 07:40:48 +0000 Subject: [PATCH] Fixed Horizontal/ Vertical menu options in NarrativeWeb. Fixed alphabet/navigation menus in the stylesheets. svn: r14562 --- src/data/Web_Alphabet-Horizontal.css | 110 ++++++++++++++++++-------- src/data/Web_Alphabet-Vertical.css | 50 ++++++------ src/data/Web_Basic-Blue.css | 1 - src/plugins/webreport/NarrativeWeb.py | 4 +- 4 files changed, 101 insertions(+), 64 deletions(-) diff --git a/src/data/Web_Alphabet-Horizontal.css b/src/data/Web_Alphabet-Horizontal.css index 93abf23c3..0df09b97d 100755 --- a/src/data/Web_Alphabet-Horizontal.css +++ b/src/data/Web_Alphabet-Horizontal.css @@ -1,34 +1,30 @@ /* - ************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008-2010 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: Web_Alphabet-Horizontal.css -************************************************************************************************** -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. +Style Name: Web_Alphabet-Horizontal Stylesheet +*************************************************************************************************** -Go to http://gramps-project.org to learn more! - --------------------------------------------------------------------------------------------------- -Copyright (C) 2009 Rob G. Healey - -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 . --------------------------------------------------------------------------------------------------- -# $Id: $ +# $Id: Web_Alphabet-Horizontal.css 14559 2010-03-02 01:16:46Z robhealey1 $ Header ----------------------------------------------------- */ @@ -41,20 +37,19 @@ div#header { margin: 0; } -/* NarrativeWeb Navigation +/* Body Element --------------------------------------------------------------------------------------- */ -body#NarrativeWeb div#navigation { - position: fixed; - left: 0px; +body { + color: #000; + background-color: #FFF; + padding: 0; + margin: 0; width: 100%; } /* Alphabet Navigation ----------------------------------------------------- */ div#alphabet { - position: fixed; - top: 130px; - left: 0px; width: 100%; margin: 0; } @@ -82,3 +77,50 @@ div#alphabet ul li a { margin:0; text-decoration:none; } + +/* Navigation +----------------------------------------------------- */ +div#navigation, div#subnavigation { + width: 100%; + margin: 0; + padding: 0; + border: solid 2px #000; +} +div#navigation ul, div#subnavigation ul { + list-style:none; + min-width: 900px; + height: 24px; + margin:0; + padding: 0px 0px 0px 9px; + border-bottom: solid 2px #000; +} +div#navigation ul li, div#subnavigation ul li { + float: left; +} +div#navigation ul li:first-child, div#subnavigation ul li:first-child { + margin-left: 10px; +} +div#navigation ul li:after, div#subnavigation ul li:after { + content: "| "; +} +div#navigation ul li a, div#subnavigation ul li a { + display: block; + padding: 4px 8px 4px 8px; + float: left; + font: .8em bold italic small-caps verdana, serif; + color: #000; + text-decoration:none; + margin:0; +} +div#navigation ul li a:hover, div#subnavigation ul li a:hover { + +} +div#navigation ul li.CurrentSection a, +div#subnavigation ul li.CurrentSection a { + background-color: #00029D; + color: #FFF; +} +div#navigation ul li.CurrentSection a:hover, +div#subnavigation ul li.CurrentSection a:hover { + background-color: #000; +} diff --git a/src/data/Web_Alphabet-Vertical.css b/src/data/Web_Alphabet-Vertical.css index b378d59b2..cee862e6e 100755 --- a/src/data/Web_Alphabet-Vertical.css +++ b/src/data/Web_Alphabet-Vertical.css @@ -1,34 +1,30 @@ /* - ************************************************************************************************** -Copyright Holder and License +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright 2008-2010 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: Web_Alphabet-Vertical.css -************************************************************************************************** -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. +Style Name: Web_Alphabet-Vertical Stylesheet +*************************************************************************************************** -Go to http://gramps-project.org to learn more! - --------------------------------------------------------------------------------------------------- -Copyright (C) 2009 Rob G. Healey - -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 . --------------------------------------------------------------------------------------------------- -# $Id: Web_Alphabet-Vertical.css 14493 2010-02-25 14:12:33Z robhealey1 $ +# $Id: Web_Alphabet-Vertical.css 14559 2010-03-02 01:16:46Z robhealey1 $ Header ----------------------------------------------------- */ diff --git a/src/data/Web_Basic-Blue.css b/src/data/Web_Basic-Blue.css index 5405363af..c87bb2fb8 100644 --- a/src/data/Web_Basic-Blue.css +++ b/src/data/Web_Basic-Blue.css @@ -716,7 +716,6 @@ div#EventDetail table.eventlist tbody tr td.ColumnPerson { /* Contact ----------------------------------------------------- */ #Contact #summaryarea { - background-color: #70B1ED; width:500px; margin:0 auto; padding:3em; diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 885f84400..9f28acb31 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -5676,8 +5676,8 @@ class NavWebOptions(MenuReportOptions): self.__css.connect("value-changed", self.__stylesheet_changed) _NAVIGATION_OPTS = [ - ["Horizontal", _("Horizontal -- No Change")], - ["Vertical", _("Vertical")] + [_("Horizontal -- No Change"), "Horizontal"], + [_("Vertical"), "Vertical"] ] self.__navigation = EnumeratedListOption(_("Navigation Layout"), _NAVIGATION_OPTS[0][1]) for layout in _NAVIGATION_OPTS: