From 88639fcd7dd7cdb5cae182f6391093f2a2e126b4 Mon Sep 17 00:00:00 2001 From: Serge Noiraud Date: Wed, 22 Nov 2017 10:27:40 +0100 Subject: [PATCH] Mainz css file produces left aligned FamilyMap pages (#489) * Mainz css file produces left aligned FamilyMap pages Solving Mainz problem creates new ones with Basic-Blue and Nebraska styles sheet. Some cleanup with unused css file (GeoView.css) Fixes #10268 * Many problems with css files and the ancestor tree * media file not created if we have unused media. --- data/css/GeoView.css | 54 ----------------------------- data/css/Web_Basic-Ash.css | 8 ++++- data/css/Web_Basic-Blue.css | 1 - data/css/Web_Basic-Cypress.css | 8 ++++- data/css/Web_Basic-Lilac.css | 8 ++++- data/css/Web_Basic-Peach.css | 8 ++++- data/css/Web_Basic-Spruce.css | 8 ++++- data/css/Web_Mainz.css | 10 ++++-- data/css/Web_Nebraska.css | 3 +- data/css/Web_Visually.css | 1 - data/css/ancestortree.css | 3 ++ data/css/narrative-maps.css | 6 ++-- gramps/plugins/webreport/family.py | 7 ---- gramps/plugins/webreport/media.py | 3 ++ gramps/plugins/webreport/person.py | 2 +- gramps/plugins/webstuff/webstuff.py | 10 ------ 16 files changed, 54 insertions(+), 86 deletions(-) delete mode 100644 data/css/GeoView.css diff --git a/data/css/GeoView.css b/data/css/GeoView.css deleted file mode 100644 index ed9bc13b0..000000000 --- a/data/css/GeoView.css +++ /dev/null @@ -1,54 +0,0 @@ -/* -# -# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - ----------------------------------------------------------------------------- -GeoView Style Sheet -Style Name: GeoView -Style Author: Serge Noiraud (2009) - ----------------------------------------------------------------------------- -This file was created for GeoView usage. - - - GeoView Styles - ------------------------------------------------------ */ - -#geo-map -{ - margin-left:0px; - margin-top:0px; - margin-right:auto; - margin-bottom:auto; -} - -/* InfoWindow */ -#geo-info { - font-size:10pt; - max-height:200px; - max-width: 600px; - min-width: 300px; - text-align: left; - padding-right: 6px; - overflow-x: auto; - overflow-y: auto; -} - diff --git a/data/css/Web_Basic-Ash.css b/data/css/Web_Basic-Ash.css index ab101b683..be513004a 100644 --- a/data/css/Web_Basic-Ash.css +++ b/data/css/Web_Basic-Ash.css @@ -86,6 +86,12 @@ h1 { font-weight: bold; padding-left: 15px; } +h2 { + display:block; + margin:0; + padding:0; + text-align: center; +} h3 { font-size: large; padding-left: 15px; @@ -415,7 +421,7 @@ div#SourceDetail { } .subsection { clear: both; - overflow: hidden; + overflow: visible; } .subsection p { margin: 0px; diff --git a/data/css/Web_Basic-Blue.css b/data/css/Web_Basic-Blue.css index 9814ce8f4..44dabde96 100644 --- a/data/css/Web_Basic-Blue.css +++ b/data/css/Web_Basic-Blue.css @@ -134,7 +134,6 @@ h5, h6 { margin:1.3em 0 .5em 1em; } p#description { - max-width: 800px; margin: 0; padding: 1em 20px; text-indent: 30px; diff --git a/data/css/Web_Basic-Cypress.css b/data/css/Web_Basic-Cypress.css index 1749e3bee..41667a04e 100644 --- a/data/css/Web_Basic-Cypress.css +++ b/data/css/Web_Basic-Cypress.css @@ -86,6 +86,12 @@ h1 { font-weight: bold; padding-left: 15px; } +h2 { + display:block; + margin:0; + padding:0; + text-align: center; +} h3 { font-size: large; padding-left: 15px; @@ -465,7 +471,7 @@ div#SourceDetail { } .subsection { clear: both; - overflow: hidden; + overflow: visible; } .subsection p { margin: 0px; diff --git a/data/css/Web_Basic-Lilac.css b/data/css/Web_Basic-Lilac.css index c3d83b137..d17608572 100644 --- a/data/css/Web_Basic-Lilac.css +++ b/data/css/Web_Basic-Lilac.css @@ -86,6 +86,12 @@ h1 { font-weight: bold; padding-left: 15px; } +h2 { + display:block; + margin:0; + padding:0; + text-align: center; +} h3 { font-size: large; padding-left: 15px; @@ -458,7 +464,7 @@ div#SourceDetail { } .subsection { clear: both; - overflow: hidden; + overflow: visible; } .subsection p { margin: 0px; diff --git a/data/css/Web_Basic-Peach.css b/data/css/Web_Basic-Peach.css index 5ffe93f76..6e6b8d365 100644 --- a/data/css/Web_Basic-Peach.css +++ b/data/css/Web_Basic-Peach.css @@ -86,6 +86,12 @@ h1 { font-weight: bold; padding-left: 15px; } +h2 { + display:block; + margin:0; + padding:0; + text-align: center; +} h3 { font-size: large; padding-left: 15px; @@ -458,7 +464,7 @@ div#SourceDetail { } .subsection { clear: both; - overflow: hidden; + overflow: visible; } .subsection p { margin: 0px; diff --git a/data/css/Web_Basic-Spruce.css b/data/css/Web_Basic-Spruce.css index 0466cf5e9..489f136de 100644 --- a/data/css/Web_Basic-Spruce.css +++ b/data/css/Web_Basic-Spruce.css @@ -86,6 +86,12 @@ h1 { font-weight: bold; padding-left: 15px; } +h2 { + display:block; + margin:0; + padding:0; + text-align: center; +} h3 { font-size: large; padding-left: 15px; @@ -458,7 +464,7 @@ div#SourceDetail { } .subsection { clear: both; - overflow: hidden; + overflow: visible; } .subsection p { margin: 0px; diff --git a/data/css/Web_Mainz.css b/data/css/Web_Mainz.css index 0865bbfed..b55acc20e 100644 --- a/data/css/Web_Mainz.css +++ b/data/css/Web_Mainz.css @@ -67,7 +67,7 @@ body { background: url(../images/Web_Mainz_Bkgd.png) black repeat; } body > div { - width: 950px; + width: 85%; margin: 0px auto; background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat; overflow: hidden; @@ -90,6 +90,12 @@ h1 { font-style: italic; margin-left: 2em; } +h2 { + display:block; + margin:0; + padding:0; + text-align: center; +} h3 { font-size: xx-large; font-weight: normal; @@ -143,7 +149,7 @@ div#nav ul li, #subnavigation ul li { float: left; } div#nav ul li a, #subnavigation ul li a { - display: block; + display: run-in; padding: 0.4em 0.8em 0.3em 0.8em; font-size: smaller; font-family: sans-serif; diff --git a/data/css/Web_Nebraska.css b/data/css/Web_Nebraska.css index a14df92ce..face9451d 100644 --- a/data/css/Web_Nebraska.css +++ b/data/css/Web_Nebraska.css @@ -114,7 +114,7 @@ h1 { font:normal 2em/1.2em serif; } h2 { - display:none; + display:block; } h3 { font:normal 2em/1.2em serif; @@ -138,7 +138,6 @@ h5, h6 { p#description { color:#542; - max-width:800px; margin:0; padding:1em 20px; background-color:#FFF; diff --git a/data/css/Web_Visually.css b/data/css/Web_Visually.css index 3a30d0037..cea309708 100644 --- a/data/css/Web_Visually.css +++ b/data/css/Web_Visually.css @@ -155,7 +155,6 @@ h5, h6 { margin:1.3em 0 .5em 1em; } p#description { - max-width:800px; margin:0; padding:1em 20px; } diff --git a/data/css/ancestortree.css b/data/css/ancestortree.css index 196c91fb4..2556cd2da 100644 --- a/data/css/ancestortree.css +++ b/data/css/ancestortree.css @@ -45,6 +45,9 @@ Females Web_Gender_Female.png } #treeContainer { position:relative; + display: table-cell; + vertical-align: middle; + overflow: visible; z-index:1; } #treeContainer div.boxbg { diff --git a/data/css/narrative-maps.css b/data/css/narrative-maps.css index f8465cf78..20bd9e767 100644 --- a/data/css/narrative-maps.css +++ b/data/css/narrative-maps.css @@ -23,7 +23,6 @@ body#FamilyMap { background-color: #000; padding: 0 14px; - width: 965px; } /* Family Maps @@ -32,8 +31,9 @@ body#FamilyMap { margin-left: 10px; margin-right: 10px; border: solid 4px #000; - width: 931px; - height: 1000px; + margin: 0px auto; + width: 800px; + height: 800px; } /* Place Maps diff --git a/gramps/plugins/webreport/family.py b/gramps/plugins/webreport/family.py index 4f61ff134..d09fc45b6 100644 --- a/gramps/plugins/webreport/family.py +++ b/gramps/plugins/webreport/family.py @@ -90,7 +90,6 @@ class FamilyPages(BasePage): """ BasePage.__init__(self, report, title="") self.family_dict = defaultdict(set) - self.person = None self.familymappages = None def display_pages(self, title): @@ -343,12 +342,6 @@ class FamilyPages(BasePage): for evt_ref in family.get_event_ref_list(): event = self.r_db.get_event_from_handle(evt_ref.ref) media_list += event.get_media_list() - thumbnail = self.disp_first_img_as_thumbnail(media_list, - family) - if thumbnail: - relationshipdetail += thumbnail - - self.person = None # no longer used relationshipdetail += Html( "h2", self.page_title, inline=True) + ( diff --git a/gramps/plugins/webreport/media.py b/gramps/plugins/webreport/media.py index 0e8def04b..e5c6a1bc2 100644 --- a/gramps/plugins/webreport/media.py +++ b/gramps/plugins/webreport/media.py @@ -147,6 +147,8 @@ class MediaPages(BasePage): BasePage.__init__(self, report, title) output_file, sio = self.report.create_file("media") + # save the media file name in case we create unused media pages + self.cur_fname = self.report.cur_fname medialistpage, head, body = self.write_header(self._('Media')) ldatec = 0 @@ -276,6 +278,7 @@ class MediaPages(BasePage): # send page out for processing # and close the file + self.report.cur_fname = self.cur_fname self.xhtml_writer(medialistpage, output_file, sio, ldatec) def media_ref_link(self, handle, name, uplink=False): diff --git a/gramps/plugins/webreport/person.py b/gramps/plugins/webreport/person.py index 722114562..0f74a64f0 100644 --- a/gramps/plugins/webreport/person.py +++ b/gramps/plugins/webreport/person.py @@ -80,7 +80,7 @@ LOG = logging.getLogger(".NarrativeWeb") getcontext().prec = 8 _WIDTH = 160 -_HEIGHT = 64 +_HEIGHT = 120 _VGAP = 10 _HGAP = 30 _SHADOW = 5 diff --git a/gramps/plugins/webstuff/webstuff.py b/gramps/plugins/webstuff/webstuff.py index 35e0fb0ef..346db40e3 100644 --- a/gramps/plugins/webstuff/webstuff.py +++ b/gramps/plugins/webstuff/webstuff.py @@ -139,16 +139,6 @@ def load_on_reg(dbstate, uistate, plugin): ["DropDown-Menus", 0, "Drop Down Menus", path_css("Web_DropDown-Menus.css"), None, [], [] ], - # GeoView style sheet with its image - ["GeoView", 0, "GeoView", - path_css("GeoView.css"), None, - [path_img("crosshairs.png"), - path_img("gramps-geo-altmap.png"), - path_img("gramps-geo-birth.png"), - path_img("gramps-geo-death.png"), - path_img("gramps-geo-mainmap.png"), - path_img("gramps-geo-marriage.png")], [] ], - # no style sheet option ["No style sheet",1, _("No style sheet"), [], None, [], [] ],