diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 1fa5a01a9..dd320a87a 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -770,8 +770,7 @@ class BasePage(object): lnk = (self.report.cur_fname, self.page_title, self.gid) text = "" for citation_handle in citation_handle_list: - citation = self.report.database.get_citation_from_handle( - citation_handle) + citation = self.report.database.get_citation_from_handle(citation_handle) if citation: # Add the source information to src_list for use when displaying the @@ -4437,8 +4436,10 @@ class SourceListPage(BasePage): # """ class SourcePage(BasePage): - def __init__(self, report, title, src_handle, src_list, ppl_handle_list, database_handles_list): + def __init__(self, report, title, src_handle, src_list, ppl_handle_list, + database_handles_list): self.dbase_ = report.database + source = self.dbase_.get_source_from_handle(src_handle) if not source: return @@ -4525,34 +4526,6 @@ class SourcePage(BasePage): (citation_list, citation_referents_list) = the_lists if citation_referents_list: - # if the menu layout if DropDown, then add these items to the web page? - if self.navigation == "DropDown": - - # add Animated Drop Down Citations Style Sheet - fname = "/".join(["css", "narrative-citations.css"]) - url = self.report.build_url_fname(fname, None, self.up) - head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet") - - # add javascript code to handle if the user's browser is IE6? - fname = "/".join(["scripts", "jquery-1.7..min.js"]) - url = self.report.build_url_fname(fname, None, self.up) - head += Html("script", src = url, type = "text/javascript", language = "javascript", inline = True) - - with Html("script", type = "text/javascript", language = "javascript") as jsc: - head += jsc - - jsc += """ - $(function() { - if ($.browser.msie && $.browser.version.substr(0,1)<7) - { - $('li').has('ul').mouseover(function(){ - $(this).children('ul').show(); - }).mouseout(function(){ - $(this).children('ul').hide(); - }) - } - });""" - # begin Source Citation Referents section with Html("div", class_ ="subsection", id = "SourceCitationReferents") as section: sourcedetail += section @@ -7008,9 +6981,6 @@ class NavWebReport(Report): # initialize place_lat_long variable for use in Family Map Pages place_lat_long = [] - # copy all of the neccessary files - self.copy_narrated_files() - place_list = {} source_list = {} @@ -7066,6 +7036,9 @@ class NavWebReport(Report): # has been moved so that all Sources can be found before processing... self.source_pages(source_list, ind_list, database_handles_list) + # copy all of the neccessary files + self.copy_narrated_files() + # if an archive is being used, close it? if self.archive: self.archive.close() @@ -7133,15 +7106,6 @@ class NavWebReport(Report): fname = CSS["DropDown-Menus"]["filename"] self.copy_file(fname, "narrative-menus.css", "css") - if self.navigation == "DropDown": - # copy SourcePage Animated Drop Down Citations Style Sheet - fname = CSS["DropDown-Citations"]["filename"] - self.copy_file(fname, "narrative-citations.css", "css") - - # copy jquery javascript file for use in the Drop Down Citations section... - fname = CSS["DropDown-Citations"]["javascript"] - self.copy_file(fname, "jquery-1.7.min.js", "scripts") - # copy narrative-maps Style Sheet if Place or Family Map pages are being created? if (self.placemappages or self.familymappages): fname = CSS["NarrativeMaps"]["filename"] diff --git a/src/plugins/webstuff/css/Makefile.am b/src/plugins/webstuff/css/Makefile.am index 962ad8edd..f2bf7a06f 100644 --- a/src/plugins/webstuff/css/Makefile.am +++ b/src/plugins/webstuff/css/Makefile.am @@ -16,7 +16,6 @@ DATAFILES = \ Web_Basic-Peach.css \ Web_Basic-Spruce.css \ Web_DropDown-Menus.css \ - Web_DropDown-Citations.css \ Web_Fade-Menus.css \ Web_Horizontal-Menus.css \ Web_Mainz.css \ diff --git a/src/plugins/webstuff/css/Web_DropDown-Citations.css b/src/plugins/webstuff/css/Web_DropDown-Citations.css deleted file mode 100644 index 034c8bc50..000000000 --- a/src/plugins/webstuff/css/Web_DropDown-Citations.css +++ /dev/null @@ -1,197 +0,0 @@ -/* -# encoding: utf-8 -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright 2012 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 -Originally Created by: Red Team Design -Style Name: Web_DropDown-Citations.css -****************************************************** - -# $Id$ -*/ - -#menu, #menu ul { - margin: 0; - padding: 0; - list-style: none; -} -#menu { - width: 95%; - margin: 6px auto; - border: 1px solid #222; - background-color: #111; - background-image: -moz-linear-gradient(#444, #111); - background-image: -webkit-gradient(linear, left top, left bottom, from(#444), to(#111)); - background-image: -webkit-linear-gradient(#444, #111); - background-image: -o-linear-gradient(#444, #111); - background-image: -ms-linear-gradient(#444, #111); - background-image: linear-gradient(#444, #111); - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; - -moz-box-shadow: 0 1px 1px #777, 0 1px 0 #666 inset; - -webkit-box-shadow: 0 1px 1px #777, 0 1px 0 #666 inset; - box-shadow: 0 1px 1px #777, 0 1px 0 #666 inset; -} -#menu:before, -#menu:after { - content: ""; - display: table; -} -#menu:after { - clear: both -} -#menu { - zoom:1 -} -#menu li { - float: left; - border-right: 1px solid #222; - -moz-box-shadow: 1px 0 0 #444; - -webkit-box-shadow: 1px 0 0 #444; - box-shadow: 1px 0 0 #444; - position: relative; -} -#menu a { - float: left; - padding: 12px 30px; - color: #999; - text-transform: uppercase; - font: bold 12px Arial, Helvetica; - text-decoration: none; - text-shadow: 0 1px 0 #000; -} -#menu li:hover > a { - color: #fafafa -} -*html #menu li a:hover { /* IE6 only */ - color: #fafafa -} -#menu ul { - margin: 20px 0 0 0; - _margin: 0; /*IE6 only*/ - opacity: 0; - visibility: hidden; - position: absolute; - top: 38px; - left: 0; - z-index: 9999; - background: #444; - background: -moz-linear-gradient(#444, #111); - background-image: -webkit-gradient(linear, left top, left bottom, from(#444), to(#111)); - background: -webkit-linear-gradient(#444, #111); - background: -o-linear-gradient(#444, #111); - background: -ms-linear-gradient(#444, #111); - background: linear-gradient(#444, #111); - -moz-box-shadow: 0 -1px rgba(255,255,255,.3); - -webkit-box-shadow: 0 -1px 0 rgba(255,255,255,.3); - box-shadow: 0 -1px 0 rgba(255,255,255,.3); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -webkit-transition: all .2s ease-in-out; - -moz-transition: all .2s ease-in-out; - -ms-transition: all .2s ease-in-out; - -o-transition: all .2s ease-in-out; - transition: all .2s ease-in-out; -} -#menu li:hover > ul { - opacity: 1; - visibility: visible; - margin: 0; -} -#menu ul ul { - top: 0; - left: 150px; - margin: 0 0 0 20px; - _margin: 0; /*IE6 only*/ - -moz-box-shadow: -1px 0 0 rgba(255,255,255,.3); - -webkit-box-shadow: -1px 0 0 rgba(255,255,255,.3); - box-shadow: -1px 0 0 rgba(255,255,255,.3); -} -#menu ul li { - float: none; - display: block; - border: 0; - _line-height: 0; /*IE6 only*/ - -moz-box-shadow: 0 1px 0 #111, 0 2px 0 #666; - -webkit-box-shadow: 0 1px 0 #111, 0 2px 0 #666; - box-shadow: 0 1px 0 #111, 0 2px 0 #666; -} -#menu ul li:last-child { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -#menu ul a { - padding: 10px; - width: 130px; - _height: 10px; /*IE6 only*/ - display: block; - white-space: nowrap; - float: none; - text-transform: none; -} -#menu ul a:hover { - background-color: #0186ba; - background-image: -moz-linear-gradient(#04acec, #0186ba); - background-image: -webkit-gradient(linear, left top, left bottom, from(#04acec), to(#0186ba)); - background-image: -webkit-linear-gradient(#04acec, #0186ba); - background-image: -o-linear-gradient(#04acec, #0186ba); - background-image: -ms-linear-gradient(#04acec, #0186ba); - background-image: linear-gradient(#04acec, #0186ba); -} -#menu ul li:first-child > a { - -moz-border-radius: 3px 3px 0 0; - -webkit-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -#menu ul li:first-child > a:after { - content: ''; - position: absolute; - left: 40px; - top: -6px; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #444; -} -#menu ul ul li:first-child a:after { - left: -6px; - top: 50%; - margin-top: -6px; - border-left: 0; - border-bottom: 6px solid transparent; - border-top: 6px solid transparent; - border-right: 6px solid #3b3b3b; -} -#menu ul li:first-child a:hover:after { - border-bottom-color: #04acec -} -#menu ul ul li:first-child a:hover:after { - border-right-color: #0299d3; - border-bottom-color: transparent; -} -#menu ul li:last-child > a { - -moz-border-radius: 0 0 3px 3px; - -webkit-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; -} diff --git a/src/plugins/webstuff/webstuff.py b/src/plugins/webstuff/webstuff.py index ff5a1dcd4..ac2208cd3 100644 --- a/src/plugins/webstuff/webstuff.py +++ b/src/plugins/webstuff/webstuff.py @@ -134,11 +134,6 @@ def load_on_reg(dbstate, uistate, plugin): ["DropDown-Menus", 0, "Drop Down Menus", path_css("Web_DropDown-Menus.css"), None, [], [] ], - # WebKit/ Html5/ CSS3 Animated DropDown Citations Style Sheet - ["DropDown-Citations", 0, "Drop Down Citations", - path_css("Web_DropDown-Citations.css"), None, [], - path_js("jquery-1.7.min.js") ], - # GeoView style sheet with its image ["GeoView", 0, "GeoView", path_css("GeoView.css"), None, @@ -147,10 +142,10 @@ def load_on_reg(dbstate, uistate, plugin): path_img("gramps-geo-birth.png"), path_img("gramps-geo-death.png"), path_img("gramps-geo-mainmap.png"), - path_img("gramps-geo-marriage.png")], [] ], + path_img("gramps-geo-marriage.png")], [] ], # no style sheet option - ["No style sheet",1, _("No style sheet"), [], None, [], [] ], + ["No style sheet",1, _("No style sheet"), [], None, [], [] ], # all other images for use in NarrativeWeb ['All Images', 0, 'All Images', None, None,