diff --git a/admin/head.php b/admin/head.php
index e5efe72..0396ee6 100755
--- a/admin/head.php
+++ b/admin/head.php
@@ -419,7 +419,7 @@ a.collapsed .readLess {
 				</ul>
 				<ul class="nav navbar-nav">
 					<li class="dropdown">
-						<a role="button" onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('<?php echo ONDEI3GEO; ?>','template_mst_bt.html');" href="#topo" data-toggle="modal"
+						<a role="button" onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('<?php echo ONDEI3GEO; ?>');" href="#topo" data-toggle="modal"
 							data-target="#modalLogin">
 							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>
 						</a>
@@ -475,18 +475,8 @@ a.collapsed .readLess {
 			</div>
 		</div>
 	</div>
-	<div id="modalLogin" class="modal fade" tabindex="-1">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				</div>
-				<div class="modal-body" id="i3GEOF_loginusuario"></div>
-			</div>
-		</div>
-	</div>
+    <?php include (dirname(__FILE__) . "/../interface/inc/modallogin.php");?>
+
 	<nav class="navbar-fixed-bottom">
 		<div class="container"></div>
 	</nav>
diff --git a/ferramentas/identifica/template_mst.html b/ferramentas/identifica/template_mst.html
index 96b43af..a0208ad 100755
--- a/ferramentas/identifica/template_mst.html
+++ b/ferramentas/identifica/template_mst.html
@@ -8,9 +8,6 @@
         </div>
         <div id='i3GEO{{namespace}}guias' class="collapse navbar-collapse">
             <ul class="nav navbar-nav ">
-                <li role="presentation"><a id='i3GEO{{namespace}}guia3' title='{{{propriedades}}}' href="javascript:void(0);">
-                        <em><span class="material-icons">settings</span></em>
-                    </a></li>
                 <li role="presentation"><a id='i3GEO{{namespace}}guia4' href="javascript:void(0);">
                         <span class='copyToMemory' style='font-size: 2rem;'></span>
                     </a></li>
diff --git a/ferramentas/loginusuario/dependencias.php b/ferramentas/loginusuario/dependencias.php
index c82754a..05959c4 100755
--- a/ferramentas/loginusuario/dependencias.php
+++ b/ferramentas/loginusuario/dependencias.php
@@ -30,10 +30,7 @@ echo "\n";
  * Inclui o template mustache do HTML usado para criar o conteudo da janela
  */
 echo 'i3GEOF.loginusuario.MUSTACHE = "';
-if(empty($_GET["template"])){
-	$_GET["template"] = "template_mst.html";
-}
-$texto = file_get_contents($_GET["template"]);
+$texto = file_get_contents("template_mst.html");
 $texto = str_replace("\n", "", $texto);
 $texto = str_replace("\r", "", $texto);
 $texto = str_replace("\t", "", $texto);
diff --git a/ferramentas/loginusuario/index.js b/ferramentas/loginusuario/index.js
index e969c06..b11abea 100755
--- a/ferramentas/loginusuario/index.js
+++ b/ferramentas/loginusuario/index.js
@@ -1,40 +1,6 @@
-/*
-Title: Login
-
-Abre di&aacute;logo de login
-
-Arquivo:
-
-i3geo/ferramentas/loginusuario/index.js.php
-
-Licenca:
-
-GPL2
-
-i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet
-
-Direitos Autorais Reservados (c) 2006 Minist&eacute;rio do Meio Ambiente Brasil
-Desenvolvedor: Edmar Moretti edmar.moretti@gmail.com
-
-Este programa &eacute; software livre; voc&ecirc; pode redistribu&iacute;-lo
-e/ou modific&aacute;-lo sob os termos da Licen&ccedil;a P&uacute;blica Geral
-GNU conforme publicada pela Free Software Foundation;
-
-Este programa &eacute; distribu&iacute;do na expectativa de que seja &uacute;til,
-por&eacute;m, SEM NENHUMA GARANTIA; nem mesmo a garantia impl&iacute;cita
-de COMERCIABILIDADE OU ADEQUA&Ccedil;&Atilde;O A UMA FINALIDADE ESPEC&Iacute;FICA.
-Consulte a Licen&ccedil;a P&uacute;blica Geral do GNU para mais detalhes.
-Voc&ecirc; deve ter recebido uma c&oacute;pia da Licen&ccedil;a P&uacute;blica Geral do
-GNU junto com este programa; se n&atilde;o, escreva para a
-Free Software Foundation, Inc., no endere&ccedil;o
-59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
-*/
 if(typeof(i3GEOF) === 'undefined'){
 	var i3GEOF = {};
 }
-/*
-Classe: i3GEOF.loginusuario
-*/
 i3GEOF.loginusuario = {
 	/*
 	Variavel: aguarde
@@ -43,6 +9,9 @@ i3GEOF.loginusuario = {
 	*/
 	aguarde: "",
 	MUSTACHE : "",
+	start: function(){
+	    i3GEOF.loginusuario.iniciaDicionario();
+	},
 	/**
 	 * Susbtitutos para o template
 	 */
@@ -129,44 +98,8 @@ i3GEOF.loginusuario = {
 	Cria a janela flutuante para controle da ferramenta.
 	*/
 	iniciaJanelaFlutuante: function(){
-		var minimiza,cabecalho,janela,divid,titulo;
-		if ($i("i3GEOF_loginusuario")) {
-			//para o caso do uso do bootstrap
-			if(typeof(YAHOO) == "undefined"){
-				i3GEOF.loginusuario.inicia("i3GEOF_loginusuario");
-			}
-			return;
-		}
-		//cria a janela flutuante
-		cabecalho = function(){};
-		minimiza = function(){
-			i3GEO.janela.minimiza("i3GEOF_loginusuario");
-		};
-		titulo = "<span class='i3GeoTituloJanelaBsNolink' >Login</span></div>";
-		janela = i3GEO.janela.cria(
-			"270px",
-			"auto",
-			"",
-			"",
-			"",
-			titulo,
-			"i3GEOF_loginusuario",
-			false,
-			"hd",
-			cabecalho,
-			minimiza,
-			"",
-			false,
-			"",
-			"",
-			"",
-			""
-		);
-		divid = janela[2].id;
-		janela[0].cfg.setProperty("constraintoviewport",false);
-		i3GEOF.loginusuario.aguarde = $i("i3GEOF_loginusuario_imagemCabecalho").style;
-		$i("i3GEOF_loginusuario_corpo").style.backgroundColor = "#F2F2F2";
-		i3GEOF.loginusuario.inicia(divid);
+		i3GEOF.loginusuario.inicia("i3GEOF_loginusuario");
+
 	},
 	/*
 	Function: enviar
diff --git a/ferramentas/loginusuario/template_mst.html b/ferramentas/loginusuario/template_mst.html
index b9f23a9..129b9f9 100755
--- a/ferramentas/loginusuario/template_mst.html
+++ b/ferramentas/loginusuario/template_mst.html
@@ -1,20 +1,35 @@
-<div class='container-fluid'>
-	<h5>{{{ativo}}}: {{{usuarioLogado}}}</h5>
-	<div class='form-group label-fixed condensed'>
-		<label class="control-label" for="">{{{usuario}}}</label>
-		<input class="form-control input-lg" type='text' id='i3geousuario' value='' />
+<!-- O div do tipo modal para abrir o login ja deve existir no html -->
+<div id="i3GEOF_loginusuario_imagemCabecalho" style="visibility: hidden;">
+	<i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
+</div>
+<p class="alert alert-info">{{{cabecalhoForm}}}</p>
+<div class="row">
+	<div class="col-md-12">
+		<form class="form" role="form" method="post" action="#">
+			<div class="form-group">
+				<input tabindex="1" style="text-align: left" type="text" class="form-control" id="i3geousuario" placeholder="{{{usuario}}}" required>
+			</div>
+			<div class="form-group">
+				<input tabindex="2" style="text-align: left" type="password" class="form-control" id="i3geosenha" placeholder="{{{senha}}}" required>
+			</div>
+		</form>
 	</div>
-	<div class='form-group label-fixed condensed'>
-		<label class="control-label" for="">{{{senha}}}</label>
-		<input class="form-control input-lg" type='password' id='i3geosenha' value='' />
+</div>
+<div class="row">
+	<div class="col-md-6 text-center">
+		<button tabindex="4" onclick="i3GEO.login.dialogo.abreLogout()" class="btn btn-primary">Logout</button>
 	</div>
-	<div class="form-group condensed">
-		<button onclick="i3GEOF.loginusuario.enviar()" class='btn btn-primary btn-sm btn-raised'>{{{enviar}}}</button>
-		<button onclick="i3GEO.login.dialogo.abreLogout()" class='btn btn-primary btn-sm btn-raised'>Logout</button>
+	<div class="col-md-6 text-center">
+		<button tabindex="3" onclick="i3GEOF.loginusuario.enviar()" class="btn btn-primary">{{{enviar}}}</button>
 	</div>
-	<div class="form-group condensed">
-		<button onclick="i3GEOF.loginusuario.recuperarSenha()" class='btn btn-primary btn-sm btn-raised'>{{{recuperar}}}</button>
-		<button onclick="i3GEOF.loginusuario.alterarSenha()" class='btn btn-primary btn-sm btn-raised'>{{{alterar}}}</button>
+</div>
+<div class="row">
+	<div class="col-md-6">
+		<p><a href="#" onclick="i3GEOF.loginusuario.recuperarSenha()">{{{recuperar}}}</a></p>
+		<p><a href="#" onclick="i3GEOF.loginusuario.alterarSenha()">{{{alterar}}}</a></p>
+	</div>
+	<div class="col-md-6">
+		<h6 class="text-muted">{{{ativo}}}: {{{usuarioLogado}}}</h6>
+		<h6 class="text-info">{{{tentativas}}}</h6>
 	</div>
-	<h5 class="alert alert-info">{{{tentativas}}}</h5>
 </div>
\ No newline at end of file
diff --git a/ferramentas/loginusuario/template_mst_bt.html b/ferramentas/loginusuario/template_mst_bt.html
deleted file mode 100755
index a696f01..0000000
--- a/ferramentas/loginusuario/template_mst_bt.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="i3GEOF_loginusuario_imagemCabecalho" style="visibility: hidden;">
-	<i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
-</div>
-<p class="alert alert-info">{{{cabecalhoForm}}}</p>
-<div class="row">
-	<div class="col-md-12">
-		<form class="form" role="form" method="post" action="#">
-			<div class="form-group">
-				<input tabindex="1" style="text-align: left" type="text" class="form-control" id="i3geousuario" placeholder="{{{usuario}}}" required>
-			</div>
-			<div class="form-group">
-				<input tabindex="2" style="text-align: left" type="password" class="form-control" id="i3geosenha" placeholder="{{{senha}}}" required>
-			</div>
-		</form>
-	</div>
-</div>
-<div class="row">
-	<div class="col-md-6 text-center">
-		<button tabindex="4" onclick="i3GEO.login.dialogo.abreLogout()" class="btn btn-primary">Logout</button>
-	</div>
-	<div class="col-md-6 text-center">
-		<button tabindex="3" onclick="i3GEOF.loginusuario.enviar()" class="btn btn-primary">{{{enviar}}}</button>
-	</div>
-</div>
-<div class="row">
-	<div class="col-md-6">
-		<p><a href="#" onclick="i3GEOF.loginusuario.recuperarSenha()">{{{recuperar}}}</a></p>
-		<p><a href="#" onclick="i3GEOF.loginusuario.alterarSenha()">{{{alterar}}}</a></p>
-	</div>
-	<div class="col-md-6">
-		<h6 class="text-muted">{{{ativo}}}: {{{usuarioLogado}}}</h6>
-		<h6 class="text-info">{{{tentativas}}}</h6>
-	</div>
-</div>
\ No newline at end of file
diff --git a/init/index.js b/init/index.js
index 62c6552..af98e4c 100755
--- a/init/index.js
+++ b/init/index.js
@@ -100,7 +100,7 @@ botoesIni = [
 	"target": "_self"
 },{
 	"img":"imagens/applications-development-web.png",
-	"href": "../admin",
+	"href": "../admin/index.php",
 	"titulo":$trad(3,g_traducao_init),
 	"subtitulo": $trad("3a",g_traducao_init),
 	"fa": "cogs",
diff --git a/init/index.php b/init/index.php
index 5383717..eeda27a 100755
--- a/init/index.php
+++ b/init/index.php
@@ -85,7 +85,7 @@ include "head.php";
                         <li><a role="button" href="../social/index.php">Social</a></li>
                         <li><a role="button" href="../rss/index.php">RSS</a></li>
                         <li <?php if(isset($i3geoPermiteLogin) && $i3geoPermiteLogin == false) { echo "style=display:none "; }?>><a role="button"
-                                onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../','template_mst_bt.html');" href="#topo" data-toggle="modal" data-target="#modalLogin">
+                                onclick="i3GEO.login.recarrega = true; i3GEO.login.dialogo.abreLogin('../');" href="#topo" data-toggle="modal" data-target="#modalLogin">
                                 Login <i class="material-icons md-18">input</i>
                             </a></li>
                     </ul>
@@ -172,18 +172,8 @@ if (! function_exists("ms_GetVersion")) {
             </div>
         </div>
     </div>
-    <div id="modalLogin" class="modal fade" tabindex="-1">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body" id="i3GEOF_loginusuario"></div>
-            </div>
-        </div>
-    </div>
+    <?php include (dirname(__FILE__) . "/../interface/inc/modallogin.php");?>
+
     <script>
 	//utilizado em ms_configura.php para customizar o local da pasta de inicializacao
 	var customDir = "<?php echo $customDir; ?>";
diff --git a/interface/inc/barraaguarde.php b/interface/inc/barraaguarde.php
index 03e4b26..40a8eeb 100644
--- a/interface/inc/barraaguarde.php
+++ b/interface/inc/barraaguarde.php
@@ -1,6 +1,6 @@
     <!--barra de progresso que e mostrada conforme as camadas sao desenhadas no mapa. Esse elemento deve ter o id="i3GEOprogressoCamadas" -->
-    <div id="i3GEOprogressoCamadas" class="progress" style="display: block; position: absolute; top: 0px; height: 5px; width: 0%; margin: auto;">
-        <div class="progress-bar progress-bar-striped active" role="progressbar" style="width: 100%"></div>
+    <div id="i3GEOprogressoCamadas" class="progress progress-striped" style="display: block; position: absolute; top: 0px; height: 5px; width: 0%; margin: auto;">
+        <div class="progress-bar progress-bar-info" role="progressbar" style="width: 100%"></div>
     </div>
     <!--barra de aguarde id="i3GEObarraAguarde" -->
     <div id="i3GEObarraAguarde" class="progress" style="display: block; position: absolute; top: 0px; height: 5px; width: 0%; margin: auto;">
diff --git a/interface/inc/guiacatalogo.php b/interface/inc/guiacatalogo.php
index 76f15ce..f545960 100644
--- a/interface/inc/guiacatalogo.php
+++ b/interface/inc/guiacatalogo.php
@@ -10,7 +10,7 @@
                 <span style="vertical-align: middle" class="material-icons">playlist_add_check</span>
             </button>
             <ul class="dropdown-menu dropdown-menu-right">
-                <li><a href="javascript:void(0)" onclick="i3GEO.login.dialogo.abreLogin()">
+                <li><a onclick="i3GEO.login.recarrega = false; i3GEO.login.dialogo.abreLogin();" href="javascript:void(0)" data-toggle="modal" data-target="#modalLogin">
                         <span class="glyphicon glyphicon-log-in"></span> Login/Logout
                     </a></li>
                 <li><a href="javascript:void(0)" onclick="i3GEO.arvoreDeTemas.dialogo.conectaservico()">
@@ -46,7 +46,7 @@
     </div>
     <div class="separadorCabecalhoGuias">&nbsp;</div>
 
-    <div class="guiaOverflow" style="height: calc(100% - 45px);width: calc(100% - 12px);">
+    <div class="guiaOverflow" style="height: calc(100% - 45px); width: calc(100% - 12px);">
         <div id="catalogoMigalha" style="display: block;" data-template="templates/catalogoMigalha.html"></div>
         <!-- aqui entra a lista de elementos quando uma das opcoes e clicada -->
         <div id="catalogoNavegacao"></div>
diff --git a/interface/inc/modallogin.php b/interface/inc/modallogin.php
new file mode 100644
index 0000000..712b180
--- /dev/null
+++ b/interface/inc/modallogin.php
@@ -0,0 +1,13 @@
+
+<div id="modalLogin" class="modal fade" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body" id="i3GEOF_loginusuario"></div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/interface/ol.php b/interface/ol.php
index dcf2e24..d9578f4 100644
--- a/interface/ol.php
+++ b/interface/ol.php
@@ -8,23 +8,23 @@ $configInc = array(
     "url" => "inc",
     "nocache" => time()
 );
-include ($configInc["url"]."/meta.php");
+include ($configInc["url"] . "/meta.php");
 ?>
 <title>i3GEO - OpenLayers</title>
 <?php
-include ($configInc["url"]."/js.php");
-include ($configInc["url"]."/css.php");
+include ($configInc["url"] . "/js.php");
+include ($configInc["url"] . "/css.php");
 ?>
 <style>
 .ol-attribution.ol-uncollapsible {
-    height: 2.1em;
-    right: 24px;
-    background: none;
-    margin-bottom: 15px;
+	height: 2.1em;
+	right: 24px;
+	background: none;
+	margin-bottom: 15px;
 }
 
 .foraDoMapa+span>span {
-    background-color: yellow;
+	background-color: yellow;
 }
 </style>
 </head>
@@ -56,13 +56,13 @@ include ($configInc["url"]."/css.php");
         -->
         <div class="iconesGuiaMovel ol-control" data-traduzir="true">
             <?php
-                include ($configInc["url"]."/iconeferramentas.php");
-                include ($configInc["url"]."/iconecamadas.php");
-                include ($configInc["url"]."/iconecatalogo.php");
-                include ($configInc["url"]."/iconelegenda.php");
-                include ($configInc["url"]."/iconebusca.php");
-                include ($configInc["url"]."/iconeinfo.php");
-                include ($configInc["url"]."/iconetutorial.php");
+            include ($configInc["url"] . "/iconeferramentas.php");
+            include ($configInc["url"] . "/iconecamadas.php");
+            include ($configInc["url"] . "/iconecatalogo.php");
+            include ($configInc["url"] . "/iconelegenda.php");
+            include ($configInc["url"] . "/iconebusca.php");
+            include ($configInc["url"] . "/iconeinfo.php");
+            include ($configInc["url"] . "/iconetutorial.php");
             ?>
         </div>
         <!-- veja i3GEO.guias.CONFIGURA -->
@@ -71,15 +71,18 @@ include ($configInc["url"]."/css.php");
         <div id="i3GEOguiaMovelMolde">
             <div id="i3GEOguiaMovelConteudo">
                 <?php
-                    include($configInc["url"]."/guiaferramentas.php");
-                    include($configInc["url"]."/guiacamadas.php");
-                    include($configInc["url"]."/guiacatalogo.php");
-                    include($configInc["url"]."/guialegenda.php");
-                    include($configInc["url"]."/guiabusca.php");
+                include ($configInc["url"] . "/guiaferramentas.php");
+                include ($configInc["url"] . "/guiacamadas.php");
+                include ($configInc["url"] . "/guiacatalogo.php");
+                include ($configInc["url"] . "/guialegenda.php");
+                include ($configInc["url"] . "/guiabusca.php");
                 ?>
             </div>
         </div>
     </div>
+        <?php
+        include ($configInc["url"] . "/modallogin.php");
+        ?>
     <!--  para mostrar o banner de abertura -->
     <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
     <div>
@@ -199,6 +202,9 @@ include ($configInc["url"]."/css.php");
                 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
                 //GM - utiliza o GoogleMaps como motor de controle do mapa
                 mapType : "OL",
+                //mostra ou nao a barra de progresso do carregamento de camadas
+                layerProgressBar: false,
+
                 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
                 saveExtension : false,
                 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
diff --git a/interface/openlayersdebug.php b/interface/openlayersdebug.php
index 837ac34..1f26a77 100644
--- a/interface/openlayersdebug.php
+++ b/interface/openlayersdebug.php
@@ -8,12 +8,12 @@ $configInc = array(
     "url" => "inc",
     "nocache" => time()
 );
-include ($configInc["url"]."/meta.php");
+include ($configInc["url"] . "/meta.php");
 ?>
 <title>i3GEO - OpenLayers</title>
 <?php
-include ($configInc["url"]."/js.php");
-include ($configInc["url"]."/css.php");
+include ($configInc["url"] . "/js.php");
+include ($configInc["url"] . "/css.php");
 ?>
 <style>
 .ol-attribution.ol-uncollapsible {
@@ -56,13 +56,13 @@ include ($configInc["url"]."/css.php");
         -->
         <div class="iconesGuiaMovel ol-control" data-traduzir="true">
             <?php
-                include ($configInc["url"]."/iconeferramentas.php");
-                include ($configInc["url"]."/iconecamadas.php");
-                include ($configInc["url"]."/iconecatalogo.php");
-                include ($configInc["url"]."/iconelegenda.php");
-                include ($configInc["url"]."/iconebusca.php");
-                include ($configInc["url"]."/iconeinfo.php");
-                include ($configInc["url"]."/iconetutorial.php");
+            include ($configInc["url"] . "/iconeferramentas.php");
+            include ($configInc["url"] . "/iconecamadas.php");
+            include ($configInc["url"] . "/iconecatalogo.php");
+            include ($configInc["url"] . "/iconelegenda.php");
+            include ($configInc["url"] . "/iconebusca.php");
+            include ($configInc["url"] . "/iconeinfo.php");
+            include ($configInc["url"] . "/iconetutorial.php");
             ?>
         </div>
         <!-- veja i3GEO.guias.CONFIGURA -->
@@ -71,15 +71,18 @@ include ($configInc["url"]."/css.php");
         <div id="i3GEOguiaMovelMolde">
             <div id="i3GEOguiaMovelConteudo">
                 <?php
-                    include($configInc["url"]."/guiaferramentas.php");
-                    include($configInc["url"]."/guiacamadas.php");
-                    include($configInc["url"]."/guiacatalogo.php");
-                    include($configInc["url"]."/guialegenda.php");
-                    include($configInc["url"]."/guiabusca.php");
+                include ($configInc["url"] . "/guiaferramentas.php");
+                include ($configInc["url"] . "/guiacamadas.php");
+                include ($configInc["url"] . "/guiacatalogo.php");
+                include ($configInc["url"] . "/guialegenda.php");
+                include ($configInc["url"] . "/guiabusca.php");
                 ?>
             </div>
         </div>
     </div>
+        <?php
+        include ($configInc["url"] . "/modallogin.php");
+        ?>
     <!--  para mostrar o banner de abertura -->
     <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
     <div>
@@ -198,6 +201,8 @@ include ($configInc["url"]."/css.php");
                 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
                 //GM - utiliza o GoogleMaps como motor de controle do mapa
                 mapType : "OL",
+                //mostra ou nao a barra de progresso do carregamento de camadas
+                layerProgressBar: false,
                 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
                 saveExtension : false,
                 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
diff --git a/interface/osm.php b/interface/osm.php
index d111145..6f46593 100644
--- a/interface/osm.php
+++ b/interface/osm.php
@@ -3,28 +3,28 @@
 <head>
 <?php
 $configInc = array(
-    "debug" => "naocompacto",
+    "debug" => "",
     "tipo" => "OSM", // OL ou OSM
     "url" => "inc",
     "nocache" => time()
 );
-include ($configInc["url"]."/meta.php");
+include ($configInc["url"] . "/meta.php");
 ?>
 <title>i3GEO - OpenLayers</title>
 <?php
-include ($configInc["url"]."/js.php");
-include ($configInc["url"]."/css.php");
+include ($configInc["url"] . "/js.php");
+include ($configInc["url"] . "/css.php");
 ?>
 <style>
 .ol-attribution.ol-uncollapsible {
-    height: 2.1em;
-    right: 24px;
-    background: none;
-    margin-bottom: 15px;
+	height: 2.1em;
+	right: 24px;
+	background: none;
+	margin-bottom: 15px;
 }
 
 .foraDoMapa+span>span {
-    background-color: yellow;
+	background-color: yellow;
 }
 </style>
 </head>
@@ -56,13 +56,13 @@ include ($configInc["url"]."/css.php");
         -->
         <div class="iconesGuiaMovel ol-control" data-traduzir="true">
             <?php
-                include ($configInc["url"]."/iconeferramentas.php");
-                include ($configInc["url"]."/iconecamadas.php");
-                include ($configInc["url"]."/iconecatalogo.php");
-                include ($configInc["url"]."/iconelegenda.php");
-                include ($configInc["url"]."/iconebusca.php");
-                include ($configInc["url"]."/iconeinfo.php");
-                include ($configInc["url"]."/iconetutorial.php");
+            include ($configInc["url"] . "/iconeferramentas.php");
+            include ($configInc["url"] . "/iconecamadas.php");
+            include ($configInc["url"] . "/iconecatalogo.php");
+            include ($configInc["url"] . "/iconelegenda.php");
+            include ($configInc["url"] . "/iconebusca.php");
+            include ($configInc["url"] . "/iconeinfo.php");
+            include ($configInc["url"] . "/iconetutorial.php");
             ?>
         </div>
         <!-- veja i3GEO.guias.CONFIGURA -->
@@ -71,15 +71,18 @@ include ($configInc["url"]."/css.php");
         <div id="i3GEOguiaMovelMolde">
             <div id="i3GEOguiaMovelConteudo">
                 <?php
-                    include($configInc["url"]."/guiaferramentas.php");
-                    include($configInc["url"]."/guiacamadas.php");
-                    include($configInc["url"]."/guiacatalogo.php");
-                    include($configInc["url"]."/guialegenda.php");
-                    include($configInc["url"]."/guiabusca.php");
+                include ($configInc["url"] . "/guiaferramentas.php");
+                include ($configInc["url"] . "/guiacamadas.php");
+                include ($configInc["url"] . "/guiacatalogo.php");
+                include ($configInc["url"] . "/guialegenda.php");
+                include ($configInc["url"] . "/guiabusca.php");
                 ?>
             </div>
         </div>
     </div>
+    <?php
+    include ($configInc["url"] . "/modallogin.php");
+    ?>
     <!--  para mostrar o banner de abertura -->
     <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
     <div>
@@ -199,6 +202,9 @@ include ($configInc["url"]."/css.php");
                 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
                 //GM - utiliza o GoogleMaps como motor de controle do mapa
                 mapType : "OSM",
+                //mostra ou nao a barra de progresso do carregamento de camadas
+                layerProgressBar: true,
+
                 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
                 saveExtension : false,
                 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
diff --git a/interface/osmdebug.php b/interface/osmdebug.php
index d111145..391b589 100644
--- a/interface/osmdebug.php
+++ b/interface/osmdebug.php
@@ -8,23 +8,23 @@ $configInc = array(
     "url" => "inc",
     "nocache" => time()
 );
-include ($configInc["url"]."/meta.php");
+include ($configInc["url"] . "/meta.php");
 ?>
 <title>i3GEO - OpenLayers</title>
 <?php
-include ($configInc["url"]."/js.php");
-include ($configInc["url"]."/css.php");
+include ($configInc["url"] . "/js.php");
+include ($configInc["url"] . "/css.php");
 ?>
 <style>
 .ol-attribution.ol-uncollapsible {
-    height: 2.1em;
-    right: 24px;
-    background: none;
-    margin-bottom: 15px;
+	height: 2.1em;
+	right: 24px;
+	background: none;
+	margin-bottom: 15px;
 }
 
 .foraDoMapa+span>span {
-    background-color: yellow;
+	background-color: yellow;
 }
 </style>
 </head>
@@ -56,13 +56,13 @@ include ($configInc["url"]."/css.php");
         -->
         <div class="iconesGuiaMovel ol-control" data-traduzir="true">
             <?php
-                include ($configInc["url"]."/iconeferramentas.php");
-                include ($configInc["url"]."/iconecamadas.php");
-                include ($configInc["url"]."/iconecatalogo.php");
-                include ($configInc["url"]."/iconelegenda.php");
-                include ($configInc["url"]."/iconebusca.php");
-                include ($configInc["url"]."/iconeinfo.php");
-                include ($configInc["url"]."/iconetutorial.php");
+            include ($configInc["url"] . "/iconeferramentas.php");
+            include ($configInc["url"] . "/iconecamadas.php");
+            include ($configInc["url"] . "/iconecatalogo.php");
+            include ($configInc["url"] . "/iconelegenda.php");
+            include ($configInc["url"] . "/iconebusca.php");
+            include ($configInc["url"] . "/iconeinfo.php");
+            include ($configInc["url"] . "/iconetutorial.php");
             ?>
         </div>
         <!-- veja i3GEO.guias.CONFIGURA -->
@@ -71,15 +71,18 @@ include ($configInc["url"]."/css.php");
         <div id="i3GEOguiaMovelMolde">
             <div id="i3GEOguiaMovelConteudo">
                 <?php
-                    include($configInc["url"]."/guiaferramentas.php");
-                    include($configInc["url"]."/guiacamadas.php");
-                    include($configInc["url"]."/guiacatalogo.php");
-                    include($configInc["url"]."/guialegenda.php");
-                    include($configInc["url"]."/guiabusca.php");
+                include ($configInc["url"] . "/guiaferramentas.php");
+                include ($configInc["url"] . "/guiacamadas.php");
+                include ($configInc["url"] . "/guiacatalogo.php");
+                include ($configInc["url"] . "/guialegenda.php");
+                include ($configInc["url"] . "/guiabusca.php");
                 ?>
             </div>
         </div>
     </div>
+        <?php
+        include ($configInc["url"] . "/modallogin.php");
+        ?>
     <!--  para mostrar o banner de abertura -->
     <script id="i3GEOlogoMarcaTemplate" type="x-tmpl-mustache">
     <div>
@@ -199,6 +202,9 @@ include ($configInc["url"]."/css.php");
                 //OSM - utiliza o OpenLayers e o OpenStreetMap como fundo, em projecao semelhante ao GoogleMaps
                 //GM - utiliza o GoogleMaps como motor de controle do mapa
                 mapType : "OSM",
+                //mostra ou nao a barra de progresso do carregamento de camadas
+                layerProgressBar: false,
+
                 //armazena em um cookie a ultima extensao geografica do mapa e utiliza essa extensao quando o mapa for aberto
                 saveExtension : false,
                 //aplica um filtro de cores apos a renderizacao da imagem de cada camada que compoe o mapa cinza|sepiaclara|sepianormal
diff --git a/js/ini_i3geo.js b/js/ini_i3geo.js
index 114d644..ad50451 100755
--- a/js/ini_i3geo.js
+++ b/js/ini_i3geo.js
@@ -322,6 +322,7 @@ var i3GEO = {
 	//
 	configMapa : function(c){
 	    i3GEO.configura.guardaExtensao = (c.hasOwnProperty("saveExtension") && c.saveExtension == true) ? true:false;
+	    i3GEO.Interface.LAYERPROGRESSBAR = (c.hasOwnProperty("layerProgressBar") && c.layerProgressBar == true) ? true:false;
 	    //TODO implementar composite para versao 7 do Mapserver
 	    i3GEO.configura.tipoimagem = (c.hasOwnProperty("posRenderType") && c.posRenderType != "") ? c.posRenderType:"nenhum";
 
diff --git a/js/interface.js b/js/interface.js
index 85d2034..0ebcbd5 100755
--- a/js/interface.js
+++ b/js/interface.js
@@ -57,6 +57,7 @@ var i3geoOL;
 
 i3GEO.Interface =
 {
+	LAYERPROGRESSBAR: true,
 	//restringe a inclusao de attribution apenas aos LAYERS adicionados manualmente
 	//e nao aos que possuem o link para a fonte definido no mapfile
 	RESTRICTATT : true,
@@ -1355,7 +1356,7 @@ i3GEO.Interface =
 				opcoes.source = source;
 				opcoes.isBaseLayer = false;
 				opcoes.visible = true;
-				if ($i("i3GEOprogressoCamadas")) {
+				if (i3GEO.Interface.LAYERPROGRESSBAR == true && $i("i3GEOprogressoCamadas")) {
 				    source.on('tileloadstart', function(event) {
 					i3GEO.Interface.openlayers.loadStartLayer(source.get("name"));
 				    });
diff --git a/js/janela.js b/js/janela.js
index bddf638..c4f0c0b 100755
--- a/js/janela.js
+++ b/js/janela.js
@@ -588,10 +588,10 @@ i3GEO.janela =
 	 */
 	abreAguarde : function() {
 	    var p = $i("i3GEObarraAguarde");
+	    i3GEO.janela.CONTADORAGUARDE.push(" ");
 	    if(p){
-		p.style.width = "100%";
+		p.style.width = (i3GEO.janela.CONTADORAGUARDE.length * 15) + "%";
 	    }
-	    i3GEO.janela.CONTADORAGUARDE.push(" ");
 	},
 	/**
 	 * Function: fechaAguarde
@@ -604,11 +604,9 @@ i3GEO.janela =
 	 */
 	fechaAguarde : function() {
 	    var p = $i("i3GEObarraAguarde");
+	    i3GEO.janela.CONTADORAGUARDE.pop();
 	    if (p){
-		if (i3GEO.janela.CONTADORAGUARDE.length == 1) {
-		    p.style.width = "0px";
-		}
-		i3GEO.janela.CONTADORAGUARDE.pop();
+		p.style.width = (i3GEO.janela.CONTADORAGUARDE.length * 15) + "%";
 	    }
 	},
 	//http://fezvrasta.github.io/snackbarjs/
diff --git a/js/login.js b/js/login.js
index eb6e013..2128a5e 100755
--- a/js/login.js
+++ b/js/login.js
@@ -204,40 +204,6 @@ i3GEO.login = {
 				+ operacao);
 	},
 	/**
-	 * Adiciona os itens no objeto menu suspenso no processo de nicializacao do
-	 * i3geo
-	 *
-	 * @param objeto
-	 *            com os parametros ja existentes no menu
-	 * @return objeto com os parametros complementados
-	 */
-	adicionaMenuSuspenso : function(obj) {
-		obj.menu.push({
-			nome : "Admin/Login",
-			id : "i3GeoAdmin"
-		});
-		obj.submenus.i3GeoAdmin = [];
-		obj.submenus.i3GeoAdmin.push(
-			{
-				id : "omenudataAdminu1",
-				text : "Login",
-				url : "javascript:i3GEO.login.dialogo.abreLogin()"
-			},
-			{
-				id : "omenudataAdminu2",
-				text : "Logout",
-				url : "javascript:i3GEO.login.dialogo.abreLogout()"
-			},
-			{
-				id : "omenudataAdmin5",
-				text : $trad("x88"),
-				url : "javascript:i3GEO.mapa.dialogo.preferencias()"
-			}
-
-		);
-		return obj;
-	},
-	/**
 	 * Section: i3GEO.login.dialogo
 	 *
 	 * Abre as telas de di&aacute;logo com o usu&aacute;rio
@@ -258,23 +224,20 @@ i3GEO.login = {
 		 *
 		 * Abre a tela de login
 		 */
-		abreLogin : function(locaplic,template) {
+		abreLogin : function(locaplic) {
 			var js;
-			if (!template || template == "") {
-				template = "template_mst.html";
-			}
 			if (!locaplic || locaplic == "") {
 				locaplic = i3GEO.configura.locaplic;
 			}
 			if (typeof (i3GEOF.loginusuario) === 'undefined') {
 				js = locaplic
-					+ "/ferramentas/loginusuario/dependencias.php?template=" + template;
+					+ "/ferramentas/loginusuario/dependencias.php";
 				i3GEO.util.scriptTag(
 					js,
-					"i3GEOF.loginusuario.criaJanelaFlutuante()",
+					"i3GEOF.loginusuario.start()",
 					"i3GEOF.loginusuario_script()");
 			} else {
-				i3GEOF.loginusuario.criaJanelaFlutuante();
+				i3GEOF.loginusuario.start();
 			}
 		},
 		/**
diff --git a/js/marcador.js b/js/marcador.js
index a790a1f..8b84cd6 100755
--- a/js/marcador.js
+++ b/js/marcador.js
@@ -171,21 +171,6 @@ i3GEO.marcador =
 			}
 		},
 		/**
-		 * Adiciona os itens no objeto menu suspenso no processo de nicializacao do i3geo
-		 *
-		 * @param objeto
-		 *            com os parametros ja existentes no menu
-		 * @return objeto com os parametros complementados
-		 */
-		adicionaMenuSuspenso : function(obj) {
-			obj.menu.push({
-				nome : $trad("x79"),
-				id : "i3GeoMenuMarcador"
-			});
-			obj.submenus.i3GeoMenuMarcador = i3GEO.marcador.itensMenu();
-			return obj;
-		},
-		/**
 		 * Itens para o menu suspenso
 		 */
 		itensMenu : function() {
--
libgit2 0.21.2