Ajustes nas mensagens d erro da ferramenta upload kml

Edmar Moretti
1 parent fead151d
Showing 59 changed files with 13 additions and 7 deletions Show diff stats
css/i3geo7.css.php
ferramentas/editorgm/editorgm_compacto.js
ferramentas/editorol/editorol_compacto.js
ferramentas/uploadarquivos/template_mst.html
ferramentas/uploadkml/index.js
ferramentas/uploadkml/template_mst.html
ferramentas/uploadkml/upload.php
js/compactados/ajuda_compacto.js
js/compactados/analise_compacto.js
js/compactados/arvoredecamadas_compacto.js
js/compactados/arvoredetemas_compacto.js
js/compactados/base64_compacto.js
js/compactados/busca_compacto.js
js/compactados/caixaDeFerramentas_compacto.js
js/compactados/calculo_compacto.js
js/compactados/catalogoDir_compacto.js
js/compactados/catalogoEstrelas_compacto.js
js/compactados/catalogoInde_compacto.js
js/compactados/catalogoMapas_compacto.js
js/compactados/catalogoMenus_compacto.js
-<div class='container-fluid customScrollBar'>
+<div class='container-fluid customScrollBar' style="margin-right:15px;">
 	<a href='javascript:void(0)' onclick="i3GEOF.uploadarquivos.shp()" class='btn btn-primary btn-lg btn-block btn-raised'>Shape File</a>
 	<a href='javascript:void(0)' onclick="i3GEOF.uploadarquivos.dbfcsv()" class='btn btn-primary btn-lg btn-block btn-raised'>DBF / CSV</a>
 	<a href='javascript:void(0)' onclick="i3GEOF.uploadarquivos.gpx()" class='btn btn-primary btn-lg btn-block btn-raised'>Gpx</a>
