From 0f1b375b4c8ef0575a648d4e8dda99acd8791b72 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 30 May 2014 14:51:03 +0000
Subject: [PATCH] V6 - atualização do layout das ferramentas de upload de dados

---
 admin/html/admin.css           | 10 ++++++++--
 css/geral.css                  |  6 ++++++
 css/i3geo6.css                 |  6 ++++++
 css/i3geo6.css.php             |  8 +++++++-
 ferramentas/upload/index.js    | 23 ++++++++++++++++-------
 ferramentas/uploaddbf/index.js | 18 ++++++++++++------
 ferramentas/uploadgpx/index.js | 14 ++++++++++----
 ferramentas/uploadkml/index.js | 14 +++++++++++---
 8 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/admin/html/admin.css b/admin/html/admin.css
index 0e3eebc..c987580 100644
--- a/admin/html/admin.css
+++ b/admin/html/admin.css
@@ -1,3 +1,9 @@
+.subbloco{
+	background-color: rgb(248,248,248);
+	width: 95%;
+    padding: 5px;
+    margin: 7px;
+}
 .letras{
 	font-size: 1em;
 }
@@ -13,7 +19,7 @@
 	font-size:1em;
 }
 .yui-skin-sam .yui-button {
-		margin: 0.25em;
+	margin: 0.25em;
 }
 .ajuda_usuario
 {
@@ -199,7 +205,7 @@ fieldset {
 	border-radius: 5px 5px 5px 5px;
 	box-shadow: 0 1px 3px gray;
 	background-color: rgb(250, 250, 250);
-	margin: 15px;
+	margin: 7px;
 }
 
 .mascaraPrincipal {
diff --git a/css/geral.css b/css/geral.css
index 691218b..978ecf1 100644
--- a/css/geral.css
+++ b/css/geral.css
@@ -1,3 +1,9 @@
+.subbloco{
+	background-color: rgb(248,248,248);
+	width: 90%;
+    padding: 5px;
+    margin: 7px;
+}
 .i3GeoMascaraCoord {
 	width: 100%;
 }
diff --git a/css/i3geo6.css b/css/i3geo6.css
index 336cc28..764c725 100755
--- a/css/i3geo6.css
+++ b/css/i3geo6.css
@@ -1,3 +1,9 @@
+.subbloco{
+background-color: rgb(248,248,248);
+width: 90%;
+padding: 5px;
+margin: 7px;
+}
 .i3GeoMascaraCoord {
 width: 100%;
 }
diff --git a/css/i3geo6.css.php b/css/i3geo6.css.php
index c921d3f..ef9b382 100755
--- a/css/i3geo6.css.php
+++ b/css/i3geo6.css.php
@@ -1,4 +1,10 @@
-<?php error_reporting(0);if(extension_loaded('zlib')){ob_start('ob_gzhandler');} header("Content-type: text/css"); ?>.i3GeoMascaraCoord {
+<?php error_reporting(0);if(extension_loaded('zlib')){ob_start('ob_gzhandler');} header("Content-type: text/css"); ?>.subbloco{
+background-color: rgb(248,248,248);
+width: 90%;
+padding: 5px;
+margin: 7px;
+}
+.i3GeoMascaraCoord {
 width: 100%;
 }
 .i3GeoMascaraCoord td {
diff --git a/ferramentas/upload/index.js b/ferramentas/upload/index.js
index 12492fe..bbbb1d9 100644
--- a/ferramentas/upload/index.js
+++ b/ferramentas/upload/index.js
@@ -104,16 +104,21 @@ i3GEOF.upload = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOuploadf target="i3GEOuploadiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/upload/upload.php" method="post" ENCTYPE="multipart/form-data">' +
+		'<fieldset class=subbloco >' +
 		'<p class="paragrafo" >shp: <br><input type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' +
 		'<p class="paragrafo" >shx: <br><input type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' +
-		'<p class="paragrafo" >dbf: <br><input type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>';
+		'<p class="paragrafo" >dbf: <br><input type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'</fieldset>';
 		if(i3GEO.parametros.editor === "sim"){
-			ins += '<p class="paragrafo" >'+$trad(1,i3GEOF.upload.dicionario)+':<br>' +
+			ins += '<fieldset class=subbloco >' +
+			'<p class="paragrafo" >'+$trad(1,i3GEOF.upload.dicionario)+':<br>' +
 			'<input class=digitar type="text" size=45 name="dirDestino" id="dirDestino" style="top:0px;left:0px;cursor:pointer;">' +
 			"&nbsp;<img onclick='i3GEO.util.navegadorDir(\"dirDestino\",false,false,false,true);' src='"+i3GEO.configura.locaplic+"/imagens/ic_zoom.png' style='cursor:pointer;position :relative;top:2px'/></p>" +
-			'<p class="paragrafo" ><input type=checkbox name=i3GEOuploadCriaMapfile id=i3GEOuploadCriaMapfile />&nbsp;'+$trad(10,i3GEOF.upload.dicionario);
+			'<p class="paragrafo" ><input type=checkbox name=i3GEOuploadCriaMapfile id=i3GEOuploadCriaMapfile />&nbsp;'+$trad(10,i3GEOF.upload.dicionario) +
+			'</fieldset>';
 		}
-		ins += '<p class="paragrafo" >'+$trad(2,i3GEOF.upload.dicionario)+': ' +
+		ins += '<fieldset class=subbloco >' +
+		'<p class="paragrafo" >'+$trad(2,i3GEOF.upload.dicionario)+': ' +
 		'	<select id=tipo name=tipo >' +
 		'	<option value="">'+$trad(3,i3GEOF.upload.dicionario)+'</option>' +
 		'	<option value="1">'+$trad(4,i3GEOF.upload.dicionario)+'</option>' +
@@ -123,12 +128,16 @@ i3GEOF.upload = {
 		'</p>' +
 		'<p class=paragrafo >'+$trad(7,i3GEOF.upload.dicionario)+':</p>' +
 		'<div id=i3GEOuploadListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
-		'<br><p class="paragrafo" ><input id=i3GEOuploadbotao1 type="button" value="'+$trad(8,i3GEOF.upload.dicionario)+'" size=12 name="submit">' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
+		'<p class="paragrafo" ><input id=i3GEOuploadbotao1 type="button" value="'+$trad(8,i3GEOF.upload.dicionario)+'" size=12 name="submit">' +
 		'<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
 		'<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' +
 		'</form>' +
+		
 		"<p class='paragrafo' style=color:red >"+$trad(9,i3GEOF.upload.dicionario)+"</p>" +
-		'<iframe name=i3GEOuploadiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>';
+		'<iframe name=i3GEOuploadiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
+		'</fieldset>';
 		return ins;
 	},
 	/*
@@ -144,7 +153,7 @@ i3GEOF.upload = {
 		};
 		titulo = $trad("a2")+" <a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=4&idajuda=27' >&nbsp;&nbsp;&nbsp;</a>";
 		janela = i3GEO.janela.cria(
-			"355px",
+			"400px",
 			"470px",
 			"",
 			"",
diff --git a/ferramentas/uploaddbf/index.js b/ferramentas/uploaddbf/index.js
index 5ab0584..80bb9fa 100644
--- a/ferramentas/uploaddbf/index.js
+++ b/ferramentas/uploaddbf/index.js
@@ -105,24 +105,30 @@ i3GEOF.uploaddbf = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOuploaddbff target="i3GEOuploaddbfiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploaddbf/upload.php" method="post" ENCTYPE="multipart/form-data">' +
+		'<fieldset class=subbloco >' +
 		'<p class="paragrafo" >'+$trad(1,i3GEOF.uploaddbf.dicionario)+': <br> '+
 		'<select name="i3GEOuploaddbftipoarquivo"> '+
 		'	<option value="dbf" select >dbf</option> '+
 		'	<option value="csvpv" >csv ";"</option> '+
 		'	<option value="csvv" >csv ","</option> '+
 		'</select></p> '+
-
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
 		'<p class="paragrafo" >'+$trad(2,i3GEOF.uploaddbf.dicionario)+': <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomex" style="top:0px;left:0px"></p>' +
 		'<p class="paragrafo" >'+$trad(3,i3GEOF.uploaddbf.dicionario)+': <br><input class=digitar type="text" size=32 name="i3GEOuploaddbfnomey" style="top:0px;left:0px"></p>' +
-
-		'<p class="paragrafo" >'+$trad(4,i3GEOF.uploaddbf.dicionario)+': <br><input type="file" size=18 name="i3GEOuploaddbffile" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >'+$trad(4,i3GEOF.uploaddbf.dicionario)+': <br><input type="file" size=10 name="i3GEOuploaddbffile" style="width:270px;top:0px;left:0px;cursor:pointer;"></p>' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
 		'<p class=paragrafo >'+$trad(5,i3GEOF.uploaddbf.dicionario)+':</p>' +
 		'<div id=i3GEOuploaddbfListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
-		'<br><p class="paragrafo" ><input id=i3GEOuploaddbfbotao1 type="button" value="'+$trad(6,i3GEOF.uploaddbf.dicionario)+'" size=12 name="submit">' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
+		'<p class="paragrafo" ><input id=i3GEOuploaddbfbotao1 type="button" value="'+$trad(6,i3GEOF.uploaddbf.dicionario)+'" size=12 name="submit">' +
 		'<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
 		'<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
 		'</form>' +
-		'<br><iframe name=i3GEOuploaddbfiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>';
+		'<br><iframe name=i3GEOuploaddbfiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
+		'</fieldset>' ;
 		return ins;
 	},
 	/*
@@ -166,4 +172,4 @@ i3GEOF.uploaddbf = {
 		i3GEOF.uploaddbf.aguarde.visibility="visible";
 		$i("i3GEOuploaddbff").submit();
 	}
-};
\ No newline at end of file
+};
diff --git a/ferramentas/uploadgpx/index.js b/ferramentas/uploadgpx/index.js
index 27af284..79c4edb 100644
--- a/ferramentas/uploadgpx/index.js
+++ b/ferramentas/uploadgpx/index.js
@@ -111,15 +111,21 @@ i3GEOF.uploadgpx = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOuploadgpxf target="i3GEOuploadgpxiframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadgpx/upload.php" method="post" ENCTYPE="multipart/form-data">' +
+		'<fieldset class=subbloco >' +
 		'<p class="paragrafo" >' + $trad(1,i3GEOF.uploadgpx.dicionario) +
 		'<br><br><input type="file" size=18 name="i3GEOuploadgpx" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
 		'<p class=paragrafo >' + $trad(2,i3GEOF.uploadgpx.dicionario) + ':</p>' +
 		'<div id=i3GEOuploadgpxListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
-		'<br><p class="paragrafo" ><input id=i3GEOuploadgpxbotao1 type="button" value="'+$trad(3,i3GEOF.uploadgpx.dicionario)+'" size=12 name="submit">' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
+		'<p class="paragrafo" ><input id=i3GEOuploadgpxbotao1 type="button" value="'+$trad(3,i3GEOF.uploadgpx.dicionario)+'" size=12 name="submit">' +
 		'<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
 		'<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
 		'</form>' +
-		'<br><iframe name=i3GEOuploadgpxiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>';
+		'<br><iframe name=i3GEOuploadgpxiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
+		'</fieldset>';
 		return ins;
 	},
 	/*
@@ -135,7 +141,7 @@ i3GEOF.uploadgpx = {
 		};
 		titulo = "GPX <a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=4&idajuda=103' >&nbsp;&nbsp;&nbsp;</a>";
 		janela = i3GEO.janela.cria(
-			"320px",
+			"400px",
 			"280px",
 			"",
 			"",
@@ -163,4 +169,4 @@ i3GEOF.uploadgpx = {
 		i3GEOF.uploadgpx.aguarde.visibility="visible";
 		$i("i3GEOuploadgpxf").submit();
 	}
-};
\ No newline at end of file
+};
diff --git a/ferramentas/uploadkml/index.js b/ferramentas/uploadkml/index.js
index 2181704..76a2694 100644
--- a/ferramentas/uploadkml/index.js
+++ b/ferramentas/uploadkml/index.js
@@ -111,19 +111,27 @@ i3GEOF.uploadkml = {
 	*/
 	html:function(){
 		var ins = '<form id=i3GEOuploadkmlf target="i3GEOuploadkmliframe" action="'+i3GEO.configura.locaplic+'/ferramentas/uploadkml/upload.php" method="post" ENCTYPE="multipart/form-data">' +
+		'<fieldset class=subbloco >' +
 		'<p class="paragrafo" style=color:red >' + $trad(1,i3GEOF.uploadkml.dicionario) + '</p>' +
 		'<p class="paragrafo" > ' + $trad(2,i3GEOF.uploadkml.dicionario) +
 		'<br><input type="file" size=22 name="i3GEOuploadkml" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
 		'<p class=paragrafo >' + $trad(3,i3GEOF.uploadkml.dicionario) +
 		'<br><input type=text size=42 name=layerkml value=""/></p>' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
 		'<p class=paragrafo >' + $trad(4,i3GEOF.uploadkml.dicionario) + '</p>' +
 		'<div id=i3GEOuploadkmlListaepsg width="98%" style="text-align:left;border:1px solid gray;left:0px;overflow:auto;height:60px"></div>' +
-		'<br><p class="paragrafo" ><input id=i3GEOuploadkmlbotao1 type="button" value="'+$trad(5,i3GEOF.uploadkml.dicionario)+'" size=12 name="submit">' +
+		'</fieldset>' +
+		'<fieldset class=subbloco >' +
+		'<p class="paragrafo" ><input id=i3GEOuploadkmlbotao1 type="button" value="'+$trad(5,i3GEOF.uploadkml.dicionario)+'" size=12 name="submit">' +
 		'<br><p class="paragrafo" >' + $trad(6,i3GEOF.uploadkml.dicionario)+'</p>'+
 		'<input type=hidden name=g_sid value="'+i3GEO.configura.sid+'" >' +
 		'<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
 		'</form>' +
-		'<br><iframe name=i3GEOuploadkmliframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>';
+		'<br><iframe name=i3GEOuploadkmliframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe>' +
+		'</fieldset>';
 		return ins;
 	},
 	/*
@@ -167,4 +175,4 @@ i3GEOF.uploadkml = {
 		i3GEOF.uploadkml.aguarde.visibility="visible";
 		$i("i3GEOuploadkmlf").submit();
 	}
-};
\ No newline at end of file
+};
--
libgit2 0.21.2