[guadec-web] Switching from OpenStreetMap to Google Maps on the Accommodation page

[Sense Hofstede <sehofstede src gnome org>]

commit 8103ce80316bd437f35d1bf2a0468b8938f4244c
Author: Sense Hofstede <qense ubuntu com>
Date:   Thu Jun 10 19:31:36 2010 +0200

    Switching from OpenStreetMap to Google Maps on the Accommodation page
    
     * Removed OpenLayer and other support code for OpenStreetMap
     * Added iFrames to the HTML tag exception list of the TinyMCE WYSIWYG editor (used for the admin panel)

 img/mapmarkers/marker-flag.png                |  Bin 0 -> 2545 bytes
 img/mapmarkers/marker-food.png                |  Bin 0 -> 8708 bytes
 img/mapmarkers/marker-hotel.png               |  Bin 0 -> 2959 bytes
 img/mapmarkers/marker-transport.png           |  Bin 0 -> 3102 bytes
 img/openlayers/Ol_icon_blue_example.png       |  Bin 363 -> 0 bytes
 img/openlayers/Ol_icon_red_example.png        |  Bin 283 -> 0 bytes
 img/openlayers/add_point_off.png              |  Bin 1616 -> 0 bytes
 img/openlayers/add_point_on.png               |  Bin 1464 -> 0 bytes
 img/openlayers/blank.gif                      |  Bin 42 -> 0 bytes
 img/openlayers/close.gif                      |  Bin 1078 -> 0 bytes
 img/openlayers/cloud-popup-relative.png       |  Bin 2564 -> 0 bytes
 img/openlayers/drag-rectangle-off.png         |  Bin 1202 -> 0 bytes
 img/openlayers/drag-rectangle-on.png          |  Bin 1218 -> 0 bytes
 img/openlayers/draw_line_off.png              |  Bin 1567 -> 0 bytes
 img/openlayers/draw_line_on.png               |  Bin 1399 -> 0 bytes
 img/openlayers/draw_point_off.png             |  Bin 1612 -> 0 bytes
 img/openlayers/draw_point_on.png              |  Bin 1460 -> 0 bytes
 img/openlayers/draw_polygon_off.png           |  Bin 1546 -> 0 bytes
 img/openlayers/draw_polygon_on.png            |  Bin 1407 -> 0 bytes
 img/openlayers/east-mini.png                  |  Bin 451 -> 0 bytes
 img/openlayers/editing_tool_bar.png           |  Bin 3901 -> 0 bytes
 img/openlayers/layer-switcher-maximize.png    |  Bin 451 -> 0 bytes
 img/openlayers/layer-switcher-minimize.png    |  Bin 249 -> 0 bytes
 img/openlayers/marker-blue.png                |  Bin 992 -> 0 bytes
 img/openlayers/marker-gold.png                |  Bin 831 -> 0 bytes
 img/openlayers/marker-green.png               |  Bin 967 -> 0 bytes
 img/openlayers/marker.png                     |  Bin 606 -> 0 bytes
 img/openlayers/measuring-stick-off.png        |  Bin 3343 -> 0 bytes
 img/openlayers/measuring-stick-on.png         |  Bin 3816 -> 0 bytes
 img/openlayers/move_feature_off.png           |  Bin 1543 -> 0 bytes
 img/openlayers/move_feature_on.png            |  Bin 1379 -> 0 bytes
 img/openlayers/navigation_history.png         |  Bin 7021 -> 0 bytes
 img/openlayers/north-mini.png                 |  Bin 484 -> 0 bytes
 img/openlayers/overview_replacement.gif       |  Bin 79 -> 0 bytes
 img/openlayers/pan-panel-NOALPHA.png          |  Bin 566 -> 0 bytes
 img/openlayers/pan-panel.png                  |  Bin 1287 -> 0 bytes
 img/openlayers/pan_off.png                    |  Bin 1696 -> 0 bytes
 img/openlayers/pan_on.png                     |  Bin 1568 -> 0 bytes
 img/openlayers/panning-hand-off.png           |  Bin 3875 -> 0 bytes
 img/openlayers/panning-hand-on.png            |  Bin 3977 -> 0 bytes
 img/openlayers/remove_point_off.png           |  Bin 1612 -> 0 bytes
 img/openlayers/remove_point_on.png            |  Bin 1464 -> 0 bytes
 img/openlayers/ruler.png                      |  Bin 1211 -> 0 bytes
 img/openlayers/save_features_off.png          |  Bin 357 -> 0 bytes
 img/openlayers/save_features_on.png           |  Bin 364 -> 0 bytes
 img/openlayers/slider.png                     |  Bin 285 -> 0 bytes
 img/openlayers/south-mini.png                 |  Bin 481 -> 0 bytes
 img/openlayers/view_next_off.png              |  Bin 1644 -> 0 bytes
 img/openlayers/view_next_on.png               |  Bin 1686 -> 0 bytes
 img/openlayers/view_previous_off.png          |  Bin 1553 -> 0 bytes
 img/openlayers/view_previous_on.png           |  Bin 1592 -> 0 bytes
 img/openlayers/west-mini.png                  |  Bin 453 -> 0 bytes
 img/openlayers/zoom-minus-mini.png            |  Bin 359 -> 0 bytes
 img/openlayers/zoom-panel-NOALPHA.png         |  Bin 1173 -> 0 bytes
 img/openlayers/zoom-panel.png                 |  Bin 1624 -> 0 bytes
 img/openlayers/zoom-plus-mini.png             |  Bin 489 -> 0 bytes
 img/openlayers/zoom-world-mini.png            |  Bin 1072 -> 0 bytes
 img/openlayers/zoombar.png                    |  Bin 463 -> 0 bytes
 js/OpenLayers.js                              | 2144 -------------------------
 js/hotels.txt                                 |    8 -
 js/venues.txt                                 |    3 -
 pages/schedConf/SchedConfHandler.inc.php      |    5 -
 plugins/generic/tinymce/TinyMCEPlugin.inc.php |    3 +-
 styles/OpenLayers.css                         |  344 ----
 styles/accommodation.css                      |    5 +
 templates/schedConf/accommodation.tpl         |   50 -
 66 files changed, 7 insertions(+), 2555 deletions(-)
