From f0b68e8d94f1357b577aae2d062faec9d23f743d Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Fri, 26 Feb 2010 01:02:12 +0000 Subject: [PATCH] Fixed place.lat and place.long in class PlaceListPage. Working on Navigation menu placement and look. svn: r14492 --- src/data/Web_Alphabet-Vertical.css | 67 +++++++++++++-------------- src/data/Web_Visually.css | 10 ++++ src/plugins/webreport/NarrativeWeb.py | 7 ++- 3 files changed, 44 insertions(+), 40 deletions(-) diff --git a/src/data/Web_Alphabet-Vertical.css b/src/data/Web_Alphabet-Vertical.css index 535ae1c25..ffaeb6a9d 100755 --- a/src/data/Web_Alphabet-Vertical.css +++ b/src/data/Web_Alphabet-Vertical.css @@ -1,34 +1,32 @@ -/* - ************************************************************************************************** -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: 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: Visually Impaired Stylesheet +Style Author: Jason M. Simanek (2008) +*************************************************************************************************** -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-Vertical.css 14491 2010-02-25 08:47:00Z robhealey1 $ Header ----------------------------------------------------- */ @@ -46,7 +44,7 @@ body { font-family: Arial, Helvetica, Lucina, sans, serif; color: #000; background-color: #FFF; - padding: 60px 0px 0px 118px; + padding: 60px 0px 0px 124px; } /* Navigation @@ -54,8 +52,8 @@ body { div#navigation { position: fixed; left: 0px; - width: 118px; - height: 500px; + width: 124px; + height: 390px; overflow-x: auto; border-width: 2px 4px 2px 4px; border-style: solid; @@ -68,18 +66,15 @@ div#navigation ul { } div#navigation ul li { font: bold 14px/100% sans; - padding: 10px 10px 10px 0px; +# padding: 10px 10px 10px 0px; margin:0; - float: left; + float: center; border-width: 0px 0px 2px 0px; border-style: solid; } div#navigation ul li:first-child { border-top: 0; } -div#navigation ul li:last-child { - border-bottom: 0; -} div#navigation ul li a { text-decoration: none; display: block; diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index 6f63e99a5..065a8d1c2 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -503,10 +503,20 @@ div#IndividualDetail div.subsection table tr td:first-child { } #Places table.infolist tbody tr td.ColumnName { background-color: #FFF; + width: 25%; } #Places table.infolist tbody tr td.ColumnName a { padding:.1em 10px .3em 10px; } +#Places table.infolist tbody tr td.ColumnState { + width: 7%; +} +#Places table.infolist tbody tr td.ColumnCountry { + width: 7%; +} +#Places table.infolist tbody tr td.ColumnCoordinates { + width: 15%; +} /* EventList and EventDetail ----------------------------------------------------- */ diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index ee65548ff..bff8f7b4b 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -960,9 +960,9 @@ class BasePage(object): Html("link", href = url2, type = "text/css", media = "screen", rel = "stylesheet") ] if self.report.css in ["Web_Basic-Blue.css", "Web_Visually.css"]: - links += Html("link", href= url5, type= "text/css", media="screen", rel="stylesheet") + links += Html("link", href= url5, type= "text/css", media="screen", rel="stylesheet", indent = True) - links += Html("link", href = url3, type = "text/css", media = 'print', rel = "stylesheet") + links += Html("link", href = url3, type = "text/css", media = 'print', rel = "stylesheet", indent = True) # add additional meta and link tags head += meta @@ -2190,7 +2190,7 @@ class PlaceListPage(BasePage): for colclass, data in [ ["State", ml.state], ["Country", ml.country], - ["Coordinates", (place.lat + ", " + place.long)] ] + ["Coordinates", (place.lat + ", " + place.long) if place.lat and place.long else None] ] if data or " " ) @@ -5112,7 +5112,6 @@ class NavWebReport(Report): """ # gets the person list and applies the requested filter - ind_list = self.database.iter_person_handles() self.progress.set_pass(_('Applying Filter...'), self.database.get_number_of_people()) ind_list = self.filter.apply(self.database, ind_list, self.progress)