Download as
Browse Code »

Commit 2917b2deb1150bc0732b70549c1b18587d2de043

Authored by Edmar Moretti
1 parent 11d33b42
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

correção nos layouts de alguns formulários do sistema de admnistração

Showing 9 changed files with 65 additions and 37 deletions   Show diff stats
admin/js/arvore.js
  Diff comments   View file @2917b2d
@@ -546,7 +546,7 @@ function montaDivTema(i) @@ -546,7 +546,7 @@ function montaDivTema(i)
546 var ins = "<br>Tema:<br><br>" 546 var ins = "<br>Tema:<br><br>"
547 ins += "<div id=comboTema >Buscando...</div>" 547 ins += "<div id=comboTema >Buscando...</div>"
548 ins += "<p>Perfis que podem ver: </p>" 548 ins += "<p>Perfis que podem ver: </p>"
549 - ins += "<input size=50 type=text id='En3_perfil' value='"+i.n3_perfil+"' /></p>" 549 + ins += "<input type=text id='En3_perfil' value='"+i.n3_perfil+"' /></p>"
550 ins += "<div id=comboPerfil >Buscando...</div>"; 550 ins += "<div id=comboPerfil >Buscando...</div>";
551 ins += "<br>Publicado?<br>" 551 ins += "<br>Publicado?<br>"
552 ins += "<select id='Epublicado' >" 552 ins += "<select id='Epublicado' >"
admin/js/core.js
  Diff comments   View file @2917b2d
@@ -501,7 +501,7 @@ function core_comboGrupos(onde,id,marcar,funcao) @@ -501,7 +501,7 @@ function core_comboGrupos(onde,id,marcar,funcao)
501 {var funcao = "";} 501 {var funcao = "";}
502 if (funcao != "") 502 if (funcao != "")
503 {var funcao = "onchange='"+funcao+"'";} 503 {var funcao = "onchange='"+funcao+"'";}
504 - ins = "<select id='"+id+"' "+funcao+" >" 504 + ins = "<select size=6 style='width:370px' id='"+id+"' "+funcao+" >"
505 ins += core_comboObjeto(valores,"id_grupo","nome_grupo",marcar) 505 ins += core_comboObjeto(valores,"id_grupo","nome_grupo",marcar)
506 ins += "</select></p>" 506 ins += "</select></p>"
507 $i(onde).innerHTML = ins; 507 $i(onde).innerHTML = ins;
@@ -542,7 +542,7 @@ function core_comboSubGrupos(onde,id,marcar,funcao) @@ -542,7 +542,7 @@ function core_comboSubGrupos(onde,id,marcar,funcao)
542 {var funcao = "";} 542 {var funcao = "";}
543 if (funcao != "") 543 if (funcao != "")
544 {var funcao = "onchange='"+funcao+"'";} 544 {var funcao = "onchange='"+funcao+"'";}
545 - ins = "<select id='"+id+"' "+funcao+" >" 545 + ins = "<select size=6 style='width:370px' id='"+id+"' "+funcao+" >"
546 ins += core_comboObjeto(valores,"id_subgrupo","nome_subgrupo",marcar) 546 ins += core_comboObjeto(valores,"id_subgrupo","nome_subgrupo",marcar)
547 ins += "</select></p>" 547 ins += "</select></p>"
548 $i(onde).innerHTML = ins; 548 $i(onde).innerHTML = ins;
@@ -583,8 +583,8 @@ function core_comboTemas(onde,id,marcar,funcao) @@ -583,8 +583,8 @@ function core_comboTemas(onde,id,marcar,funcao)
583 {var funcao = "";} 583 {var funcao = "";}
584 if (funcao != "") 584 if (funcao != "")
585 {var funcao = "onchange='"+funcao+"'";} 585 {var funcao = "onchange='"+funcao+"'";}
586 - ins = "<select id='"+id+"' "+funcao+" >"  
587 - ins += core_comboObjeto(valores,"id_tema","nome_tema",marcar) 586 + ins = "<select size=6 style='width:370px' id='"+id+"' "+funcao+" >"
  587 + ins += core_comboObjeto(valores,"id_tema","nome_tema",marcar,"codigo_tema")
