Completed the move of the webstuff into the webstuff directories. Feature Request 4547, 4555. Doug Blank told me that he thought that I could finish this one.
svn: r16427
This commit is contained in:
Rob G. Healey
parent
b4096bae73
commit
458e738a3d
@ -156,7 +156,6 @@ src/images/scalable/Makefile
|
||||
src/images/16x16/Makefile
|
||||
src/images/22x22/Makefile
|
||||
src/images/48x48/Makefile
|
||||
src/mapstraction/Makefile
|
||||
data/Makefile
|
||||
data/man/Makefile
|
||||
data/man/cs/Makefile
|
||||
|
||||
@ -14,7 +14,6 @@ SUBDIRS = \
|
||||
gui \
|
||||
images \
|
||||
Merge \
|
||||
mapstraction \
|
||||
plugins \
|
||||
Simple
|
||||
|
||||
|
||||
@ -176,7 +176,6 @@ DATA_DIR = os.path.join(ROOT_DIR, "data")
|
||||
WEB_DIR = os.path.join(ROOT_DIR, 'web')
|
||||
#SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml")
|
||||
TIP_DATA = os.path.join(DATA_DIR, "tips.xml")
|
||||
MAPSTRACTION_DIR = os.path.join(ROOT_DIR, "mapstraction")
|
||||
|
||||
PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml")
|
||||
|
||||
|
||||
@ -9,8 +9,7 @@ dist_pkgdata_DATA = \
|
||||
authors.xml \
|
||||
papersize.xml \
|
||||
tips.xml\
|
||||
lds.xml\
|
||||
GeoView.css
|
||||
lds.xml
|
||||
|
||||
# Rules for files with translatable strings
|
||||
# These are taken care of by the intltool
|
||||
|
||||
@ -29,8 +29,6 @@ dist_pkgdata_DATA = \
|
||||
gramps-font-color.png \
|
||||
gramps-font.png \
|
||||
gramps-geo.png \
|
||||
gramps-geo-mainmap.png \
|
||||
gramps-geo-altmap.png \
|
||||
gramps-gramplet.png \
|
||||
gramps-lock.png \
|
||||
gramps-media.png \
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
# $$Id: Makefile.am 15542 2010-06-07 16:47:00Z robhealey1 $
|
||||
#
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@/mapstraction
|
||||
|
||||
dist_pkgdata_DATA = \
|
||||
crosshairs.png \
|
||||
mxn.core.js \
|
||||
mxn.geocommons.core.js \
|
||||
mxn.google.geocoder.js \
|
||||
mxn.googlev3.core.js \
|
||||
mxn.js \
|
||||
mxn.openlayers.core.js \
|
||||
README
|
||||
@ -5830,29 +5830,15 @@ class NavWebReport(Report):
|
||||
if self.placemappages or self.familymappages:
|
||||
fname = CSS["mapstraction"]["filename"]
|
||||
self.copy_file(fname, "mapstraction.css", "styles")
|
||||
|
||||
for from_path in CSS["mapstraction"]["javascript"]:
|
||||
fdir, fname = os.path.split(from_path)
|
||||
self.copy_file( from_path, fname, "mapstraction" )
|
||||
|
||||
# copy printer style sheet
|
||||
fname = CSS["Print-Default"]["filename"]
|
||||
self.copy_file(fname, _NARRATIVEPRINT, "styles")
|
||||
|
||||
# copy mapstraction files to mapstraction directory
|
||||
# if PlacePage or IndividualPage maps will be used
|
||||
if self.placemappages or self.familymappages:
|
||||
js_files = [ "mxn.core.js", "mxn.geocommons.core.js", "mxn.google.core.js",
|
||||
"mxn.google.geocoder.js", "mxn.googlev3.core.js",
|
||||
"mxn.js", "mxn.openlayers.core.js" ]
|
||||
|
||||
for fname in js_files:
|
||||
from_path = os.path.join(const.MAPSTRACTION_DIR, fname)
|
||||
self.copy_file(from_path, fname, "mapstraction")
|
||||
|
||||
image_names = [ "gramps-geo-mainmap.png", "gramps-geo-altmap.png" ]
|
||||
for image_name in image_names:
|
||||
fname = os.path.join(const.ROOT_DIR,
|
||||
'images', '22x22',
|
||||
'%s' % image_name )
|
||||
self.copy_file(fname, image_name, "images")
|
||||
|
||||
imgs = []
|
||||
|
||||
# Copy the Creative Commons icon if the Creative Commons
|
||||
|
||||
@ -6,8 +6,9 @@
|
||||
SUBDIRS =
|
||||
|
||||
DATAFILES = \
|
||||
css/GeoView.css \
|
||||
css/ancestortree.css \
|
||||
css/behaviour.css \
|
||||
css/behaviour.css \
|
||||
css/Mapstraction.css \
|
||||
css/Web_Basic-Spruce.css \
|
||||
css/Web_Mainz.css \
|
||||
@ -22,16 +23,31 @@ DATAFILES = \
|
||||
css/Web_Basic-Peach.css \
|
||||
css/Web_Visually.css \
|
||||
images/blank.gif \
|
||||
images/crosshairs.png \
|
||||
images/document.png \
|
||||
images/favicon2.ico \
|
||||
images/favicon.ico \
|
||||
images/gramps-geo-altmap.png \
|
||||
images/gramps-geo-birth.png \
|
||||
images/gramps-geo-death.png \
|
||||
images/gramps-geo-mainmap.png \
|
||||
images/gramps-geo-marriage.png \
|
||||
images/somerights20.gif \
|
||||
images/Web_Gender_Female.png \
|
||||
images/Web_Gender_Male.png \
|
||||
images/Web_Mainz_Bkgd.png \
|
||||
images/Web_Mainz_Header.png \
|
||||
images/Web_Mainz_MidLight.png \
|
||||
images/Web_Mainz_Mid.png
|
||||
images/Web_Mainz_Mid.png \
|
||||
js/mapstraction/README \
|
||||
js/mapstraction/mxn.core.js \
|
||||
js/mapstraction/mxn.geocommons.core.js \
|
||||
js/mapstraction/mxn.google.core.js \
|
||||
js/mapstraction/mxn.googleearth.core.js \
|
||||
js/mapstraction/mxn.google.geocoder.js \
|
||||
js/mapstraction/mxn.googlev3.core.js \
|
||||
js/mapstraction/mxn.js \
|
||||
js/mapstraction/mxn.openlayers.core.js
|
||||
|
||||
pkgdatadir = $(datadir)/@PACKAGE@/plugins/webstuff
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 193 B After Width: | Height: | Size: 193 B |
|
Before Width: | Height: | Size: 654 B After Width: | Height: | Size: 654 B |
|
Before Width: | Height: | Size: 969 B After Width: | Height: | Size: 969 B |
|
Before Width: | Height: | Size: 957 B After Width: | Height: | Size: 957 B |
|
Before Width: | Height: | Size: 678 B After Width: | Height: | Size: 678 B |
|
Before Width: | Height: | Size: 951 B After Width: | Height: | Size: 951 B |
@ -2,6 +2,7 @@
|
||||
# Gramps - a GTK+/GNOME based genealogy program
|
||||
#
|
||||
# Copyright (C) 2010 Douglas Blank <doug.blank@gmail.com>
|
||||
# Copyright (C) 2011 Rob G. Healey <robhealey1@gmail.com>
|
||||
#
|
||||
# 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
|
||||
@ -35,6 +36,7 @@ def make_css_dict(tup):
|
||||
"filename": tup[3],
|
||||
"navigation": tup[4],
|
||||
"images": tup[5],
|
||||
"javascript": tup[6],
|
||||
}
|
||||
|
||||
def load_on_reg(dbstate, uistate, plugin):
|
||||
@ -43,55 +45,128 @@ def load_on_reg(dbstate, uistate, plugin):
|
||||
"""
|
||||
dir, fname = os.path.split(__file__)
|
||||
CSS_FILES = [
|
||||
# id, user selectable?, translated_name, fullpath, navigation target name, additional files
|
||||
|
||||
# id, user selectable?, translated_name, fullpath, navigation target name, images, javascript
|
||||
# "default" is used as default
|
||||
|
||||
# Basic Ash style sheet
|
||||
["Basic-Ash", 1, _("Basic-Ash"),
|
||||
os.path.join(dir, "css", 'Web_Basic-Ash.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Basic-Ash.css'), None, [], []],
|
||||
|
||||
# Basic Blue style sheet with navigation menus
|
||||
["Basic-Blue", 1, _("Basic-Blue"),
|
||||
os.path.join(dir, "css", 'Web_Basic-Blue.css'), "Web_Navigation-Menus.css", []],
|
||||
os.path.join(dir, "css", 'Web_Basic-Blue.css'), "Web_Navigation-Menus.css", [], []],
|
||||
|
||||
# Basic Cypress style sheet
|
||||
["Basic-Cypress", 1, _("Basic-Cypress"),
|
||||
os.path.join(dir, "css", 'Web_Basic-Cypress.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Basic-Cypress.css'), None, [], []],
|
||||
|
||||
# basic Lilac style sheet
|
||||
["Basic-Lilac", 1, _("Basic-Lilac"),
|
||||
os.path.join(dir, "css", 'Web_Basic-Lilac.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Basic-Lilac.css'), None, [], []],
|
||||
|
||||
# basic Peach style sheet
|
||||
["Basic-Peach", 1, _("Basic-Peach"),
|
||||
os.path.join(dir, "css", 'Web_Basic-Peach.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Basic-Peach.css'), None, [], []],
|
||||
|
||||
# basic Spruce style sheet
|
||||
["Basic-Spruce", 1, _("Basic-Spruce"),
|
||||
os.path.join(dir, "css", 'Web_Basic-Spruce.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Basic-Spruce.css'), None, [], []],
|
||||
|
||||
# Mainz style sheet with its images
|
||||
["Mainz", 1, _("Mainz"),
|
||||
os.path.join(dir, "css", 'Web_Mainz.css'), None,
|
||||
[os.path.join(dir, "images", "Web_Mainz_Bkgd.png"),
|
||||
os.path.join(dir, "images", "Web_Mainz_Header.png"),
|
||||
os.path.join(dir, "images", "Web_Mainz_Mid.png"),
|
||||
os.path.join(dir, "images", "Web_Mainz_MidLight.png")]],
|
||||
os.path.join(dir, "images", "Web_Mainz_MidLight.png")], []],
|
||||
|
||||
# Nebraska style sheet
|
||||
["Nebraska", 1, _("Nebraska"),
|
||||
os.path.join(dir, "css", 'Web_Nebraska.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Nebraska.css'), None, [], []],
|
||||
|
||||
# Visually Impaired style sheet with its navigation menus
|
||||
["Visually Impaired", 1, _("Visually Impaired"),
|
||||
os.path.join(dir, "css", 'Web_Visually.css'), "Web_Navigation-Menus.css", []],
|
||||
["No style sheet",1, _("No style sheet"), '', None, []],
|
||||
os.path.join(dir, "css", 'Web_Visually.css'), "Web_Navigation-Menus.css", [], []],
|
||||
|
||||
# no style sheet option
|
||||
["No style sheet",1, _("No style sheet"), [], None, [], []],
|
||||
|
||||
# ancestor tree style sheet
|
||||
["ancestortree", 0, "ancestortree",
|
||||
os.path.join(dir, "css", "ancestortree.css"), None, []],
|
||||
os.path.join(dir, "css", "ancestortree.css"), None, [], []],
|
||||
|
||||
# media reference regions style sheet
|
||||
["behaviour", 0, "Behaviour",
|
||||
os.path.join(dir, "css", 'behaviour.css'), None, []],
|
||||
["mapstraction", 0, "",
|
||||
os.path.join(dir, "css", "Mapstraction.css"), None, []],
|
||||
os.path.join(dir, "css", 'behaviour.css'), None, [], []],
|
||||
|
||||
# mapstraction style sheet for NarrativeWeb place maps
|
||||
["mapstraction", 0, "mapstraction",
|
||||
os.path.join(dir, "css", "Mapstraction.css"), None, [],
|
||||
[ os.path.join(dir, "js", "mapstraction", "mxn.core.js"),
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.googlev3.core.js"),
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.js"),
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.openlayers.core.js")] ],
|
||||
|
||||
# default style sheet in the options
|
||||
["default", 0, _("Basic-Ash"),
|
||||
os.path.join(dir, "css", 'Web_Basic-Ash.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Basic-Ash.css'), None, [], []],
|
||||
|
||||
# default printer style sheet
|
||||
["Print-Default", 0, "Print-Default",
|
||||
os.path.join(dir, "css", 'Web_Print-Default.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Print-Default.css'), None, [], []],
|
||||
|
||||
# vertical navigation style sheet
|
||||
["Navigation-Vertical", 0, "Navigation-Vertical",
|
||||
os.path.join(dir, "css", 'Web_Navigation-Vertical.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Navigation-Vertical.css'), None, [], []],
|
||||
|
||||
# horizontal navigation style sheet
|
||||
["Navigation-Horizontal", 0, "Navigation-Horizontal",
|
||||
os.path.join(dir, "css", 'Web_Navigation-Horizontal.css'), None, []],
|
||||
os.path.join(dir, "css", 'Web_Navigation-Horizontal.css'), None, [], []],
|
||||
|
||||
# GeoView style sheet with its image
|
||||
["GeoView", 0, "GeoView",
|
||||
os.path.join(dir, "css", "GeoView.css"), None,
|
||||
[os.path.join(dir, "images", "crosshairs.png"),
|
||||
os.path.join(dir, "images", "gramps-geo-altmap.png"),
|
||||
os.path.join(dir, "images", "gramps-geo-birth.png"),
|
||||
os.path.join(dir, "images", "gramps-geo-death.png"),
|
||||
os.path.join(dir, "images", "gramps-geo-mainmap.png"),
|
||||
os.path.join(dir, "images", "gramps-geo-marriage.png")],
|
||||
[ os.path.join(dir, "js", "mapstraction", "mxn.core.js"),
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.googlev3.core.js"),
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.js"),
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.openlayers.core.js")]],
|
||||
|
||||
# gender symbol images for use in NarrativeWeb's Ancestor Tree
|
||||
['Gender Images', 0, 'Gender Images', None, None,
|
||||
[os.path.join(dir, "images", "Web_Gender_Female.png"),
|
||||
os.path.join(dir, "images", "Web_Gender_Male.png"),
|
||||
]],
|
||||
os.path.join(dir, "images", "Web_Gender_Male.png")], []],
|
||||
|
||||
# all other images for use in NarrativeWeb
|
||||
['All Images', 0, 'All Images', None, None,
|
||||
[os.path.join(dir, "images", "favicon2.ico"),
|
||||
os.path.join(dir, "images", "blank.gif"),
|
||||
os.path.join(dir, "images", "document.png")]],
|
||||
['Copyright', 0, 'Copyright', os.path.join(dir, "images", "somerights20.gif"), None, []],
|
||||
['Document', 0, 'Document', os.path.join(dir, "images", "document.png"), None, []],
|
||||
[ os.path.join(dir, "images", "favicon2.ico"),
|
||||
os.path.join(dir, "images", "blank.gif"),
|
||||
os.path.join(dir, "images", "document.png")], []],
|
||||
|
||||
# copyright image
|
||||
['Copyright', 0, 'Copyright', os.path.join(dir, "images", "somerights20.gif"), None, [], []],
|
||||
|
||||
# document image in case the media object is not an image
|
||||
['Document', 0, 'Document', os.path.join(dir, "images", "document.png"), None, [], []],
|
||||
|
||||
# Google core javascript
|
||||
[ "Google Core", 0, "Google Core",
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.google.core.js"), None, [], []],
|
||||
|
||||
# Google Earth core javascript
|
||||
["Google Earth", 0, "Google Earth",
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.googleearth.core.js"), None, [], []],
|
||||
|
||||
# Google GeoCoder javascript
|
||||
["Google GeoCoder", 0, "Google GeoCoder",
|
||||
os.path.join(dir, "js", "mapstraction", "mxn.google.geocoder.js"), None, [], []],
|
||||
|
||||
]
|
||||
return CSS_FILES
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user