---
diff --git a/img/mapmarkers/marker-flag.png b/img/mapmarkers/marker-flag.png
new file mode 100644
index 0000000..1a30f5b
Binary files /dev/null and b/img/mapmarkers/marker-flag.png differ
diff --git a/img/mapmarkers/marker-food.png b/img/mapmarkers/marker-food.png
new file mode 100644
index 0000000..e881bca
Binary files /dev/null and b/img/mapmarkers/marker-food.png differ
diff --git a/img/mapmarkers/marker-hotel.png b/img/mapmarkers/marker-hotel.png
new file mode 100644
index 0000000..fcde27e
Binary files /dev/null and b/img/mapmarkers/marker-hotel.png differ
diff --git a/img/mapmarkers/marker-transport.png b/img/mapmarkers/marker-transport.png
new file mode 100644
index 0000000..2e75010
Binary files /dev/null and b/img/mapmarkers/marker-transport.png differ
diff --git a/pages/schedConf/SchedConfHandler.inc.php b/pages/schedConf/SchedConfHandler.inc.php
index c45299d..3347fd7 100644
--- a/pages/schedConf/SchedConfHandler.inc.php
+++ b/pages/schedConf/SchedConfHandler.inc.php
@@ -350,13 +350,8 @@ class SchedConfHandler extends Handler {
 		list($conference, $schedConf) = SchedConfHandler::validate(true, true);
 
 		$templateMgr =& TemplateManager::getManager();
-		$templateMgr->append('stylesheets', Request::getBaseUrl() . "/styles/OpenLayers.css");
 		$templateMgr->append('stylesheets', Request::getBaseUrl() . "/styles/accommodation.css");
 		
-		$templateMgr->append('javascripts', "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js";);
-        $templateMgr->append('javascripts', Request::getBaseUrl() . "/js/OpenLayers.js");
-        $templateMgr->append('javascripts', "http://www.openstreetmap.org/openlayers/OpenStreetMap.js";);
-		
 		$templateMgr->assign('pageHierarchy', array(
 			array(Request::url(null, 'index', 'index'), $conference->getConferenceTitle(), true),
 			array(Request::url(null, null, 'index'), $schedConf->getSchedConfTitle(), true)));
diff --git a/plugins/generic/tinymce/TinyMCEPlugin.inc.php b/plugins/generic/tinymce/TinyMCEPlugin.inc.php
index 47d836b..da2ae36 100644
--- a/plugins/generic/tinymce/TinyMCEPlugin.inc.php
+++ b/plugins/generic/tinymce/TinyMCEPlugin.inc.php
@@ -295,7 +295,8 @@ class TinyMCEPlugin extends GenericPlugin {
 					theme : "advanced",
 					theme_advanced_buttons1 : "pasteword,bold,italic,underline,bullist,numlist,link,unlink,help,code",
 					theme_advanced_buttons2 : "",
-					theme_advanced_buttons3 : ""
+					theme_advanced_buttons3 : "",
+					extended_valid_elements : "iframe[src|width|height|name|align]"
 				});
 			</script>';
 
