From e40fe0847b1a1e1bece069aad52dd70a420e29af Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Sat, 12 Nov 2016 10:20:55 -0200
Subject: [PATCH] Padronização do código e da interface da opção de listagem de mapas, conforme o modelo adotado no sistema de administração

---
 admin1/cadastros/identifica/index.php | 17 -----------------
 mapas/dicionario.js                   | 20 ++++++++++++++++++++
 mapas/index.js                        |  8 ++++++--
 mapas/index.php                       | 57 +++++++++++++++++++--------------------------------------
 mapas/templates/templatelinks.php     | 14 ++++++++++++++
 mapas/templates/templatelista.php     | 27 +++++++++++++++++++++++++++
 6 files changed, 86 insertions(+), 57 deletions(-)
 create mode 100644 mapas/templates/templatelinks.php
 create mode 100644 mapas/templates/templatelista.php

diff --git a/admin1/cadastros/identifica/index.php b/admin1/cadastros/identifica/index.php
index a13c162..c74ceda 100755
--- a/admin1/cadastros/identifica/index.php
+++ b/admin1/cadastros/identifica/index.php
@@ -19,12 +19,6 @@ include "../../head.php";
 	<div class="row center-block">
 		<div class="col-md-12" id="titulo">
 			<div class="well hidden" >
-				<!--
-				<button data-toggle="modal" data-target="#ajudaPrincipal"
-					class="btn btn-primary btn-fab btn-fab-mini pull-right">
-					<i class="material-icons">help</i>
-				</button>
-				-->
 				<button data-toggle="modal" data-target="#modalFiltro"
 					class="btn btn-primary btn-fab btn-fab-mini pull-right">
 					<i class="material-icons">search</i>
@@ -32,17 +26,6 @@ include "../../head.php";
 				<h2><small>{{{txtTitulo}}}</small></h2>
 				<blockquote>{{{txtDesc}}}</blockquote>
 				<div class="clearfix"></div>
-				<!--Modal ajuda
-				<div id="ajudaPrincipal" class="modal fade" tabindex="-1">
-					<div class="modal-dialog">
-						<div class="modal-content">
-							<div class="modal-body">
-								<p>{{{txtIdentifica}}}</p>
-							</div>
-						</div>
-					</div>
-				</div>
-				-->
 			</div>
 			<div class="well hidden">
 				<div class="panel-heading">
diff --git a/mapas/dicionario.js b/mapas/dicionario.js
index 194d93c..a60b2c2 100755
--- a/mapas/dicionario.js
+++ b/mapas/dicionario.js
@@ -10,5 +10,25 @@ g_traducao_mapas =
 			pt : "Copiado",
 			en : "",
 			es : ""
+		}],
+		"outrosLinks" : [{
+			pt : "outros links",
+			en : "",
+			es : ""
+		}],
+		"linkDefault" : [{
+			pt : "abre o mapa",
+			en : "",
+			es : ""
+		}],
+		"tituloModal" : [{
+			pt : "O mapa pode ser aberto com diferentes interfaces, escolha abaixo",
+			en : "",
+			es : ""
+		}],
+		"txtDesc" : [{
+			pt : "Lista de mapas que foram elaborados previamente. Os mapas podem ser abertos com diferentes interfaces ou como foram salvos originalmente. Utilize os links principais de cada um para abrir ou a op&ccedil;&atilde;o de links adicionais.",
+			en : "",
+			es : ""
 		}]
 };
diff --git a/mapas/index.js b/mapas/index.js
index d20d78f..53803ab 100755
--- a/mapas/index.js
+++ b/mapas/index.js
@@ -10,9 +10,12 @@ function mostraBotoesBT(){
 		}
 		html = Mustache.to_html(
 				"{{#mapas}}" + $("#templateLista").html() + "{{/mapas}}",
-				d
+				$.extend(
+						{},
+						i3GEO.idioma.objetoIdioma(g_traducao_mapas),
+						d
+				)
 		);
