http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58454
Revision: 58454 Author: jeroendedauw Date: 2009-11-03 00:35:16 +0000 (Tue, 03 Nov 2009) Log Message: ----------- Changes for 0.4 (see: http://www.mediawiki.org/wiki/Extension:Maps/Future) Modified Paths: -------------- trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFunctions.js trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersQP.php trunk/extensions/SemanticMaps/SemanticMaps.i18n.php trunk/extensions/SemanticMaps/SemanticMaps.php Modified: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php =================================================================== --- trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php 2009-11-03 00:35:05 UTC (rev 58453) +++ trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php 2009-11-03 00:35:16 UTC (rev 58454) @@ -79,7 +79,7 @@ <div id='".$this->mapName."' style='width: {$this->width}px; height: {$this->height}px; background-color: #cccccc;'></div> <script type='$wgJsMimeType'>/*<![CDATA[*/ - addOnloadHook(makeFormInputOpenLayer('".$this->mapName."', '".$this->coordsFieldName."', ".$this->centre_lat.", ".$this->centre_lon.", ".$this->zoom.", ".$this->marker_lat.", ".$this->marker_lon.", [$layerItems], [$controlItems])); + addOnloadHook(makeFormInputOpenLayer('".$this->mapName."', '".$this->coordsFieldName."', ".$this->centre_lat.", ".$this->centre_lon.", ".$this->zoom.", ".$this->marker_lat.", ".$this->marker_lon.", [$layerItems], [$controlItems], $this->height)); /*]]>*/</script>"; } Modified: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFunctions.js =================================================================== --- trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFunctions.js 2009-11-03 00:35:05 UTC (rev 58453) +++ trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFunctions.js 2009-11-03 00:35:16 UTC (rev 58454) @@ -11,7 +11,7 @@ * This function holds spesific functionallity for the Open Layers form input of Semantic Maps * TODO: Refactor as much code as possible to non specific functions */ -function makeFormInputOpenLayer(mapName, locationFieldName, lat, lon, zoom, marker_lat, marker_lon, layers, controls) { +function makeFormInputOpenLayer(mapName, locationFieldName, lat, lon, zoom, marker_lat, marker_lon, layers, controls, height) { var markers = Array(); // Show a starting marker only if marker coordinates are provided @@ -54,7 +54,7 @@ var clickHanler = new OpenLayers.Control.Click(); controls.push(clickHanler); - var map = initOpenLayer(mapName, lon, lat, zoom, layers, controls, markers); + var map = initOpenLayer(mapName, lon, lat, zoom, layers, controls, markers, height); // Make the map variable available for other functions if (!window.OLMaps) window.OLMaps = new Object; Modified: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersQP.php =================================================================== --- trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersQP.php 2009-11-03 00:35:05 UTC (rev 58453) +++ trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersQP.php 2009-11-03 00:35:16 UTC (rev 58454) @@ -72,7 +72,7 @@ $this->output .= "<div id='$this->mapName' style='width: {$this->width}px; height: {$this->height}px; background-color: #cccccc;'></div> <script type='$wgJsMimeType'> /*<![CDATA[*/ addOnloadHook( - initOpenLayer('$this->mapName', $this->centre_lon, $this->centre_lat, $this->zoom, [$layerItems], [$controlItems], [$markersString]) + initOpenLayer('$this->mapName', $this->centre_lon, $this->centre_lat, $this->zoom, [$layerItems], [$controlItems], [$markersString], $this->height) ); /*]]>*/ </script>"; } Modified: trunk/extensions/SemanticMaps/SemanticMaps.i18n.php =================================================================== --- trunk/extensions/SemanticMaps/SemanticMaps.i18n.php 2009-11-03 00:35:05 UTC (rev 58453) +++ trunk/extensions/SemanticMaps/SemanticMaps.i18n.php 2009-11-03 00:35:16 UTC (rev 58454) @@ -142,11 +142,8 @@ /** Spanish (Español) * @author Crazymadlover * @author Imre - * @author Locos epraix */ $messages['es'] = array( - 'semanticmaps_desc' => 'Proporciona la capacidad de ver y editar los datos coordinados almacenados a través de la extensión Semantic MediaWiki ([http://wiki.bn2vs.com/wiki/Semantic_Maps demo]). -Servicios de mapas disponibles: $1', 'semanticmaps_lookupcoordinates' => 'Busque las coordenadas', 'semanticmaps_enteraddresshere' => 'Ingresar dirección aquí', 'semanticmaps_notfound' => 'no encontrado', Modified: trunk/extensions/SemanticMaps/SemanticMaps.php =================================================================== --- trunk/extensions/SemanticMaps/SemanticMaps.php 2009-11-03 00:35:05 UTC (rev 58453) +++ trunk/extensions/SemanticMaps/SemanticMaps.php 2009-11-03 00:35:16 UTC (rev 58454) @@ -23,7 +23,7 @@ die( 'Not an entry point.' ); } -define('SM_VERSION', '0.4 a9'); +define('SM_VERSION', '0.4 a10'); $smgScriptPath = $wgScriptPath . '/extensions/SemanticMaps'; $smgIP = $IP . '/extensions/SemanticMaps'; _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
