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

change str.format calls back to % operations

Browse Source 
svn: r13397
This commit is contained in:
Gerald Britton 2009-10-23 20:43:18 +00:00
parent 131f5396b6
commit 8592d8c68f
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/DataViews/GeoView.py
View File

@ -108,67 +108,67 @@ NB_MARKERS_PER_PAGE = 200
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
_HTMLHEADER = '''<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" _HTMLHEADER = '''<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\" {xmllang} > \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\" %(xmllang)s >
<html xmlns=\"http://www.w3.org/1999/xhtml\" > <html xmlns=\"http://www.w3.org/1999/xhtml\" >
<head> <head>
<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/> <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"/>
<title>This is used to pass messages between javascript and python</title> <title>This is used to pass messages between javascript and python</title>
<meta http-equiv=\"Content-Script-Type\" content=\"text/javascript\"> <meta http-equiv=\"Content-Script-Type\" content=\"text/javascript\">
{css}<script type=\"text/javascript\"''' %(css)s<script type=\"text/javascript\"'''
_JAVASCRIPT = '''<script> _JAVASCRIPT = '''<script>
var gmarkers = []; var min = 0; var zoom = 0; var uzoom = 0; var gmarkers = []; var min = 0; var zoom = 0; var uzoom = 0;
var pos = 0; var mapstraction; var pos = 0; var mapstraction;
var regrep = new RegExp(\"default\",\"g\"); var regrep = new RegExp(\"default\",\"g\");
var current_map; var ulat; var ulon; var default_icon; var current_map; var ulat; var ulon; var default_icon;
function getArgs(){{ function getArgs(){
var args = new Object(); var args = new Object();
var query = location.search.substring(1); var query = location.search.substring(1);
var pairs = query.split("&"); var pairs = query.split("&");
search_array = query.split("&"); search_array = query.split("&");
for (var i=0; i < pairs.length; i++){{ for (var i=0; i < pairs.length; i++){
var pos = pairs[i].indexOf('='); var pos = pairs[i].indexOf('=');
if (pos == -1) continue; if (pos == -1) continue;
var argname = pairs[i].substring(0,pos); var argname = pairs[i].substring(0,pos);
var value = pairs[i].substring(pos+1); var value = pairs[i].substring(pos+1);
args[argname] = unescape(value); args[argname] = unescape(value);
}} }
return args; return args;
}} }
var selectedmarkers = 'All'; var selectedmarkers = 'All';
// shows or hide markers of a particular category // shows or hide markers of a particular category
function selectmarkers(year) {{ function selectmarkers(year) {
selectedmarkers = year; selectedmarkers = year;
for (var i=0; i<gmarkers.length; i++) {{ for (var i=0; i<gmarkers.length; i++) {
val = gmarkers[i].getAttribute("year"); val = gmarkers[i].getAttribute("year");
min = parseInt(year); min = parseInt(year);
max = min + step; max = min + step;
if ( selectedmarkers == "All" ) {{ min = 0; max = 9999; }} if ( selectedmarkers == "All" ) { min = 0; max = 9999; }
gmarkers[i].hide(); gmarkers[i].hide();
years = val.split(' '); years = val.split(' ');
for ( j=0; j < years.length; j++) {{ for ( j=0; j < years.length; j++) {
if ( years[j] >= min ) {{ if ( years[j] >= min ) {
if ( years[j] < max ) {{ if ( years[j] < max ) {
gmarkers[i].show(); gmarkers[i].show();
}} }
}} }
}} }
}} }
}} }
function savezoomandposition(map) {{ function savezoomandposition(map) {
var t=setTimeout("savezoomandposition(mapstraction)",1000); var t=setTimeout("savezoomandposition(mapstraction)",1000);
// shows or hide markers of a particular category // shows or hide markers of a particular category
nzoom = map.getZoom(); nzoom = map.getZoom();
nposition=map.getCenter(); nposition=map.getCenter();
if ( ( nzoom != zoom ) || ( nposition != pos )) {{ if ( ( nzoom != zoom ) || ( nposition != pos )) {
zoom = nzoom; zoom = nzoom;
pos = nposition; pos = nposition;
document.title = "zoom=" + zoom + " coord=" + pos + ":::"; document.title = "zoom=" + zoom + " coord=" + pos + ":::";
}} }
}} }
function placeclick(i) {{ function placeclick(i) {
gmarkers[i].openBubble(); gmarkers[i].openBubble();
}} }
''' '''
_HTMLTRAILER = ''' _HTMLTRAILER = '''
@ -1045,10 +1045,10 @@ class GeoView(HtmlView):
""" """
Create the needed javascript functions. Create the needed javascript functions.
""" """
self.mapview.write( self.mapview.write(_JAVASCRIPT)
_JAVASCRIPT.format( # _JAVASCRIPT.format(
) # )
) # )
return return
def _createmapstractionheader(self, filename): def _createmapstractionheader(self, filename):
@ -1064,10 +1064,10 @@ class GeoView(HtmlView):
else: else:
lang = lang_country.split('_')[0] lang = lang_country.split('_')[0]
self.mapview.write( self.mapview.write(
_HTMLHEADER.format( _HTMLHEADER % {
xmllang = "xml:lang=\"%s\"" % lang, "xmllang" : "xml:lang=\"%s\"" % lang,
css = self._add_stylesheet() "css": self._add_stylesheet()
) }
) )
fpath = os.path.join(const.ROOT_DIR, 'mapstraction', fpath = os.path.join(const.ROOT_DIR, 'mapstraction',
#'mxn.js?(openlayers,google)') #'mxn.js?(openlayers,google)')
@ -1085,10 +1085,10 @@ class GeoView(HtmlView):
Add the last directives for the html page. Add the last directives for the html page.
""" """
self.mapview.write( self.mapview.write(_HTMLTRAILER)
_HTMLTRAILER.format( # _HTMLTRAILER.format(
) # )
) # )
self.mapview.close() self.mapview.close()
def _set_center_and_zoom(self, ptype): def _set_center_and_zoom(self, ptype):