From 2917b2deb1150bc0732b70549c1b18587d2de043 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 12 Mar 2010 19:51:13 +0000
Subject: [PATCH] correção nos layouts de alguns formulários do sistema de admnistração

---
 admin/js/arvore.js           |  2 +-
 admin/js/core.js             | 15 ++++++++++-----
 admin/js/editormapfile.js    |  4 ++--
 admin/js/listatemas.js       |  6 ++++++
 menutemas/admin.db           | Bin 66560 -> 0 bytes
 ms_configura.php             |  2 +-
 temas/biomashp.map           |  4 +++-
 temas/geopr_aneel_linhas.map | 50 +++++++++++++++++++++++---------------------------
 temas/teste5.map             | 19 +++++++++++++++++++
 9 files changed, 65 insertions(+), 37 deletions(-)
 create mode 100644 temas/teste5.map

diff --git a/admin/js/arvore.js b/admin/js/arvore.js
index 59dd67c..abc8d04 100644
--- a/admin/js/arvore.js
+++ b/admin/js/arvore.js
@@ -546,7 +546,7 @@ function montaDivTema(i)
 	var ins = "<br>Tema:<br><br>"
 	ins += "<div id=comboTema >Buscando...</div>"
 	ins += "<p>Perfis que podem ver: </p>"
-	ins += "<input size=50 type=text id='En3_perfil' value='"+i.n3_perfil+"' /></p>"
+	ins += "<input type=text id='En3_perfil' value='"+i.n3_perfil+"' /></p>"
 	ins += "<div id=comboPerfil >Buscando...</div>";
 	ins += "<br>Publicado?<br>"
 	ins += "<select id='Epublicado' >"
diff --git a/admin/js/core.js b/admin/js/core.js
index faa06aa..ec53917 100644
--- a/admin/js/core.js
+++ b/admin/js/core.js
@@ -501,7 +501,7 @@ function core_comboGrupos(onde,id,marcar,funcao)
 				{var funcao = "";}
 				if (funcao != "")
 				{var funcao = "onchange='"+funcao+"'";}
-				ins = "<select  id='"+id+"' "+funcao+" >"
+				ins = "<select size=6 style='width:370px' id='"+id+"' "+funcao+" >"
 				ins += core_comboObjeto(valores,"id_grupo","nome_grupo",marcar)
 				ins += "</select></p>"
 				$i(onde).innerHTML = ins;
@@ -542,7 +542,7 @@ function core_comboSubGrupos(onde,id,marcar,funcao)
 				{var funcao = "";}
 				if (funcao != "")
 				{var funcao = "onchange='"+funcao+"'";}
-				ins = "<select  id='"+id+"' "+funcao+" >"
+				ins = "<select size=6 style='width:370px' id='"+id+"' "+funcao+" >"
 				ins += core_comboObjeto(valores,"id_subgrupo","nome_subgrupo",marcar)
 				ins += "</select></p>"
 				$i(onde).innerHTML = ins;
@@ -583,8 +583,8 @@ function core_comboTemas(onde,id,marcar,funcao)
 				{var funcao = "";}
 				if (funcao != "")
 				{var funcao = "onchange='"+funcao+"'";}
-				ins = "<select  id='"+id+"' "+funcao+" >"
-				ins += core_comboObjeto(valores,"id_tema","nome_tema",marcar)
+				ins = "<select size=6 style='width:370px' id='"+id+"' "+funcao+" >"
+				ins += core_comboObjeto(valores,"id_tema","nome_tema",marcar,"codigo_tema")
 				ins += "</select></p>"
 				$i(onde).innerHTML = ins;
   			}
@@ -755,7 +755,7 @@ Function: core_comboObjeto
 
 Retorna os itens option de um combo baseado em um objeto json
 */
