From cdf1f287d83ce71c578cc5a78720c5e31268f9f2 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 31 May 2014 02:21:46 +0000
Subject: [PATCH] v6 - ajustes no layout de alguns formulários do sistema de administração

---
 admin/html/admin.css               |  5 +++--
 admin/html/estat_uploaddados.html  |  2 +-
 admin/js/editormapfile.js          |  2 +-
 admin/js/estat_editor.js           | 36 ++++++++++++++++++++++++++----------
 css/geral.css                      |  6 ++++++
 css/i3geo6.css                     |  8 ++++++++
 css/i3geo6.css.php                 |  8 ++++++++
 ferramentas/metaestat/upload.html  |  2 +-
 ferramentas/uploaddbf/index.js     |  4 ++--
 ferramentas/uploaddbf/join.htm     |  2 +-
 ferramentas/uploaddbf/novotema.htm |  2 +-
 11 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/admin/html/admin.css b/admin/html/admin.css
index 3d87296..dfc1829 100644
--- a/admin/html/admin.css
+++ b/admin/html/admin.css
@@ -1,8 +1,8 @@
 .subbloco{
 	background-color: rgb(248,248,248);
 	width: 95%;
-    padding: 5px;
-    margin: 7px;
+	padding: 5px;
+	margin: 7px;
 }
 .i3GeoAguardeJanela{
 	height: 1px;
@@ -75,6 +75,7 @@ input {
 	cursor: pointer;
 }
 
+
 .lista td {
 	border: 1px solid rgb(140, 140, 140);
 	border-left: 0px;
diff --git a/admin/html/estat_uploaddados.html b/admin/html/estat_uploaddados.html
index cc50148..a5e54a0 100644
--- a/admin/html/estat_uploaddados.html
+++ b/admin/html/estat_uploaddados.html
@@ -53,7 +53,7 @@ body {
 				<form id=i3GEOupload target="i3GEOuploadiframe" action="../php/metaestat_uploaddados_submit.php" onsubmit="i3GEOadmin.uploaddados.upload.submit();"
 					method="post" ENCTYPE="multipart/form-data">
 					<p class="paragrafo">
-						<input class=digitar type="file" size=42 name="i3GEOuploadArquivo"
+						<input type="file" size=42 name="i3GEOuploadArquivo"
 							style="top: 0px; left: 0px; cursor: pointer;">
 					</p>
 					<input type="hidden" name="MAX_FILE_SIZE" value="1000000">
diff --git a/admin/js/editormapfile.js b/admin/js/editormapfile.js
index 283ea86..0e832a9 100644
--- a/admin/js/editormapfile.js
+++ b/admin/js/editormapfile.js
@@ -165,7 +165,7 @@ function ativaBotaoUploadGvsig(idBotao)
 {
 	var temp = function(){
 		var ins = '<form id=i3GEOuploadgvp target="i3GEOuploadgvpiframe" action="../php/uploadgvp.php" method="post" ENCTYPE="multipart/form-data">' +
-		'<p class="paragrafo" >Arquivo gvp: <br><input class=digitar type="file" size=20 name="i3GEOuploadgvp" style="top:0px;left:0px;cursor:pointer;"></p>' +
+		'<p class="paragrafo" >Arquivo gvp: <br><input type="file" size=20 name="i3GEOuploadgvp" style="top:0px;left:0px;cursor:pointer;"></p>' +
 		'<p class="paragrafo" ><input id=i3GEOuploadgvpbotao1 type="submit" value="Enviar" size=12 name="submit">' +
 		'<input type="hidden" name="MAX_FILE_SIZE" value="100000">' +
 		'</form>' +
diff --git a/admin/js/estat_editor.js b/admin/js/estat_editor.js
index 9ded2d9..dff374d 100644
--- a/admin/js/estat_editor.js
+++ b/admin/js/estat_editor.js
@@ -163,10 +163,15 @@ i3GEOadmin.editor = {
 							"<p class=paragrafo >Crie uma tabela no banco contendo limites ou localidades que poder&aacute; ser utilizada para espacializar os dados estat&iacute;sticos existentes em outras tabelas<br>" +
 							"<input type=button value='Upload Shapefile' id='i3GEOadmin_botaoupload' /></p>" +
 							"<div id='i3GEOadmin_formupload'></div>" +
+							"</fieldset>" +
+							"<fieldset>" +
 							"<p class=paragrafo >Crie uma tabela nova a partir de um arquivo CSV. Utilize essa op&ccedil;&atilde;o para armazenar no banco os dados que ser&atilde;o relacionados &agrave;s tabelas contendo limites ou localidades. Se no CSV existirem colunas com as coordenadas, a tabela criada poder&aacute; armazenar a geometria possibilitando seu uso como localidades. </p>" +
 							"<input type=button value='Upload CSV' id='i3GEOadmin_botaouploadcsv' /></p>" +
 							"<div id='i3GEOadmin_formuploadcsv'></div>" +
-							"<p class=paragrafo >Crie uma tabela vazia no banco de dados, definindo o nome e os tipos de colunas<br><input type=button value='Criar uma nova tabela' id='i3GEOadmintabelaCriar' /></p>" +
+							"</fieldset>" +
+							"<fieldset>" +
+							"<p class=paragrafo >Crie uma tabela vazia no banco de dados, definindo o nome e os tipos de colunas<br>" +
+							"<input type=button value='Criar uma nova tabela' id='i3GEOadmintabelaCriar' /></p>" +
 							"</fieldset>";
 
 							temp += "<fieldset>" +
@@ -524,29 +529,35 @@ i3GEOadmin.editor = {
 			$i("outsrid").value = obj.value;
 		},
 		formulario: function(){
-			var ins = '<fieldset><form id=i3GEOuploadf target="i3GEOuploadiframe" action="../php/metaestat_uploadshp_submit.php" method="post" ENCTYPE="multipart/form-data">' +
-			'<p class="paragrafo" >shp: <br><input class=digitar type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' +
-			'<p class="paragrafo" >shx: <br><input class=digitar type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' +
-			'<p class="paragrafo" >dbf: <br><input class=digitar type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>' +
+			var ins = '<fieldset class=subbloco >' +
+			'<form id=i3GEOuploadf target="i3GEOuploadiframe" action="../php/metaestat_uploadshp_submit.php" method="post" ENCTYPE="multipart/form-data">' +
+			'<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>' +
+			'</fieldset>' +
+			'<fieldset class=subbloco >' +
 			'<p class="paragrafo" >Nome da tabela (n&atilde;o utilize caracteres incompat&iacute;veis com o banco de dados, como -, acentos ou espa&ccedil;os em branco):<br><input class=digitar type="text" size=20 id="tabelaDestino" name="tabelaDestino" style="top:0px;left:0px;cursor:pointer;"> ' +
 			'Ou escolha da lista: ' +
 			'<select onchange="javascript:$i(\'tabelaDestino\').value = this.value;">' +
 			i3GEOadmin.editor.tabela.optionsTabela +
 			'</select></p>' +
+			'</fieldset>' +
+			'<fieldset class=subbloco >' +
 			'<p class="paragrafo" >Tipo de opera&ccedil;&atilde;o:</p>' +
 			'<select id=i3GEOtipoOperacao name=tipoOperacao >' +
 			'<option value=criar >Criar a tabela nova e incluir registros do SHP</option>' +
 			'<option value=incluir >Adicionar novos registros</option>' +
 			'<option value=apagar >Apagar dados atuais e incluir do SHP</option>' +
 			'</select></p>' +
-			
+			'</fieldset>' +
+			'<fieldset class=subbloco >' +
 			'<p class="paragrafo" >Assegure-se que o shapefile esteja na proje&ccedil;&atilde;o geogr&aacute;fica se voc&ecirc; for usar com o sistema de metadados estat&iacute;sticos.</p>' +
-			
 			'<p class="paragrafo" >C&oacute;digo da proje&ccedil;&atilde;o (SRID) do arquivo</p>' +
 			'<p><div id=selInSrid ></div><input class=digitar type="text" value="4326" size=20 id="insrid" name="insrid" style="top:0px;left:0px;cursor:pointer;"></p>' +
 			'<p class="paragrafo" >Projetar o arquivo para (deixe em branco caso n&atilde;o deva ser feita a proje&ccedil;&atilde;o dos dados):</p>' +
 			'<p><div id=selOutSrid ></div><input class=digitar type="text" value="" size=20 id="outsrid" name="outsrid" style="top:0px;left:0px;cursor:pointer;"></p>' +
-
+			'</fieldset>' +
+			'<fieldset class=subbloco >' +
 			'<p class="paragrafo" ><input type="checkbox" id="incluiserialshp" name="incluiserialshp" style="cursor:pointer;position:relative;top:2px;">&nbsp;Inclui uma coluna gid do tipo serial e chave prim&aacute;ria com c&oacute;digo &uacute;nico</p>' +
 			'<p class="paragrafo" ><input id=i3GEOuploadsubmit type="button" value="Enviar" size=12 />' +
 			'<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' +
@@ -596,13 +607,16 @@ i3GEOadmin.editor = {
 			);
 		},
 		formulario: function(){
-			var ins = '<fieldset><form id=i3GEOuploadcsvf target="i3GEOuploadcsviframe" action="../php/metaestat_uploadcsv_submit.php" method="post" ENCTYPE="multipart/form-data">' +
-			'<p class="paragrafo" >CSV (N&atilde;o utilize separador de milhar e utilize ponto como separador de casas decimais ou a importa&ccedil;&atilde;o poder&aacute; n&atilde;o ocorrer): <br><br><input class=digitar type="file" size=22 name="i3GEOuploadcsv" style="top:0px;left:0px;cursor:pointer;"></p>' +
+			var ins = '<fieldset class=subbloco >' +
+			'<form id=i3GEOuploadcsvf target="i3GEOuploadcsviframe" action="../php/metaestat_uploadcsv_submit.php" method="post" ENCTYPE="multipart/form-data">' +
+			'<p class="paragrafo" >CSV (N&atilde;o utilize separador de milhar e utilize ponto como separador de casas decimais ou a importa&ccedil;&atilde;o poder&aacute; n&atilde;o ocorrer): <br><br><input type="file" size=22 name="i3GEOuploadcsv" style="top:0px;left:0px;cursor:pointer;"></p>' +
 			'<p class="paragrafo" >Nome da nova tabela (n&atilde;o utilize caracteres incompat&iacute;veis com o banco de dados, como -, acentos ou espa&ccedil;os em branco):<br><input class=digitar type="text" size=20 id="tabelaDestinocsv" name="tabelaDestinocsv" style="top:0px;left:0px;cursor:pointer;">&nbsp;' +
 			'Ou escolha da lista: ' +
 			'<select onchange="javascript:$i(\'tabelaDestinocsv\').value = this.value;">' +
 			i3GEOadmin.editor.tabela.optionsTabela +
 			'</select></p>' +
+			'</fieldset>' +
+			'<fieldset class=subbloco >' +
 			'<p class="paragrafo" >Tipo de opera&ccedil;&atilde;o:</p>' +
 			'<select id=i3GEOtipoOperacaocsv name=tipoOperacao >' +
 			'<option value=criar >Criar a tabela nova e incluir registros do CSV</option>' +
@@ -611,6 +625,8 @@ i3GEOadmin.editor = {
 			'</select></p>' +
 			'<p class="paragrafo" ><input type="checkbox" id="incluiserialcsv" name="incluiserialcsv" style="cursor:pointer;position:relative;top:2px;">&nbsp;Inclui uma coluna gid do tipo serial e chave prim&aacute;ria com c&oacute;digo &uacute;nico</p>' +
 			'<p class="paragrafo" >Opcional (utilize sempre coordenadas em d&eacute;cimos de grau no CSV): <br><br>coluna que cont&eacute;m as latitudes (Y) <input class=digitar type="text" size=8 id="colunaycsv" name="colunaycsv" style="top:0px;left:0px;cursor:pointer;"> coluna que cont&eacute;m as longitudes (X) <input class=digitar type="text" size=8 id="colunaxcsv" name="colunaxcsv" style="top:0px;left:0px;cursor:pointer;"></p>' +
+			'</fieldset>' +
+			'<fieldset class=subbloco >' +
 			'<p class="paragrafo" ><input id=i3GEOuploadcsvsubmit type="button" value="Enviar" size=12 />' +
 			'<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' +
 			'<input type="hidden" id="i3GEOuploadcsvcodigoconexao" name="i3GEOuploadcsvcodigoconexao" value="">' +
diff --git a/css/geral.css b/css/geral.css
index 8afebc0..12115ec 100644
--- a/css/geral.css
+++ b/css/geral.css
@@ -135,6 +135,12 @@ input
 input[type=checkbox]{
 border: 0px solid white;
 }
+input[type=file]{
+	border: 0px solid white;
+	background-color: none;
+	background: none;
+}
+
 select
 {box-shadow:1px 1px 3px 0 lightgray;font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #2F4632;background-color: #FFFFFF;padding: 0;border: 1px solid rgb(230,230,230);text-align: left;cursor: pointer;}
 select option:hover {
diff --git a/css/i3geo6.css b/css/i3geo6.css
index 4fee4c8..9ec4a11 100755
--- a/css/i3geo6.css
+++ b/css/i3geo6.css
@@ -132,6 +132,14 @@ input
 input[type=checkbox]{
 border: 0px solid white;
 }
+input[type=file]{
+border: 0px solid white;
+background-color: none;
+background: none;
+}
+input[type=file][value=""]{
+background: red;
+}
 select
 {box-shadow:1px 1px 3px 0 lightgray;font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #2F4632;background-color: #FFFFFF;padding: 0;border: 1px solid rgb(230,230,230);text-align: left;cursor: pointer;}
 select option:hover {
diff --git a/css/i3geo6.css.php b/css/i3geo6.css.php
index 8435416..6eaa3ba 100755
--- a/css/i3geo6.css.php
+++ b/css/i3geo6.css.php
@@ -132,6 +132,14 @@ input
 input[type=checkbox]{
 border: 0px solid white;
 }
+input[type=file]{
+border: 0px solid white;
+background-color: none;
+background: none;
+}
+input[type=file][value=""]{
+background: red;
+}
 select
 {box-shadow:1px 1px 3px 0 lightgray;font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #2F4632;background-color: #FFFFFF;padding: 0;border: 1px solid rgb(230,230,230);text-align: left;cursor: pointer;}
 select option:hover {
diff --git a/ferramentas/metaestat/upload.html b/ferramentas/metaestat/upload.html
index 1e00aa3..f571064 100644
--- a/ferramentas/metaestat/upload.html
+++ b/ferramentas/metaestat/upload.html
@@ -28,7 +28,7 @@ body {
 	<br>
 	<form id=i3GEOupload target="i3GEOuploadiframe" action="../../admin/php/metaestat_uploaddados_submit.php" onsubmit="i3GEOadmin.uploaddados.upload.submit();" method="post" ENCTYPE="multipart/form-data">
 		<p class="paragrafo">
-			<input class=digitar type="file" size=22 name="i3GEOuploadArquivo" style="top: 0px; left: 0px; cursor: pointer;">
+			<input type="file" size=22 name="i3GEOuploadArquivo" style="top: 0px; left: 0px; cursor: pointer;">
 		</p>
 		<input type="hidden" name="MAX_FILE_SIZE" value="100000000"> <input type="submit" value="Enviar" size="22">
 	</form>
diff --git a/ferramentas/uploaddbf/index.js b/ferramentas/uploaddbf/index.js
index 80bb9fa..a8b9ba9 100644
--- a/ferramentas/uploaddbf/index.js
+++ b/ferramentas/uploaddbf/index.js
@@ -114,8 +114,8 @@ i3GEOF.uploaddbf = {
 		'</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(2,i3GEOF.uploaddbf.dicionario)+': <br><input type="text" size=32 name="i3GEOuploaddbfnomex" style="top:0px;left:0px"></p>' +
+		'<p class="paragrafo" >'+$trad(3,i3GEOF.uploaddbf.dicionario)+': <br><input 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=10 name="i3GEOuploaddbffile" style="width:270px;top:0px;left:0px;cursor:pointer;"></p>' +
 		'</fieldset>' +
 		'<fieldset class=subbloco >' +
diff --git a/ferramentas/uploaddbf/join.htm b/ferramentas/uploaddbf/join.htm
index bc3c278..c6162a0 100644
--- a/ferramentas/uploaddbf/join.htm
+++ b/ferramentas/uploaddbf/join.htm
@@ -10,7 +10,7 @@
 <div style="top:5px;left:10px;display:block;position:absolute">
 <form id=f action="upload.php" method="post" ENCTYPE="multipart/form-data">
   <pre style="font-size:14px">
-dbf: <input class=digitar type="file" size=20 name="filedbf">
+dbf: <input type="file" size=20 name="filedbf">
 </pre>
 Coluna DBF: <input class=digitar type="text" size=20 name="colunadbf"></input><br>
 
diff --git a/ferramentas/uploaddbf/novotema.htm b/ferramentas/uploaddbf/novotema.htm
index c0e9fc4..da55498 100644
--- a/ferramentas/uploaddbf/novotema.htm
+++ b/ferramentas/uploaddbf/novotema.htm
@@ -10,7 +10,7 @@
 <div style="top:5px;left:10px;display:block;position:absolute">
 <form id=f action="upload.php" method="post" ENCTYPE="multipart/form-data">
   <pre style="font-size:14px">
-dbf: <input class=digitar type="file" size=20 name="filedbf">
+dbf: <input type="file" size=20 name="filedbf">
 </pre>
 nome coluna x: <input class=digitar type="text" size=20 name="nomex"><br>
 nome coluna y: <input class=digitar type="text" size=20 name="nomey"><br><br>
--
libgit2 0.21.2