From 84021a8fb660661d60c68b4ee75906062dfb7f73 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 16 Jan 2013 12:06:29 +0000 Subject: Add some missing JS translatable strings, update .po files. --- web/js/map-OpenLayers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 85ab09889..b76a7b166 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -349,7 +349,7 @@ $(function(){ $('#sub_map_links').show(); //only on mobile $('#mob_sub_map_links').remove(); - $('.mobile-map-banner').html('Home Place pin on map'); + $('.mobile-map-banner').html('' + translation_strings.home + ' ' + translation_strings.place_pin_on_map); fixmystreet.page = 'around'; }); @@ -538,13 +538,13 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { height = $map_box.height(); $map_box.append( '' ).css({ position: 'relative', width: width, height: height, marginBottom: '1em' }); // Making it relative here makes it much easier to do the scrolling later - $('.mobile-map-banner').html('Home Right place?'); + $('.mobile-map-banner').html('' + translation_strings.home + ' ' + translation_strings.right_place); // mobile user clicks 'ok' on map $('#mob_ok').toggle(function(){ -- cgit v1.2.3 From 1f057dc7eb3f6520c03eacc9757e86aefc3d37fc Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 18 Jan 2013 16:29:09 +0000 Subject: Allow hide/show pins in German to work. --- web/js/map-OpenLayers.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index b76a7b166..ccf0f71b0 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -201,7 +201,8 @@ function fixmystreet_onload() { var showhide = [ 'Show pins', 'Hide pins', 'Dangos pinnau', 'Cuddio pinnau', - "Vis nåler", "Gjem nåler" + "Vis nåler", "Gjem nåler", + "Zeige Stecknadeln", "Stecknadeln ausblenden" ]; for (var i=0; i Date: Fri, 18 Jan 2013 18:10:28 +0000 Subject: Add ability for multiple base map layers, add Zurich Stadtplan. --- web/js/map-OpenLayers.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index ccf0f71b0..cd77beefb 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -268,19 +268,24 @@ $(function(){ } // Set it up our way - fixmystreet.layer_options = OpenLayers.Util.extend({ - zoomOffset: fixmystreet.zoomOffset, - transitionEffect: 'resize', - numZoomLevels: fixmystreet.numZoomLevels - }, fixmystreet.layer_options); var layer; - if (fixmystreet.layer_options.matrixIds) { - layer = new fixmystreet.map_type(fixmystreet.layer_options); - } else { - layer = new fixmystreet.map_type("", fixmystreet.layer_options); + if (!fixmystreet.layer_options.length) { + fixmystreet.layer_options = [ fixmystreet.layer_options ]; + } + for (var i=0; i Date: Thu, 24 Jan 2013 15:00:57 +0000 Subject: More details to Details and in translation. --- web/js/map-OpenLayers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index cd77beefb..19bf8ee94 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -171,7 +171,7 @@ function fixmystreet_onload() { var popup = new OpenLayers.Popup.FramedCloud("popup", feature.geometry.getBounds().getCenterLonLat(), null, - feature.attributes.title + "
More details", + feature.attributes.title + "
" + translation_strings.more_details + "", { size: new OpenLayers.Size(0,0), offset: new OpenLayers.Pixel(0,-40) }, true, onPopupClose); feature.popup = popup; -- cgit v1.2.3 From 42a4d0357fb887526727beb0804f06cf3b7dbd73 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 24 Jan 2013 15:22:39 +0000 Subject: Get remaining English hardcoded strings from JavaScript into translatable template. --- web/js/map-OpenLayers.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 19bf8ee94..3e4a4d703 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -16,7 +16,7 @@ function fixmystreet_update_pin(lonlat) { if (!$('#side-form-error').length) { $('
').insertAfter($('#side-form')); } - $('#side-form-error').html('

Reporting a problem

' + data.error + '

').show(); + $('#side-form-error').html('

' + translation_strings.reporting_a_problem + '

' + data.error + '

').show(); $('#side-form').hide(); return; } @@ -545,7 +545,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { $map_box.append( '' ).css({ position: 'relative', width: width, height: height, marginBottom: '1em' }); // Making it relative here makes it much easier to do the scrolling later @@ -559,12 +559,12 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { //to do this on other pages where #side-form might not be $('html, body').animate({ scrollTop: height-60 }, 1000, function(){ $('#mob_sub_map_links').addClass('map_complete'); - $('#mob_ok').text('MAP'); + $('#mob_ok').text(translation_strings.map); }); }, function(){ $('html, body').animate({ scrollTop: 0 }, 1000, function(){ $('#mob_sub_map_links').removeClass('map_complete'); - $('#mob_ok').text('OK'); + $('#mob_ok').text(translation_strings.ok); }); }); } -- cgit v1.2.3 From 46d078d170adba70ff256af66256ee01a3d31125 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 31 Jan 2013 18:51:46 +0000 Subject: Zurich area unfilled with thick black outline (fixes a25). --- web/js/map-OpenLayers.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3e4a4d703..e9e51113c 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -82,6 +82,9 @@ function fixmystreet_onload() { fixmystreet.map.addLayer(area); if ( fixmystreet.area.length == 1 ) { area.events.register('loadend', null, function(a,b,c) { + if ( fixmystreet.area_format ) { + area.styleMap.styles.default.defaultStyle = fixmystreet.area_format; + } var bounds = area.getDataExtent(); if (bounds) { var center = bounds.getCenterLonLat(); -- cgit v1.2.3 From 32cb826ae50efd512677a5ea890a647af3cd0aa0 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Mon, 4 Feb 2013 07:39:10 +0000 Subject: Fix bad map JavaScript. --- web/js/map-OpenLayers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index e9e51113c..3639549f8 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -273,8 +273,8 @@ $(function(){ // Set it up our way var layer; - if (!fixmystreet.layer_options.length) { - fixmystreet.layer_options = [ fixmystreet.layer_options ]; + if (!fixmystreet.layer_options) { + fixmystreet.layer_options = [ {} ]; } for (var i=0; i Date: Mon, 4 Feb 2013 11:15:40 +0000 Subject: Some jslint fixes. --- web/js/map-OpenLayers.js | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'web/js/map-OpenLayers.js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3639549f8..88dc6d69e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -26,7 +26,7 @@ function fixmystreet_update_pin(lonlat) { if ( data.extra_name_info && !$('#form_fms_extra_title').length ) { // there might be a first name field on some cobrands var lb = $('#form_first_name').prev(); - if ( lb.length == 0 ) { lb = $('#form_name').prev(); } + if ( lb.length === 0 ) { lb = $('#form_name').prev(); } lb.before(data.extra_name_info); } }); @@ -83,7 +83,7 @@ function fixmystreet_onload() { if ( fixmystreet.area.length == 1 ) { area.events.register('loadend', null, function(a,b,c) { if ( fixmystreet.area_format ) { - area.styleMap.styles.default.defaultStyle = fixmystreet.area_format; + area.styleMap.styles['default'].defaultStyle = fixmystreet.area_format; } var bounds = area.getDataExtent(); if (bounds) { @@ -150,18 +150,20 @@ function fixmystreet_onload() { } fixmystreet.markers = new OpenLayers.Layer.Vector("Pins", pin_layer_options); fixmystreet.markers.events.register( 'loadend', fixmystreet.markers, function(evt) { - if (fixmystreet.map.popups.length) fixmystreet.map.removePopup(fixmystreet.map.popups[0]); + if (fixmystreet.map.popups.length) { + fixmystreet.map.removePopup(fixmystreet.map.popups[0]); + } }); var markers = fms_markers_list( fixmystreet.pins, true ); fixmystreet.markers.addFeatures( markers ); + function onPopupClose(evt) { + fixmystreet.select_feature.unselect(selectedFeature); + OpenLayers.Event.stop(evt); + } if (fixmystreet.page == 'around' || fixmystreet.page == 'reports' || fixmystreet.page == 'my') { fixmystreet.select_feature = new OpenLayers.Control.SelectFeature( fixmystreet.markers ); var selectedFeature; - function onPopupClose(evt) { - fixmystreet.select_feature.unselect(selectedFeature); - OpenLayers.Event.stop(evt); - } fixmystreet.markers.events.register( 'featureunselected', fixmystreet.markers, function(evt) { var feature = evt.feature, popup = feature.popup; fixmystreet.map.removePopup(popup); @@ -520,7 +522,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { if (sidebar.css('position') == 'absolute') { var w = sidebar.width(), h = sidebar.height(), o = sidebar.offset(), - $map_box = $('#map_box'), bo = $map_box.offset(); + $map_boxx = $('#map_box'), bo = $map_boxx.offset(); // e.xy is relative to top left of map, which might not be top left of page e.xy.x += bo.left; e.xy.y += bo.top; @@ -545,12 +547,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { var $map_box = $('#map_box'), width = $map_box.width(), height = $map_box.height(); - $map_box.append( - '' - ).css({ position: 'relative', width: width, height: height, marginBottom: '1em' }); + $map_box.append( '' ).css({ position: 'relative', width: width, height: height, marginBottom: '1em' }); // Making it relative here makes it much easier to do the scrolling later $('.mobile-map-banner').html('' + translation_strings.home + ' ' + translation_strings.right_place); -- cgit v1.2.3