Commit 0394d9d45f0ddf1548dd0c26698b267c3138481c

Authored by Edmar Moretti
1 parent 5eb63282

Correção nos estilos, pois quando mais de um tema é adicionado, a barra de botões sumia

mashups/openlayers.css
1 -.olControlEditingToolbar .panItemInactive { 1 +.olControlEditingToolbar1 .panItemInactive {
2 background-position:-0px 0; 2 background-position:-0px 0;
3 } 3 }
4 -.olControlEditingToolbar .panItemActive { 4 +.olControlEditingToolbar1 .panItemActive {
5 background-position:-0px -28px; 5 background-position:-0px -28px;
6 } 6 }
7 -.olControlEditingToolbar .zoomboxItemInactive { 7 +.olControlEditingToolbar1 .zoomboxItemInactive {
8 background-position:-29px 0; 8 background-position:-29px 0;
9 } 9 }
10 -.olControlEditingToolbar .zoomboxItemActive { 10 +.olControlEditingToolbar1 .zoomboxItemActive {
11 background-position:-29px -28px; 11 background-position:-29px -28px;
12 } 12 }
13 -.olControlEditingToolbar .zoomtotItemInactive { 13 +.olControlEditingToolbar1 .zoomtotItemInactive {
14 background-position:-58px 0; 14 background-position:-58px 0;
15 } 15 }
16 -.olControlEditingToolbar .zoomtotItemActive { 16 +.olControlEditingToolbar1 .zoomtotItemActive {
17 background-position:-58px -28px; 17 background-position:-58px -28px;
18 } 18 }
19 -.olControlEditingToolbar .legendaItemInactive { 19 +.olControlEditingToolbar1 .legendaItemInactive {
20 background-position:-87px 0; 20 background-position:-87px 0;
21 } 21 }
22 -.olControlEditingToolbar .legendaItemActive { 22 +.olControlEditingToolbar1 .legendaItemActive {
23 background-position:-87px -28px; 23 background-position:-87px -28px;
24 } 24 }
25 -.olControlEditingToolbar .distanciaItemInactive { 25 +.olControlEditingToolbar1 .distanciaItemInactive {
26 background-position:-116px 0; 26 background-position:-116px 0;
27 } 27 }
28 -.olControlEditingToolbar .distanciaItemActive { 28 +.olControlEditingToolbar1 .distanciaItemActive {
29 background-position:-116px -28px; 29 background-position:-116px -28px;
30 } 30 }
31 -.olControlEditingToolbar .areaItemInactive { 31 +.olControlEditingToolbar1 .areaItemInactive {
32 background-position:-145px 0; 32 background-position:-145px 0;
33 } 33 }
34 -.olControlEditingToolbar .areaItemActive { 34 +.olControlEditingToolbar1 .areaItemActive {
35 background-position:-145px -28px; 35 background-position:-145px -28px;
36 } 36 }
37 -.olControlEditingToolbar .identificaItemInactive { 37 +.olControlEditingToolbar1 .identificaItemInactive {
38 background-position:-174px 0; 38 background-position:-174px 0;
39 } 39 }
40 -.olControlEditingToolbar .identificaItemActive { 40 +.olControlEditingToolbar1 .identificaItemActive {
41 background-position:-174px -28px; 41 background-position:-174px -28px;
42 } 42 }
43 -.olControlEditingToolbar .linhaItemInactive { 43 +.olControlEditingToolbar1 .linhaItemInactive {
44 background-position:-203px 0; 44 background-position:-203px 0;
45 } 45 }
46 -.olControlEditingToolbar .linhaItemActive { 46 +.olControlEditingToolbar1 .linhaItemActive {
47 background-position:-203px -28px; 47 background-position:-203px -28px;
48 } 48 }
49 -.olControlEditingToolbar .pontoItemInactive { 49 +.olControlEditingToolbar1 .pontoItemInactive {
50 background-position:-232px 0; 50 background-position:-232px 0;
51 } 51 }
52 .olControlEditingToolbar .pontoItemActive { 52 .olControlEditingToolbar .pontoItemActive {
53 background-position:-232px -28px; 53 background-position:-232px -28px;
54 } 54 }
55 -.olControlEditingToolbar .poligonoItemInactive { 55 +.olControlEditingToolbar1 .poligonoItemInactive {
56 background-position:-261px 0; 56 background-position:-261px 0;
57 } 57 }
58 -.olControlEditingToolbar .poligonoItemActive { 58 +.olControlEditingToolbar1 .poligonoItemActive {
59 background-position:-261px -28px; 59 background-position:-261px -28px;
60 } 60 }
61 -.olControlEditingToolbar .editaItemInactive { 61 +.olControlEditingToolbar1 .editaItemInactive {
62 background-position:-290px 0; 62 background-position:-290px 0;
63 } 63 }
64 -.olControlEditingToolbar .editaItemActive { 64 +.olControlEditingToolbar1 .editaItemActive {
65 background-position:-290px -28px; 65 background-position:-290px -28px;
66 } 66 }
67 -.olControlEditingToolbar .apagaItemInactive { 67 +.olControlEditingToolbar1 .apagaItemInactive {
68 background-position:-319px 0; 68 background-position:-319px 0;
69 } 69 }
70 -.olControlEditingToolbar .apagaItemActive { 70 +.olControlEditingToolbar1 .apagaItemActive {
71 background-position:-319px -28px; 71 background-position:-319px -28px;
72 } 72 }
73 -.olControlEditingToolbar .selecaoItemInactive { 73 +.olControlEditingToolbar1 .selecaoItemInactive {
74 background-position:-348px 0; 74 background-position:-348px 0;
75 } 75 }
76 -.olControlEditingToolbar .selecaoItemActive { 76 +.olControlEditingToolbar1 .selecaoItemActive {
77 background-position:-348px -28px; 77 background-position:-348px -28px;
78 } 78 }
79 -.olControlEditingToolbar .capturaItemInactive { 79 +.olControlEditingToolbar1 .capturaItemInactive {
80 background-position:-377px 0; 80 background-position:-377px 0;
81 } 81 }
82 -.olControlEditingToolbar .capturaItemActive { 82 +.olControlEditingToolbar1 .capturaItemActive {
83 background-position:-377px -28px; 83 background-position:-377px -28px;
84 } 84 }
85 -.olControlEditingToolbar .procuraItemInactive { 85 +.olControlEditingToolbar1 .procuraItemInactive {
86 background-position:-406px 0; 86 background-position:-406px 0;
87 } 87 }
88 -.olControlEditingToolbar .procuraItemActive { 88 +.olControlEditingToolbar1 .procuraItemActive {
89 background-position:-406px -28px; 89 background-position:-406px -28px;
90 } 90 }
91 -  
92 -.olControlEditingToolbar .salvaItemInactive { 91 +.olControlEditingToolbar1 .salvaItemInactive {
93 background-position:-435px 0; 92 background-position:-435px 0;
94 } 93 }
95 -.olControlEditingToolbar .salvaItemActive { 94 +.olControlEditingToolbar1 .salvaItemActive {
96 background-position:-435px -28px; 95 background-position:-435px -28px;
97 } 96 }
98 -  
99 -  
100 -.olControlEditingToolbar { 97 +.olControlEditingToolbar1 {
101 width:500px; 98 width:500px;
  99 + float:right;
  100 + right: 0px;
102 } 101 }
103 -  
104 -.olControlEditingToolbar div { 102 +.olControlEditingToolbar1 div {
105 background-image:url(openlayers.png); 103 background-image:url(openlayers.png);
106 background-repeat:no-repeat; 104 background-repeat:no-repeat;
107 float:right; 105 float:right;
  106 + right: 0px;
108 height:29px; 107 height:29px;
109 margin:2px; 108 margin:2px;
110 width:29px; 109 width:29px;
mashups/openlayers.js.php
@@ -47,21 +47,26 @@ i3GEOOL = { @@ -47,21 +47,26 @@ i3GEOOL = {
47 alayers.push(i3GEOOL.ol_mma); 47 alayers.push(i3GEOOL.ol_mma);
48 } 48 }
49 if(i3GEOOL.ol_wms != ""){ 49 if(i3GEOOL.ol_wms != ""){
  50 + i3GEOOL.ol_wms.transitionEffect = "resize";
50 i3GEOOL.ol_wms.setVisibility(false); 51 i3GEOOL.ol_wms.setVisibility(false);
51 alayers.push(i3GEOOL.ol_wms); 52 alayers.push(i3GEOOL.ol_wms);
52 } 53 }
53 if(i3GEOOL.jpl_wms != ""){ 54 if(i3GEOOL.jpl_wms != ""){
  55 + i3GEOOL.jpl_wms.transitionEffect = "resize";
54 alayers.push(i3GEOOL.jpl_wms); 56 alayers.push(i3GEOOL.jpl_wms);
55 i3GEOOL.jpl_wms.setVisibility(false); 57 i3GEOOL.jpl_wms.setVisibility(false);
56 } 58 }
57 i3GEOOL.mapa.addLayers(alayers); 59 i3GEOOL.mapa.addLayers(alayers);
58 - if(i3GEOOL.layersIniciais != "")  
59 - {i3GEOOL.mapa.addLayers(i3GEOOL.layersIniciais);}  
60 - 60 +
  61 + if(i3GEOOL.layersIniciais != ""){
  62 + var n = i3GEOOL.layersIniciais.length;
  63 + for(i=0;i<n;i++)
  64 + {i3GEOOL.mapa.addLayer(i3GEOOL.layersIniciais[i]);}
  65 + }
61 if(i3GEOOL.layergrafico != ""){ 66 if(i3GEOOL.layergrafico != ""){
62 i3GEOOL.mapa.addLayers([i3GEOOL.layergrafico]); 67 i3GEOOL.mapa.addLayers([i3GEOOL.layergrafico]);
63 } 68 }
64 - 69 +
65 i3GEOOL.mapa.zoomToMaxExtent(); 70 i3GEOOL.mapa.zoomToMaxExtent();
66 i3GEOOL.coordenadas(); 71 i3GEOOL.coordenadas();
67 i3GEOOL.criaJanelaBusca(); 72 i3GEOOL.criaJanelaBusca();
@@ -370,7 +375,7 @@ i3GEOOL = { @@ -370,7 +375,7 @@ i3GEOOL = {
370 var adiciona = false; 375 var adiciona = false;
371 var controles = new Array(); 376 var controles = new Array();
372 var panel = new OpenLayers.Control.Panel({ 377 var panel = new OpenLayers.Control.Panel({
373 - displayClass: "olControlEditingToolbar noprint" 378 + displayClass: "olControlEditingToolbar1 noprint"
374 }); 379 });
375 if(botoes.procura==true){ 380 if(botoes.procura==true){
376 var button = new OpenLayers.Control.Button({ 381 var button = new OpenLayers.Control.Button({