Download as
Browse Code »

Commit 1c1ee3d3179ca5e3328d66bfe01224ec8e8fcaca

Authored by Edmar Moretti
1 parent bb1dc76f
Exists in master and in 6 other branches composer, doc-root, guia, licenca, readme, unmaintened

Desabilitada o slide para zoom. Inclusão dos botões de zoomin e zoomout na barra de navegação

Showing 6 changed files with 34 additions and 18 deletions   Show diff stats
css/default.css
  Diff comments   View file @1c1ee3d
  1 +.ol-zoom {
  2 + position: unset !Important;
  3 + display: flex !Important;
  4 +}
  5 +
1 .ol-FullScreen.ol-unselectable.ol-control { 6 .ol-FullScreen.ol-unselectable.ol-control {
2 position: unset !Important; 7 position: unset !Important;
3 display: unset !Important; 8 display: unset !Important;
@@ -347,7 +352,7 @@ hr { @@ -347,7 +352,7 @@ hr {
347 z-index: 1; 352 z-index: 1;
348 left: auto; 353 left: auto;
349 right: 2px; 354 right: 2px;
350 - top: 5px; 355 + top: 1rem;
351 width: 380px; 356 width: 380px;
352 } 357 }
353 #i3GEOguiaMovelMolde { 358 #i3GEOguiaMovelMolde {
@@ -570,14 +575,9 @@ no caso do OL3 @@ -570,14 +575,9 @@ no caso do OL3
570 top: 10px; 575 top: 10px;
571 } 576 }
572 577
573 -.ol-zoom {  
574 - top: 2.8em;  
575 - font-size: 1.8rem;  
576 -}  
577 -  
578 .ol-i3GEOcontrols { 578 .ol-i3GEOcontrols {
579 - top: 2.8em;  
580 - left: 3.5em; 579 + top: 2.5rem;
  580 + left: 1rem;
581 width: auto; 581 width: auto;
582 font-size: 1.8rem; 582 font-size: 1.8rem;
583 } 583 }
interface/ol.htm
  Diff comments   View file @1c1ee3d
@@ -115,6 +115,7 @@ @@ -115,6 +115,7 @@
115 </div> 115 </div>
116 <!-- barra de icones de navegacao --> 116 <!-- barra de icones de navegacao -->
117 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true"> 117 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
  118 + <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
118 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;"> 119 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
119 <i class="material-icons">public</i> 120 <i class="material-icons">public</i>
120 </button> 121 </button>
@@ -841,6 +842,9 @@ @@ -841,6 +842,9 @@
841 source: "i3geo" 842 source: "i3geo"
842 843
843 }).setMap(i3geoOL); 844 }).setMap(i3geoOL);
  845 + new ol.control.Zoom({
  846 + target: $i("i3GEOzoomInOut")
  847 + }).setMap(i3geoOL);
