Commit 75db4a98a1934d343c430e353c9f1d8bf13413fb
1 parent
618e96c4
Exists in
master
Inclusão de opção de login no testamapfile
Showing
2 changed files
with
38 additions
and
14 deletions
Show diff stats
admin/js/core.js
... | ... | @@ -1745,7 +1745,7 @@ function core_listaDeLetras(onde,nomeFuncao,semLetras){ |
1745 | 1745 | */ |
1746 | 1746 | var jsfiles = []; |
1747 | 1747 | var cssfiles = []; |
1748 | - if(typeof(i3GEO) !== 'undefined' && i3GEO.locaplic){ | |
1748 | + if(typeof(i3GEO) !== 'undefined' && i3GEO.configura.locaplic){ | |
1749 | 1749 | scriptLocation = ""; |
1750 | 1750 | jsfiles = []; |
1751 | 1751 | // | ... | ... |
testamapfile.php
... | ... | @@ -81,18 +81,21 @@ if ($tipo == "") |
81 | 81 | { |
82 | 82 | echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'; |
83 | 83 | echo '<html><head><META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">'; |
84 | - echo '<link rel="stylesheet" type="text/css" href="admin/html/admin.css">'; | |
85 | - echo '<style>body {COLOR: #2F4632;text-align: justify;font-size: 12px;font-family: Verdana, Arial, Helvetica, sans-serif;}</style>'; | |
86 | - | |
87 | - echo '</head>'; | |
84 | + echo '<script src="classesjs/i3geo.js"></script>'; | |
88 | 85 | echo '<script>'; |
89 | 86 | echo 'function roda(){window.location.href = "?map="+document.getElementById("nomemap").value;}'; |
90 | 87 | echo 'function rodaTabela(){window.location.href = window.location.href+"&tabela";}'; |
88 | + echo 'i3GEO.configura.locaplic = i3GEO.util.protocolo() + "://" + window.location.host + "/i3geo";'; | |
91 | 89 | echo '</script>'; |
92 | - echo '<body><center><div class="bordaSuperior" > </div><div class="mascaraPrincipal" id="divGeral">'; | |
93 | - echo '<form action="testamapfile.php" method="post" id=f >'; | |
94 | - echo 'Nome do arquivo map existente no diretório i3geo/temas. Exemplo para uso manual da URL: testamapfile.php?map=biomashp (utilize "testamapfile.php?map=todos" na URL para testar todos de uma só vez)<br><br>'; | |
95 | - //echo '<br>Mostra apenas a legenda? <input type=radio name=solegenda value=sim />sim <input type=radio name=solegenda value=nao CHECKED /> não<br>'; | |
90 | + echo '<script src="admin/js/core.js"></script>'; | |
91 | + echo '</head>'; | |
92 | + echo '<body class=" yui-skin-sam" style="background: white;"><center>'; | |
93 | + echo '<div class="bordaSuperior" > </div>'; | |
94 | + echo '<div class="mascaraPrincipal" id="divGeral" style=display:none; >'; | |
95 | + echo '<div id=cabecalhoPrincipal></div>'; | |
96 | + echo '<h1 style="background-color: white; color: black;" >Administração do i3geo - teste de mapfiles </h1>'; | |
97 | + echo '<form action="testamapfile.php" method="post" id=f >'; | |
98 | + echo '<br><p>Nome do arquivo map existente no diretório i3geo/temas. Exemplo para uso manual da URL: testamapfile.php?map=biomashp (utilize "testamapfile.php?map=todos" na URL para testar todos de uma só vez)</p>'; | |
96 | 99 | $combo = "<br><select onchange='roda()' id=nomemap ><option value=''>Escolha o arquivo para testar</option>"; |
97 | 100 | foreach ($arqs["arquivos"] as $arq){ |
98 | 101 | $temp = explode(".",$arq); |
... | ... | @@ -101,7 +104,7 @@ if ($tipo == "") |
101 | 104 | } |
102 | 105 | } |
103 | 106 | echo $combo."</select></form><br>"; |
104 | - echo '<br><input type=button value="Testa tabela" onclick="rodaTabela();" />'; | |
107 | + echo '<br><input type=button value="Testa tabela" id="rodatabela" />'; | |
105 | 108 | } |
106 | 109 | if (isset($map) && $map != "") |
107 | 110 | { |
... | ... | @@ -125,9 +128,30 @@ if (isset($map) && $map != "") |
125 | 128 | verifica($map,$solegenda,$tabela); |
126 | 129 | } |
127 | 130 | } |
128 | -echo '</div>'; | |
129 | -echo '<script>if(screen.availWidth > 700){document.getElementById("divGeral").style.width = "700px";}</script>'; | |
130 | -echo '</body></html>'; | |
131 | +?> | |
132 | + | |
133 | +</div> | |
134 | +<div id=logajax style="display: block"></div> | |
135 | +<script> | |
136 | + if(screen.availWidth > 900){ | |
137 | + document.getElementById("divGeral").style.width = "900px"; | |
138 | + }; | |
139 | + cabecalhoGeral("cabecalhoPrincipal","menus","admin/html/"); | |
140 | + inicia = function() { | |
141 | + $i("divGeral").style.display = "block"; | |
142 | + }; | |
143 | + i3GEO.login.recarrega = true; | |
144 | + i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, inicia, "sessao", i3GEO.login.dialogo.abreLogin); | |
145 | + var botao = new YAHOO.widget.Button("rodatabela"); | |
146 | + botao.addClass("abrir150"); | |
147 | + $i("rodatabela-button").onclick = function(){ | |
148 | + rodaTabela(); | |
149 | + }; | |
150 | +</script> | |
151 | +</body> | |
152 | +</html> | |
153 | + | |
154 | +<?php | |
131 | 155 | function verifica($map,$solegenda,$tabela){ |
132 | 156 | global $tipo,$locaplic,$postgis_mapa,$versao,$base,$dir_tmp,$tempo; |
133 | 157 | $mapUrl = $map; |
... | ... | @@ -348,7 +372,7 @@ function verifica($map,$solegenda,$tabela){ |
348 | 372 | $destino = $dir_tmp."/".nomeRandomico().".map"; |
349 | 373 | |
350 | 374 | $mapa->save($destino); |
351 | - //echo $destino;exit; | |
375 | + validaAcessoTemas($destino,true); | |
352 | 376 | |
353 | 377 | //testa a tabela de atributos |
354 | 378 | if(isset($tabela)){ | ... | ... |