From 88f8f12b407996638a80bcaddca3e3f0c9c3240f Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 28 Oct 2017 11:34:02 -0200
Subject: [PATCH] Inclusão de botão de teste na opção de definição de conexão no editor de mapfiles. Alteração nos ícones das opções no editor de mapfiles

---
 admin/admin.db                                                 | Bin 352256 -> 0 bytes
 admin/catalogo/mapfile/conexao/local/index.js                  |  4 ++++
 admin/catalogo/mapfile/conexao/local/index.php                 | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
 admin/catalogo/mapfile/opcoes/templates/templateMaisOpcoes.php | 10 +++++-----
 4 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 0c7fbbd..5129c49 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/catalogo/mapfile/conexao/local/index.js b/admin/catalogo/mapfile/conexao/local/index.js
index bbb0f7d..12129a5 100755
--- a/admin/catalogo/mapfile/conexao/local/index.js
+++ b/admin/catalogo/mapfile/conexao/local/index.js
@@ -120,5 +120,9 @@ i3GEOadmin.conexaolocal = {
 						i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
 					}
 			);
+		},
+		testa: function(codigo){
+			i3GEOadmin.core.modalAguarde(true);
+			i3GEOadmin.teste.testaImg("../../../../..",codigo,"","",$("#modalGeral .modal-body"))
 		}
 };
\ No newline at end of file
diff --git a/admin/catalogo/mapfile/conexao/local/index.php b/admin/catalogo/mapfile/conexao/local/index.php
index c52bacc..27e576a 100755
--- a/admin/catalogo/mapfile/conexao/local/index.php
+++ b/admin/catalogo/mapfile/conexao/local/index.php
@@ -1,62 +1,65 @@
 <?php
-//TODO incluir opcao para listar os arquivos no servidor
-//TODO incluir construtor de sql
-define ( "ONDEI3GEO", "../../../../.." );
+// TODO incluir opcao para listar os arquivos no servidor
+// TODO incluir construtor de sql
+define("ONDEI3GEO", "../../../../..");
 include ("exec.php");
 
 include "../../../../head.php";
-$codigo = filter_var ( $_GET ["codigo"], FILTER_SANITIZE_STRING );
-$id_tema = (int) $_GET ["id_tema"];
+$codigo = filter_var($_GET["codigo"], FILTER_SANITIZE_STRING);
+$id_tema = (int) $_GET["id_tema"];
 ?>
 <div class="container-fluid migalha">
-	<div class="row">
-		<div class="btn-group btn-breadcrumb">
-			<a class="btn btn-default" href="../../../../../init/index.php">
-				<span>i3Geo</span>
-			</a>
-			<a class="btn btn-default" href="../../../../index.php">
-				<span>Admin</span>
-			</a>
-			<a class="btn btn-default" style="pointer-events: none">
-				<span>Cat&aacute;logo</span>
-			</a>
-			<a class="btn btn-default" href="../../index.php">
-				<span>Mapfiles</span>
-			</a>
-			<a class="btn btn-default" href="../../opcoes/index.php?codigo=<?php echo $codigo; ?>&id_tema=<?php echo $id_tema; ?>">
-				<span>Op&ccedil;&otilde;es</span>
-			</a>
-			<a class="btn btn-default" style="pointer-events: none">
-				<span><?php echo $codigo; ?></span>
-			</a>
-			<a class="btn btn-default" style="pointer-events: none">
-				<span>Conex&atilde;o local</span>
-			</a>
-		</div>
-	</div>
+    <div class="row">
+        <div class="btn-group btn-breadcrumb">
+            <a class="btn btn-default" href="../../../../../init/index.php">
+                <span>i3Geo</span>
+            </a>
+            <a class="btn btn-default" href="../../../../index.php">
+                <span>Admin</span>
+            </a>
+            <a class="btn btn-default" style="pointer-events: none">
+                <span>Cat&aacute;logo</span>
+            </a>
+            <a class="btn btn-default" href="../../index.php">
+                <span>Mapfiles</span>
+            </a>
+            <a class="btn btn-default" href="../../opcoes/index.php?codigo=<?php echo $codigo; ?>&id_tema=<?php echo $id_tema; ?>">
+                <span>Op&ccedil;&otilde;es</span>
+            </a>
+            <a class="btn btn-default" style="pointer-events: none">
+                <span><?php echo $codigo; ?></span>
+            </a>
+            <a class="btn btn-default" style="pointer-events: none">
+                <span>Conex&atilde;o local</span>
+            </a>
+        </div>
+    </div>
 </div>
 <div class="container">
