From 86509020b7d126e73d91e3c5374669000e919bc0 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 3 May 2016 19:02:56 -0300
Subject: [PATCH] Inclusão do qrcode na página principal

---
 init/index.js   | 11 ++++++++++-
 init/nindex.php | 39 ++++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/init/index.js b/init/index.js
index 8c08a7c..8ce760d 100755
--- a/init/index.js
+++ b/init/index.js
@@ -212,7 +212,16 @@ function mostraBotoesBT(men){
 	$("#menuTpl").html(html);
 	//
 	$i("mensagemLogin").innerHTML = men;
-	$i("jumbotron").innerHTML = "<img src='../imagens/i3Geo_bigTransp.png' style='float:left;width:80px;margin:5px;' /><p>"+$trad(35,g_traducao_init)+"</p>";
+	//$i("jumbotron").innerHTML = "<img src='../imagens/i3Geo_bigTransp.png' style='float:left;width:80px;margin:5px;' /><p>"+$trad(35,g_traducao_init)+"</p>";
+	html = Mustache.to_html(
+		$("#jumbotron").html(),
+		{
+			"jumbotron" : $trad(35,g_traducao_init),
+			"host" : location.host,
+			"href" : location.href
+		}
+	);
+	$("#jumbotron").html(html);
 	i3GEO.configura = {"locaplic" : ".."};
 	i3GEO.idioma.IDSELETOR = "bandeiras";
 	i3GEO.idioma.mostraSeletor();
diff --git a/init/nindex.php b/init/nindex.php
index 91aa968..faf24dd 100755
--- a/init/nindex.php
+++ b/init/nindex.php
@@ -123,18 +123,27 @@ define ( "ONDEI3GEO", ".." );
 			</div>
 		</div>
 	</nav>
-	<div class="container-fluid">
+	<div class="container-fluid hidden">
 		<div class="row">
 			<div class="col-sm-12" id="mensagemLogin"></div>
 			<div class="col-sm-12">
-				<div class="jumbotron" id="jumbotron"></div>
+				<div class="jumbotron" id="jumbotron">
+					<!-- Template pare mensagem do i3Geo -->
+					<ul class="list-inline">
+						<li>
+							<img class="pull-left" src='../imagens/i3Geo_bigTransp.png' style='width:80px;margin:5px;' />
+							<img class="pull-right" src='../pacotes/qrcode/php/qr_img.php?host={{{host}}}&d={{{href}}}' style='width:80px;margin:5px;' />
+							<p>{{{jumbotron}}}</p>
+						</li>
+					</ul>
+				</div>
 			</div>
 		</div>
 	</div>
 	<div class="container">
 		<div class="row">
 			<!-- Template para criacao dos quadros ver index.js -->
-			<div id="botoesTpl" class="hidden" >
+			<div id="botoesTpl" class="hidden">
 				<div id="{{{fa}}}" class="col-sm-12" style="width: 260px; min-width: 260px; max-width: 260px;">
 					<div class="panel panel-default">
 						<div class="panel-body" style="height: 250px;">
@@ -176,7 +185,7 @@ define ( "ONDEI3GEO", ".." );
 			</div>
 		</div>
 
-		<hr/>
+		<hr />
 
 		<footer class="text-center">
 			<div class="row hidden">
@@ -194,22 +203,22 @@ define ( "ONDEI3GEO", ".." );
 	</div>
 
     <?php
-				echo "<script>";
-				include "index.js";
-				echo "</script>";
-				include "body.php";
-				?>
+		echo "<script>";
+		include "index.js";
+		echo "</script>";
+		include "body.php";
+	?>
     <script>
     $(document).ready(function(){
 		var template = '<div class="col-sm-12" style="width:260px;min-width:260px;max-width:260px;"><div class="panel panel-default"><div class="panel-body" style="height: 250px;"><div class="thumbnail" style="height:90px;"><img class="img-rounded" style="height: 100%; width: 100%" src="imagens/{{{img}}}" /></div><h4>{{{titulo}}}</h4><div style="overflow:auto;height:200px;"><p>{{{subtitulo}}}</p></div></div><div class="panel-footer text-right" style="border:0px;background-color:white;"><p><a class="btn btn-primary btn-raised" href="{{{href}}}" role="button" target="_blank" >Abrir <i class="fa fa-{{{fa}}}" aria-hidden="true" ></i></a></p></div></div></div>';
 
     	<?php
-					if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") {
-						echo "var men = '<div class=\'alert alert-danger\' >' + $" . "trad(19,g_traducao_init) + '</div>';";
-					} else {
-						echo "var men = '';";
-					}
-					?>
+			if ($i3geomaster [0] ["usuario"] == "admin" && $i3geomaster [0] ["senha"] == "admin") {
+				echo "var men = '<div class=\'alert alert-danger\' >' + $" . "trad(19,g_traducao_init) + '</div>';";
+			} else {
+				echo "var men = '';";
+			}
+		?>
     	mostraBotoesBT(men);
     	$('.hidden').removeClass('hidden');
     	//carrega o TT
--
libgit2 0.21.2