@@ -143,8 +143,13 @@ i3GEOF.uploadkml = {
 	Submete o arquivo ao servidor.
 	*/
 	submete: function(){
-		if(i3GEOF.uploadkml.aguarde.visibility==="visible")
-		{return;}
+		if($i("layerkml").value == ""){
+			i3GEO.janela.tempoMsg($trad("nomeLayerKml",i3GEOF.uploadkml.dicionario));
+			return;
+		}
+		if(i3GEOF.uploadkml.aguarde.visibility==="visible"){
+			return;
+		}
 		i3GEOF.uploadkml.aguarde.visibility="visible";
 		$i("i3GEOuploadkmlf").submit();
 	}
@@ -10,7 +10,7 @@
 		<br>
 		<div class='form-group label-fixed condensed'>
 			<label class="control-label" for="">{{{nomeLayerKml}}}</label>
-			<input class="form-control input-lg" type='text' name="layerkml" value='' />
+			<input class="form-control input-lg" type='text' name="layerkml" id="layerkml" value='' />
 		</div>
 		<div class='form-group label-fixed condensed'>
 			<label class="control-label" for="tipo">{{{projecao}}}</label>
@@ -18,9 +18,10 @@
 			<div id=i3GEOuploadkmlListaepsg style="text-align: left; overflow: auto; height: 70px; margin-top: 8px;"></div>
 		</div>
 		<hr />
-		<button name="submit" onclick="i3GEOF.uploadkml.submete()" class='btn btn-primary btn-sm btn-raised'>{{{criaCamada}}}</button>
+
 		<input type='hidden' name='g_sid' value='{{{sid}}}'>
 		<input type='hidden' name='MAX_FILE_SIZE' value='100000'>
 	</form>
+	<button onclick="i3GEOF.uploadkml.submete()" class='btn btn-primary btn-sm btn-raised'>{{{criaCamada}}}</button>
 	<iframe name='i3GEOuploadkmliframe' style='text-align: left; border: 1px solid gray;' width='98%' height='60px'></iframe>
 </div>
 \ No newline at end of file
@@ -23,7 +23,7 @@ if (ob_get_level() == 0) ob_start();
 <body bgcolor="white" style="background-color:white;text-align:left;">
 <p>
 <?php
-if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOuploadkml']['name'])) < 200 )
+if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOuploadkml']['name'])) < 200 && !empty($_GET["layerkml"]) )
 {
 	$checkphp = fileContemString($_FILES['i3GEOuploadkml']['tmp_name'],"<?php");
 	if($checkphp == true){
@@ -124,7 +124,7 @@ if (isset($_FILES[&#39;i3GEOuploadkml&#39;][&#39;name&#39;]) &amp;&amp; strlen(basename($_FILES[&#39;i3GEOup
 }
 else
 {
-	echo "<p class='paragrafo' >Erro ao enviar o arquivo. Talvez o tamanho do arquivo seja maior do que o permitido.</p>";
+	echo "<p class='paragrafo' >Erro ao enviar o arquivo. Verifique os par&acirc;metros enviados. Talvez o tamanho do arquivo seja maior do que o permitido.</p>";
 }
 restauraCon($map_file,$postgis_mapa);
 paraAguarde();
1		-<div class='container-fluid customScrollBar'>
	1	+<div class='container-fluid customScrollBar' style="margin-right:15px;">
2	2	<a href='javascript:void(0)' onclick="i3GEOF.uploadarquivos.shp()" class='btn btn-primary btn-lg btn-block btn-raised'>Shape File</a>
3	3	<a href='javascript:void(0)' onclick="i3GEOF.uploadarquivos.dbfcsv()" class='btn btn-primary btn-lg btn-block btn-raised'>DBF / CSV</a>
4	4	<a href='javascript:void(0)' onclick="i3GEOF.uploadarquivos.gpx()" class='btn btn-primary btn-lg btn-block btn-raised'>Gpx</a>
...	...
...	...	@@ -143,8 +143,13 @@ i3GEOF.uploadkml = {
143	143	Submete o arquivo ao servidor.
144	144	*/
145	145	submete: function(){
146		- if(i3GEOF.uploadkml.aguarde.visibility==="visible")
147		- {return;}
	146	+ if($i("layerkml").value == ""){
	147	+ i3GEO.janela.tempoMsg($trad("nomeLayerKml",i3GEOF.uploadkml.dicionario));
	148	+ return;
	149	+ }
	150	+ if(i3GEOF.uploadkml.aguarde.visibility==="visible"){
	151	+ return;
	152	+ }
148	153	i3GEOF.uploadkml.aguarde.visibility="visible";
149	154	$i("i3GEOuploadkmlf").submit();
150	155	}
...	...
...	...	@@ -10,7 +10,7 @@
10	10	<br>
11	11	<div class='form-group label-fixed condensed'>
12	12	<label class="control-label" for="">{{{nomeLayerKml}}}</label>
13		- <input class="form-control input-lg" type='text' name="layerkml" value='' />
	13	+ <input class="form-control input-lg" type='text' name="layerkml" id="layerkml" value='' />
14	14	</div>
15	15	<div class='form-group label-fixed condensed'>
16	16	<label class="control-label" for="tipo">{{{projecao}}}</label>
...	...	@@ -18,9 +18,10 @@
18	18	<div id=i3GEOuploadkmlListaepsg style="text-align: left; overflow: auto; height: 70px; margin-top: 8px;"></div>
19	19	</div>
20	20	<hr />
21		- <button name="submit" onclick="i3GEOF.uploadkml.submete()" class='btn btn-primary btn-sm btn-raised'>{{{criaCamada}}}</button>
	21	+
22	22	<input type='hidden' name='g_sid' value='{{{sid}}}'>
23	23	<input type='hidden' name='MAX_FILE_SIZE' value='100000'>
24	24	</form>
	25	+ <button onclick="i3GEOF.uploadkml.submete()" class='btn btn-primary btn-sm btn-raised'>{{{criaCamada}}}</button>
25	26	<iframe name='i3GEOuploadkmliframe' style='text-align: left; border: 1px solid gray;' width='98%' height='60px'></iframe>
26	27	</div>
27	28	\ No newline at end of file
...	...
...	...	@@ -23,7 +23,7 @@ if (ob_get_level() == 0) ob_start();
23	23	<body bgcolor="white" style="background-color:white;text-align:left;">
24	24	<p>
25	25	<?php
26		-if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOuploadkml']['name'])) < 200 )
	26	+if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOuploadkml']['name'])) < 200 && !empty($_GET["layerkml"]) )
27	27	{
28	28	$checkphp = fileContemString($_FILES['i3GEOuploadkml']['tmp_name'],"<?php");
29	29	if($checkphp == true){
...	...	@@ -124,7 +124,7 @@ if (isset($_FILES['i3GEOuploadkml']['name']) && strlen(basename($_FILES['i3GEOup
124	124	}
125	125	else
126	126	{
127		- echo "<p class='paragrafo' >Erro ao enviar o arquivo. Talvez o tamanho do arquivo seja maior do que o permitido.</p>";
	127	+ echo "<p class='paragrafo' >Erro ao enviar o arquivo. Verifique os parâmetros enviados. Talvez o tamanho do arquivo seja maior do que o permitido.</p>";
128	128	}
129	129	restauraCon($map_file,$postgis_mapa);
130	130	paraAguarde();
...	...