diff --git a/styles/accommodation.css b/styles/accommodation.css
index 7a9e11a..53ea054 100644
--- a/styles/accommodation.css
+++ b/styles/accommodation.css
@@ -17,3 +17,8 @@
 #hotels li {
     margin: 5px;
 }
+
+img.markers {
+    display: inline;
+    margin-left: 0.2em;
+}
diff --git a/templates/schedConf/accommodation.tpl b/templates/schedConf/accommodation.tpl
index 2252462..92521dc 100644
--- a/templates/schedConf/accommodation.tpl
+++ b/templates/schedConf/accommodation.tpl
@@ -10,56 +10,7 @@
  *}
 {translate|assign:"pageTitleTranslated" key="schedConf.accommodation.title"}{include file="common/header.tpl"}
 {assign var="helpTopicId" value="user.conferenceInformation"}
-<script type="text/javascript">
-var baseUrl = "{$baseUrl}";
-{literal}
-var map;
-function init(){
-	var lat=52.09000;
-	var lon=4.30000;
-	var zoom=13;
-	map = new OpenLayers.Map ("map", {
-	    controls:[
-		    new OpenLayers.Control.Navigation(),
-		    new OpenLayers.Control.PanZoomBar(),
-		    new OpenLayers.Control.LayerSwitcher(),
-		    new OpenLayers.Control.Permalink(),
-            new OpenLayers.Control.OverviewMap(),
-            new OpenLayers.Control.KeyboardDefaults(),
-            new OpenLayers.Control.MousePosition(),
-		    new OpenLayers.Control.Attribution()],
-	    maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
-				    maxResolution: 156543.0399,
-	    numZoomLevels: 19,
-	    units: 'm',
-	    projection: new OpenLayers.Projection("EPSG:900913"),
-	    displayProjection: new OpenLayers.Projection("EPSG:4326")
-    } );
 
-
-    var layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
-    map.addLayer(layerMapnik);
-    var layerOsmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender");
-    map.addLayer(layerOsmarender);
-
-    var poisv = new OpenLayers.Layer.Text( "Venues",
-            { location: baseUrl + "/js/venues.txt",
-                projection: map.displayProjection
-            });
-    map.addLayer(poisv);
-
-    var poish = new OpenLayers.Layer.Text( "Hotels and Hostels",
-            { location: baseUrl + "/js/hotels.txt",
-                projection: map.displayProjection
-            });
-    map.addLayer(poish);
-
-    var lonLat = new OpenLayers.LonLat(lon, lat).transform(map.displayProjection,  map.projection);
-	map.setCenter (lonLat, zoom);
-}
-$(document).ready(function(){init()});
-	</script>
-{/literal}
 <div>{$accommodationDescription|nl2br}</div>
 
 {if !empty($accommodationFiles)}
@@ -71,6 +22,5 @@ $(document).ready(function(){init()});
 		<a class="file" href="{$publicFilesDir}/{$accommodationFile.uploadName}" target="_blank">{$accommodationFile.title|default:$accommodationFile.name|escape}</a>
 	</div>
 {/foreach}
-<div id="map"></div>
 
 {include file="common/footer.tpl"}