diff --git a/admin1/cadastros/identifica/index.php b/admin1/cadastros/identifica/index.php index 33f77a9..7a1bbbc 100755 --- a/admin1/cadastros/identifica/index.php +++ b/admin1/cadastros/identifica/index.php @@ -81,10 +81,11 @@ include("../../templates/templateOpcoesPublicado.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.identifica.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/identifica",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/identifica",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/cadastros/perfis/index.php b/admin1/cadastros/perfis/index.php index 2270a73..513467a 100755 --- a/admin1/cadastros/perfis/index.php +++ b/admin1/cadastros/perfis/index.php @@ -95,10 +95,11 @@ include("templates/templateFiltro.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.perfis.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/perfis",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/perfis",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/cadastros/servicos/index.php b/admin1/cadastros/servicos/index.php index 3ec741e..82cc9d2 100755 --- a/admin1/cadastros/servicos/index.php +++ b/admin1/cadastros/servicos/index.php @@ -98,10 +98,11 @@ include("templates/templateOpcoesTipo.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.webservices.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/webservices",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/webservices",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/cadastros/sistemas/funcoes/index.php b/admin1/cadastros/sistemas/funcoes/index.php index a4010b7..40ce45b 100755 --- a/admin1/cadastros/sistemas/funcoes/index.php +++ b/admin1/cadastros/sistemas/funcoes/index.php @@ -99,10 +99,11 @@ include("templates/templateFiltro.php"); $.material.init(); i3GEOadmin.funcao.id_sistema = ; var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.funcao.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/sistemas",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/sistemas",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/cadastros/sistemas/index.php b/admin1/cadastros/sistemas/index.php index 4988237..968dcee 100755 --- a/admin1/cadastros/sistemas/index.php +++ b/admin1/cadastros/sistemas/index.php @@ -85,6 +85,7 @@ include("../../templates/templateOpcoesPublicado.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); //verifica se foi enviado um parametro de filtro pela url var f = ""; if(f != ""){ @@ -93,7 +94,7 @@ include("../../templates/templateOpcoesPublicado.php"); $(".hidden").removeClass('hidden'); i3GEOadmin.sistemas.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/sistemas",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/sistemas",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/cadastros/tags/index.php b/admin1/cadastros/tags/index.php index 8e3dc51..195ffbb 100755 --- a/admin1/cadastros/tags/index.php +++ b/admin1/cadastros/tags/index.php @@ -90,10 +90,11 @@ include("templates/templateFiltro.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.tags.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/tags",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/tags",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/atlas/index.php b/admin1/catalogo/atlas/index.php index 5ba2a0e..02aec90 100755 --- a/admin1/catalogo/atlas/index.php +++ b/admin1/catalogo/atlas/index.php @@ -95,6 +95,7 @@ include("../../templates/templateOpcoesPublicado.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); //verifica se foi enviado um parametro de filtro pela url var f = ""; if(f != ""){ @@ -103,7 +104,7 @@ include("../../templates/templateOpcoesPublicado.php"); $(".hidden").removeClass('hidden'); i3GEOadmin.atlas.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/atlas",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/atlas",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/atlas/pranchas/index.php b/admin1/catalogo/atlas/pranchas/index.php index 1e8d57e..0583e22 100755 --- a/admin1/catalogo/atlas/pranchas/index.php +++ b/admin1/catalogo/atlas/pranchas/index.php @@ -98,10 +98,11 @@ include("templates/templateFiltro.php"); $.material.init(); i3GEOadmin.prancha.id_atlas = ; var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.prancha.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/prancha",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/prancha",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/atlas/pranchas/temas/index.php b/admin1/catalogo/atlas/pranchas/temas/index.php index 68a17e4..398243f 100755 --- a/admin1/catalogo/atlas/pranchas/temas/index.php +++ b/admin1/catalogo/atlas/pranchas/temas/index.php @@ -89,10 +89,11 @@ include("../../../../templates/templateOpcoesLigado.php"); $.material.init(); i3GEOadmin.tema.id_prancha = ; var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.tema.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/atlas",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/atlas",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapas/index.php b/admin1/catalogo/mapas/index.php index bc85093..8ac4684 100755 --- a/admin1/catalogo/mapas/index.php +++ b/admin1/catalogo/mapas/index.php @@ -96,10 +96,11 @@ include("../../templates/templateOpcoesPublicado.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.mapas.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/mapas",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/mapas",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/cdados/index.php b/admin1/catalogo/mapfile/cdados/index.php index 898ed24..eb0d303 100755 --- a/admin1/catalogo/mapfile/cdados/index.php +++ b/admin1/catalogo/mapfile/cdados/index.php @@ -83,10 +83,11 @@ include("templates/templateFormCdados.php"); ) ); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.cdados.inicia("",""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/comportamento/index.php b/admin1/catalogo/mapfile/comportamento/index.php index 5ae8333..95afabe 100755 --- a/admin1/catalogo/mapfile/comportamento/index.php +++ b/admin1/catalogo/mapfile/comportamento/index.php @@ -87,10 +87,11 @@ include("../../../templates/templateMsStatus.php"); ); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.comportamento.inicia("",""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/conexao/index.php b/admin1/catalogo/mapfile/conexao/index.php index 11ec7d7..4025938 100755 --- a/admin1/catalogo/mapfile/conexao/index.php +++ b/admin1/catalogo/mapfile/conexao/index.php @@ -84,10 +84,11 @@ include("../../../templates/templateOpcoesPublicado.php"); ) ); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.editavel.inicia("",""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/disponibilidade/index.php b/admin1/catalogo/mapfile/disponibilidade/index.php index f83ac93..3b0b607 100755 --- a/admin1/catalogo/mapfile/disponibilidade/index.php +++ b/admin1/catalogo/mapfile/disponibilidade/index.php @@ -86,10 +86,11 @@ include("../../../templates/templateOpcoesPublicado.php"); ); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.disponibilidade.inicia("",""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/editavel/index.php b/admin1/catalogo/mapfile/editavel/index.php index 11ec7d7..4025938 100755 --- a/admin1/catalogo/mapfile/editavel/index.php +++ b/admin1/catalogo/mapfile/editavel/index.php @@ -84,10 +84,11 @@ include("../../../templates/templateOpcoesPublicado.php"); ) ); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.editavel.inicia("",""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/editor/index.php b/admin1/catalogo/mapfile/editor/index.php index 680f090..8e0141b 100755 --- a/admin1/catalogo/mapfile/editor/index.php +++ b/admin1/catalogo/mapfile/editor/index.php @@ -111,9 +111,10 @@ $(document).ready(function(){ ) ); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); }; - i3GEO.login.verificaOperacao("admin/html/editortexto",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editortexto",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); $.material.init(); $("#editor").height(parseInt($("#editortemp").height()) + 50 + "px"); diff --git a/admin1/catalogo/mapfile/gruposusuarios/index.php b/admin1/catalogo/mapfile/gruposusuarios/index.php index 18f3cb9..5f24de6 100755 --- a/admin1/catalogo/mapfile/gruposusuarios/index.php +++ b/admin1/catalogo/mapfile/gruposusuarios/index.php @@ -80,10 +80,11 @@ include("templates/templateGrupos.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.gruposusuarios.init($("#corpo"),"",""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/index.php b/admin1/catalogo/mapfile/index.php index a13b767..aa7e5a4 100755 --- a/admin1/catalogo/mapfile/index.php +++ b/admin1/catalogo/mapfile/index.php @@ -133,10 +133,11 @@ include ("templates/templateClonarTema.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.mapfile.init($("#corpo"),""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/opcoes/index.php b/admin1/catalogo/mapfile/opcoes/index.php index 4ffa933..88e2943 100755 --- a/admin1/catalogo/mapfile/opcoes/index.php +++ b/admin1/catalogo/mapfile/opcoes/index.php @@ -83,9 +83,10 @@ include("templates/templateMaisOpcoes.php"); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/mapfile/renderizacao/index.php b/admin1/catalogo/mapfile/renderizacao/index.php index 25e3d1f..34eba00 100755 --- a/admin1/catalogo/mapfile/renderizacao/index.php +++ b/admin1/catalogo/mapfile/renderizacao/index.php @@ -84,10 +84,11 @@ include("../../../templates/templateOpcoesPublicado.php"); ) ); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.renderizacao.inicia("",""); }; - i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/editormapfile",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/menus/grupos/index.php b/admin1/catalogo/menus/grupos/index.php index f7c73d6..4dbe4be 100755 --- a/admin1/catalogo/menus/grupos/index.php +++ b/admin1/catalogo/menus/grupos/index.php @@ -130,10 +130,11 @@ include("templates/templateOpcoesTema.php"); i3GEOadmin.grupos.id_menu = ; i3GEOadmin.grupos.nome_menu = ""; var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.grupos.init($("#corpo"),$("#raiz")); }; - i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/menus/grupos/listadegrupos/index.php b/admin1/catalogo/menus/grupos/listadegrupos/index.php index 67103e2..e643435 100755 --- a/admin1/catalogo/menus/grupos/listadegrupos/index.php +++ b/admin1/catalogo/menus/grupos/listadegrupos/index.php @@ -85,10 +85,11 @@ include("templates/templateFiltro.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.grupos.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/menus/grupos/subgrupos/index.php b/admin1/catalogo/menus/grupos/subgrupos/index.php index a057a93..9e6a28e 100755 --- a/admin1/catalogo/menus/grupos/subgrupos/index.php +++ b/admin1/catalogo/menus/grupos/subgrupos/index.php @@ -139,10 +139,11 @@ include("templates/templateOpcoesTema.php"); i3GEOadmin.subgrupos.nome_menu = ""; var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.subgrupos.init($("#corpo"),$("#raiz")); }; - i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/index.php b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/index.php index f7dbede..bae8353 100755 --- a/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/index.php +++ b/admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/index.php @@ -88,10 +88,11 @@ include("templates/templateFiltro.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.subgrupos.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/menus/grupos/subgrupos/temas/index.php b/admin1/catalogo/menus/grupos/subgrupos/temas/index.php index 5c21996..ca20f58 100755 --- a/admin1/catalogo/menus/grupos/subgrupos/temas/index.php +++ b/admin1/catalogo/menus/grupos/subgrupos/temas/index.php @@ -116,10 +116,11 @@ include("templates/templateOpcoesPerfil.php"); i3GEOadmin.temas.nome_subgrupo = ""; var inicia = function() { + i3GEOadmin.core.loginOn(); $(".hidden").removeClass('hidden'); i3GEOadmin.temas.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/arvore",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/catalogo/menus/index.php b/admin1/catalogo/menus/index.php index d7a2b16..b6c6145 100755 --- a/admin1/catalogo/menus/index.php +++ b/admin1/catalogo/menus/index.php @@ -102,6 +102,7 @@ include("../../templates/templateOpcoesAberto.php"); ); $.material.init(); var inicia = function() { + i3GEOadmin.core.loginOn(); //verifica se foi enviado um parametro de filtro pela url var f = ""; if(f != ""){ @@ -110,7 +111,7 @@ include("../../templates/templateOpcoesAberto.php"); $(".hidden").removeClass('hidden'); i3GEOadmin.menus.init($("#corpo")); }; - i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, inicia, "sessao"); + i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, inicia, "sessao" ,i3GEOadmin.core.erroLogin); }); diff --git a/admin1/head.php b/admin1/head.php index eaa384e..ac88c65 100755 --- a/admin1/head.php +++ b/admin1/head.php @@ -391,7 +391,7 @@ h2 small { diff --git a/admin1/js/core.js b/admin1/js/core.js index 6a099b5..4416357 100755 --- a/admin1/js/core.js +++ b/admin1/js/core.js @@ -71,6 +71,15 @@ i3GEOadmin.core = { //valor do filtro utilizado ao iniciar a pagina //usado para enviar parametros pela URL ao iniciar uma pagina initFiltro: "", + erroLogin: function(){ + $("#loginOff").css("display",""); + $("#loginOn").css("display","none"); + alert("Login!"); + }, + loginOn: function(){ + $("#loginOff").css("display","none"); + $("#loginOn").css("display",""); + }, mostraErro: function(erro){ var html = '