Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GeoView : issue 4547 : move GeoView and Mapstraction javascript into src/plugins/webstuff

Browse Source 
svn: r16433
This commit is contained in:
Serge Noiraud
2011-01-22 10:20:36 +00:00
parent 384b081489
commit a6bb3c1e53
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/view/geoview.py
View File

@@ -447,7 +447,7 @@ class GeoView(HtmlView):
self.already_testing = False self.already_testing = False
self.alt_provider = self._config.get('preferences.alternate-provider') self.alt_provider = self._config.get('preferences.alternate-provider')
self.usedmap = "googlev3" if self.alt_provider else "openlayers" self.usedmap = "googlev3" if self.alt_provider else "openlayers"
fpath = os.path.join(const.ROOT_DIR, 'mapstraction', fpath = os.path.join(const.ROOT_DIR, 'plugins/webstuff/images',
'crosshairs.png') 'crosshairs.png')
self.crosspath = urlparse.urlunsplit( self.crosspath = urlparse.urlunsplit(
('file', '', URL_SEP.join(fpath.split(os.sep)), '', '') ('file', '', URL_SEP.join(fpath.split(os.sep)), '', '')
@@ -1780,7 +1780,7 @@ class GeoView(HtmlView):
"css" : self._add_stylesheet() "css" : self._add_stylesheet()
} }
) )
fpath = os.path.join(const.ROOT_DIR, 'mapstraction', fpath = os.path.join(const.ROOT_DIR, 'plugins/webstuff/js/mapstraction',
"mxn.js?(googlev3,openlayers)") "mxn.js?(googlev3,openlayers)")
upath = urlparse.urlunsplit( upath = urlparse.urlunsplit(
('file', '', URL_SEP.join(fpath.split(os.sep)), '', '') ('file', '', URL_SEP.join(fpath.split(os.sep)), '', '')
@@ -2014,7 +2014,7 @@ class GeoView(HtmlView):
value = 'gramps-geo-default' # we use default icon. value = 'gramps-geo-default' # we use default icon.
if ( value == "gramps-geo-default" ): if ( value == "gramps-geo-default" ):
value = value.replace("default",'" + default_icon + "') value = value.replace("default",'" + default_icon + "')
ipath = os.path.join(const.ROOT_DIR, 'images/22x22/', '%s.png' % value ) ipath = os.path.join(const.ROOT_DIR, 'plugins/webstuff/images', '%s.png' % value )
upath = urlparse.urlunsplit(('file', '', upath = urlparse.urlunsplit(('file', '',
URL_SEP.join(ipath.split(os.sep)), '', '')) URL_SEP.join(ipath.split(os.sep)), '', ''))
# Workaround to avoid a drift problem with openlayers. # Workaround to avoid a drift problem with openlayers.
@@ -2523,7 +2523,7 @@ class GeoView(HtmlView):
delp = 'type="text/css" rel="stylesheet" />\n' delp = 'type="text/css" rel="stylesheet" />\n'
# Get the GeoView stylesheet. # Get the GeoView stylesheet.
cpath = os.path.join(const.ROOT_DIR, cpath = os.path.join(const.ROOT_DIR,
'data', 'plugins/webstuff/css',
'GeoView.css' 'GeoView.css'
) )
gpath = urlparse.urlunsplit(('file', '', gpath = urlparse.urlunsplit(('file', '',