diff --git a/admin/admin.db b/admin/admin.db index 6e3f422..2188503 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/css/geral.css b/css/geral.css index ced92b5..79241fa 100644 --- a/css/geral.css +++ b/css/geral.css @@ -15,6 +15,9 @@ input[type=text]{ -o-user-select: text; user-select: text; } +a:active { + outline: none; +} /* Popup do identifica no openlayers 3 */ @@ -1343,10 +1346,10 @@ h1 { text-overflow: ellipsis; font-size: 12px; appearance: none; - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; background-size: 16px 144px; } } diff --git a/css/i3geo6.css b/css/i3geo6.css index 37d8d17..65e43f3 100755 --- a/css/i3geo6.css +++ b/css/i3geo6.css @@ -15,6 +15,9 @@ input[type=text]{ -o-user-select: text; user-select: text; } +a:active { +outline: none; +} /* Popup do identifica no openlayers 3 */ @@ -1201,10 +1204,10 @@ white-space: nowrap; text-overflow: ellipsis; font-size: 12px; appearance: none; -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; background-size: 16px 144px; } } diff --git a/css/i3geo6.css.php b/css/i3geo6.css.php index 3c6b6ef..9863448 100755 --- a/css/i3geo6.css.php +++ b/css/i3geo6.css.php @@ -15,6 +15,9 @@ input[type=text]{ -o-user-select: text; user-select: text; } +a:active { +outline: none; +} /* Popup do identifica no openlayers 3 */ @@ -1201,10 +1204,10 @@ white-space: nowrap; text-overflow: ellipsis; font-size: 12px; appearance: none; -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; background-size: 16px 144px; } } diff --git a/css/i3geo_ferramentas6.css b/css/i3geo_ferramentas6.css index 3f33e12..d0a4c1f 100755 --- a/css/i3geo_ferramentas6.css +++ b/css/i3geo_ferramentas6.css @@ -15,6 +15,9 @@ input[type=text]{ -o-user-select: text; user-select: text; } +a:active { + outline: none; +} /* Popup do identifica no openlayers 3 */ @@ -1343,10 +1346,10 @@ h1 { text-overflow: ellipsis; font-size: 12px; appearance: none; - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; background-size: 16px 144px; } } diff --git a/init/index.js b/init/index.js index a30c973..4189ee0 100644 --- a/init/index.js +++ b/init/index.js @@ -123,11 +123,11 @@ function mostraBotoes(){ //i3GEO.barraDeBotoes.ATIVA = false; var ins = [],i,n = botoesIni.length,texto; for(i=0;i

'+botoesIni[i].titulo+''; + texto = '


'+botoesIni[i].titulo+'
'; if(botoesIni[i].subtitulo){ texto += botoesIni[i].subtitulo; } - texto += '
'; + texto += '
'; ins.push(texto); } $i("botoes").innerHTML = ins.join(""); diff --git a/init/index.php b/init/index.php index f1fbdf4..6bd105b 100755 --- a/init/index.php +++ b/init/index.php @@ -95,6 +95,14 @@ body { z-index: 2; } +.ri { + left: 50%; + position: absolute; + top: 50%; + transform: translate(-50%, -50%); + width: 100%; +} + table { width: 100%; } @@ -187,47 +195,28 @@ A:hover {
- - - - - - -
- -
+
+ +
-
- - - - - -
- - -
-
- - - - - -
- - -
-
- - - - - -
- -
-
+
+
+
+ + +
+
+
+ +
+
+
+ +
+
diff --git a/interface/osmdebug.htm b/interface/osmdebug.htm index a8c0179..3509a59 100755 --- a/interface/osmdebug.htm +++ b/interface/osmdebug.htm @@ -175,14 +175,14 @@ OpenLayers.ImgPath = "../pacotes/openlayers/img/"; (function() { function getTileURL(bounds) { - console.info(this) + console.info(bounds) var res = this.map.getResolution(); //var m = i3GEO.util.projGeo2OSM(i3geoOL.maxExtent); //bounds = i3GEO.util.projGeo2OSM(bounds) //this.map.zoomIn() var m = (this.maxExtent); - var x = Math.round((bounds.left - m.left) / (res * 256)); - var y = Math.round((m.top - bounds.top) / (res * 256)); + var x = Math.round((bounds.left - m.left) / ((res) * 256)); + var y = Math.round((m.top - bounds.top) / ((res) * 256)); var z = this.map.getZoom(); var limit = Math.pow(2, z); @@ -243,13 +243,13 @@ visibility : false }); - var layMSNOsmRoad = new OpenLayers.Layer.TMS("OSM Roads", "http://korona.geog.uni-heidelberg.de/tiles/roads/", { + var layMSNOsmRoad = new OpenLayers.Layer.OSM("OSM Roads", ["http://korona.geog.uni-heidelberg.de/tiles/roads/x=${x}&y=${y}&z=${z}"], { + displayOutsideMaxExtent: true, type : 'png', - getURL : getTileURL, + //getURL : getTileURL, isBaseLayer : true, visibility : false, - attribution : mapSurfer, - displayOutsideMaxExtent: true + attribution : mapSurfer }); var layMSNOsmRoadsGray = @@ -272,9 +272,8 @@ attribution : mapSurfer }); - var layMSNOsmHybrid = new OpenLayers.Layer.TMS("OSM Semitransparent", "http://korona.geog.uni-heidelberg.de/tiles/hybrid/", { - type : 'png', - getURL : getTileURL, + var layMSNOsmHybrid = new OpenLayers.Layer.OSM("OSM Semitransparent", "http://korona.geog.uni-heidelberg.de/tiles/hybrid/x=${x}&y=${y}&z=${z}", { + displayOutsideMaxExtent: true, visibility : false, isBaseLayer : true, attribution : mapSurfer -- libgit2 0.21.2