Author: simoneg
Date: Tue Jan 26 18:08:41 2010
New Revision: 903347
URL: http://svn.apache.org/viewvc?rev=903347&view=rev
Log:
Compatibility with ie/safari
Modified:
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.css
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.js
Modified:
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.css
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.css?rev=903347&r1=903346&r2=903347&view=diff
==============================================================================
---
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.css
(original)
+++
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.css
Tue Jan 26 18:08:41 2010
@@ -19,16 +19,16 @@
.MagmaMapEdit { width: 88%; height: 500px; float: left; }
.MagmaMapListContainer { width: 10%; float: right; height: 500px; border: 1px
solid gray; overflow: scroll }
-.actioncell { display: none }
+.buttonaround { float:left; width: 32px, height: 32px}
.element-hover .actioncell {display: auto}
.button { background: url('icons.png'); width: 32px; height: 32px }
-.btn-view { background-position: 0 32px }
+.btn-view { background-position: 0px 32px }
.btn-point { background-position: -128px 32px }
.btn-line { background-position: -32px 32px }
.btn-poly { background-position: -64px 32px }
.btn-route { background-position: -96px 32px }
-.btn-view.selected { background-position: 0 0px }
+.btn-view.selected { background-position: 0px 0px }
.btn-point.selected { background-position: -128px 0px }
.btn-line.selected { background-position: -32px 0px }
.btn-poly.selected { background-position: -64px 0px }
Modified:
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.js
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.js?rev=903347&r1=903346&r2=903347&view=diff
==============================================================================
---
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.js
(original)
+++
labs/magma/trunk/website-maps-google/src/main/resources/org/apache/magma/website/maps/mapEditor.js
Tue Jan 26 18:08:41 2010
@@ -595,59 +595,40 @@
me.buttons_ = [];
var control_div = document.createElement('div');
- control_div.style.width="100px";
- control_div.style.height="32px";
- var control_table = document.createElement('table');
- control_table.style.width="100px";
- control_table.style.height="32px";
-
- var control_tr = document.createElement('tr');
var vc_opts = {cssclass: 'btn-view',
name: 'view', tooltip: 'Select geometries by clicking on
them.'};
var view_button = this.createButton(vc_opts);
- var view_td = document.createElement('td');
- view_td.appendChild(view_button.img);
- control_tr.appendChild(view_td);
+ control_div.appendChild(view_button.img);
if (this.magOptions.markers) {
var mc_opts = {cssclass: 'btn-point',
name: 'point', tooltip: 'Click on the map to create a
new marker.'};
var marker_button = this.createButton(mc_opts);
- var marker_td = document.createElement('td');
- marker_td.appendChild(marker_button.img);
- control_tr.appendChild(marker_td);
+ control_div.appendChild(marker_button.img);
}
if (this.magOptions.polylines) {
var lc_opts = {cssclass: 'btn-line',
name: 'line', tooltip: 'Click on the map to start
creating a new line.'};
var line_button = this.createButton(lc_opts);
- var line_td = document.createElement('td');
- line_td.appendChild(line_button.img);
- control_tr.appendChild(line_td);
+ control_div.appendChild(line_button.img);
}
if (this.magOptions.routes) {
var lc_opts = {cssclass: 'btn-route',
name: 'route', tooltip: 'Click on the map to start creating a
new route.'};
var route_button = this.createButton(lc_opts);
- var route_td = document.createElement('td');
- route_td.appendChild(route_button.img);
- control_tr.appendChild(route_td);
+ control_div.appendChild(route_button.img);
}
if (this.magOptions.polygons) {
var pc_opts = {cssclass: 'btn-poly',
name: 'poly', tooltip: 'Click on the map to start
creating a new filled poly.'};
var poly_button = this.createButton(pc_opts);
- var poly_td = document.createElement('td');
- poly_td.appendChild(poly_button.img);
- control_tr.appendChild(poly_td);
+ control_div.appendChild(poly_button.img);
}
- control_table.appendChild(control_tr);
- control_div.appendChild(control_table);
GEvent.trigger(view_button.img, 'click');
map.getContainer().appendChild(control_div);
return control_div;
@@ -658,10 +639,11 @@
var button = {};
button.opts = button_opts;
- var button_img = document.createElement('div');
+ var button_img = $('<div class="buttonaround"></div>')[0];
button_img.style.cursor = 'pointer';
- button_img.style.width = '32px';
- button_img.style.height = '32px';
+ //button_img.src = 'icons.png';
+ button_img.style.width = '32';
+ button_img.style.height = '32';
button_img.style.border = '0';
$(button_img).addClass('button').addClass(button_opts.cssclass);
button_img.id = button_opts.name+'_control';
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
