Add scale on all map

Fix items translation

Author: xbgmsharp

admin/admin_photo.php

@@ -127,7 +127,7 @@
 $js = "\nvar map = L.map('map', { 'zoomControl': false, editInOSMControlOptions: { editors: ['id'] }, }).setView([".$lat.", ".$lon."], ".$zoom.");
 
 L.tileLayer('".$baselayerurl."', { maxZoom: 18 }).addTo(map);
-
+L.control.scale().addTo(map);
 map.addControl(L.control.zoom({position: 'topleft'}));
 
 L.marker([".$lat.", ".$lon."]).addTo(map)

admin/admin_photo.tpl

@@ -85,7 +85,7 @@
 	map.on('click', onMapClick);
 
 	/* BEGIN leaflet-search */
-	var jsonpurl = 'http://open.mapquestapi.com/nominatim/v1/search.php?q={s}'+
+	var jsonpurl = 'https://open.mapquestapi.com/nominatim/v1/search.php?q={s}'+
 				   '&format=json&osm_type=N&limit=100&addressdetails=0',
 		jsonpName = 'json_callback';
 	//third party jsonp service

category.inc.php

@@ -60,7 +60,7 @@ function osm_render_category_description()
             $height = isset($conf['osm_conf']['category_description']['height']) ? $conf['osm_conf']['category_description']['height'] : '200';
             $width = isset($conf['osm_conf']['category_description']['width']) ? $conf['osm_conf']['category_description']['width'] : 'auto';
             $js = osm_get_js($conf, $local_conf, $js_data);
-            $template->set_filename('map', dirname(__FILE__).'/template/osm-index.tpl' );
+            $template->set_filename('map', dirname(__FILE__).'/template/osm-category.tpl' );
             $template->assign(
                 array(
                     'CONTENT_ENCODING'	=> get_pwg_charset(),

include/functions_map.php

@@ -254,6 +254,7 @@ function osm_get_js($conf, $local_conf, $js_data)
     latlng = new L.LatLng(".$local_conf['center_lat'].", ".$local_conf['center_lng'].");\n";
     $js .= "var " . $divname . " = new L.Map('" . $divname . "', {" . $worldcopyjump . ", center: latlng, zoom: ".$local_conf['zoom'].", layers: [TileLayer], contextmenu: " . $local_conf['contextmenu'] . "});\n";
     $js .= $divname . ".attributionControl.setPrefix('');\n";
+    $js .= "L.control.scale().addTo(map);\n";
     $js .= "var MarkerClusterList=[];\n";
     $js .= "if (typeof L.MarkerClusterGroup === 'function')\n";
     $js .= "     var markers = new L.MarkerClusterGroup();\n";

template/osm-index.tpl template/osm-category.tpltemplate/osm-index.tpl renamed to template/osm-category.tpl

@@ -471,7 +471,7 @@ function toggle(arrow)
 			}
 		}
 		/* Update items counts */
-		document.getElementById("nb_showall").innerHTML = {/literal}{'ITEMS'|@translate}{literal};
+		document.getElementById("nb_showall").innerHTML = nb_items +' items';
 
 		/* Update jcarousel and all witdh*/
 		if (nb_items>0) {
@@ -532,9 +532,9 @@ function toggle(arrow)
 	/* BEGIN leaflet Location */
 	function onLocationFound(e) {
 		var radius = e.accuracy / 2;
-		var str = {/literal}{'METERS_FROM_POINT'|@translate}{literal};
+		var str = '{/literal}{'METERS_FROM_POINT'|@translate}{literal}';
 		L.marker(e.latlng).addTo(map)
-			.bindPopup(str.replace('%d', radius)).openPopup();
+			.bindPopup(str.replace('%s', radius)).openPopup();
 
 		L.circle(e.latlng, radius).addTo(map);
 	}