Download as
Browse Code »

Commit 479a23e038b6d1e83db26f0a2575a646011223bc

Authored by Edmar Moretti
1 parent 8c1c3c1e
Exists in master and in 6 other branches composer, doc-root, guia, licenca, readme, unmaintened

Inclusão da variável de configuração i3GEO.Interface.LAYERPROGRESSBAR

Showing 20 changed files with 170 additions and 298 deletions   Show diff stats
admin/head.php
  Diff comments   View file @479a23e
... ... @@ -419,7 +419,7 @@ a.collapsed .readLess {
419 419 </ul>
420 420 <ul class="nav navbar-nav">
421 421 <li class="dropdown">
422   - <a role="button" onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('<?php echo ONDEI3GEO; ?>','template_mst_bt.html');" href="#topo" data-toggle="modal"
  422 + <a role="button" onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('<?php echo ONDEI3GEO; ?>');" href="#topo" data-toggle="modal"
423 423 data-target="#modalLogin">
424 424 Login <i id="loginOff" style="display: none;" class="material-icons md-18">lock</i><i id="loginOn" style="display: none;" class="material-icons md-18">lock_open</i>
425 425 </a>
... ... @@ -475,18 +475,8 @@ a.collapsed .readLess {
475 475 </div>
476 476 </div>
477 477 </div>
478   - <div id="modalLogin" class="modal fade" tabindex="-1">
479   - <div class="modal-dialog">
480   - <div class="modal-content">
481   - <div class="modal-header">
482   - <button type="button" class="close" data-dismiss="modal" aria-label="Close">
483   - <span aria-hidden="true">&times;</span>
484   - </button>
485   - </div>
486   - <div class="modal-body" id="i3GEOF_loginusuario"></div>
487   - </div>
488   - </div>
489   - </div>
  478 + <?php include (dirname(__FILE__) . "/../interface/inc/modallogin.php");?>
  479 +
490 480 <nav class="navbar-fixed-bottom">
491 481 <div class="container"></div>
492 482 </nav>
... ...
ferramentas/identifica/template_mst.html
  Diff comments   View file @479a23e
... ... @@ -8,9 +8,6 @@
8 8 </div>
9 9 <div id='i3GEO{{namespace}}guias' class="collapse navbar-collapse">
10 10 <ul class="nav navbar-nav ">
11   - <li role="presentation"><a id='i3GEO{{namespace}}guia3' title='{{{propriedades}}}' href="javascript:void(0);">
12   - <em><span class="material-icons">settings</span></em>
13   - </a></li>
14 11 <li role="presentation"><a id='i3GEO{{namespace}}guia4' href="javascript:void(0);">
15 12 <span class='copyToMemory' style='font-size: 2rem;'></span>
16 13 </a></li>
... ...
ferramentas/loginusuario/dependencias.php
  Diff comments   View file @479a23e
... ... @@ -30,10 +30,7 @@ echo &quot;\n&quot;;
30 30 * Inclui o template mustache do HTML usado para criar o conteudo da janela
31 31 */
32 32 echo 'i3GEOF.loginusuario.MUSTACHE = "';
33   -if(empty($_GET["template"])){
34   - $_GET["template"] = "template_mst.html";
35   -}
36   -$texto = file_get_contents($_GET["template"]);
  33 +$texto = file_get_contents("template_mst.html");
37 34 $texto = str_replace("\n", "", $texto);
38 35 $texto = str_replace("\r", "", $texto);
39 36 $texto = str_replace("\t", "", $texto);
... ...
ferramentas/loginusuario/index.js
  Diff comments   View file @479a23e
1   -/*
2   -Title: Login
3   -
4   -Abre di&aacute;logo de login
5   -
6   -Arquivo:
7   -
8   -i3geo/ferramentas/loginusuario/index.js.php
9   -
10   -Licenca:
11   -
12   -GPL2
13   -
14   -i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
15   -
16   -Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
17   -Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com
18   -
19   -Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
20   -e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
21   -GNU conforme publicada pela Free Software Foundation;
22   -
23   -Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
24   -por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
25   -de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
26   -Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
27   -Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
28   -GNU junto com este programa; se n&atilde;o, escreva para a
29   -Free Software Foundation, Inc., no endere&ccedil;o
30   -59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
31   -*/
32 1 if(typeof(i3GEOF) === 'undefined'){
33 2 var i3GEOF = {};
34 3 }
35   -/*
36   -Classe: i3GEOF.loginusuario
37   -*/
38 4 i3GEOF.loginusuario = {
39 5 /*
40 6 Variavel: aguarde
... ... @@ -43,6 +9,9 @@ i3GEOF.loginusuario = {
43 9 */
44 10 aguarde: "",
45 11 MUSTACHE : "",
  12 + start: function(){
  13 + i3GEOF.loginusuario.iniciaDicionario();
  14 + },
46 15 /**
47 16 * Susbtitutos para o template
48 17 */
... ... @@ -129,44 +98,8 @@ i3GEOF.loginusuario = {
129 98 Cria a janela flutuante para controle da ferramenta.
130 99 */
131 100 iniciaJanelaFlutuante: function(){
132   - var minimiza,cabecalho,janela,divid,titulo;
133   - if ($i("i3GEOF_loginusuario")) {
134   - //para o caso do uso do bootstrap
135   - if(typeof(YAHOO) == "undefined"){
136   - i3GEOF.loginusuario.inicia("i3GEOF_loginusuario");
137   - }
138   - return;
139   - }
140   - //cria a janela flutuante
141   - cabecalho = function(){};
142   - minimiza = function(){
143   - i3GEO.janela.minimiza("i3GEOF_loginusuario");
144   - };
145   - titulo = "<span class='i3GeoTituloJanelaBsNolink' >Login</span></div>";
146   - janela = i3GEO.janela.cria(
147   - "270px",
148   - "auto",
149   - "",
150   - "",
151   - "",
152   - titulo,
153   - "i3GEOF_loginusuario",
154   - false,
155   - "hd",
156   - cabecalho,
157   - minimiza,
158   - "",
159   - false,
160   - "",
161   - "",
162   - "",
163   - ""
164   - );
165   - divid = janela[2].id;
166   - janela[0].cfg.setProperty("constraintoviewport",false);
167   - i3GEOF.loginusuario.aguarde = $i("i3GEOF_loginusuario_imagemCabecalho").style;
168   - $i("i3GEOF_loginusuario_corpo").style.backgroundColor = "#F2F2F2";
169   - i3GEOF.loginusuario.inicia(divid);
  101 + i3GEOF.loginusuario.inicia("i3GEOF_loginusuario");
  102 +
170 103 },
171 104 /*
172 105 Function: enviar
... ...
ferramentas/loginusuario/template_mst.html
  Diff comments   View file @479a23e
1   -<div class='container-fluid'>
2   - <h5>{{{ativo}}}: {{{usuarioLogado}}}</h5>
3   - <div class='form-group label-fixed condensed'>
4   - <label class="control-label" for="">{{{usuario}}}</label>
5   - <input class="form-control input-lg" type='text' id='i3geousuario' value='' />
  1 +<!-- O div do tipo modal para abrir o login ja deve existir no html -->
  2 +<div id="i3GEOF_loginusuario_imagemCabecalho" style="visibility: hidden;">
  3 + <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
  4 +</div>
  5 +<p class="alert alert-info">{{{cabecalhoForm}}}</p>
  6 +<div class="row">
  7 + <div class="col-md-12">
  8 + <form class="form" role="form" method="post" action="#">
  9 + <div class="form-group">
  10 + <input tabindex="1" style="text-align: left" type="text" class="form-control" id="i3geousuario" placeholder="{{{usuario}}}" required>
  11 + </div>
  12 + <div class="form-group">
  13 + <input tabindex="2" style="text-align: left" type="password" class="form-control" id="i3geosenha" placeholder="{{{senha}}}" required>
  14 + </div>
  15 + </form>
6 16 </div>
7   - <div class='form-group label-fixed condensed'>
8   - <label class="control-label" for="">{{{senha}}}</label>
9   - <input class="form-control input-lg" type='password' id='i3geosenha' value='' />
  17 +</div>
  18 +<div class="row">
  19 + <div class="col-md-6 text-center">
  20 + <button tabindex="4" onclick="i3GEO.login.dialogo.abreLogout()" class="btn btn-primary">Logout</button>
10 21 </div>
11   - <div class="form-group condensed">
12   - <button onclick="i3GEOF.loginusuario.enviar()" class='btn btn-primary btn-sm btn-raised'>{{{enviar}}}</button>
13   - <button onclick="i3GEO.login.dialogo.abreLogout()" class='btn btn-primary btn-sm btn-raised'>Logout</button>
  22 + <div class="col-md-6 text-center">
  23 + <button tabindex="3" onclick="i3GEOF.loginusuario.enviar()" class="btn btn-primary">{{{enviar}}}</button>
14 24 </div>
15   - <div class="form-group condensed">
16   - <button onclick="i3GEOF.loginusuario.recuperarSenha()" class='btn btn-primary btn-sm btn-raised'>{{{recuperar}}}</button>
17   - <button onclick="i3GEOF.loginusuario.alterarSenha()" class='btn btn-primary btn-sm btn-raised'>{{{alterar}}}</button>
  25 +</div>
  26 +<div class="row">
  27 + <div class="col-md-6">
  28 + <p><a href="#" onclick="i3GEOF.loginusuario.recuperarSenha()">{{{recuperar}}}</a></p>
  29 + <p><a href="#" onclick="i3GEOF.loginusuario.alterarSenha()">{{{alterar}}}</a></p>
  30 + </div>
  31 + <div class="col-md-6">
  32 + <h6 class="text-muted">{{{ativo}}}: {{{usuarioLogado}}}</h6>
  33 + <h6 class="text-info">{{{tentativas}}}</h6>
18 34 </div>
19   - <h5 class="alert alert-info">{{{tentativas}}}</h5>
20 35 </div>
21 36 \ No newline at end of file
... ...
ferramentas/loginusuario/template_mst_bt.html
View file @8c1c3c1
... ... @@ -1,34 +0,0 @@
1   -<div id="i3GEOF_loginusuario_imagemCabecalho" style="visibility: hidden;">
2   - <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
3   -</div>
4   -<p class="alert alert-info">{{{cabecalhoForm}}}</p>
5   -<div class="row">
6   - <div class="col-md-12">
7   - <form class="form" role="form" method="post" action="#">
8   - <div class="form-group">
9   - <input tabindex="1" style="text-align: left" type="text" class="form-control" id="i3geousuario" placeholder="{{{usuario}}}" required>
10   - </div>
11   - <div class="form-group">
12   - <input tabindex="2" style="text-align: left" type="password" class="form-control" id="i3geosenha" placeholder="{{{senha}}}" required>
13   - </div>
14   - </form>
15   - </div>
16   -</div>
17   -<div class="row">
18   - <div class="col-md-6 text-center">
19   - <button tabindex="4" onclick="i3GEO.login.dialogo.abreLogout()" class="btn btn-primary">Logout</button>
20   - </div>
21   - <div class="col-md-6 text-center">
22   - <button tabindex="3" onclick="i3GEOF.loginusuario.enviar()" class="btn btn-primary">{{{enviar}}}</button>
23   - </div>
24   -</div>
25   -<div class="row">
26   - <div class="col-md-6">
27   - <p><a href="#" onclick="i3GEOF.loginusuario.recuperarSenha()">{{{recuperar}}}</a></p>
28   - <p><a href="#" onclick="i3GEOF.loginusuario.alterarSenha()">{{{alterar}}}</a></p>
29   - </div>
30   - <div class="col-md-6">
31   - <h6 class="text-muted">{{{ativo}}}: {{{usuarioLogado}}}</h6>
32   - <h6 class="text-info">{{{tentativas}}}</h6>
33   - </div>
34   -</div>
35 0 \ No newline at end of file
init/index.js
  Diff comments   View file @479a23e
... ... @@ -100,7 +100,7 @@ botoesIni = [
100 100 "target": "_self"
101 101 },{
102 102 "img":"imagens/applications-development-web.png",
103   - "href": "../admin",
  103 + "href": "../admin/index.php",
104 104 "titulo":$trad(3,g_traducao_init),
105 105 "subtitulo": $trad("3a",g_traducao_init),
106 106 "fa": "cogs",
... ...
init/index.php
  Diff comments   View file @479a23e
... ... @@ -85,7 +85,7 @@ include &quot;head.php&quot;;
85 85 <li><a role="button" href="../social/index.php">Social</a></li>
86 86 <li><a role="button" href="../rss/index.php">RSS</a></li>
87 87 <li <?php if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false) { echo "style=display:none "; }?>><a role="button"
88   - onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../','template_mst_bt.html');" href="#topo" data-toggle="modal" data-target="#modalLogin">
  88 + onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../');" href="#topo" data-toggle="modal" data-target="#modalLogin">
89 89 Login <i class="material-icons md-18">input</i>
90 90 </a></li>
91 91 </ul>
... ... @@ -172,18 +172,8 @@ if (! function_exists(&quot;ms_GetVersion&quot;)) {
172 172 </div>
173 173 </div>
174 174 </div>
175   - <div id="modalLogin" class="modal fade" tabindex="-1">
176   - <div class="modal-dialog">
177   - <div class="modal-content">
178   - <div class="modal-header">
179   - <button type="button" class="close" data-dismiss="modal" aria-label="Close">
180   - <span aria-hidden="true">&times;</span>
181   - </button>
182   - </div>
183   - <div class="modal-body" id="i3GEOF_loginusuario"></div>
184   - </div>
185   - </div>
186   - </div>
  175 + <?php include (dirname(__FILE__) . "/../interface/inc/modallogin.php");?>
  176 +
187 177 <script>
188 178 //utilizado em ms_configura.php para customizar o local da pasta de inicializacao
189 179 var customDir = "<?php echo $customDir; ?>";
... ...
interface/inc/barraaguarde.php
  Diff comments   View file @479a23e
1 1 <!--barra de progresso que e mostrada conforme as camadas sao desenhadas no mapa. Esse elemento deve ter o id="i3GEOprogressoCamadas" -->
2   - <div id="i3GEOprogressoCamadas" class="progress" style="display: block; position: absolute; top: 0px; height: 5px; width: 0%; margin: auto;">
3   - <div class="progress-bar progress-bar-striped active" role="progressbar" style="width: 100%"></div>
  2 + <div id="i3GEOprogressoCamadas" class="progress progress-striped" style="display: block; position: absolute; top: 0px; height: 5px; width: 0%; margin: auto;">
  3 + <div class="progress-bar progress-bar-info" role="progressbar" style="width: 100%"></div>
4 4 </div>
5 5 <!--barra de aguarde id="i3GEObarraAguarde" -->
6 6 <div id="i3GEObarraAguarde" class="progress" style="display: block; position: absolute; top: 0px; height: 5px; width: 0%; margin: auto;">
... ...
interface/inc/guiacatalogo.php
  Diff comments   View file @479a23e
... ... @@ -10,7 +10,7 @@
10 10 <span style="vertical-align: middle" class="material-icons">playlist_add_check</span>
11 11 </button>
12 12 <ul class="dropdown-menu dropdown-menu-right">
13   - <li><a href="javascript:void(0)" onclick="i3GEO.login.dialogo.abreLogin()">
  13 + <li><a onclick="i3GEO.login.recarrega = false; i3GEO.login.dialogo.abreLogin();" href="javascript:void(0)" data-toggle="modal" data-target="#modalLogin">
14 14 <span class="glyphicon glyphicon-log-in"></span> Login/Logout
15 15 </a></li>
16 16 <li><a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.conectaservico()">
... ... @@ -46,7 +46,7 @@
46 46 </div>
47 47 <div class="separadorCabecalhoGuias">&nbsp;</div>
48 48  
49   - <div class="guiaOverflow" style="height: calc(100% - 45px);width: calc(100% - 12px);">
  49 + <div class="guiaOverflow" style="height: calc(100% - 45px); width: calc(100% - 12px);">
50 50 <div id="catalogoMigalha" style="display: block;" data-template="templates/catalogoMigalha.html"></div>
51 51 <!-- aqui entra a lista de elementos quando uma das opcoes e clicada -->
52 52 <div id="catalogoNavegacao"></div>
... ...
interface/inc/modallogin.php 0 → 100644
  Diff comments   View file @479a23e
... ... @@ -0,0 +1,13 @@
  1 +
  2 +<div id="modalLogin" class="modal fade" tabindex="-1">
  3 + <div class="modal-dialog">
  4 + <div class="modal-content">
  5 + <div class="modal-header">
  6 + <button type="button" class="close" data-dismiss="modal" aria-label="Close">
  7 + <span aria-hidden="true">&times;</span>
  8 + </button>
  9 + </div>
  10 + <div class="modal-body" id="i3GEOF_loginusuario"></div>
  11 + </div>
  12 + </div>
  13 +</div>
0 14 \ No newline at end of file
... ...
interface/ol.php
  Diff comments   View file @479a23e
... ... @@ -8,23 +8,23 @@ $configInc = array(
8 8 "url" => "inc",
9 9 "nocache" => time()
10 10 );
11   -include ($configInc["url"]."/meta.php");
  11 +include ($configInc["url"] . "/meta.php");
12 12 ?>
13 13 <title>i3GEO - OpenLayers</title>
14 14 <?php
15   -include ($configInc["url"]."/js.php");
16   -include ($configInc["url"]."/css.php");
  15 +include ($configInc["url"] . "/js.php");
  16 +include ($configInc["url"] . "/css.php");
17 17 ?>
18 18 <style>
19 19 .ol-attribution.ol-uncollapsible {
20   - height: 2.1em;
21   - right: 24px;
22   - background: none;
23   - margin-bottom: 15px;
  20 + height: 2.1em;
  21 + right: 24px;
  22 + background: none;
  23 + margin-bottom: 15px;
24 24 }
25 25  
26 26 .foraDoMapa+span>span {
27   - background-color: yellow;
  27 + background-color: yellow;
28 28 }
29 29 </style>
30 30 </head>
... ... @@ -56,13 +56,13 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
56 56 -->
57 57 <div class="iconesGuiaMovel ol-control" data-traduzir="true">
58 58 <?php
59   - include ($configInc["url"]."/iconeferramentas.php");
60   - include ($configInc["url"]."/iconecamadas.php");
61   - include ($configInc["url"]."/iconecatalogo.php");
62   - include ($configInc["url"]."/iconelegenda.php");
63   - include ($configInc["url"]."/iconebusca.php");
64   - include ($configInc["url"]."/iconeinfo.php");
65   - include ($configInc["url"]."/iconetutorial.php");
  59 + include ($configInc["url"] . "/iconeferramentas.php");
  60 + include ($configInc["url"] . "/iconecamadas.php");
  61 + include ($configInc["url"] . "/iconecatalogo.php");
  62 + include ($configInc["url"] . "/iconelegenda.php");
  63 + include ($configInc["url"] . "/iconebusca.php");
  64 + include ($configInc["url"] . "/iconeinfo.php");
  65 + include ($configInc["url"] . "/iconetutorial.php");
66 66 ?>
67 67 </div>
68 68 <!-- veja i3GEO.guias.CONFIGURA -->
... ... @@ -71,15 +71,18 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
71 71 <div id="i3GEOguiaMovelMolde">
72 72 <div id="i3GEOguiaMovelConteudo">
73 73 <?php
74   - include($configInc["url"]."/guiaferramentas.php");
75   - include($configInc["url"]."/guiacamadas.php");
76   - include($configInc["url"]."/guiacatalogo.php");
77   - include($configInc["url"]."/guialegenda.php");
78   - include($configInc["url"]."/guiabusca.php");
  74 + include ($configInc["url"] . "/guiaferramentas.php");
  75 + include ($configInc["url"] . "/guiacamadas.php");
  76 + include ($configInc["url"] . "/guiacatalogo.php");
  77 + include ($configInc["url"] . "/guialegenda.php");
  78 + include ($configInc["url"] . "/guiabusca.php");
79 79 ?>
80 80 </div>
81 81 </div>
82 82 </div>
  83 + <?php
  84 + include ($configInc["url"] . "/modallogin.php");
  85 + ?>
83 86 <!-- para mostrar o banner de abertura -->
84 87 <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
85 88 <div>
... ... @@ -199,6 +202,9 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
199 202 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
200 203 //GM - utiliza o GoogleMaps como motor de controle do mapa
201 204 mapType : "OL",
  205 + //mostra ou nao a barra de progresso do carregamento de camadas
  206 + layerProgressBar: false,
  207 +
202 208 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
203 209 saveExtension : false,
204 210 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
... ...
interface/openlayersdebug.php
  Diff comments   View file @479a23e
... ... @@ -8,12 +8,12 @@ $configInc = array(
8 8 "url" => "inc",
9 9 "nocache" => time()
10 10 );
11   -include ($configInc["url"]."/meta.php");
  11 +include ($configInc["url"] . "/meta.php");
12 12 ?>
13 13 <title>i3GEO - OpenLayers</title>
14 14 <?php
15   -include ($configInc["url"]."/js.php");
16   -include ($configInc["url"]."/css.php");
  15 +include ($configInc["url"] . "/js.php");
  16 +include ($configInc["url"] . "/css.php");
17 17 ?>
18 18 <style>
19 19 .ol-attribution.ol-uncollapsible {
... ... @@ -56,13 +56,13 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
56 56 -->
57 57 <div class="iconesGuiaMovel ol-control" data-traduzir="true">
58 58 <?php
59   - include ($configInc["url"]."/iconeferramentas.php");
60   - include ($configInc["url"]."/iconecamadas.php");
61   - include ($configInc["url"]."/iconecatalogo.php");
62   - include ($configInc["url"]."/iconelegenda.php");
63   - include ($configInc["url"]."/iconebusca.php");
64   - include ($configInc["url"]."/iconeinfo.php");
65   - include ($configInc["url"]."/iconetutorial.php");
  59 + include ($configInc["url"] . "/iconeferramentas.php");
  60 + include ($configInc["url"] . "/iconecamadas.php");
  61 + include ($configInc["url"] . "/iconecatalogo.php");
  62 + include ($configInc["url"] . "/iconelegenda.php");
  63 + include ($configInc["url"] . "/iconebusca.php");
  64 + include ($configInc["url"] . "/iconeinfo.php");
  65 + include ($configInc["url"] . "/iconetutorial.php");
66 66 ?>
67 67 </div>
68 68 <!-- veja i3GEO.guias.CONFIGURA -->
... ... @@ -71,15 +71,18 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
71 71 <div id="i3GEOguiaMovelMolde">
72 72 <div id="i3GEOguiaMovelConteudo">
73 73 <?php
74   - include($configInc["url"]."/guiaferramentas.php");
75   - include($configInc["url"]."/guiacamadas.php");
76   - include($configInc["url"]."/guiacatalogo.php");
77   - include($configInc["url"]."/guialegenda.php");
78   - include($configInc["url"]."/guiabusca.php");
  74 + include ($configInc["url"] . "/guiaferramentas.php");
  75 + include ($configInc["url"] . "/guiacamadas.php");
  76 + include ($configInc["url"] . "/guiacatalogo.php");
  77 + include ($configInc["url"] . "/guialegenda.php");
  78 + include ($configInc["url"] . "/guiabusca.php");
79 79 ?>
80 80 </div>
81 81 </div>
82 82 </div>
  83 + <?php
  84 + include ($configInc["url"] . "/modallogin.php");
  85 + ?>
83 86 <!-- para mostrar o banner de abertura -->
84 87 <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
85 88 <div>
... ... @@ -198,6 +201,8 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
198 201 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
199 202 //GM - utiliza o GoogleMaps como motor de controle do mapa
200 203 mapType : "OL",
  204 + //mostra ou nao a barra de progresso do carregamento de camadas
  205 + layerProgressBar: false,
201 206 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
202 207 saveExtension : false,
203 208 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
... ...
interface/osm.php
  Diff comments   View file @479a23e
... ... @@ -3,28 +3,28 @@
3 3 <head>
4 4 <?php
5 5 $configInc = array(
6   - "debug" => "naocompacto",
  6 + "debug" => "",
7 7 "tipo" => "OSM", // OL ou OSM
8 8 "url" => "inc",
9 9 "nocache" => time()
10 10 );
11   -include ($configInc["url"]."/meta.php");
  11 +include ($configInc["url"] . "/meta.php");
12 12 ?>
13 13 <title>i3GEO - OpenLayers</title>
14 14 <?php
15   -include ($configInc["url"]."/js.php");
16   -include ($configInc["url"]."/css.php");
  15 +include ($configInc["url"] . "/js.php");
  16 +include ($configInc["url"] . "/css.php");
17 17 ?>
18 18 <style>
19 19 .ol-attribution.ol-uncollapsible {
20   - height: 2.1em;
21   - right: 24px;
22   - background: none;
23   - margin-bottom: 15px;
  20 + height: 2.1em;
  21 + right: 24px;
  22 + background: none;
  23 + margin-bottom: 15px;
24 24 }
25 25  
26 26 .foraDoMapa+span>span {
27   - background-color: yellow;
  27 + background-color: yellow;
28 28 }
29 29 </style>
30 30 </head>
... ... @@ -56,13 +56,13 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
56 56 -->
57 57 <div class="iconesGuiaMovel ol-control" data-traduzir="true">
58 58 <?php
59   - include ($configInc["url"]."/iconeferramentas.php");
60   - include ($configInc["url"]."/iconecamadas.php");
61   - include ($configInc["url"]."/iconecatalogo.php");
62   - include ($configInc["url"]."/iconelegenda.php");
63   - include ($configInc["url"]."/iconebusca.php");
64   - include ($configInc["url"]."/iconeinfo.php");
65   - include ($configInc["url"]."/iconetutorial.php");
  59 + include ($configInc["url"] . "/iconeferramentas.php");
  60 + include ($configInc["url"] . "/iconecamadas.php");
  61 + include ($configInc["url"] . "/iconecatalogo.php");
  62 + include ($configInc["url"] . "/iconelegenda.php");
  63 + include ($configInc["url"] . "/iconebusca.php");
  64 + include ($configInc["url"] . "/iconeinfo.php");
  65 + include ($configInc["url"] . "/iconetutorial.php");
66 66 ?>
67 67 </div>
68 68 <!-- veja i3GEO.guias.CONFIGURA -->
... ... @@ -71,15 +71,18 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
71 71 <div id="i3GEOguiaMovelMolde">
72 72 <div id="i3GEOguiaMovelConteudo">
73 73 <?php
74   - include($configInc["url"]."/guiaferramentas.php");
75   - include($configInc["url"]."/guiacamadas.php");
76   - include($configInc["url"]."/guiacatalogo.php");
77   - include($configInc["url"]."/guialegenda.php");
78   - include($configInc["url"]."/guiabusca.php");
  74 + include ($configInc["url"] . "/guiaferramentas.php");
  75 + include ($configInc["url"] . "/guiacamadas.php");
  76 + include ($configInc["url"] . "/guiacatalogo.php");
  77 + include ($configInc["url"] . "/guialegenda.php");
  78 + include ($configInc["url"] . "/guiabusca.php");
79 79 ?>
80 80 </div>
81 81 </div>
82 82 </div>
  83 + <?php
  84 + include ($configInc["url"] . "/modallogin.php");
  85 + ?>
83 86 <!-- para mostrar o banner de abertura -->
84 87 <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
85 88 <div>
... ... @@ -199,6 +202,9 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
199 202 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
200 203 //GM - utiliza o GoogleMaps como motor de controle do mapa
201 204 mapType : "OSM",
  205 + //mostra ou nao a barra de progresso do carregamento de camadas
  206 + layerProgressBar: true,
  207 +
202 208 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
203 209 saveExtension : false,
204 210 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
... ...
interface/osmdebug.php
  Diff comments   View file @479a23e
... ... @@ -8,23 +8,23 @@ $configInc = array(
8 8 "url" => "inc",
9 9 "nocache" => time()
10 10 );
11   -include ($configInc["url"]."/meta.php");
  11 +include ($configInc["url"] . "/meta.php");
12 12 ?>
13 13 <title>i3GEO - OpenLayers</title>
14 14 <?php
15   -include ($configInc["url"]."/js.php");
16   -include ($configInc["url"]."/css.php");
  15 +include ($configInc["url"] . "/js.php");
  16 +include ($configInc["url"] . "/css.php");
17 17 ?>
18 18 <style>
19 19 .ol-attribution.ol-uncollapsible {
20   - height: 2.1em;
21   - right: 24px;
22   - background: none;
23   - margin-bottom: 15px;
  20 + height: 2.1em;
  21 + right: 24px;
  22 + background: none;
  23 + margin-bottom: 15px;
24 24 }
25 25  
26 26 .foraDoMapa+span>span {
27   - background-color: yellow;
  27 + background-color: yellow;
28 28 }
29 29 </style>
30 30 </head>
... ... @@ -56,13 +56,13 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
56 56 -->
57 57 <div class="iconesGuiaMovel ol-control" data-traduzir="true">
58 58 <?php
59   - include ($configInc["url"]."/iconeferramentas.php");
60   - include ($configInc["url"]."/iconecamadas.php");
61   - include ($configInc["url"]."/iconecatalogo.php");
62   - include ($configInc["url"]."/iconelegenda.php");
63   - include ($configInc["url"]."/iconebusca.php");
64   - include ($configInc["url"]."/iconeinfo.php");
65   - include ($configInc["url"]."/iconetutorial.php");
  59 + include ($configInc["url"] . "/iconeferramentas.php");
  60 + include ($configInc["url"] . "/iconecamadas.php");
  61 + include ($configInc["url"] . "/iconecatalogo.php");
  62 + include ($configInc["url"] . "/iconelegenda.php");
  63 + include ($configInc["url"] . "/iconebusca.php");
  64 + include ($configInc["url"] . "/iconeinfo.php");
  65 + include ($configInc["url"] . "/iconetutorial.php");
66 66 ?>
67 67 </div>
68 68 <!-- veja i3GEO.guias.CONFIGURA -->
... ... @@ -71,15 +71,18 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
71 71 <div id="i3GEOguiaMovelMolde">
72 72 <div id="i3GEOguiaMovelConteudo">
73 73 <?php
74   - include($configInc["url"]."/guiaferramentas.php");
75   - include($configInc["url"]."/guiacamadas.php");
76   - include($configInc["url"]."/guiacatalogo.php");
77   - include($configInc["url"]."/guialegenda.php");
78   - include($configInc["url"]."/guiabusca.php");
  74 + include ($configInc["url"] . "/guiaferramentas.php");
  75 + include ($configInc["url"] . "/guiacamadas.php");
  76 + include ($configInc["url"] . "/guiacatalogo.php");
  77 + include ($configInc["url"] . "/guialegenda.php");
  78 + include ($configInc["url"] . "/guiabusca.php");
79 79 ?>
80 80 </div>
81 81 </div>
82 82 </div>
  83 + <?php
  84 + include ($configInc["url"] . "/modallogin.php");
  85 + ?>
83 86 <!-- para mostrar o banner de abertura -->
84 87 <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
85 88 <div>
... ... @@ -199,6 +202,9 @@ include ($configInc[&quot;url&quot;].&quot;/css.php&quot;);
199 202 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
200 203 //GM - utiliza o GoogleMaps como motor de controle do mapa
201 204 mapType : "OSM",
  205 + //mostra ou nao a barra de progresso do carregamento de camadas
  206 + layerProgressBar: false,
  207 +
202 208 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
203 209 saveExtension : false,
204 210 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
... ...
js/ini_i3geo.js
  Diff comments   View file @479a23e
... ... @@ -322,6 +322,7 @@ var i3GEO = {
322 322 //
323 323 configMapa : function(c){
324 324 i3GEO.configura.guardaExtensao = (c.hasOwnProperty("saveExtension") && c.saveExtension == true) ? true:false;
  325 + i3GEO.Interface.LAYERPROGRESSBAR = (c.hasOwnProperty("layerProgressBar") && c.layerProgressBar == true) ? true:false;
325 326 //TODO implementar composite para versao 7 do Mapserver
326 327 i3GEO.configura.tipoimagem = (c.hasOwnProperty("posRenderType") && c.posRenderType != "") ? c.posRenderType:"nenhum";
327 328  
... ...
js/interface.js
  Diff comments   View file @479a23e
... ... @@ -57,6 +57,7 @@ var i3geoOL;
57 57  
58 58 i3GEO.Interface =
59 59 {
  60 + LAYERPROGRESSBAR: true,
60 61 //restringe a inclusao de attribution apenas aos LAYERS adicionados manualmente
61 62 //e nao aos que possuem o link para a fonte definido no mapfile
62 63 RESTRICTATT : true,
... ... @@ -1355,7 +1356,7 @@ i3GEO.Interface =
1355 1356 opcoes.source = source;
1356 1357 opcoes.isBaseLayer = false;
1357 1358 opcoes.visible = true;
1358   - if ($i("i3GEOprogressoCamadas")) {
  1359 + if (i3GEO.Interface.LAYERPROGRESSBAR == true && $i("i3GEOprogressoCamadas")) {
1359 1360 source.on('tileloadstart', function(event) {
1360 1361 i3GEO.Interface.openlayers.loadStartLayer(source.get("name"));
1361 1362 });
... ...
js/janela.js
  Diff comments   View file @479a23e
... ... @@ -588,10 +588,10 @@ i3GEO.janela =
588 588 */
589 589 abreAguarde : function() {
590 590 var p = $i("i3GEObarraAguarde");
  591 + i3GEO.janela.CONTADORAGUARDE.push(" ");
591 592 if(p){
592   - p.style.width = "100%";
  593 + p.style.width = (i3GEO.janela.CONTADORAGUARDE.length * 15) + "%";
593 594 }
594   - i3GEO.janela.CONTADORAGUARDE.push(" ");
595 595 },
596 596 /**
597 597 * Function: fechaAguarde
... ... @@ -604,11 +604,9 @@ i3GEO.janela =
604 604 */
605 605 fechaAguarde : function() {
606 606 var p = $i("i3GEObarraAguarde");
  607 + i3GEO.janela.CONTADORAGUARDE.pop();
607 608 if (p){
608   - if (i3GEO.janela.CONTADORAGUARDE.length == 1) {
609   - p.style.width = "0px";
610   - }
611   - i3GEO.janela.CONTADORAGUARDE.pop();
  609 + p.style.width = (i3GEO.janela.CONTADORAGUARDE.length * 15) + "%";
612 610 }
613 611 },
614 612 //http://fezvrasta.github.io/snackbarjs/
... ...
js/login.js
  Diff comments   View file @479a23e
... ... @@ -204,40 +204,6 @@ i3GEO.login = {
204 204 + operacao);
205 205 },
206 206 /**
207   - * Adiciona os itens no objeto menu suspenso no processo de nicializacao do
208   - * i3geo
209   - *
210   - * @param objeto
211   - * com os parametros ja existentes no menu
212   - * @return objeto com os parametros complementados
213   - */
214   - adicionaMenuSuspenso : function(obj) {
215   - obj.menu.push({
216   - nome : "Admin/Login",
217   - id : "i3GeoAdmin"
218   - });
219   - obj.submenus.i3GeoAdmin = [];
220   - obj.submenus.i3GeoAdmin.push(
221   - {
222   - id : "omenudataAdminu1",
223   - text : "Login",
224   - url : "javascript:i3GEO.login.dialogo.abreLogin()"
225   - },
226   - {
227   - id : "omenudataAdminu2",
228   - text : "Logout",
229   - url : "javascript:i3GEO.login.dialogo.abreLogout()"
230   - },
231   - {
232   - id : "omenudataAdmin5",
233   - text : $trad("x88"),
234   - url : "javascript:i3GEO.mapa.dialogo.preferencias()"
235   - }
236   -
237   - );
238   - return obj;
239   - },
240   - /**
241 207 * Section: i3GEO.login.dialogo
242 208 *
243 209 * Abre as telas de di&aacute;logo com o usu&aacute;rio
... ... @@ -258,23 +224,20 @@ i3GEO.login = {
258 224 *
259 225 * Abre a tela de login
260 226 */
261   - abreLogin : function(locaplic,template) {
  227 + abreLogin : function(locaplic) {
262 228 var js;
263   - if (!template || template == "") {
264   - template = "template_mst.html";
265   - }
266 229 if (!locaplic || locaplic == "") {
267 230 locaplic = i3GEO.configura.locaplic;
268 231 }
269 232 if (typeof (i3GEOF.loginusuario) === 'undefined') {
270 233 js = locaplic
271   - + "/ferramentas/loginusuario/dependencias.php?template=" + template;
  234 + + "/ferramentas/loginusuario/dependencias.php";
272 235 i3GEO.util.scriptTag(
273 236 js,
274   - "i3GEOF.loginusuario.criaJanelaFlutuante()",
  237 + "i3GEOF.loginusuario.start()",
275 238 "i3GEOF.loginusuario_script()");
276 239 } else {
277   - i3GEOF.loginusuario.criaJanelaFlutuante();
  240 + i3GEOF.loginusuario.start();
278 241 }
279 242 },
280 243 /**
... ...
js/marcador.js
  Diff comments   View file @479a23e
... ... @@ -171,21 +171,6 @@ i3GEO.marcador =
171 171 }
172 172 },
173 173 /**
174   - * Adiciona os itens no objeto menu suspenso no processo de nicializacao do i3geo
175   - *
176   - * @param objeto
177   - * com os parametros ja existentes no menu
178   - * @return objeto com os parametros complementados
179   - */
180   - adicionaMenuSuspenso : function(obj) {
181   - obj.menu.push({
182   - nome : $trad("x79"),
183   - id : "i3GeoMenuMarcador"
184   - });
185   - obj.submenus.i3GeoMenuMarcador = i3GEO.marcador.itensMenu();
186   - return obj;
187   - },
188   - /**
189 174 * Itens para o menu suspenso
190 175 */
191 176 itensMenu : function() {
... ...