-	<div class="row center-block">
-		<div class="col-md-12" id="titulo">
-			<div class="well hidden" >
-				<h2><small>{{{conexaoLocal}}}</small></h2>
-				<blockquote>{{{conexaoLayerLocal}}}</blockquote>
-				<div class="clearfix"></div>
-			</div>
-			<div class="well hidden">
-				<div id="corpo">
-				</div>
-			</div>
-		</div>
-	</div>
+    <div class="row center-block">
+        <div class="col-md-12" id="titulo">
+            <div class="well hidden">
+                <h2>
+                    <small>{{{conexaoLocal}}}</small>
+                </h2>
+                <blockquote>{{{conexaoLayerLocal}}}</blockquote>
+                <div class="clearfix"></div>
+                <button onclick="i3GEOadmin.conexaolocal.testa('<?php echo $codigo; ?>')" href="javascript:void(0)" class="btn btn-primary" role="button" style="color:#008579;">{{{testaLayer}}}</button>
+            </div>
+            <div class="well hidden">
+                <div id="corpo"></div>
+            </div>
+        </div>
+    </div>
 </div>
 <?php
-include("templates/templateFormConexaoLocal.php");
-include("../../templates/templateTiposLayer.php");
-include("../../templates/templateTiposConexao.php");
-include("../../../../templates/templateOpcoesPublicado.php");
+include ("templates/templateFormConexaoLocal.php");
+include ("../../templates/templateTiposLayer.php");
+include ("../../templates/templateTiposConexao.php");
+include ("../../../../templates/templateOpcoesPublicado.php");
 ?>
 <script type="text/javascript" src="index.js"></script>
+<script type="text/javascript" src="../../teste/index.js"></script>
 <script type="text/javascript" src="../../../../dicionario/editormapfile.js"></script>
 <script>
 	$(document).ready(function(){
diff --git a/admin/catalogo/mapfile/opcoes/templates/templateMaisOpcoes.php b/admin/catalogo/mapfile/opcoes/templates/templateMaisOpcoes.php
index bd80964..f018536 100755
--- a/admin/catalogo/mapfile/opcoes/templates/templateMaisOpcoes.php
+++ b/admin/catalogo/mapfile/opcoes/templates/templateMaisOpcoes.php
@@ -31,7 +31,7 @@
 	<div class="row-content" >
 		<h4 class="list-group-item-heading">
 			<a title="{{{testaLayer}}}" onclick="i3GEOadmin.opcoesmapfile.testa('{{codigo}}')" href="javascript:void(0)" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
-				<i class="material-icons  md-18">send</i>
+				<i class="material-icons  md-18">gavel</i>
 			</a>
 			{{{testaLayer}}}
 		</h4>
@@ -42,7 +42,7 @@
 	<div class="row-content" >
 		<h4 class="list-group-item-heading">
 			<a title="{{{testarI3geo}}}" onclick="window.open('../../../../ms_criamapa.php?temasa={{codigo}}&layers={{codigo}}')" href="javascript:void(0)" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
-				<i class="material-icons  md-18">send</i>
+				<i class="material-icons  md-18">gavel</i>
 			</a>
 			{{{testarI3geo}}}
 		</h4>
@@ -53,7 +53,7 @@
 	<div class="row-content" >
 		<h4 class="list-group-item-heading">
 			<a title="{{{editarI3geo}}}" onclick="window.open('../../../../admin/black_editor.php?temaEdicao={{codigo}}')" href="javascript:void(0)" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
-				<i class="material-icons  md-18">more_horiz</i>
+				<i class="material-icons  md-18">mode_edit</i>
 			</a>
 			{{{editarI3geo}}}
 			<span id="helpBlock" class="help-block">
@@ -67,7 +67,7 @@
 	<div class="row-content" >
 		<h4 class="list-group-item-heading">
 			<a title="{{{editorTxt}}}" href="../editor/index.php?codigo={{codigo}}&id_tema={{id_tema}}" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
-				<i class="material-icons  md-18">more_horiz</i>
+				<i class="material-icons  md-18">mode_edit</i>
 			</a>
 			{{{editorTxt}}}
 		</h4>
@@ -78,7 +78,7 @@
 	<div class="row-content">
 		<h4 class="list-group-item-heading">
 			<a title="{{{limpaCache}}}" onclick="i3GEOadmin.opcoesmapfile.limpaCacheDialogo('{{codigo}}')" href="javascript:void(0)" class="pull-right btn btn-danger btn-fab btn-fab-mini" role="button">
-				<i class="material-icons  md-18">send</i>
+				<i class="material-icons  md-18">clear_all</i>
 			</a>
 			{{{limpaCache}}}
 			<span id="helpBlock" class="help-block">
--
libgit2 0.21.2