Commit f8a8deb10623b46448ee05821663e7f5157378a2

Authored by Edmar Moretti
1 parent 6b4ea08a
Exists in master

Atualização dos atalhos de edição do editor de mapfiles

ferramentas/atalhosedicao/template_mst.html
@@ -2,25 +2,25 @@ @@ -2,25 +2,25 @@
2 <a title="{{{salvaTip}}}" onclick="i3GEOF.atalhosedicao.salva()" class='btn btn-warning btn-lg btn-block btn-raised' href='javascript:void(0)' > 2 <a title="{{{salvaTip}}}" onclick="i3GEOF.atalhosedicao.salva()" class='btn btn-warning btn-lg btn-block btn-raised' href='javascript:void(0)' >
3 {{{salva}}} 3 {{{salva}}}
4 </a> 4 </a>
5 - <a title="{{{legendaTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.editaLegenda();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' > 5 + <a title="{{{legendaTip}}}" onclick="i3GEO.tema.dialogo.editaLegenda(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
6 {{{legenda}}} 6 {{{legenda}}}
7 </a> 7 </a>
8 - <a title="{{{tabelaTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.tabela();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' > 8 + <a title="{{{tabelaTip}}}" onclick="i3GEO.tema.dialogo.tabela(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
9 {{{tabela}}} 9 {{{tabela}}}
10 </a> 10 </a>
11 - <a title="{{{textoTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.toponimia();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' > 11 + <a title="{{{textoTip}}}" onclick="i3GEO.tema.dialogo.toponimia(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
12 {{{texto}}} 12 {{{texto}}}
13 </a> 13 </a>
14 - <a title="{{{etiquetaTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.etiquetas();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' > 14 + <a title="{{{etiquetaTip}}}" onclick="i3GEO.tema.dialogo.etiquetas(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
15 {{{etiqueta}}} 15 {{{etiqueta}}}
16 </a> 16 </a>
17 - <a title="{{{funcaojsTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.funcaojstip();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' > 17 + <a title="{{{funcaojsTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.funcaojstip(i3GEO.temaAtivo);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
18 {{{funcaojsTitulo}}} 18 {{{funcaojsTitulo}}}
19 </a> 19 </a>
20 - <a title="{{{filtroTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.filtro();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' > 20 + <a title="{{{filtroTip}}}" onclick="i3GEO.tema.dialogo.filtro(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
21 {{{filtro}}} 21 {{{filtro}}}
22 </a> 22 </a>
23 - <a title="{{{temacomgraficoTip}}}" onclick="i3GEOF.atalhosedicao.temaComGrafico();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' > 23 + <a title="{{{temacomgraficoTip}}}" onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEOF.atalhosedicao.temaComGrafico(i3GEOF.atalhosedicao.tema);" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
24 {{{temacomgrafico}}} 24 {{{temacomgrafico}}}
25 </a> 25 </a>
26 26
interface/inc/barradeicones.php
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <button title="GPS" onclick="i3GEO.navega.geolocal.start()" style="float: left; cursor: pointer;"> 37 <button title="GPS" onclick="i3GEO.navega.geolocal.start()" style="float: left; cursor: pointer;">
38 <i class="material-icons">gps_fixed</i> 38 <i class="material-icons">gps_fixed</i>
39 </button> 39 </button>
40 - <button title="{{{itensvisib}}}" onclick="i3GEO.mapa.itensvisib(['.ol-i3GEOcontrols','.iconesGuiaMovel','.ol-attribution button','.escalanumerica','.localizarxy','.i3GEOfechaGuia'])" style="float: left; cursor: pointer;"> 40 + <button title="{{{itensvisib}}}" onclick="i3GEO.mapa.itensvisib(['.check','.ol-i3GEOcontrols','.iconesGuiaMovel','.ol-attribution button','.escalanumerica','.localizarxy','.i3GEOfechaGuia'])" style="float: left; cursor: pointer;">
41 <i class="material-icons">visibility</i> 41 <i class="material-icons">visibility</i>
42 </button> 42 </button>
43 <button class="hidden-xs toggle" title="{{{d18t}}}" onclick="i3GEO.navega.lente.start()" style="float: left; cursor: pointer; display: none;"> 43 <button class="hidden-xs toggle" title="{{{d18t}}}" onclick="i3GEO.navega.lente.start()" style="float: left; cursor: pointer; display: none;">
interface/templates/camada.html
@@ -61,7 +61,6 @@ @@ -61,7 +61,6 @@
61 <li><a href='javascript:void(0)' onclick="i3GEO.tema.dialogo.filtro('{{name}}')" class='{{isnotvetor}} '> 61 <li><a href='javascript:void(0)' onclick="i3GEO.tema.dialogo.filtro('{{name}}')" class='{{isnotvetor}} '>
62 <span class="glyphicon glyphicon-filter"></span> {{{filtroTexto}}} 62 <span class="glyphicon glyphicon-filter"></span> {{{filtroTexto}}}
63 </a></li> 63 </a></li>
64 -  
65 <li><a class="{{{sel}}}" href="javascript:void(0)" onclick="i3GEO.tema.limpasel('{{{name}}}')" title="{{{selTitle}}}"> 64 <li><a class="{{{sel}}}" href="javascript:void(0)" onclick="i3GEO.tema.limpasel('{{{name}}}')" title="{{{selTitle}}}">
66 <span class="glyphicon glyphicon-erase"></span> {{{limpaselTexto}}} 65 <span class="glyphicon glyphicon-erase"></span> {{{limpaselTexto}}}
67 </a></li> 66 </a></li>
@@ -757,20 +757,15 @@ i3GEO.tema = @@ -757,20 +757,15 @@ i3GEO.tema =
757 * {string} - id que identifica o tema conforme definido no map file 757 * {string} - id que identifica o tema conforme definido no map file
758 */ 758 */
759 etiquetas : function(idtema) { 759 etiquetas : function(idtema) {
760 - if(idtema && idtema != ""){  
761 - var t = i3GEO.arvoreDeCamadas.pegaTema(idtema);  
762 - if(t.status < 2){  
763 - i3GEO.janela.snackBar({content: $trad("deveLigada"),style: "red"});  
764 - return;  
765 - }  
766 - }  
767 - i3GEO.mapa.ativaTema(idtema); 760 + var temp = function(){
  761 + i3GEOF.etiqueta.start(idtema);
  762 + };
768 i3GEO.util.dialogoFerramenta( 763 i3GEO.util.dialogoFerramenta(
769 - "i3GEO.tema.dialogo.etiquetas()", 764 + "i3GEO.tema.dialogo.etiqueta()",
770 "etiqueta", 765 "etiqueta",
771 "etiqueta", 766 "etiqueta",
772 "dependencias.php", 767 "dependencias.php",
773 - "i3GEOF.etiqueta.iniciaJanelaFlutuante()"); 768 + "i3GEOF.etiqueta.start()");
774 }, 769 },
775 /** 770 /**
776 * Function: funcaojstip 771 * Function: funcaojstip