-function core_comboObjeto(obj,valor,texto,marcar)
+function core_comboObjeto(obj,valor,texto,marcar,texto2)
 {
 	var ins = "<option value='' "
 	ins += ">---</option>";
@@ -769,6 +769,11 @@ function core_comboObjeto(obj,valor,texto,marcar)
 		var t = eval("obj[k]."+texto);
 		else
 		var t = obj[k];
+		
+		if(texto2){
+			t += " ("+eval("obj[k]."+texto2)+")";
+		}
+		
 		ins += "<option value='"+v+"' "
 		if (marcar == v){ins += "selected"}
 		ins += ">"+t+"</option>";
diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js
index 9c927e1..7cc6c7c 100644
--- a/admin/js/editormapfile.js
+++ b/admin/js/editormapfile.js
@@ -110,8 +110,8 @@ function ativaBotaoAdicionaMapfile(idBotao)
 {
 	var adiciona = function()
 	{
-		core_montaEditor("adicionaNovoMapfile()")
-		ins = "<p>Título do novo tema: </p>"
+		core_montaEditor("adicionaNovoMapfile()","450px","660px")
+		ins = "<p><b>Título do novo tema</b></p>"
 		ins += "<p>Português: </p>";
 		ins += "<input size=50 type=text id='Etitulo' value='' /></p>"
 		ins += "<p>Espanhol:: </p>";
diff --git a/admin/js/listatemas.js b/admin/js/listatemas.js
index 2fbc638..485dfb9 100644
--- a/admin/js/listatemas.js
+++ b/admin/js/listatemas.js
@@ -34,6 +34,12 @@ function montaEditorTema(dados)
 		editorBotoes.on("checkedButtonChange", on_editorCheckBoxChange);	
 		YAHOO.example.container.panelEditorTema = new YAHOO.widget.Panel("janela_editor", { fixedcenter:true,close:true,width:"400px", height:"400px",overflow:"auto", visible:false,constraintoviewport:true } );
 		YAHOO.example.container.panelEditorTema.render();
+		var fecha = function()
+		{
+			YAHOO.example.container.panelEditorTema.destroy();
+			YAHOO.example.container.panelEditorTema = null;
+		}
+		YAHOO.util.Event.addListener(YAHOO.example.container.panelEditorTema.close, "click", fecha);
 	}
 	YAHOO.example.container.panelEditorTema.show();
 	//carrega os dados na janela
diff --git a/menutemas/admin.db b/menutemas/admin.db
index 1b99fe5..23e5a2a 100644
Binary files a/menutemas/admin.db and b/menutemas/admin.db differ
diff --git a/ms_configura.php b/ms_configura.php
index a2335fe..c20fac2 100644
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -50,7 +50,7 @@ Arquivo: ms_configura.php
 	Tipo:
 	{string}
 */
-$mensagemInicia = 'Vers&atilde;o 4.3 - Revis&atilde;o SVN 1578';
+$mensagemInicia = 'Vers&atilde;o 4.4 - Revis&atilde;o SVN 1579';
 /*
 	Variable: tituloInstituicao
 	
diff --git a/temas/biomashp.map b/temas/biomashp.map
index e6abf8e..5485436 100644
--- a/temas/biomashp.map
+++ b/temas/biomashp.map
@@ -1,5 +1,6 @@
 MAP
   LAYER
+    CONNECTION ""
     DATA "c:\ms4w\apache\htdocs\geodados\brasil\vegetacao\biomas.shp"
     GROUP "Grupo 1"
     METADATA
@@ -8,13 +9,14 @@ MAP
       "permitedownload"	"sim"
       "download"	"SIM"
       "arquivodownload"	"C:\ms4w\Apache\htdocs\geodados\brasil\vegetacao\vegetacao.zip"
-      "permiteogc"	""
       "permitekml"	"sim"
+      "permiteogc"	""
       "TEMA"	"Biomas shapefile"
     END
     NAME "biomashp"
     STATUS OFF
     TEMPLATE "none.htm"
+    OPACITY 50
     TYPE POLYGON
     UNITS METERS
     CLASS
diff --git a/temas/geopr_aneel_linhas.map b/temas/geopr_aneel_linhas.map
index c46b37d..b48ca9f 100644
--- a/temas/geopr_aneel_linhas.map
+++ b/temas/geopr_aneel_linhas.map
@@ -1,41 +1,37 @@
-MAP
-
-
-SYMBOLSET ../symbols/simbolos.sym
-FONTSET   "../symbols/fontes.txt"
-LAYER
+MAP
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolos.sym"
+  LAYER
     CONNECTION "http://sigel.aneel.gov.br/wmsconnector/com.esri.wms.Esrimap/gsiwms?"
     CONNECTIONTYPE WMS
     DATA ""
-      METADATA
-        "wms_srs"	"EPSG:4326"
-        "wms_exceptions_format"	"application/vnd.ogc.se_xml"
-        "CLASSE"	"SIM"
-        "wfs"	"nao"
-        "TEXTO"	"NAO"
-        "wms_force_separate_request"	"1"
-        "wms_name"	"3"
-        "formatosinfo"	"application/vnd.ogc.wms_xml,text/xml,text/html,text/plain"
-        "legendawms"	"http://sigel.aneel.gov.br/wmsconnector/com.esri.wms.Esrimap/gsiwms?&service=wms&request=getlegendgraphic&version=1.1.1&service=wms&layer=3&format=image/png"
-        "wms_formatlist"	"image/png,image/jpeg"
-        "wms_format"	"image/png"
-        "wms_connectiontimeout"	"30"
-        "TEMA"	"Linhas de Transmissão"
-        "wms_server_version"	"1.1.1"
-        "wms_style"	"default"
-      END
+    METADATA
+      "wms_srs"	"EPSG:4326"
+      "wms_exceptions_format"	"application/vnd.ogc.se_xml"
+      "CLASSE"	"SIM"
+      "wfs"	"nao"
+      "wms_force_separate_request"	"1"
+      "TEXTO"	"NAO"
+      "legendawms"	"http://sigel.aneel.gov.br/wmsconnector/com.esri.wms.Esrimap/gsiwms?&service=wms&request=getlegendgraphic&version=1.1.1&service=wms&layer=3&format=image/png"
+      "formatosinfo"	"application/vnd.ogc.wms_xml,text/xml,text/html,text/plain"
+      "wms_name"	"3"
+      "wms_format"	"image/png"
+      "wms_formatlist"	"image/png,image/jpeg"
+      "wms_connectiontimeout"	"30"
+      "TEMA"	"Linhas de Transmissão"
+      "wms_server_version"	"1.1.1"
+      "wms_style"	"default"
+    END
     NAME "geopr_aneel_linhas"
     OFFSITE 255 255 255
-    SIZEUNITS PIXELS
     STATUS DEFAULT
     TOLERANCE 0
-    TOLERANCEUNITS PIXELS
     TYPE RASTER
     UNITS METERS
     CLASS
       NAME " "
-      METADATA
-      END
     END
   END
+
 END
+
diff --git a/temas/teste5.map b/temas/teste5.map
new file mode 100644
index 0000000..cd8b1c1
--- /dev/null
+++ b/temas/teste5.map
@@ -0,0 +1,19 @@
+MAP
+SYMBOLSET ../symbols/simbolos.sym
+FONTSET   "../symbols/fontes.txt"
+LAYER
+	NAME teste5
+	TYPE line
+	DATA ""
+	METADATA
+		TEMA "teste criando novo mapfile"
+		CLASSE "SIM"
+	END
+    CLASS
+        NAME ""
+        STYLE
+        	COLOR 0 0 0
+        END
+    END
+END
+END
--
libgit2 0.21.2