From cd7144aab3f89aa6f338fc6cc9a7fee1bec36edc Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Sun, 24 Feb 2013 15:44:52 +0000 Subject: [PATCH] Correções no layout do sistema de administração --- admin/html/admin.css | 15 +++++++++++---- admin/html/editormapfile.html | 8 ++++---- admin/html/estat_conexao.html | 6 +----- admin/html/estat_editor.html | 4 +--- admin/html/estat_fonteinfo.html | 6 +----- admin/html/estat_mapa.html | 4 +--- admin/html/estat_tipo_periodo.html | 6 +----- admin/html/estat_tipo_regiao.html | 5 ++--- admin/html/estat_unidade_medida.html | 7 ++----- admin/html/estat_uploaddados.html | 4 +--- admin/html/estat_variavel.html | 4 +--- admin/html/gruposusuarios.html | 4 +--- admin/html/identifica.html | 4 +--- admin/html/incluimap.html | 4 +--- admin/html/mapas.html | 4 +--- admin/html/ogcws.html | 4 +--- admin/html/operacoes.html | 3 --- admin/html/sistemas.html | 4 +--- admin/html/subirshapefile.html | 4 ++-- admin/html/tags.html | 4 +--- admin/html/usuarios.html | 3 --- admin/html/webservices.html | 4 +--- admin/js/core.js | 7 ++++--- admin/js/estat_conexao.js | 3 ++- admin/js/estat_fonteinfo.js | 3 ++- admin/js/estat_tipo_periodo.js | 3 ++- admin/js/estat_tipo_regiao.js | 4 ++-- admin/js/estat_unidade_medida.js | 3 ++- admin/js/estat_variavel.js | 10 +++++----- admin/js/grupos.js | 3 ++- admin/js/identifica.js | 3 ++- admin/js/mapas.js | 21 +++++++++++---------- admin/js/menu.js | 3 ++- admin/js/ogcws.js | 1 - admin/js/subgrupos.js | 3 ++- admin/js/webservices.js | 3 ++- admin/php/ogcws.php | 6 ++---- testainstal.php | 5 +---- 38 files changed, 79 insertions(+), 113 deletions(-) diff --git a/admin/html/admin.css b/admin/html/admin.css index 1bf6563..5a73d15 100644 --- a/admin/html/admin.css +++ b/admin/html/admin.css @@ -20,6 +20,9 @@ cursor: se-resize; .yui-skin-sam .yui-button button, .yui-skin-sam .yui-button a, .yui-skin-sam .yui-button a:visited{ font-size:10pt; } +.yui-skin-sam .yui-button { + margin: 0.25em; +} .ajuda_usuario { background-image:url(../../imagens/external.png); @@ -31,17 +34,21 @@ cursor:help; } P { text-align: left; - font-size: 13pt; + font-size: 12pt; + font-family: Verdana, Arial, Helvetica, sans-serif; +} +P b{ + text-align: left; + font-size: 10pt; font-family: Verdana, Arial, Helvetica, sans-serif; } - legend { font-weight: bold; cursor: pointer; background-color: white; color: navy; text-align: left; - font-size: 13pt; + font-size: 11pt; font-family: Verdana, Arial, Helvetica, sans-serif; } @@ -78,7 +85,7 @@ input { .lista1 td { cursor: pointer; text-align: left; - font-size: 14px; + font-size: 12pt; font-family: Verdana, Arial, Helvetica, sans-serif; } diff --git a/admin/html/editormapfile.html b/admin/html/editormapfile.html index 531691e..f9d1493 100644 --- a/admin/html/editormapfile.html +++ b/admin/html/editormapfile.html @@ -39,6 +39,8 @@ body { @@ -78,9 +76,7 @@ body { i3geo/admin/html/estat_conexao.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/estat_editor.html b/admin/html/estat_editor.html index 2d6e9be..08faa6f 100644 --- a/admin/html/estat_editor.html +++ b/admin/html/estat_editor.html @@ -79,9 +79,7 @@ body { i3geo/admin/html/estat_editor.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/estat_fonteinfo.html b/admin/html/estat_fonteinfo.html index c07c9ad..8b84097 100755 --- a/admin/html/estat_fonteinfo.html +++ b/admin/html/estat_fonteinfo.html @@ -39,8 +39,6 @@ body {
-

-


@@ -77,9 +75,7 @@ body { i3geo/admin/html/estat_fonteinfo.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/estat_mapa.html b/admin/html/estat_mapa.html index 5ea0619..e5bf1f3 100755 --- a/admin/html/estat_mapa.html +++ b/admin/html/estat_mapa.html @@ -96,9 +96,7 @@ body { i3geo/admin/html/estat_mapa.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : window.location.href.replace("/admin/html/estat_mapa.html","") diff --git a/admin/html/estat_tipo_periodo.html b/admin/html/estat_tipo_periodo.html index 89b0f5a..bbbd9e9 100755 --- a/admin/html/estat_tipo_periodo.html +++ b/admin/html/estat_tipo_periodo.html @@ -38,8 +38,6 @@ body {
-

-


@@ -75,9 +73,7 @@ body { i3geo/admin/html/estat_tipo_periodo.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/estat_tipo_regiao.html b/admin/html/estat_tipo_regiao.html index 00ed6ff..f827c36 100755 --- a/admin/html/estat_tipo_regiao.html +++ b/admin/html/estat_tipo_regiao.html @@ -41,9 +41,8 @@ body {

Utilize a opção "Editor" no menu superior caso você queira fazer o upload de shapefile para criar uma nova tabela com os dados que serão utilizados em uma determinada região -

-
+ value="Adicionar um novo registro" style="left: -5px;" />

Utilize a opção "Editor" no menu superior caso você queira fazer o upload de shapefile para criar uma nova tabela com os dados que serão utilizados em uma determinada região

+
diff --git a/admin/html/estat_unidade_medida.html b/admin/html/estat_unidade_medida.html index 6d68caa..e27c4c6 100755 --- a/admin/html/estat_unidade_medida.html +++ b/admin/html/estat_unidade_medida.html @@ -39,8 +39,7 @@ body {
-

-
+


@@ -77,9 +76,7 @@ body { i3geo/admin/html/estat_unidade_medida.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/estat_uploaddados.html b/admin/html/estat_uploaddados.html index 0b3fa55..fa97f67 100644 --- a/admin/html/estat_uploaddados.html +++ b/admin/html/estat_uploaddados.html @@ -96,9 +96,7 @@ body { i3geo/admin/html/estat_uploaddados.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/estat_variavel.html b/admin/html/estat_variavel.html index 5ffead9..bc293b9 100755 --- a/admin/html/estat_variavel.html +++ b/admin/html/estat_variavel.html @@ -101,9 +101,7 @@ body { i3geo/admin/html/estat_variaveis.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : window.location.href.replace("/admin/html/estat_variavel.html","") diff --git a/admin/html/gruposusuarios.html b/admin/html/gruposusuarios.html index dd2c00a..785524f 100755 --- a/admin/html/gruposusuarios.html +++ b/admin/html/gruposusuarios.html @@ -79,9 +79,7 @@ body { i3geo/admin/html/gruposusuarios.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/identifica.html b/admin/html/identifica.html index 61e9e3f..90e8bab 100644 --- a/admin/html/identifica.html +++ b/admin/html/identifica.html @@ -93,9 +93,7 @@ body { i3geo/admin/html/identifica.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "1100px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/incluimap.html b/admin/html/incluimap.html index 537f274..0e6b6b0 100644 --- a/admin/html/incluimap.html +++ b/admin/html/incluimap.html @@ -87,9 +87,7 @@ i3geo/admin/html/incluimap.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/mapas.html b/admin/html/mapas.html index 0f913b9..00ffb8c 100644 --- a/admin/html/mapas.html +++ b/admin/html/mapas.html @@ -88,9 +88,7 @@ body { i3geo/admin/html/mapas.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/ogcws.html b/admin/html/ogcws.html index 7342c5b..11ea743 100644 --- a/admin/html/ogcws.html +++ b/admin/html/ogcws.html @@ -84,9 +84,7 @@ body { i3geo/admin/html/ogcws.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/operacoes.html b/admin/html/operacoes.html index 3c304b3..e3f11a5 100644 --- a/admin/html/operacoes.html +++ b/admin/html/operacoes.html @@ -86,9 +86,6 @@ body { i3geo/admin/html/funcionalidades.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/sistemas.html b/admin/html/sistemas.html index c451277..7dd0831 100644 --- a/admin/html/sistemas.html +++ b/admin/html/sistemas.html @@ -90,9 +90,7 @@ body { i3geo/admin/html/sistemas.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/subirshapefile.html b/admin/html/subirshapefile.html index 7d34479..9ee193c 100644 --- a/admin/html/subirshapefile.html +++ b/admin/html/subirshapefile.html @@ -14,9 +14,9 @@ body { padding: 0; } - + + src="../../ferramentas/upload/index.js"> diff --git a/admin/html/tags.html b/admin/html/tags.html index 5dda2f9..defcb8c 100644 --- a/admin/html/tags.html +++ b/admin/html/tags.html @@ -84,9 +84,7 @@ body { i3geo/admin/html/tags.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessário para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/usuarios.html b/admin/html/usuarios.html index 4c9aac4..96249e7 100755 --- a/admin/html/usuarios.html +++ b/admin/html/usuarios.html @@ -80,9 +80,6 @@ body { i3geo/admin/html/usuarios.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/html/webservices.html b/admin/html/webservices.html index ca7cc07..1516878 100644 --- a/admin/html/webservices.html +++ b/admin/html/webservices.html @@ -92,9 +92,7 @@ body { i3geo/admin/html/webservices.html */ - if (screen.availWidth > 700) { - document.getElementById("divGeral").style.width = "700px"; - } + //necessario para a ferramenta login e outras i3GEO.configura = { locaplic : "../.." diff --git a/admin/js/core.js b/admin/js/core.js index 3ce7266..f6a0808 100644 --- a/admin/js/core.js +++ b/admin/js/core.js @@ -1100,7 +1100,7 @@ function core_geraLinhas(dados) { if(!p.value) p.value = ""; - resultado += ""; + resultado += ""; if(p.tipo == "cor") { resultado += " "; @@ -1523,7 +1523,7 @@ function core_ativaforms(lista){ } function core_listaDeLetras(onde,nomeFuncao){ //letraAtual guarda a última letra clicada - var o,i,ins= "", + var o,i,ins= "

", letras = ["Todos","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","X","Y","Z","_","1","2","3","4","5","6","7","8","9"], nletras = letras.length; if(!i3GEO.util){ @@ -1540,10 +1540,11 @@ function core_listaDeLetras(onde,nomeFuncao){ + "\")' style='color:blue;cursor:pointer;padding:1px;border: 1px solid #C8C8FA'>" + letras[i] + " "; } + ins += "

"; if(onde != ""){ o = document.getElementById(onde); if(o){ - o.innerHTML = "
Iniciais: ou
"+ins+"
"; + o.innerHTML = "

Iniciais: ou

"+ins+"

"; document.getElementById("forminiciais").onsubmit = function(){ var v = document.getElementById("iniciaisLetras").value; i3GEO.util.insereCookie("I3GEOletraAdmin", v); diff --git a/admin/js/estat_conexao.js b/admin/js/estat_conexao.js index db68b52..e87f2b6 100755 --- a/admin/js/estat_conexao.js +++ b/admin/js/estat_conexao.js @@ -63,7 +63,8 @@ i3GEOadmin.conexao = { myDataSource.responseSchema = { fields: i3GEOadmin.conexao.colunas }; - i3GEOadmin.conexao.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.conexao.defColunas(), myDataSource); + //i3GEOadmin.conexao.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.conexao.defColunas(), myDataSource); + i3GEOadmin.conexao.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.conexao.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.conexao.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/estat_fonteinfo.js b/admin/js/estat_fonteinfo.js index 19ac1a3..5b6e959 100755 --- a/admin/js/estat_fonteinfo.js +++ b/admin/js/estat_fonteinfo.js @@ -57,7 +57,8 @@ i3GEOadmin.fonteinfo = { myDataSource.responseSchema = { fields: i3GEOadmin.fonteinfo.colunas }; - i3GEOadmin.fonteinfo.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.fonteinfo.defColunas(), myDataSource); + //i3GEOadmin.fonteinfo.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.fonteinfo.defColunas(), myDataSource); + i3GEOadmin.fonteinfo.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.fonteinfo.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.fonteinfo.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/estat_tipo_periodo.js b/admin/js/estat_tipo_periodo.js index cada5ff..1e5cc7e 100755 --- a/admin/js/estat_tipo_periodo.js +++ b/admin/js/estat_tipo_periodo.js @@ -57,7 +57,8 @@ i3GEOadmin.periodo = { myDataSource.responseSchema = { fields: i3GEOadmin.periodo.colunas }; - i3GEOadmin.periodo.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.periodo.defColunas(), myDataSource); + //i3GEOadmin.periodo.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.periodo.defColunas(), myDataSource); + i3GEOadmin.periodo.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.periodo.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.periodo.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/estat_tipo_regiao.js b/admin/js/estat_tipo_regiao.js index 6a69d9d..ac24921 100755 --- a/admin/js/estat_tipo_regiao.js +++ b/admin/js/estat_tipo_regiao.js @@ -78,7 +78,7 @@ function montaTabela(dados){ {label:"SRID",key:"srid",formatter:formatTexto} ]; myDataSource = new YAHOO.util.DataSource(dados); - myDataTable = new YAHOO.widget.DataTable("tabela", myColumnDefs, myDataSource); + myDataTable = new YAHOO.widget.ScrollingDataTable("tabela", myColumnDefs, myDataSource,{width:"100%"}); myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSARRAY; myDataSource.responseSchema = { @@ -139,7 +139,7 @@ function iniciaEditorAgregacoes(dados,codigo_tipo_regiao){ core_carregando("desativa"); //if($i("editor_bd")){return;} core_montaEditor("","550px","250px","","Agregações"); - $i("editor_bd").innerHTML = '



'; + $i("editor_bd").innerHTML = '

'; core_ativaBotaoAdicionaLinha("../php/metaestat.php?funcao=alteraAgregaRegiao&codigo_tipo_regiao="+codigo_tipo_regiao,"adicionaNovaAgregacao","pegaDadosAgregacoes('"+codigo_tipo_regiao+"')"); montaTabelaAgregacoes(dados); } diff --git a/admin/js/estat_unidade_medida.js b/admin/js/estat_unidade_medida.js index a8c8301..35999d6 100755 --- a/admin/js/estat_unidade_medida.js +++ b/admin/js/estat_unidade_medida.js @@ -59,7 +59,8 @@ i3GEOadmin.umedida = { myDataSource.responseSchema = { fields: i3GEOadmin.umedida.colunas }; - i3GEOadmin.umedida.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.umedida.defColunas(), myDataSource); + //i3GEOadmin.umedida.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.umedida.defColunas(), myDataSource); + i3GEOadmin.umedida.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.umedida.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.umedida.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/estat_variavel.js b/admin/js/estat_variavel.js index d11c14a..6a66b4e 100755 --- a/admin/js/estat_variavel.js +++ b/admin/js/estat_variavel.js @@ -309,7 +309,7 @@ i3GEOadmin.variaveis = { ] }; ins += core_geraLinhas(param); - ins += "


"; + //ins += "


"; //utilizado para passar o codigo da variavel qd for necessario ins += ""; $i("editor_bd").innerHTML = ins; @@ -495,7 +495,7 @@ i3GEOadmin.variaveis = { ins += core_geraLinhas(param); //utilizado para passar o codigo da variavel qd for necessario ins += ""; - ins += "


"; + //ins += "


"; $i("editor_bd").innerHTML = ins; } }, @@ -563,7 +563,7 @@ i3GEOadmin.variaveis = { ] }; ins += core_geraLinhas(param); - ins += "


"; + //ins += "


"; $i("editor_bd").innerHTML = ins; } }, @@ -696,7 +696,7 @@ i3GEOadmin.variaveis = { ] }; ins += core_geraLinhas(param); - ins += "


"; + //ins += "


"; $i("editor_bd").innerHTML = ins; } }, @@ -764,7 +764,7 @@ i3GEOadmin.variaveis = { ] }; ins += core_geraLinhas(param); - ins += "


"; + //ins += "


"; $i("editor_bd").innerHTML = ins; }, editarMontaFormulario: function(dados,tipo,id){ diff --git a/admin/js/grupos.js b/admin/js/grupos.js index 657df42..9223f59 100644 --- a/admin/js/grupos.js +++ b/admin/js/grupos.js @@ -124,7 +124,8 @@ i3GEOadmin.grupos = { myDataSource.responseSchema = { fields: i3GEOadmin.grupos.colunas }; - i3GEOadmin.grupos.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.grupos.defColunas(), myDataSource); + //i3GEOadmin.grupos.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.grupos.defColunas(), myDataSource); + i3GEOadmin.grupos.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.grupos.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.grupos.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/identifica.js b/admin/js/identifica.js index 3617bbd..2439220 100644 --- a/admin/js/identifica.js +++ b/admin/js/identifica.js @@ -90,7 +90,8 @@ i3GEOadmin.identifica = { myDataSource.responseSchema = { fields: i3GEOadmin.identifica.colunas }; - i3GEOadmin.identifica.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.identifica.defColunas(), myDataSource); + //i3GEOadmin.identifica.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.identifica.defColunas(), myDataSource); + i3GEOadmin.identifica.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.identifica.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.identifica.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/mapas.js b/admin/js/mapas.js index f523a1a..06152a0 100644 --- a/admin/js/mapas.js +++ b/admin/js/mapas.js @@ -89,7 +89,8 @@ i3GEOadmin.mapas = { myDataSource.responseSchema = { fields: i3GEOadmin.mapas.colunas }; - i3GEOadmin.mapas.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.mapas.defColunas(), myDataSource); + //i3GEOadmin.mapas.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.mapas.defColunas(), myDataSource); + i3GEOadmin.mapas.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.mapas.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.mapas.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), @@ -167,7 +168,7 @@ i3GEOadmin.mapas = { ins += "

"; ins += "

Nome do mapa:
"; - ins += "

"; + ins += "

"; ins += "

Publicado?
"; ins += "

"; ins += "

Descrição:
"; - ins += "

"; + ins += "

"; ins += "

Extensão geográfica:
"; - ins += "

"; + ins += "

"; ins += "

URL da imagem miniatura:
"; - ins += "

"; + ins += "

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

Temas que serão incluídos nesse mapa (utilize os códigos dos mapfiles mostrados na lista abaixo):

"; - ins += "

"; + ins += "

"; ins += "
Buscando...
"; ins += "

Temas que serão ligados. Devem constar na lista de temas incluídos:

"; - ins += "

"; + ins += "

"; ins += "

Perfis que podem ver este mapa:

"; - ins += "

"; + ins += "

"; ins += "
Buscando...
"; ins += "

Outros parâmetros (separe com '&'):
"; - ins += "

"; + ins += "

"; ins += "

Link direto para abertura do mapa (despreza os outros parâmetros):
"; - ins += "

"; + ins += "

"; ins += "


"; return(ins); }, diff --git a/admin/js/menu.js b/admin/js/menu.js index 4869b99..9a07dc5 100644 --- a/admin/js/menu.js +++ b/admin/js/menu.js @@ -101,7 +101,8 @@ i3GEOadmin.menus = { myDataSource.responseSchema = { fields: i3GEOadmin.menus.colunas }; - i3GEOadmin.menus.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.menus.defColunas(), myDataSource); + //i3GEOadmin.menus.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.menus.defColunas(), myDataSource); + i3GEOadmin.menus.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.menus.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.menus.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/ogcws.js b/admin/js/ogcws.js index b699d21..cb03fd9 100644 --- a/admin/js/ogcws.js +++ b/admin/js/ogcws.js @@ -163,4 +163,3 @@ function salva(variavel) $i(variavel).value = original; } } -YAHOO.util.Event.addListener(window, "load", initMenu); \ No newline at end of file diff --git a/admin/js/subgrupos.js b/admin/js/subgrupos.js index 2e78437..2c939c5 100644 --- a/admin/js/subgrupos.js +++ b/admin/js/subgrupos.js @@ -99,7 +99,8 @@ i3GEOadmin.subgrupos = { myDataSource.responseSchema = { fields: i3GEOadmin.subgrupos.colunas }; - i3GEOadmin.subgrupos.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.subgrupos.defColunas(), myDataSource); + //i3GEOadmin.subgrupos.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.subgrupos.defColunas(), myDataSource); + i3GEOadmin.subgrupos.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.subgrupos.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.subgrupos.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/js/webservices.js b/admin/js/webservices.js index f757700..6353a3d 100644 --- a/admin/js/webservices.js +++ b/admin/js/webservices.js @@ -95,7 +95,8 @@ i3GEOadmin.webservices = { myDataSource.responseSchema = { fields: i3GEOadmin.webservices.colunas }; - i3GEOadmin.webservices.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.webservices.defColunas(), myDataSource); + //i3GEOadmin.webservices.dataTable = new YAHOO.widget.DataTable("tabela", i3GEOadmin.webservices.defColunas(), myDataSource); + i3GEOadmin.webservices.dataTable = new YAHOO.widget.ScrollingDataTable("tabela", i3GEOadmin.webservices.defColunas(), myDataSource,{width:"100%"}); i3GEOadmin.webservices.dataTable.subscribe('cellClickEvent',function(ev){ var sUrl, callback,$clicouId, $recordid, target = YAHOO.util.Event.getTarget(ev), diff --git a/admin/php/ogcws.php b/admin/php/ogcws.php index ed26a29..75c1246 100644 --- a/admin/php/ogcws.php +++ b/admin/php/ogcws.php @@ -44,7 +44,6 @@ if(verificaOperacaoSessao("admin/html/ogcws") == false){ //error_reporting(E_ALL); $versao = versao(); $map_file = $locaplic."/aplicmap/ogcwsv".$versao["principal"].".map"; - $mapa = ms_newMapObj($map_file); $web = $mapa->web; //faz a busca da função que deve ser executada @@ -83,9 +82,8 @@ switch (strtoupper($funcao)) "ows_name" ); $par = array(); - foreach ($vs as $v) - { - $par[$v] = utf8_encode($web->metadata->get($v)); + foreach ($vs as $v){ + $par[$v] = utf8_encode($mapa->getmetadata($v)); } $par["mapfile"] = $map_file; retornaJSON($par); diff --git a/testainstal.php b/testainstal.php index 8254b2d..d6089fc 100644 --- a/testainstal.php +++ b/testainstal.php @@ -433,9 +433,6 @@ function permissoesarquivo($arquivo){ ?> - + -- libgit2 0.21.2