Commit 1f641fd14ac4600a0be27a318b06e3f0d34d4f73

Authored by Edmar Moretti
1 parent 3b1fcd49

--no commit message

classesjs/classe_barradebotoes.js
@@ -564,8 +564,11 @@ i3GEO.barraDeBotoes = { @@ -564,8 +564,11 @@ i3GEO.barraDeBotoes = {
564 */ 564 */
565 inicializaBarra:function(idconteudo,idconteudonovo,barraZoom,x,y,onde){ 565 inicializaBarra:function(idconteudo,idconteudonovo,barraZoom,x,y,onde){
566 if(typeof(console) !== 'undefined'){console.info("i3GEO.barraDeBotoes.inicializaBarra()");} 566 if(typeof(console) !== 'undefined'){console.info("i3GEO.barraDeBotoes.inicializaBarra()");}
567 - if(this.TEMPLATEBOTAO === "") 567 + if(this.TEMPLATEBOTAO === "" && i3GEO.Interface.TABLET === false)
568 {this.TEMPLATEBOTAO = "<div style='display:inline;background-color:rgb(250,250,250);'><img style='border:0px solid white;' src='"+i3GEO.configura.locaplic+"/imagens/branco.gif' id='$$'/></div>";} 568 {this.TEMPLATEBOTAO = "<div style='display:inline;background-color:rgb(250,250,250);'><img style='border:0px solid white;' src='"+i3GEO.configura.locaplic+"/imagens/branco.gif' id='$$'/></div>";}
  569 + if(this.TEMPLATEBOTAO === "" && i3GEO.Interface.TABLET === true)
  570 + {this.TEMPLATEBOTAO = "<div style='display:inline;background-color:rgb(250,250,250);'><img style='margin:4px;border:0px solid white;' src='"+i3GEO.configura.locaplic+"/imagens/branco.gif' id='$$'/></div>";}
  571 +
569 var ticone,tipo,mostra,i,temp,elementos,e,wj,recuo,novoel,alturadisponivel,n,chaves,re,estilo, 572 var ticone,tipo,mostra,i,temp,elementos,e,wj,recuo,novoel,alturadisponivel,n,chaves,re,estilo,
570 numerobotoes = 0, 573 numerobotoes = 0,
571 nelementos = 0, 574 nelementos = 0,
@@ -706,7 +709,7 @@ i3GEO.barraDeBotoes = { @@ -706,7 +709,7 @@ i3GEO.barraDeBotoes = {
706 } 709 }
707 YAHOO.namespace("janelaBotoes.xp"); 710 YAHOO.namespace("janelaBotoes.xp");
708 if(i3GEO.barraDeBotoes.ORIENTACAO === "horizontal"){ 711 if(i3GEO.barraDeBotoes.ORIENTACAO === "horizontal"){
709 - YAHOO.janelaBotoes.xp.panel = new YAHOO.widget.Panel(idconteudonovo, {zIndex:20000,width:i3GEO.barraDeBotoes.HORIZONTALW, fixedcenter: false, constraintoviewport: false, underlay:"none", close:i3GEO.barraDeBotoes.PERMITEFECHAR, visible:true, draggable:i3GEO.barraDeBotoes.PERMITEDESLOCAR, modal:false,iframe:false } ); 712 + YAHOO.janelaBotoes.xp.panel = new YAHOO.widget.Panel(idconteudonovo, {zIndex:20000,height:40,width:i3GEO.barraDeBotoes.HORIZONTALW, fixedcenter: false, constraintoviewport: false, underlay:"none", close:i3GEO.barraDeBotoes.PERMITEFECHAR, visible:true, draggable:i3GEO.barraDeBotoes.PERMITEDESLOCAR, modal:false,iframe:false } );
710 } 713 }
711 else{ 714 else{
712 if(this.AUTOALTURA === false || barraZoom === true || (elementos.length > numerobotoes)) 715 if(this.AUTOALTURA === false || barraZoom === true || (elementos.length > numerobotoes))
classesjs/classe_coordenadas.js
@@ -364,12 +364,12 @@ i3GEO.coordenadas = { @@ -364,12 +364,12 @@ i3GEO.coordenadas = {
364 */ 364 */
365 criaMascaraDMS: function(prefixo,titulo,caixa){ 365 criaMascaraDMS: function(prefixo,titulo,caixa){
366 var ins = '<table id='+prefixo+' style=display:block;text-align:center;width:410px ><tr style="border-bottom:2px solid white" >' + 366 var ins = '<table id='+prefixo+' style=display:block;text-align:center;width:410px ><tr style="border-bottom:2px solid white" >' +
367 - '<td style=width:120px;text-align:right >'+titulo+' X:&nbsp;</td>' +  
368 - '<td>'+$inputText('','315',prefixo+'xg','grau','3','-00')+'&nbsp;</td>' +  
369 - '<td>'+$inputText('','',prefixo+'xm','minuto','2','00')+'&nbsp;</td>' +  
370 - '<td>'+$inputText('','',prefixo+'xs','segundo','5','00.00')+'&nbsp;</td>' +  
371 - '<td>Y:'+$inputText('','',prefixo+'yg','grau','3','-00')+'&nbsp;</td>' +  
372 - '<td>'+$inputText('','',prefixo+'ym','minuto','2','00')+'&nbsp;</td>' + 367 + '<td style=width:120px;text-align:right >'+titulo+' X:</td>' +
  368 + '<td>'+$inputText('','',prefixo+'xg','grau','3','-00')+'</td>' +
  369 + '<td>'+$inputText('','',prefixo+'xm','minuto','2','00')+'</td>' +
  370 + '<td>'+$inputText('','',prefixo+'xs','segundo','5','00.00')+'</td>' +
  371 + '<td>Y:'+$inputText('','',prefixo+'yg','grau','3','-00')+'</td>' +
  372 + '<td>'+$inputText('','',prefixo+'ym','minuto','2','00')+'</td>' +
373 '<td>'+$inputText('','',prefixo+'ys','segundo','5','00.00')+'</td>', 373 '<td>'+$inputText('','',prefixo+'ys','segundo','5','00.00')+'</td>',
374 temp = 'var '+prefixo+'xxx = i3GEO.calculo.dms2dd($i(\''+prefixo+'xg\').value,$i(\''+prefixo+'xm\').value,$i(\''+prefixo+'xs\').value);' + 374 temp = 'var '+prefixo+'xxx = i3GEO.calculo.dms2dd($i(\''+prefixo+'xg\').value,$i(\''+prefixo+'xm\').value,$i(\''+prefixo+'xs\').value);' +
375 'var '+prefixo+'yyy = i3GEO.calculo.dms2dd($i(\''+prefixo+'yg\').value,$i(\''+prefixo+'ym\').value,$i(\''+prefixo+'ys\').value);' + 375 'var '+prefixo+'yyy = i3GEO.calculo.dms2dd($i(\''+prefixo+'yg\').value,$i(\''+prefixo+'ym\').value,$i(\''+prefixo+'ys\').value);' +
@@ -592,7 +592,7 @@ i3GEO.coordenadas = { @@ -592,7 +592,7 @@ i3GEO.coordenadas = {
592 // 592 //
593 if(onde === "") 593 if(onde === "")
594 {onde = i3GEO.coordenadas.config[tipos[0]].idhtml;} 594 {onde = i3GEO.coordenadas.config[tipos[0]].idhtml;}
595 - caixa = "<select onchange='javascript:i3GEO.coordenadas.mudaTipo(this,\""+onde+"\");' style='margin-left:3px;font-size:10px;height:16px;width:50px;' ><option>---</option><option value='janela' >janela</option>"; 595 + caixa = "<select onchange='javascript:i3GEO.coordenadas.mudaTipo(this,\""+onde+"\");' style='margin-left:3px;font-size:10px;height:16px;width:40px;' ><option>---</option><option value='janela' >janela</option>";
596 // 596 //
597 //cria a caixa de seleção 597 //cria a caixa de seleção
598 // 598 //
classesjs/classe_gadgets.js
@@ -237,7 +237,7 @@ i3GEO.gadgets = { @@ -237,7 +237,7 @@ i3GEO.gadgets = {
237 }; 237 };
238 if(!$i("i3geo_escalanum")){ 238 if(!$i("i3geo_escalanum")){
239 i = $inputText(id,"100","i3geo_escalanum",$trad("d10"),"9",parseInt(i3GEO.parametros.mapscale,10)); 239 i = $inputText(id,"100","i3geo_escalanum",$trad("d10"),"9",parseInt(i3GEO.parametros.mapscale,10));
240 - ins = "<table><tr><td><span style=background-color:none >1:</span>"+i; 240 + ins = "<table><tr><td>"+i;
241 temp = 'var nova = document.getElementById("i3geo_escalanum").value;'; 241 temp = 'var nova = document.getElementById("i3geo_escalanum").value;';
242 temp += 'i3GEO.navega.aplicaEscala(i3GEO.configura.locaplic,i3GEO.configura.sid,nova);'; 242 temp += 'i3GEO.navega.aplicaEscala(i3GEO.configura.locaplic,i3GEO.configura.sid,nova);';
243 ins += "</td><td><img src='"+i3GEO.util.$im("branco.gif")+"' class='tic' onclick='"+temp+"' /></td></tr></table>"; 243 ins += "</td><td><img src='"+i3GEO.util.$im("branco.gif")+"' class='tic' onclick='"+temp+"' /></td></tr></table>";
@@ -70,7 +70,7 @@ select @@ -70,7 +70,7 @@ select
70 .inputsb 70 .inputsb
71 {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #2F4632;background-color: #FFFFFF;padding: 0;border: 0px solid gray;text-align: center;cursor: text;} 71 {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #2F4632;background-color: #FFFFFF;padding: 0;border: 0px solid gray;text-align: center;cursor: text;}
72 .legendatemas 72 .legendatemas
73 -{cursor:pointer;text-align:left;background-color:none;vertical-align: top;border: 0px solid gray;margin:0;padding:0;font-family: Verdana, Arial, Helvetica, sans-serif;} 73 +{cursor:pointer;text-align:left;background-color:transparent;vertical-align: top;border: 0px solid gray;margin:0;padding:0;font-family: Verdana, Arial, Helvetica, sans-serif;}
74 .legendatemas td 74 .legendatemas td
75 {text-align:left;background-color:#ffffff;vertical-align: top;padding: 0;font-family: Verdana, Arial, Helvetica, sans-serif;z-index:1000;position:relative;} 75 {text-align:left;background-color:#ffffff;vertical-align: top;padding: 0;font-family: Verdana, Arial, Helvetica, sans-serif;z-index:1000;position:relative;}
76 .legendatemas input 76 .legendatemas input
interface/openlayers_t.htm
@@ -169,7 +169,7 @@ i3GEO.barraDeBotoes.AUTO = true; @@ -169,7 +169,7 @@ i3GEO.barraDeBotoes.AUTO = true;
169 i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja"; 169 i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja";
170 i3GEO.barraDeBotoes.ORIENTACAO = "horizontal"; 170 i3GEO.barraDeBotoes.ORIENTACAO = "horizontal";
171 i3GEO.barraDeBotoes.AJUDA = false; 171 i3GEO.barraDeBotoes.AJUDA = false;
172 -i3GEO.barraDeBotoes.HORIZONTALW = 360; 172 +i3GEO.barraDeBotoes.HORIZONTALW = 380;
173 173
174 i3GEO.Interface.BARRABOTOESLEFT = 5; 174 i3GEO.Interface.BARRABOTOESLEFT = 5;
175 i3GEO.Interface.BARRABOTOESTOP = 0; 175 i3GEO.Interface.BARRABOTOESTOP = 0;