588 ins += "</select></p>" 588 ins += "</select></p>"
589 $i(onde).innerHTML = ins; 589 $i(onde).innerHTML = ins;
590 } 590 }
@@ -755,7 +755,7 @@ Function: core_comboObjeto @@ -755,7 +755,7 @@ Function: core_comboObjeto
755 755
756 Retorna os itens option de um combo baseado em um objeto json 756 Retorna os itens option de um combo baseado em um objeto json
757 */ 757 */
758 -function core_comboObjeto(obj,valor,texto,marcar) 758 +function core_comboObjeto(obj,valor,texto,marcar,texto2)
759 { 759 {
760 var ins = "<option value='' " 760 var ins = "<option value='' "
761 ins += ">---</option>"; 761 ins += ">---</option>";
@@ -769,6 +769,11 @@ function core_comboObjeto(obj,valor,texto,marcar) @@ -769,6 +769,11 @@ function core_comboObjeto(obj,valor,texto,marcar)
769 var t = eval("obj[k]."+texto); 769 var t = eval("obj[k]."+texto);
770 else 770 else
771 var t = obj[k]; 771 var t = obj[k];
  772 +
  773 + if(texto2){
  774 + t += " ("+eval("obj[k]."+texto2)+")";
  775 + }
  776 +
772 ins += "<option value='"+v+"' " 777 ins += "<option value='"+v+"' "
773 if (marcar == v){ins += "selected"} 778 if (marcar == v){ins += "selected"}
774 ins += ">"+t+"</option>"; 779 ins += ">"+t+"</option>";
admin/js/editormapfile.js
  Diff comments   View file @2917b2d
@@ -110,8 +110,8 @@ function ativaBotaoAdicionaMapfile(idBotao) @@ -110,8 +110,8 @@ function ativaBotaoAdicionaMapfile(idBotao)
110 { 110 {
111 var adiciona = function() 111 var adiciona = function()
112 { 112 {
113 - core_montaEditor("adicionaNovoMapfile()")  
114 - ins = "<p>Título do novo tema: </p>" 113 + core_montaEditor("adicionaNovoMapfile()","450px","660px")
  114 + ins = "<p><b>Título do novo tema</b></p>"
115 ins += "<p>Português: </p>"; 115 ins += "<p>Português: </p>";
116 ins += "<input size=50 type=text id='Etitulo' value='' /></p>" 116 ins += "<input size=50 type=text id='Etitulo' value='' /></p>"
117 ins += "<p>Espanhol:: </p>"; 117 ins += "<p>Espanhol:: </p>";
admin/js/listatemas.js
  Diff comments   View file @2917b2d
@@ -34,6 +34,12 @@ function montaEditorTema(dados) @@ -34,6 +34,12 @@ function montaEditorTema(dados)
34 editorBotoes.on("checkedButtonChange", on_editorCheckBoxChange); 34 editorBotoes.on("checkedButtonChange", on_editorCheckBoxChange);
35 YAHOO.example.container.panelEditorTema = new YAHOO.widget.Panel("janela_editor", { fixedcenter:true,close:true,width:"400px", height:"400px",overflow:"auto", visible:false,constraintoviewport:true } ); 35 YAHOO.example.container.panelEditorTema = new YAHOO.widget.Panel("janela_editor", { fixedcenter:true,close:true,width:"400px", height:"400px",overflow:"auto", visible:false,constraintoviewport:true } );
36 YAHOO.example.container.panelEditorTema.render(); 36 YAHOO.example.container.panelEditorTema.render();
  37 + var fecha = function()
  38 + {
  39 + YAHOO.example.container.panelEditorTema.destroy();
  40 + YAHOO.example.container.panelEditorTema = null;
  41 + }
  42 + YAHOO.util.Event.addListener(YAHOO.example.container.panelEditorTema.close, "click", fecha);
37 } 43 }
38 YAHOO.example.container.panelEditorTema.show(); 44 YAHOO.example.container.panelEditorTema.show();
39 //carrega os dados na janela 45 //carrega os dados na janela
menutemas/admin.db
View file @2917b2d
No preview for this file type
ms_configura.php
  Diff comments   View file @2917b2d
@@ -50,7 +50,7 @@ Arquivo: ms_configura.php @@ -50,7 +50,7 @@ Arquivo: ms_configura.php
50 Tipo: 50 Tipo:
51 {string} 51 {string}
52 */ 52 */
53 -$mensagemInicia = 'Vers&atilde;o 4.3 - Revis&atilde;o SVN 1578'; 53 +$mensagemInicia = 'Vers&atilde;o 4.4 - Revis&atilde;o SVN 1579';
54 /* 54 /*
55 Variable: tituloInstituicao 55 Variable: tituloInstituicao
56 56
temas/biomashp.map
  Diff comments   View file @2917b2d
1 MAP 1 MAP
2 LAYER 2 LAYER
  3 + CONNECTION ""
3 DATA "c:\ms4w\apache\htdocs\geodados\brasil\vegetacao\biomas.shp" 4 DATA "c:\ms4w\apache\htdocs\geodados\brasil\vegetacao\biomas.shp"
4 GROUP "Grupo 1" 5 GROUP "Grupo 1"
5 METADATA 6 METADATA
@@ -8,13 +9,14 @@ MAP @@ -8,13 +9,14 @@ MAP
8 "permitedownload" "sim" 9 "permitedownload" "sim"
9 "download" "SIM" 10 "download" "SIM"
10 "arquivodownload" "C:\ms4w\Apache\htdocs\geodados\brasil\vegetacao\vegetacao.zip" 11 "arquivodownload" "C:\ms4w\Apache\htdocs\geodados\brasil\vegetacao\vegetacao.zip"
11 - "permiteogc" ""  
12 "permitekml" "sim" 12 "permitekml" "sim"
  13 + "permiteogc" ""
13 "TEMA" "Biomas shapefile" 14 "TEMA" "Biomas shapefile"
14 END 15 END
15 NAME "biomashp" 16 NAME "biomashp"
16 STATUS OFF 17 STATUS OFF
17 TEMPLATE "none.htm" 18 TEMPLATE "none.htm"
  19 + OPACITY 50
18 TYPE POLYGON 20 TYPE POLYGON
19 UNITS METERS 21 UNITS METERS
20 CLASS 22 CLASS
temas/geopr_aneel_linhas.map
  Diff comments   View file @2917b2d
1 -MAP  
2 -  
3 -  
4 -SYMBOLSET ../symbols/simbolos.sym  
5 -FONTSET "../symbols/fontes.txt"  
6 -LAYER 1 +MAP
  2 + FONTSET "../symbols/fontes.txt"
  3 + SYMBOLSET "../symbols/simbolos.sym"
  4 + LAYER
7 CONNECTION "http://sigel.aneel.gov.br/wmsconnector/com.esri.wms.Esrimap/gsiwms?" 5 CONNECTION "http://sigel.aneel.gov.br/wmsconnector/com.esri.wms.Esrimap/gsiwms?"
8 CONNECTIONTYPE WMS 6 CONNECTIONTYPE WMS
9 DATA "" 7 DATA ""
10 - METADATA  
11 - "wms_srs" "EPSG:4326"  
12 - "wms_exceptions_format" "application/vnd.ogc.se_xml"  
13 - "CLASSE" "SIM"  
14 - "wfs" "nao"  
15 - "TEXTO" "NAO"  
16 - "wms_force_separate_request" "1"  
17 - "wms_name" "3"  
18 - "formatosinfo" "application/vnd.ogc.wms_xml,text/xml,text/html,text/plain"  
19 - "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"  
20 - "wms_formatlist" "image/png,image/jpeg"  
21 - "wms_format" "image/png"  
22 - "wms_connectiontimeout" "30"  
23 - "TEMA" "Linhas de Transmissão"  
24 - "wms_server_version" "1.1.1"  
25 - "wms_style" "default"  
26 - END 8 + METADATA
  9 + "wms_srs" "EPSG:4326"
  10 + "wms_exceptions_format" "application/vnd.ogc.se_xml"
  11 + "CLASSE" "SIM"
  12 + "wfs" "nao"
  13 + "wms_force_separate_request" "1"
  14 + "TEXTO" "NAO"
  15 + "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"
  16 + "formatosinfo" "application/vnd.ogc.wms_xml,text/xml,text/html,text/plain"
  17 + "wms_name" "3"
  18 + "wms_format" "image/png"
  19 + "wms_formatlist" "image/png,image/jpeg"
  20 + "wms_connectiontimeout" "30"
  21 + "TEMA" "Linhas de Transmissão"
  22 + "wms_server_version" "1.1.1"
  23 + "wms_style" "default"
  24 + END
27 NAME "geopr_aneel_linhas" 25 NAME "geopr_aneel_linhas"
28 OFFSITE 255 255 255 26 OFFSITE 255 255 255
29 - SIZEUNITS PIXELS  
30 STATUS DEFAULT 27 STATUS DEFAULT
31 TOLERANCE 0 28 TOLERANCE 0
32 - TOLERANCEUNITS PIXELS  
33 TYPE RASTER 29 TYPE RASTER
34 UNITS METERS 30 UNITS METERS
35 CLASS 31 CLASS
36 NAME " " 32 NAME " "
37 - METADATA  
38 - END  
39 END 33 END
40 END 34 END
  35 +
41 END 36 END
  37 +
temas/teste5.map 0 → 100644
  Diff comments   View file @2917b2d
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +MAP
  2 +SYMBOLSET ../symbols/simbolos.sym
  3 +FONTSET "../symbols/fontes.txt"
  4 +LAYER
  5 + NAME teste5
  6 + TYPE line
  7 + DATA ""
  8 + METADATA
  9 + TEMA "teste criando novo mapfile"
  10 + CLASSE "SIM"
  11 + END
  12 + CLASS
  13 + NAME ""
  14 + STYLE
  15 + COLOR 0 0 0
  16 + END
  17 + END
  18 +END
  19 +END