diff --git a/admin1/dicionario/core.js b/admin1/dicionario/core.js index ce67591..2be3c96 100755 --- a/admin1/dicionario/core.js +++ b/admin1/dicionario/core.js @@ -141,6 +141,11 @@ i3GEOadmin.core.dicionario = { en : "", es : "" } ], + 'adicionar' : [ { + pt : "Adicionar", + en : "", + es : "" + } ], 'layers' : [ { pt : "Layers", en : "", diff --git a/admin1/dicionario/operacoes.js b/admin1/dicionario/operacoes.js index ac42959..81715a3 100755 --- a/admin1/dicionario/operacoes.js +++ b/admin1/dicionario/operacoes.js @@ -2,7 +2,7 @@ i3GEOadmin.operacoes = {}; i3GEOadmin.operacoes.dicionario = { 'operacoes' : [ { - pt : "Operações e executores (papéis)", + pt : "Operações e quem pode executá-las (papéis)", en : "", es : "" } ], diff --git a/admin1/head.php b/admin1/head.php index d492410..b37fce6 100755 --- a/admin1/head.php +++ b/admin1/head.php @@ -163,6 +163,17 @@ body { .navbar .dropdown-menu li>a, .navbar.navbar-default .dropdown-menu li>a { font-size: 1em; } + +#indice .bs-docs-sidebar .nav>.active:focus>a, .bs-docs-sidebar .nav>.active:hover>a, + .bs-docs-sidebar .nav>.active>a { + background-color: transparent; + border-left-color: green; + border-left-style: solid; + border-left-width: 2px; + color: green; + font-weight: 700; + padding-left: 18px; +} diff --git a/admin1/templates/login.php b/admin1/templates/login.php old mode 100644 new mode 100755 index 87e129c..87e129c --- a/admin1/templates/login.php +++ b/admin1/templates/login.php diff --git a/admin1/usuarios/operacoes/exec.php b/admin1/usuarios/operacoes/exec.php old mode 100644 new mode 100755 index 7447780..d035d50 --- a/admin1/usuarios/operacoes/exec.php +++ b/admin1/usuarios/operacoes/exec.php @@ -61,7 +61,7 @@ switch (strtoupper($funcao)) $operacao["papeis"] = $p; $o[] = $operacao; } - $papeis = pegaDados("SELECT * from ".$esquemaadmin."i3geousr_papeis order by nome"); + $papeis = pegaDados("SELECT * from ".$esquemaadmin."i3geousr_papeis WHERE nome <> 'admin' order by nome"); retornaJSON(array("operacoes"=>$o,"papeis"=>$papeis)); break; case "PEGAOPERACOES": diff --git a/admin1/usuarios/operacoes/index.js b/admin1/usuarios/operacoes/index.js old mode 100644 new mode 100755 index 66c6df7..67a84bd --- a/admin1/usuarios/operacoes/index.js +++ b/admin1/usuarios/operacoes/index.js @@ -30,7 +30,7 @@ Inicializa o editor function init(){ pegaOperacoes(); } -function ativaBotaoAdicionaOperacao(sUrl,idBotao){ +function adicionaOperacao(){ var botao, adiciona = function() { core_carregando("ativa"); @@ -60,19 +60,20 @@ function ativaBotaoAdicionaOperacao(sUrl,idBotao){ /* Function: pegaOperacoes -Obtém a lista de atlas - - +Obtém a lista de operacoes */ function pegaOperacoes(){ - //core_pegaDados($trad("msgBuscaOperacoes",i3GEOadmin.operacoes.dicionario),"../php/operacoes.php?funcao=pegaOperacoes","montaArvore"); $.post( "exec.php?funcao=pegaOperacoesEpapeis", {}, function(data, status){ + //objeto json com os dados viondos do banco var json = jQuery.parseJSON(data); + //template dos checkbox var templatePapeis = $("#templateInputPapeis").html(); + //template do form de cada operacao var templateOperacoes = $("#templateOperacoes").html(); + //lista todas as operacoes var html = Mustache.to_html( "{{#data}}" + templateOperacoes + "{{/data}}", { @@ -104,6 +105,34 @@ function pegaOperacoes(){ } ); $("#corpo").html(html); + //indice + html = Mustache.to_html( + "{{#data}}" + $("#indiceTpl").html() + "{{/data}}", + {"data":json["operacoes"]} + ); + $("#indice").html(html); + //$("#indice").affix('checkPosition'); + //monta um template para o modal de inclusao de nova operacao + html = Mustache.to_html( + $("#templateOperacoes").html(), + { + "labelCodigo": $trad("codigo",i3GEOadmin.operacoes.dicionario), + "labelDescricao": $trad("descricao",i3GEOadmin.operacoes.dicionario), + "operacao": $trad("operacao",i3GEOadmin.operacoes.dicionario), + "papeisv": $trad("papeisv",i3GEOadmin.operacoes.dicionario), + "codigo": "", + "descricao": "", + "inputPapeis": function(){ + return Mustache.to_html( + "{{#data}}" + $("#templateInputPapeis").html() + "{{/data}}", + { + "data":json["papeis"] + } + ); + } + } + ); + $("#adicionaOperacao .modal-body").html(html); $.material.init(); } ); diff --git a/admin1/usuarios/operacoes/index.php b/admin1/usuarios/operacoes/index.php index efb5d9c..b76783c 100755 --- a/admin1/usuarios/operacoes/index.php +++ b/admin1/usuarios/operacoes/index.php @@ -16,7 +16,7 @@ include "../../head.php";
-
+
- + + +
+ @@ -93,6 +125,8 @@ include "../../head.php"; }); //traducao var t = $("#titulo"); + //complementa dicionario + i3GEOadmin.operacoes.dicionario.adicionar = i3GEOadmin.core.dicionario.adicionar; t.html( Mustache.to_html( t.html(), diff --git a/mapas/index.php b/mapas/index.php index c9f336b..ecdf3aa 100755 --- a/mapas/index.php +++ b/mapas/index.php @@ -34,7 +34,7 @@ include "../init/head.php"; border-radius: 20%; } -.list-group .list-group-separator::before{ +.list-group .list-group-separator::before { width: 100%; } @@ -77,7 +77,8 @@ include "../init/head.php"; height: 78px; width: 170px } -.thumbnail.hidden-xs > a > img { + +.thumbnail.hidden-xs>a>img { height: 67px; width: 160px; } @@ -87,7 +88,8 @@ include "../init/head.php"; height: 43px; width: 85px } -.thumbnail.visible-xs > a > img { + +.thumbnail.visible-xs>a>img { height: 33px; width: 80px; } @@ -149,8 +151,8 @@ include "../init/head.php"; - +