From 4e36b58aa2701c3750a9c4b747a9194f2df0a1ef Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Thu, 17 Aug 2017 20:26:37 -0300
Subject: [PATCH] Aplicação do padrão de título de janela na ferramenta de navegação GoogleMaps

---
 ferramentas/storymap/index.js          | 29 +++++++++++++++++------------
 ferramentas/storymap/template_mst.html | 19 ++++++++++++-------
 ferramentas/tme/index.js               |  2 +-
 ferramentas/tme/templateLista_mst.html | 30 +++++++++++-------------------
 ferramentas/tme/template_mst.html      |  3 +--
 js/janela.js                           |  2 +-
 js/navega.js                           | 16 +++++++++++++---
 7 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/ferramentas/storymap/index.js b/ferramentas/storymap/index.js
index 5527b76..f6f75ec 100755
--- a/ferramentas/storymap/index.js
+++ b/ferramentas/storymap/index.js
@@ -123,19 +123,24 @@ i3GEOF.storymap =
 			}
 			$i(iddiv).innerHTML = i3GEOF.storymap.html();
 			if (!$i("i3GEOFstoComboCabecaSel")) {
-				i3GEO.janela.comboCabecalhoTemasBs("i3GEOFstoComboCabeca", "i3GEOFstoComboCabecaSel", "storymap", "ligadosComTabela",function(evt){
-					var botao = evt.target;
-					if (botao) {
-						if (botao.value != "") {
-							i3GEO.mapa.ativaTema(botao.value);
-							i3GEOF.storymap.tema = botao.value;
-							$i(iddiv).innerHTML = "";
-							i3GEOF.storymap.inicia(iddiv);
-						} else {
-							$i(iddiv).innerHTML = "";
+				i3GEO.janela.comboCabecalhoTemasBs(
+					"i3GEOFstoComboCabeca",
+					"i3GEOFstoComboCabecaSel",
+					"storymap",
+					"ligadosComTabela",
+					function(evt){
+						var botao = evt.target;
+						if (botao) {
+							if (botao.value != "") {
+								i3GEO.mapa.ativaTema(botao.value);
+								i3GEOF.storymap.tema = botao.value;
+								$i(iddiv).innerHTML = "";
+								i3GEOF.storymap.inicia(iddiv);
+							} else {
+								$i(iddiv).innerHTML = "";
+							}
 						}
-					}
-				});
+					});
 			}
 			if (i3GEO.login.verificaCookieLogin() === true && i3GEO.parametros.editor === "sim") {
 				$(".i3GEOstorymap").find(".hidden").removeClass("hidden");
diff --git a/ferramentas/storymap/template_mst.html b/ferramentas/storymap/template_mst.html
index 989da81..e05fc7f 100755
--- a/ferramentas/storymap/template_mst.html
+++ b/ferramentas/storymap/template_mst.html
@@ -1,5 +1,10 @@
 <div class='container-fluid i3GEOstorymap'>
-	<div  id='i3GEOFstoComboCabeca' class='form-group condensed' style='width:100%'></div>
+
+	<div id='i3GEOFstoComboCabeca' class='form-group condensed' style='width: 100%'>
+		<span class="material-icons iconeComboTemas">playlist_add_check</span>
+	</div>
+
+	<div id='i3GEOFstoComboCabeca' class='form-group condensed' style='width: 100%'></div>
 
 	<div class='form-group label-fixed condensed'>
 		<label class="control-label" for="i3GEOStocabecalho">{{{cabecalho}}}</label>
@@ -12,37 +17,37 @@
 	<div class='form-group label-fixed condensed'>
 		<label class="control-label" for="i3GEOstocolcabecalho">{{{colcabecalho}}}</label>
 		<div style="width: 100%;" class="input-group">
-		<div id='i3GEOstocolcabecalho'></div>
+			<div id='i3GEOstocolcabecalho'></div>
 		</div>
 	</div>
 	<div class='form-group label-fixed condensed'>
 		<label class="control-label" for="i3GEOstocoltexto">{{{coltexto}}}</label>
 		<div style="width: 100%;" class="input-group">
-		<div id='i3GEOstocoltexto'></div>
+			<div id='i3GEOstocoltexto'></div>
 		</div>
 	</div>
 	<div class='form-group label-fixed condensed'>
 		<label class="control-label" for="i3GEOstocollocal">{{{collocal}}}</label>
 		<div style="width: 100%;" class="input-group">
-		<div id='i3GEOstocollocal'></div>
+			<div id='i3GEOstocollocal'></div>
 		</div>
 	</div>
 	<div class='form-group label-fixed condensed'>
 		<label class="control-label" for="i3GEOstocolmedia">{{{colmedia}}}</label>
 		<div style="width: 100%;" class="input-group">
-		<div id='i3GEOstocolmedia'></div>
+			<div id='i3GEOstocolmedia'></div>
 		</div>
 	</div>
 	<div class='form-group label-fixed condensed'>
 		<label class="control-label" for="i3GEOstocollon">{{{collon}}}</label>
 		<div style="width: 100%;" class="input-group">
-		<div id='i3GEOstocollon'></div>
+			<div id='i3GEOstocollon'></div>
 		</div>
 	</div>
 	<div class='form-group label-fixed condensed'>
 		<label class="control-label" for="i3GEOstocollat">{{{collat}}}</label>
 		<div style="width: 100%;" class="input-group">
-		<div id='i3GEOstocollat'></div>
+			<div id='i3GEOstocollat'></div>
 		</div>
 	</div>
 
diff --git a/ferramentas/tme/index.js b/ferramentas/tme/index.js
index 990d57a..1abc7ae 100755
--- a/ferramentas/tme/index.js
+++ b/ferramentas/tme/index.js
@@ -462,7 +462,7 @@ i3GEOF.tme =
 								+ url
 								+ "</a>";
 
-						$i("i3GEOTMEresultado").innerHTML = ins;
+						$("#i3GEOTMEresultado").removeClass("hidden").html(ins);
 						$i("i3GEOTMEresultado").scrollIntoView(true);
 
 					};
diff --git a/ferramentas/tme/templateLista_mst.html b/ferramentas/tme/templateLista_mst.html
index f9b6425..d65aec3 100755
--- a/ferramentas/tme/templateLista_mst.html
+++ b/ferramentas/tme/templateLista_mst.html
@@ -1,19 +1,11 @@
-<table class=lista8>
-	<tr>
-	</tr>
-	{{#linhas}}
-	<tr>
-		<td>
-			<div class="checkbox condensed">
-				<label>
-					<input name="{{{item}}}" type=checkbox id="i3GEOtme{{{item}}}" />
-					<span class="checkbox-material noprint">
-						<span class="check"></span>
-					</span>
-				</label>
-			</div>
-		</td>
-		<td>{{{item}}}</td>
-	</tr>
-	{{/linhas}}
-</table>
\ No newline at end of file
+ {{#linhas}}
+<div class="checkbox condensed">
+	<label>
+		<input name="{{{item}}}" type=checkbox id="i3GEOtme{{{item}}}" />
+		<span class="checkbox-material noprint">
+			<span class="check"></span>
+		</span>
+		{{{item}}}
+	</label>
+</div>
+{{/linhas}}
diff --git a/ferramentas/tme/template_mst.html b/ferramentas/tme/template_mst.html
index e5db4ad..49fa30e 100755
--- a/ferramentas/tme/template_mst.html
+++ b/ferramentas/tme/template_mst.html
@@ -2,8 +2,7 @@
 	<div  id='i3GEOFtmeComboCabeca' class='form-group condensed' style='width:100%'>
 	<span class="material-icons iconeComboTemas">playlist_add_check</span>
 	</div>
-
-	<div class="alert alert-info" id='i3GEOTMEresultado'></div>
+	<div class="alert alert-info hidden" id='i3GEOTMEresultado'></div>
 	<div class="hidden" id='parametrosComLogin'>
 		<div class="checkbox text-left">
 			<label>
diff --git a/js/janela.js b/js/janela.js
index 9656c63..c35e08d 100755
--- a/js/janela.js
+++ b/js/janela.js
@@ -214,7 +214,7 @@ i3GEO.janela =
 			}
 			ins += '</div><div id="' + id + '_corpo" class="bd ' + classeAdicional + '" style="display:block;padding:0px">';
 			if (wsrc !== "") {
-				ins += '<iframe name="' + id + 'i" id="' + id + 'i" valign="top" style="border:0px white solid;width:100%"></iframe>';
+				ins += '<div class="container-fluid"><iframe name="' + id + 'i" id="' + id + 'i" valign="top" style="border:0px white solid;width:100%"></iframe></div>';
 			}
 			ins += '</div>';
 			if(idajuda){
diff --git a/js/navega.js b/js/navega.js
index edd0853..f2458f5 100755
--- a/js/navega.js
+++ b/js/navega.js
@@ -990,9 +990,19 @@ i3GEO.navega =
 						+ "/ferramentas/googlemaps1/index.php",
 						"",
 						"",
-						"</div><a class=i3GeoTituloJanelaBs target=_blank href='"
-						+ i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=7&idajuda=68' >Google maps</a>",
-						idgoogle
+						"<span class='i3GeoTituloJanelaBsNolink' >Google maps</span></div>",
+						idgoogle,
+						false,
+						"hd",
+						"",
+						"",
+						"",
+						false,
+						"",
+						"",
+						"",
+						"",
+						"68"
 				);
 
 				temp = function() {
--
libgit2 0.21.2