-
 		$("#corpo").html(html);
 		d.mapas.push({
 			"ID_MAPA": "topo",
@@ -32,6 +35,7 @@ function mostraBotoesBT(){
 	//cpJSON vem de classe_php.js
 	cpJSON.call("../classesphp/mapa_controle.php?map_file=&funcao=pegaMapas&g_sid=", "foo", r);
 }
+//define os links adicionais conforme o tipo de mapa
 function verificaMapa(mapa){
 	var link, nome, combo, links = [], html;
 	//imagem dinamica ou nao
diff --git a/mapas/index.php b/mapas/index.php
index 070c649..57fb650 100755
--- a/mapas/index.php
+++ b/mapas/index.php
@@ -91,19 +91,7 @@ include "../init/head.php";
 	width: 80px;
 }
 </style>
-<script id="templateLinks" type="x-tmpl-mustache">
-<div class="list-group">
-	<div class="row-content" >
-		<h4 class="list-group-item-heading">
-			{{{nome}}}
-		</h4>
-		<p class="list-group-item-text hidden-xs hidden-sm">
-			<a href="{{{link}}}" target="_blank">{{{link}}}</a>
-		</p>
-	</div>
-	<div class="list-group-separator"></div>
-</div>
-</script>
+
 <body style="padding-top: 55px; position: relative;" >
 	<nav class="navbar navbar-default navbar-fixed-top">
 		<div class="container-fluid">
@@ -131,6 +119,13 @@ include "../init/head.php";
 	<div class="container">
 		<div class="row center-block">
 			<div class="col-md-12">
+				<div class="well hidden escondido" >
+					<blockquote id="titulo"></blockquote>
+				</div>
+			</div>
+		</div>
+		<div class="row center-block">
+			<div class="col-md-12">
 				<div class="well" id="corpo">
 					<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i> <span class="sr-only">Loading...</span>
 				</div>
@@ -149,30 +144,10 @@ include "../init/head.php";
 			</div>
 		</div>
 	</div>
-<script id="templateLista" type="x-tmpl-mustache">
-<div class="list-group-item" >
-	<div class="row-content" >
-		<h4 class="list-group-item-heading">
-			<span class="pull-right">&nbsp;&nbsp;</span>
-			<a onclick="mostraLinks('detalhe_{{ID_MAPA}}')" href="javascript:void(0)" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
-				<i class="material-icons md-18">more_horiz</i>
-			</a>
-			<span class="pull-right">&nbsp;&nbsp;</span>
-			<a title="default" href="{{{LINK}}}" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
-				<i class="material-icons md-18">launch</i>
-			</a>
-			<span class="pull-right">&nbsp;&nbsp;</span>
-			<a title="link" role="button" href="javascript:void(0)" data-toggle="quadroQrcode" data-url="{{{LINK}}}" class="btn btn-danger btn-fab btn-fab-mini pull-right">
-				<span class="glyphicon glyphicon-qrcode" aria-hidden="true"></span>
-			</a>
-			<a href="{{{LINK}}}"><img class="img-rounded" src="{{{IMAGEM}}}" />&nbsp;{{{NOME}}}</a>
-		</h4>
-	</div>
-	<div class="list-group-separator"></div>
-</div>
-<!-- dados para o modal -->
-<div style="display:none" id="detalhe_{{ID_MAPA}}">{{{subtitulo}}}</div>
-</script>
+	<?php
+	include("templates/templatelinks.php");
+	include("templates/templatelista.php");
+	?>
 	<script src='../pacotes/cpaint/cpaint2_compacto.inc.js'></script>
 	<script src='../classesjs/compactados/dicionario_compacto.js'></script>
 	<script src='../classesjs/compactados/classe_util_compacto.js'></script>
@@ -185,7 +160,13 @@ include "../init/head.php";
 	<script>
 	$(document).ready(function(){
 		i3GEO.configura = {"locaplic" : window.location.href.split("/mapas")[0],"sid": ""};
-		$(".active").html($trad("mapas",g_traducao_mapas));
+		//traducoes de alguns elementos individualmente
+		$(".active").html(
+			$trad("mapas",g_traducao_mapas)
+		);
+		$("#titulo").html(
+			$trad("txtDesc",g_traducao_mapas)
+		);
 		mostraBotoesBT();
 		$('.escondido').removeClass('hidden');
 		$.material.init();
diff --git a/mapas/templates/templatelinks.php b/mapas/templates/templatelinks.php
new file mode 100644
index 0000000..810f3c0
--- /dev/null
+++ b/mapas/templates/templatelinks.php
@@ -0,0 +1,14 @@
+<script id="templateLinks" type="x-tmpl-mustache">
+<div class="list-group">
+	<div class="list-group-separator"></div>
+	<div class="row-content" >
+		<h4 class="list-group-item-heading">
+			{{{nome}}}
+		</h4>
+		<p class="list-group-item-text hidden-xs hidden-sm">
+			<a href="{{{link}}}" target="_blank">{{{link}}}</a>
+		</p>
+	</div>
+	<div class="list-group-separator"></div>
+</div>
+</script>
\ No newline at end of file
diff --git a/mapas/templates/templatelista.php b/mapas/templates/templatelista.php
new file mode 100644
index 0000000..27a5e74
--- /dev/null
+++ b/mapas/templates/templatelista.php
@@ -0,0 +1,27 @@
+<script id="templateLista" type="x-tmpl-mustache">
+<div class="list-group-item" >
+	<div class="row-content" >
+		<h4 class="list-group-item-heading">
+			<span class="pull-right">&nbsp;&nbsp;</span>
+			<a title="{{{outrosLinks}}}" onclick="mostraLinks('detalhe_{{ID_MAPA}}')" href="javascript:void(0)" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
+				<i class="material-icons md-18">more_horiz</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+			<a title="{{{linkDefault}}}" href="{{{LINK}}}" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
+				<i class="material-icons md-18">launch</i>
+			</a>
+			<span class="pull-right">&nbsp;&nbsp;</span>
+			<a title="link" role="button" href="javascript:void(0)" data-toggle="quadroQrcode" data-url="{{{LINK}}}" class="btn btn-danger btn-fab btn-fab-mini pull-right">
+				<span class="glyphicon glyphicon-qrcode" aria-hidden="true"></span>
+			</a>
+			<a href="{{{LINK}}}"><img class="img-rounded" src="{{{IMAGEM}}}" />&nbsp;{{{NOME}}}</a>
+		</h4>
+	</div>
+	<div class="list-group-separator"></div>
+</div>
+<!-- dados para o modal -->
+<div style="display:none" id="detalhe_{{ID_MAPA}}">
+<h4>{{{tituloModal}}}</h4>
+{{{subtitulo}}}
+</div>
+</script>
\ No newline at end of file
--
libgit2 0.21.2