From 0ac2e32cebf675913a8cf875e83398ed81fcd129 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 21 May 2011 13:28:21 +0000
Subject: [PATCH] 

---
 classesjs/classe_barradebotoes.js |  3 ++-
 mashups/openlayers.css            |  6 ++++++
 mashups/openlayers.js.php         | 50 ++++++++++++++++++++++++++++++++++----------------
 mashups/openlayers.php            |  3 +++
 mashups/openlayers.png            | Bin 17103 -> 0 bytes
 5 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/classesjs/classe_barradebotoes.js b/classesjs/classe_barradebotoes.js
index de29d7e..0d2799f 100644
--- a/classesjs/classe_barradebotoes.js
+++ b/classesjs/classe_barradebotoes.js
@@ -1054,7 +1054,8 @@ i3GEO.barraDeBotoes = {
 				'edita':true,
 				'apaga':true,
 				'procura':false,
-				'salva':true
+				'salva':true,
+				'fecha':true
 			}
 			i3GEOOL.layergrafico = new OpenLayers.Layer.Vector("Edição",{displayInLayerSwitcher:false,visibility:true});
 			i3GEOOL.mapa.addLayers([i3GEOOL.layergrafico]);			
diff --git a/mashups/openlayers.css b/mashups/openlayers.css
index 73298eb..f57ee76 100644
--- a/mashups/openlayers.css
+++ b/mashups/openlayers.css
@@ -94,6 +94,12 @@ background-position:-435px 0;
 .olControlEditingToolbar1 .salvaItemActive {
 background-position:-435px -28px;
 }
+.olControlEditingToolbar1 .fechaItemInactive {
+background-position:-464px 0;
+}
+.olControlEditingToolbar1 .fechaItemActive {
+background-position:-464px -28px;
+}
 .olControlEditingToolbar1 {
 	width:500px;
 	float:right;
diff --git a/mashups/openlayers.js.php b/mashups/openlayers.js.php
index c226723..6b3e18f 100644
--- a/mashups/openlayers.js.php
+++ b/mashups/openlayers.js.php
@@ -53,7 +53,8 @@ i3GEOOL = {
 		'edita':true,
 		'apaga':true,
 		'procura':true,
-		'salva':true
+		'salva':true,
+		'fecha':false
 	},
 	pontos: [],
 	marca: "../pacotes/openlayers/img/marker-gold.png",
@@ -112,7 +113,6 @@ i3GEOOL = {
 		i3GEOOL.criaJanelaBusca();
 		i3GEOOL.criaJanelaAtivaTema();
 		i3GEOOL.criaBotoes(i3GEOOL.botoes);
-		
 	},
 	layersLigados: function(){
 		var layers = i3GEOOL.mapa.layers;
@@ -195,21 +195,28 @@ i3GEOOL = {
 			combo += "<option value='"+i+"' >"+layers[i].name+"</option>";
 		}
 		combo += "</select>";
-		try{
+		if(!document.getElementById("paneltemaativo")){
 			YAHOO.namespace("temaativo.container");
-			YAHOO.temaativo.container.panel = new YAHOO.widget.Panel("paneltemaativo", {zIndex:2000, iframe:false, width:"250px", visible:false, draggable:true, close:true } );
-			YAHOO.temaativo.container.panel.setHeader("Tema ativo");
+			YAHOO.temaativo.container.panel = new YAHOO.widget.Panel("paneltemaativo", {zIndex:20000, iframe:true, width:"250px", visible:false, draggable:true, close:true } );
 			YAHOO.temaativo.container.panel.setBody(combo);
+			YAHOO.temaativo.container.panel.setHeader("Tema ativo");
 			YAHOO.temaativo.container.panel.setFooter("");
 			YAHOO.temaativo.container.panel.render(document.body);
 			YAHOO.temaativo.container.panel.center();
-			document.getElementById("i3GEOOLlistaTemasAtivos").onchange = function(){
-				if(botaoIdentifica){
-					botaoIdentifica.layers = [i3GEOOL.layersLigados()[this.value]];
-				} 
-			};
+			YAHOO.util.Event.addListener(YAHOO.temaativo.container.panel.close, "click", function(){
+				i3GEOpanelEditor.deactivate();
+				i3GEOpanelEditor.activate();
+			}); 
 		}
-		catch(e){}
+		else{	
+			YAHOO.temaativo.container.panel.render(document.body);
+			YAHOO.temaativo.container.panel.show();
+		}
+		document.getElementById("i3GEOOLlistaTemasAtivos").onchange = function(){
+			if(botaoIdentifica){
+				botaoIdentifica.layers = [i3GEOOL.layersLigados()[this.value]];
+			} 
+		};
 	},
 	ativaTema: function(id){
 		document.getElementById("i3GEOOLlistaTemasAtivos").value = id;
@@ -428,7 +435,7 @@ i3GEOOL = {
 		var styleMap = new OpenLayers.StyleMap({"default": style});
 		var adiciona = false;
 		var controles = new Array();
-		var panel = new OpenLayers.Control.Panel({
+		i3GEOpanelEditor = new OpenLayers.Control.Panel({
 			displayClass: "olControlEditingToolbar1 noprint"
 		});
 		if(botoes.procura==true){
@@ -528,8 +535,7 @@ i3GEOOL = {
 						));
 					},
 					activate: function(){
-						try{YAHOO.temaativo.container.panel.show();}
-						catch(e){}
+						i3GEOOL.criaJanelaAtivaTema();
 					}
 				}
 			});
@@ -629,12 +635,24 @@ i3GEOOL = {
 			controles.push(button);
 			var adiciona = true;
 		}
+		if(botoes.fecha==true){
+			var button = new OpenLayers.Control.Button({
+				displayClass: "fecha", 
+				trigger: function(){
+					i3GEOpanelEditor.destroy();
+					YAHOO.temaativo.container.panel.destroy();
+				},
+				title: "Fechar editor"
+			});
+			controles.push(button);
+			var adiciona = true;
+		}		
 		//
 		//adiciona o painel ao mapa se alguma op��o foi inserida
 		//
 		if(adiciona == true){
-			panel.addControls(controles);
-			i3GEOOL.mapa.addControl(panel);
+			i3GEOpanelEditor.addControls(controles);
+			i3GEOOL.mapa.addControl(i3GEOpanelEditor);
 		}
 	},
 	adicionaMarcas: function(){
diff --git a/mashups/openlayers.php b/mashups/openlayers.php
index 0aca111..952ab0f 100644
--- a/mashups/openlayers.php
+++ b/mashups/openlayers.php
@@ -71,6 +71,8 @@ if(isset($botoes)){
 	{$objBotoes[] = "'procura':false";}
 	if(in_array("salva",$botoes))
 	{$objBotoes[] = "'salva':false";}
+	if(in_array("fecha",$botoes))
+	{$objBotoes[] = "'fecha':false";}
 	$botoes = "{".implode(",",$objBotoes)."}";
 }
 
@@ -170,6 +172,7 @@ Parâmetros:
 		captura
 		procura
 		salva
+		fecha
 
 	Para ver a lista de códigos de temas, que podem ser utilizados no parâmetro 'temas', acesse: 
 	<a href='../ogc.php?lista=temas' >lista de temas</a>. Os códigos são mostrados em vermelho.
diff --git a/mashups/openlayers.png b/mashups/openlayers.png
index 91a2690..8e98deb 100644
Binary files a/mashups/openlayers.png and b/mashups/openlayers.png differ
--
libgit2 0.21.2