From 34f872b2912c3b24b18dc9e43079a51c0e797fc6 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Sun, 27 Mar 2016 18:58:48 -0300 Subject: [PATCH] Correção em vários formulários do sistema de administração. Correção no filtro de letras. Padronização CSS --- admin/admin.db | Bin 335872 -> 0 bytes admin/html/admin.css | 26 +++++++++++++++++++++++++- admin/html/menus.html | 3 +-- admin/js/arvore.js | 31 ++++++++++++++++++++++--------- admin/js/core.js | 11 ++++++++--- admin/js/editormapfile.js | 16 ++++++++++------ admin/js/editormapfile_classes.js | 3 +-- admin/js/editormapfile_conexao.js | 4 ++-- admin/js/editormapfile_editavel.js | 8 ++++---- admin/js/editormapfile_estilos.js | 2 +- admin/js/estat_conexao.js | 3 ++- admin/js/estat_fonteinfo.js | 3 ++- admin/js/estat_tipo_periodo.js | 3 ++- admin/js/estat_unidade_medida.js | 3 ++- admin/js/estat_variavel.js | 2 +- admin/js/grupos.js | 3 ++- admin/js/identifica.js | 3 ++- admin/js/listatemas.js | 15 +++++++++------ admin/js/mapas.js | 23 ++++++++++++----------- admin/js/menu.js | 3 ++- admin/js/menutemas.js | 2 +- admin/js/subgrupos.js | 3 ++- admin/js/webservices.js | 3 ++- css/input.css | 2 +- 24 files changed, 116 insertions(+), 59 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index 3ff893c..e1fe7bd 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/html/admin.css b/admin/html/admin.css index a9c39fc..3a12887 100755 --- a/admin/html/admin.css +++ b/admin/html/admin.css @@ -352,9 +352,10 @@ select{ background: url(../../imagens/oxygen/16x16/svn-commit.png) 5% 50% no-repeat; width: 250px; } + .iconeEditar { -moz-appearance: none; - background: transparent url("../../imagens/gisicons/edit2.png") no-repeat scroll 100% 3px; + background: transparent url("../../imagens/branco.gif") no-repeat scroll 100% 3px; border: 0 none; box-shadow: none; font-size: 12px; @@ -365,6 +366,10 @@ select{ text-overflow: ""; } +.styled-select input, .styled-select150 input { + background: transparent url("../../imagens/branco.gif") no-repeat scroll 100% 3px; +} + .styled-select { width: 252px; overflow: hidden; @@ -405,6 +410,25 @@ select{ } } +.i3geoFormSemIcone { + background: none; +} + +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { + width: 100%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + cursor: text; +} + .lupaBuscar { cursor: pointer; height: 14px; diff --git a/admin/html/menus.html b/admin/html/menus.html index 024b9f7..fbf44db 100755 --- a/admin/html/menus.html +++ b/admin/html/menus.html @@ -41,8 +41,7 @@ body {

-

-
+
diff --git a/admin/js/arvore.js b/admin/js/arvore.js index 5978541..9a484d2 100755 --- a/admin/js/arvore.js +++ b/admin/js/arvore.js @@ -63,10 +63,10 @@ Inicializa a arvore function initMenu(){ var botao, editorDeMenus = function() { if($i("editor_bd")){return;} - core_montaEditor("","600px","500px","pegaMenus","Menu"); + core_montaEditor("","600px","350px","pegaMenus","Menu"); $i("editor_bd").innerHTML = '



'; + '" style="left:-5px;" />

'; i3GEOadmin.menus.inicia(); }, editorDeGrupos = function(){ @@ -740,10 +740,14 @@ function montaDivGrupo(i) var ins = "

" + $trad("escolheGrupo",i3GEOadmin.arvore.dicionario) + "

" + "
"+ $trad("msgBusca",i3GEOadmin.arvore.dicionario) +"
" + "

"+ $trad("novoGrupo",i3GEOadmin.arvore.dicionario) +"

" - + "" + + "
" + + "" + + "
" + "

"+ $trad("perfilVer",i3GEOadmin.arvore.dicionario) +"

" - + "" + + "
" + + "" + + "
" + "
"+ $trad("msgBusca",i3GEOadmin.arvore.dicionario) +"
" + "

"+ $trad("publicado",i3GEOadmin.arvore.dicionario) +"" + "

" - + + "
" + "

"+ $trad("perfilVer",i3GEOadmin.arvore.dicionario) +"

" - + "" + + "
" + + "" + + "
" + "
"+ $trad("msgBusca",i3GEOadmin.arvore.dicionario) +"
" + "

"+ $trad("publicado",i3GEOadmin.arvore.dicionario) +"" + "

" + "

"+ $trad("perfilVer",i3GEOadmin.arvore.dicionario) +"

" - + "" + + "
" + + "" + + "
" + "
Buscando...
" + "

"+ $trad("ordem",i3GEOadmin.arvore.dicionario) +"

" - + ""; + + "
" + + "" + + "
"; return(ins); } function montaDivRaiz(i) @@ -791,7 +802,9 @@ function montaDivRaiz(i) var ins = "

"+ $trad("tema",i3GEOadmin.arvore.dicionario) +"

" + "
"+ $trad("msgBusca",i3GEOadmin.arvore.dicionario) +"
" + "

"+ $trad("perfilVer",i3GEOadmin.arvore.dicionario) +"

" - + "

" + + "
" + + "" + + "
" + "
"+ $trad("msgBusca",i3GEOadmin.arvore.dicionario) +"
" + ""; return(ins); diff --git a/admin/js/core.js b/admin/js/core.js index 6361848..0183198 100755 --- a/admin/js/core.js +++ b/admin/js/core.js @@ -1179,11 +1179,17 @@ function core_geraLinhas(dados) resultado += ""; } else{ - resultado += "
"; + if(p.tipo == "cor"){ + resultado += "
"; + } + else{ + resultado += "
"; + } } if(p.tipo == "cor"){ - resultado += " "; + resultado += " "; } + resultado += "
"; } if(p.div){ resultado += p.div; @@ -1696,7 +1702,6 @@ function core_listaDeLetras(onde,nomeFuncao,semLetras,w){ + "\")' style='color:blue;cursor:pointer;padding:1px;border: 1px solid #C8C8FA'>" + letras[i] + " "; } - //ins += "

"; } else{ ins = ""; diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js index 23dda5a..13b47e5 100755 --- a/admin/js/editormapfile.js +++ b/admin/js/editormapfile.js @@ -185,8 +185,9 @@ function ativaBotaoAdicionaMapfile(idBotao) var botao, adiciona = function() { core_montaEditor("adicionaNovoMapfile()","450px","660px","","Mapfile",true,true,false); - ins = "

"+ $trad("nomeMap",i3GEOadmin.editormapfile.dicionario) +"

"; - ins += "

"; + ins = "

"+ $trad("nomeMap",i3GEOadmin.editormapfile.dicionario) +"

"; + ins += "
"; + ins += "
"; ins += "

"; ins += ""+ $trad("permiteOgc",i3GEOadmin.editormapfile.dicionario) +"

"; @@ -194,13 +195,16 @@ function ativaBotaoAdicionaMapfile(idBotao) ins += "
"; - ins += "

"+ $trad("tituloTema",i3GEOadmin.editormapfile.dicionario) +"

"; + ins += "

"+ $trad("tituloTema",i3GEOadmin.editormapfile.dicionario) +"

"; ins += "

"+ $trad("tituloPt",i3GEOadmin.editormapfile.dicionario) +"

"; - ins += "

"; + ins += "
"; + ins += "
"; ins += "

"+ $trad("tituloEs",i3GEOadmin.editormapfile.dicionario) +"

"; - ins += "

"; + ins += "
"; + ins += "
"; ins += "

"+ $trad("tituloEn",i3GEOadmin.editormapfile.dicionario) +"

"; - ins += "

"; + ins += "
"; + ins += "
"; ins += "

"; $i("editor_bd").innerHTML = ins; }; diff --git a/admin/js/editormapfile_classes.js b/admin/js/editormapfile_classes.js index 646c128..238f192 100755 --- a/admin/js/editormapfile_classes.js +++ b/admin/js/editormapfile_classes.js @@ -222,9 +222,8 @@ function classesAuto(codigoMap,codigoLayer) } catch(e){} }; - YAHOO.util.Event.addListener(YAHOO.admin.container.panelEditorAutoClasses.close, "click", fecha); - YAHOO.admin.container.panelEditorAutoClasses.render(); + YAHOO.util.Event.addListener(YAHOO.admin.container.panelEditorAutoClasses.close, "click", fecha); var sUrl = "../php/editormapfile.php?funcao=pegaItensLayer&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer; var callback = { success:function(o) { diff --git a/admin/js/editormapfile_conexao.js b/admin/js/editormapfile_conexao.js index 27baa56..c20e94f 100755 --- a/admin/js/editormapfile_conexao.js +++ b/admin/js/editormapfile_conexao.js @@ -85,7 +85,7 @@ function montaEditorDados(dados) temp += "
"+dados.postgis_mapa+".

"+ $trad("defineAlias",i3GEOadmin.editormapfile.dicionario) +""; temp += "

"; } - temp += '
'; + temp += '
'; temp += "
"; $i("cConnection").innerHTML = temp; } @@ -95,7 +95,7 @@ function montaEditorDados(dados) $i("cData").innerHTML = temp; } if($i("cMetaestat_id_medida_variavel")){ - temp = '
'; + temp = '
'; temp += "
"; $i("cMetaestat_id_medida_variavel").innerHTML = temp; } diff --git a/admin/js/editormapfile_editavel.js b/admin/js/editormapfile_editavel.js index cab534a..6a21cbf 100755 --- a/admin/js/editormapfile_editavel.js +++ b/admin/js/editormapfile_editavel.js @@ -47,7 +47,7 @@ function montaEditorEditavel(dados) $i("cEditavel").innerHTML = temp; } if($i("cEsquematabelaeditavel")){ - temp = '
' + + temp = '
' + "
"; $i("cEsquematabelaeditavel").innerHTML = temp; } @@ -55,7 +55,7 @@ function montaEditorEditavel(dados) i3GEO.util.navegadorPostgis($i("esquematabelaeditavel"),"","esquema"); }; if($i("cTabelatabelaeditavel")){ - temp = '
' + + temp = '
' + "
"; $i("cTabelatabelaeditavel").innerHTML = temp; } @@ -63,7 +63,7 @@ function montaEditorEditavel(dados) i3GEO.util.navegadorPostgis($i("tabelaeditavel"),"","tabela"); }; if($i("cColunatabelaeditavel")){ - temp = '
' + + temp = '
' + "
"; $i("cColunatabelaeditavel").innerHTML = temp; } @@ -71,7 +71,7 @@ function montaEditorEditavel(dados) i3GEO.util.navegadorPostgis($i("colunaidunico"),"","coluna"); }; if($i("cColunageometriatabelaeditavel")){ - temp = '
' + + temp = '
' + "
"; $i("cColunageometriatabelaeditavel").innerHTML = temp; } diff --git a/admin/js/editormapfile_estilos.js b/admin/js/editormapfile_estilos.js index b290fc5..34d83a8 100755 --- a/admin/js/editormapfile_estilos.js +++ b/admin/js/editormapfile_estilos.js @@ -110,7 +110,7 @@ function montaEditorEstilo(dados) ins += "


"; $i("editor_bd").innerHTML = ins; - temp = "
"; + temp = "
"; temp += "
"; temp += "
"; $i("cSymbolname").innerHTML = temp; diff --git a/admin/js/estat_conexao.js b/admin/js/estat_conexao.js index 54de5e8..b9c5ac4 100755 --- a/admin/js/estat_conexao.js +++ b/admin/js/estat_conexao.js @@ -186,7 +186,8 @@ i3GEOadmin.conexao = { novo = []; for(i=0;i

"; if($i("cSimbolo")){ - temp = '
' + + temp = '
' + ""; $i("cSimbolo").innerHTML = temp; } diff --git a/admin/js/grupos.js b/admin/js/grupos.js index 2211626..5dfb0b3 100755 --- a/admin/js/grupos.js +++ b/admin/js/grupos.js @@ -243,7 +243,8 @@ i3GEOadmin.grupos = { novo = []; for(i=0;i"; - ins += "

"; - ins += "

"+ $trad("fonte",i3GEOadmin.listatemas.dicionario) +"
"; - ins += "

"; - ins += "

"+ $trad("tags",i3GEOadmin.listatemas.dicionario) +""; - ins += "
"; + ins += "

"+ $trad("descricao",i3GEOadmin.listatemas.dicionario) +"

"; + ins += "
"; + ins += "
"; + ins += "

"+ $trad("fonte",i3GEOadmin.listatemas.dicionario) +"

"; + ins += "
"; + ins += "
"; + ins += "

"+ $trad("tags",i3GEOadmin.listatemas.dicionario) +"

"; + ins += "
"; + ins += "
"; ins += "
"+ $trad("busca",i3GEOadmin.listatemas.dicionario) +"
"; //tipoa_tema pode receber o valor META indicando que baseia-se no sistema de metadados estatisticos //nesse caso, tipoa_tema e preenchido pelo editor de mapfile diff --git a/admin/js/mapas.js b/admin/js/mapas.js index dde0741..459934b 100755 --- a/admin/js/mapas.js +++ b/admin/js/mapas.js @@ -183,10 +183,10 @@ i3GEOadmin.mapas = { var ins = ""; ins += "

"+ $trad("ordemMapa",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += "

"+ $trad("nomeMapa",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += "

"+ $trad("publicado",i3GEOadmin.mapas.dicionario) +"

"; ins += "
"; ins += "

"+ $trad("descricao",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += "

"+ $trad("extensao",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += "

"+ $trad("img",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += ""; ins += "

"+ $trad("temas",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += "
"+ $trad("msgBusca",i3GEOadmin.mapas.dicionario) +"
"; ins += "

"+ $trad("temasLigados",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += "

"+ $trad("perfis",i3GEOadmin.mapas.dicionario) +"

"; - ins += "
"; + ins += "
"; ins += "
"+ $trad("msgBusca",i3GEOadmin.mapas.dicionario) +"
"; ins += "

"+ $trad("parametros",i3GEOadmin.mapas.dicionario) +"
"; - ins += "

"; + ins += "
"; ins += "

"+ $trad("linkDireto",i3GEOadmin.mapas.dicionario) +"
"; - ins += "

"; + ins += "
"; ins += "


"; return(ins); }, @@ -243,7 +243,8 @@ i3GEOadmin.mapas = { novo = []; for(i=0;i"; ins += "

"; - ins += " Filtro:

"; + ins += " Filtro:

"; ins += "

"; ins += "
"; ins += "

"+$parametros.simples[i].mensagem+"

"; diff --git a/admin/js/subgrupos.js b/admin/js/subgrupos.js index f149860..b70a9ca 100755 --- a/admin/js/subgrupos.js +++ b/admin/js/subgrupos.js @@ -218,7 +218,8 @@ i3GEOadmin.subgrupos = { novo = []; for(i=0;i