844 tutorial.init(); 848 tutorial.init();
845 //i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140)); 849 //i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140));
846 850
@@ -970,8 +974,9 @@ @@ -970,8 +974,9 @@
970 //opcoes de inicializacao do mapa conforme definido na API do OpenLayers 974 //opcoes de inicializacao do mapa conforme definido na API do OpenLayers
971 MapOptions : { 975 MapOptions : {
972 layers : [], 976 layers : [],
973 - controls : [ new ol.control.Zoom(),  
974 - new ol.control.ZoomSlider(), 977 + controls : [
  978 + //new ol.control.Zoom(),
  979 + //new ol.control.ZoomSlider(),
975 new ol.control.ScaleLine(), 980 new ol.control.ScaleLine(),
976 new ol.control.Attribution({ 981 new ol.control.Attribution({
977 collapsible : true 982 collapsible : true
interface/openlayersdebug.htm
  Diff comments   View file @1c1ee3d
@@ -114,6 +114,7 @@ @@ -114,6 +114,7 @@
114 </div> 114 </div>
115 <!-- barra de icones de navegacao --> 115 <!-- barra de icones de navegacao -->
116 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true"> 116 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
  117 + <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
117 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;"> 118 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
118 <i class="material-icons">public</i> 119 <i class="material-icons">public</i>
119 </button> 120 </button>
@@ -839,6 +840,10 @@ @@ -839,6 +840,10 @@
839 source: "i3geo" 840 source: "i3geo"
840 841
841 }).setMap(i3geoOL); 842 }).setMap(i3geoOL);
  843 + new ol.control.Zoom({
  844 + target: $i("i3GEOzoomInOut")
  845 + }).setMap(i3geoOL);
  846 +
842 //i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140)); 847 //i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140));
843 848
844 //setTimeout(function() { 849 //setTimeout(function() {
@@ -972,8 +977,8 @@ @@ -972,8 +977,8 @@
972 MapOptions : { 977 MapOptions : {
973 layers : [], 978 layers : [],
974 controls : [ 979 controls : [
975 - new ol.control.Zoom(),  
976 - new ol.control.ZoomSlider(), 980 + //new ol.control.Zoom(),
  981 + //new ol.control.ZoomSlider(),
977 new ol.control.ScaleLine(), 982 new ol.control.ScaleLine(),
978 new ol.control.Attribution({ 983 new ol.control.Attribution({
979 collapsible : true 984 collapsible : true
interface/osm.htm
  Diff comments   View file @1c1ee3d
@@ -115,6 +115,7 @@ @@ -115,6 +115,7 @@
115 </div> 115 </div>
116 <!-- barra de icones de navegacao --> 116 <!-- barra de icones de navegacao -->
117 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true"> 117 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
  118 + <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
118 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;"> 119 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
119 <i class="material-icons">public</i> 120 <i class="material-icons">public</i>
120 </button> 121 </button>
@@ -841,6 +842,9 @@ @@ -841,6 +842,9 @@
841 source: "i3geo" 842 source: "i3geo"
842 843
843 }).setMap(i3geoOL); 844 }).setMap(i3geoOL);
  845 + new ol.control.Zoom({
  846 + target: $i("i3GEOzoomInOut")
  847 + }).setMap(i3geoOL);
844 tutorial.init(); 848 tutorial.init();
845 //i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140)); 849 //i3GEO.eventos.adicionaEventos("RESIZE", $(".guiaOverflow").css("height",i3GEO.parametros.h - 140));
846 850
@@ -970,8 +974,9 @@ @@ -970,8 +974,9 @@
970 //opcoes de inicializacao do mapa conforme definido na API do OpenLayers 974 //opcoes de inicializacao do mapa conforme definido na API do OpenLayers
971 MapOptions : { 975 MapOptions : {
972 layers : [], 976 layers : [],
973 - controls : [ new ol.control.Zoom(),  
974 - new ol.control.ZoomSlider(), 977 + controls : [
  978 + //new ol.control.Zoom(),
  979 + //new ol.control.ZoomSlider(),
975 new ol.control.ScaleLine(), 980 new ol.control.ScaleLine(),
976 new ol.control.Attribution({ 981 new ol.control.Attribution({
977 collapsible : true 982 collapsible : true
interface/osmdebug.htm
  Diff comments   View file @1c1ee3d
@@ -115,6 +115,7 @@ @@ -115,6 +115,7 @@
115 </div> 115 </div>
116 <!-- barra de icones de navegacao --> 116 <!-- barra de icones de navegacao -->
117 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true"> 117 <div class="ol-i3GEOcontrols ol-control" data-traduzir="true">
  118 + <span id="i3GEOzoomInOut" class="hidden-xs hidden-sm" style="cursor:pointer;"></span>
118 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;"> 119 <button title="{{{d2t}}}" onclick="i3GEO.Interface.zoom2ext(i3GEO.parametros.extentTotal)" style="float: left;">
119 <i class="material-icons">public</i> 120 <i class="material-icons">public</i>
120 </button> 121 </button>
@@ -970,8 +971,9 @@ @@ -970,8 +971,9 @@
970 //opcoes de inicializacao do mapa conforme definido na API do OpenLayers 971 //opcoes de inicializacao do mapa conforme definido na API do OpenLayers
971 MapOptions : { 972 MapOptions : {
972 layers : [], 973 layers : [],
973 - controls : [ new ol.control.Zoom(),  
974 - new ol.control.ZoomSlider(), 974 + controls : [
  975 + //new ol.control.Zoom(),
  976 + //new ol.control.ZoomSlider(),
975 new ol.control.ScaleLine(), 977 new ol.control.ScaleLine(),
976 new ol.control.Attribution({ 978 new ol.control.Attribution({
977 collapsible : true 979 collapsible : true
interface/templates/camadaGr.html
  Diff comments   View file @1c1ee3d
@@ -5,9 +5,8 @@ @@ -5,9 +5,8 @@
5 {{{checked}}} onclick="i3geoOL.getLayersGrBy('name','{{{name}}}')[0].setVisibility(this.checked);i3geoOL.getLayersGrBy('name','{{{name}}}')[0].changed()"> 5 {{{checked}}} onclick="i3geoOL.getLayersGrBy('name','{{{name}}}')[0].setVisibility(this.checked);i3geoOL.getLayersGrBy('name','{{{name}}}')[0].changed()">
6 <span class="checkbox-material noprint"><span class="check"></span></span> {{{tema}}} 6 <span class="checkbox-material noprint"><span class="check"></span></span> {{{tema}}}
7 </label> 7 </label>
8 - <a data-target=".listaLayersGrBtn" class="pull-right collapsed" style="margin-top: 0px; padding-top: 0px; padding-bottom: 0px;" type="button" data-toggle="collapse"> </a> 8 + <a data-target="listaLayersGrBtn" class="pull-right collapsed" style="margin-top: 0px; padding-top: 0px; padding-bottom: 0px;" type="button" data-toggle="collapse"> </a>
9 </div> 9 </div>
10 - <div class="clearfix"></div>  
11 </div> 10 </div>
12 <div class="listaLayersGrBtn collapse" style="overflow: none;width: 35rem;"> 11 <div class="listaLayersGrBtn collapse" style="overflow: none;width: 35rem;">
13 <button title="{{{dlinha}}}" onclick="i3GEO.editor.draw.lineString()" class="btn btn-xs" style="margin: 2px; padding: 2px;"> 12 <button title="{{{dlinha}}}" onclick="i3GEO.editor.draw.lineString()" class="btn btn-xs" style="margin: 2px; padding: 2px;">