Commit 6aa69b2fb8f91d9e6e9683e0b4b175cb06a4edb4
1 parent
0e0d14df
Exists in
master
and in
7 other branches
remção da tag table e ajustes no css dos botões de seleção (select>
Showing
8 changed files
with
59 additions
and
59 deletions
Show diff stats
admin/admin.db
No preview for this file type
css/geral.css
| @@ -15,6 +15,9 @@ input[type=text]{ | @@ -15,6 +15,9 @@ input[type=text]{ | ||
| 15 | -o-user-select: text; | 15 | -o-user-select: text; |
| 16 | user-select: text; | 16 | user-select: text; |
| 17 | } | 17 | } |
| 18 | +a:active { | ||
| 19 | + outline: none; | ||
| 20 | +} | ||
| 18 | /* | 21 | /* |
| 19 | Popup do identifica no openlayers 3 | 22 | Popup do identifica no openlayers 3 |
| 20 | */ | 23 | */ |
| @@ -1343,10 +1346,10 @@ h1 { | @@ -1343,10 +1346,10 @@ h1 { | ||
| 1343 | text-overflow: ellipsis; | 1346 | text-overflow: ellipsis; |
| 1344 | font-size: 12px; | 1347 | font-size: 12px; |
| 1345 | appearance: none; | 1348 | appearance: none; |
| 1346 | - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1349 | + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1347 | @media (-webkit-min-device-pixel-ratio: 2), | 1350 | @media (-webkit-min-device-pixel-ratio: 2), |
| 1348 | (min-resolution: 192dpi) { | 1351 | (min-resolution: 192dpi) { |
| 1349 | - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1352 | + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1350 | background-size: 16px 144px; | 1353 | background-size: 16px 144px; |
| 1351 | } | 1354 | } |
| 1352 | } | 1355 | } |
css/i3geo6.css
| @@ -15,6 +15,9 @@ input[type=text]{ | @@ -15,6 +15,9 @@ input[type=text]{ | ||
| 15 | -o-user-select: text; | 15 | -o-user-select: text; |
| 16 | user-select: text; | 16 | user-select: text; |
| 17 | } | 17 | } |
| 18 | +a:active { | ||
| 19 | +outline: none; | ||
| 20 | +} | ||
| 18 | /* | 21 | /* |
| 19 | Popup do identifica no openlayers 3 | 22 | Popup do identifica no openlayers 3 |
| 20 | */ | 23 | */ |
| @@ -1201,10 +1204,10 @@ white-space: nowrap; | @@ -1201,10 +1204,10 @@ white-space: nowrap; | ||
| 1201 | text-overflow: ellipsis; | 1204 | text-overflow: ellipsis; |
| 1202 | font-size: 12px; | 1205 | font-size: 12px; |
| 1203 | appearance: none; | 1206 | appearance: none; |
| 1204 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1207 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1205 | @media (-webkit-min-device-pixel-ratio: 2), | 1208 | @media (-webkit-min-device-pixel-ratio: 2), |
| 1206 | (min-resolution: 192dpi) { | 1209 | (min-resolution: 192dpi) { |
| 1207 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1210 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1208 | background-size: 16px 144px; | 1211 | background-size: 16px 144px; |
| 1209 | } | 1212 | } |
| 1210 | } | 1213 | } |
css/i3geo6.css.php
| @@ -15,6 +15,9 @@ input[type=text]{ | @@ -15,6 +15,9 @@ input[type=text]{ | ||
| 15 | -o-user-select: text; | 15 | -o-user-select: text; |
| 16 | user-select: text; | 16 | user-select: text; |
| 17 | } | 17 | } |
| 18 | +a:active { | ||
| 19 | +outline: none; | ||
| 20 | +} | ||
| 18 | /* | 21 | /* |
| 19 | Popup do identifica no openlayers 3 | 22 | Popup do identifica no openlayers 3 |
| 20 | */ | 23 | */ |
| @@ -1201,10 +1204,10 @@ white-space: nowrap; | @@ -1201,10 +1204,10 @@ white-space: nowrap; | ||
| 1201 | text-overflow: ellipsis; | 1204 | text-overflow: ellipsis; |
| 1202 | font-size: 12px; | 1205 | font-size: 12px; |
| 1203 | appearance: none; | 1206 | appearance: none; |
| 1204 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1207 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1205 | @media (-webkit-min-device-pixel-ratio: 2), | 1208 | @media (-webkit-min-device-pixel-ratio: 2), |
| 1206 | (min-resolution: 192dpi) { | 1209 | (min-resolution: 192dpi) { |
| 1207 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1210 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1208 | background-size: 16px 144px; | 1211 | background-size: 16px 144px; |
| 1209 | } | 1212 | } |
| 1210 | } | 1213 | } |
css/i3geo_ferramentas6.css
| @@ -15,6 +15,9 @@ input[type=text]{ | @@ -15,6 +15,9 @@ input[type=text]{ | ||
| 15 | -o-user-select: text; | 15 | -o-user-select: text; |
| 16 | user-select: text; | 16 | user-select: text; |
| 17 | } | 17 | } |
| 18 | +a:active { | ||
| 19 | + outline: none; | ||
| 20 | +} | ||
| 18 | /* | 21 | /* |
| 19 | Popup do identifica no openlayers 3 | 22 | Popup do identifica no openlayers 3 |
| 20 | */ | 23 | */ |
| @@ -1343,10 +1346,10 @@ h1 { | @@ -1343,10 +1346,10 @@ h1 { | ||
| 1343 | text-overflow: ellipsis; | 1346 | text-overflow: ellipsis; |
| 1344 | font-size: 12px; | 1347 | font-size: 12px; |
| 1345 | appearance: none; | 1348 | appearance: none; |
| 1346 | - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1349 | + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1347 | @media (-webkit-min-device-pixel-ratio: 2), | 1350 | @media (-webkit-min-device-pixel-ratio: 2), |
| 1348 | (min-resolution: 192dpi) { | 1351 | (min-resolution: 192dpi) { |
| 1349 | - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | 1352 | + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 0px; |
| 1350 | background-size: 16px 144px; | 1353 | background-size: 16px 144px; |
| 1351 | } | 1354 | } |
| 1352 | } | 1355 | } |
init/index.js
| @@ -123,11 +123,11 @@ function mostraBotoes(){ | @@ -123,11 +123,11 @@ function mostraBotoes(){ | ||
| 123 | //i3GEO.barraDeBotoes.ATIVA = false; | 123 | //i3GEO.barraDeBotoes.ATIVA = false; |
| 124 | var ins = [],i,n = botoesIni.length,texto; | 124 | var ins = [],i,n = botoesIni.length,texto; |
| 125 | for(i=0;i<n;i++){ | 125 | for(i=0;i<n;i++){ |
| 126 | - texto = '<div class="r" ><table ><tr><td><a target=_blank href="'+botoesIni[i].href+'" ><img src="'+botoesIni[i].img+'" /><br><br>'+botoesIni[i].titulo+'</a>'; | 126 | + texto = '<div class="r" ><div class="ri" ><a target=_blank href="'+botoesIni[i].href+'" ><img src="'+botoesIni[i].img+'" /><br><br>'+botoesIni[i].titulo+'</a>'; |
| 127 | if(botoesIni[i].subtitulo){ | 127 | if(botoesIni[i].subtitulo){ |
| 128 | texto += botoesIni[i].subtitulo; | 128 | texto += botoesIni[i].subtitulo; |
| 129 | } | 129 | } |
| 130 | - texto += '</td></tr></table></div>'; | 130 | + texto += '</div></div>'; |
| 131 | ins.push(texto); | 131 | ins.push(texto); |
| 132 | } | 132 | } |
| 133 | $i("botoes").innerHTML = ins.join(""); | 133 | $i("botoes").innerHTML = ins.join(""); |
init/index.php
| @@ -95,6 +95,14 @@ body { | @@ -95,6 +95,14 @@ body { | ||
| 95 | z-index: 2; | 95 | z-index: 2; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | +.ri { | ||
| 99 | + left: 50%; | ||
| 100 | + position: absolute; | ||
| 101 | + top: 50%; | ||
| 102 | + transform: translate(-50%, -50%); | ||
| 103 | + width: 100%; | ||
| 104 | +} | ||
| 105 | + | ||
| 98 | table { | 106 | table { |
| 99 | width: 100%; | 107 | width: 100%; |
| 100 | } | 108 | } |
| @@ -187,47 +195,28 @@ A:hover { | @@ -187,47 +195,28 @@ A:hover { | ||
| 187 | <div id="botoes" style="width: 100%;"></div> | 195 | <div id="botoes" style="width: 100%;"></div> |
| 188 | <script>mostraBotoes();</script> | 196 | <script>mostraBotoes();</script> |
| 189 | <div class="r"> | 197 | <div class="r"> |
| 190 | - <table> | ||
| 191 | - <tbody> | ||
| 192 | - <tr> | ||
| 193 | - <td> | ||
| 194 | - <script type="text/javascript" src="http://www.openhub.net/p/150688/widgets/project_users.js?style=gray"></script> | ||
| 195 | - </td> | ||
| 196 | - </tr> | ||
| 197 | - </tbody> | ||
| 198 | - </table> | 198 | + <div class="ri" > |
| 199 | + <script type="text/javascript" src="http://www.openhub.net/p/150688/widgets/project_users.js?style=gray"></script> | ||
| 200 | + </div> | ||
| 199 | </div> | 201 | </div> |
| 200 | </div> | 202 | </div> |
| 201 | - <div style="float: left"> | ||
| 202 | - <a href="#" class="r" style="width: 230px; height: 380px;"> | ||
| 203 | - <table> | ||
| 204 | - <tr> | ||
| 205 | - <td> | ||
| 206 | - <a class="twitter-timeline" href="https://twitter.com/i3geo" data-widget-id="288061915689787392" width="220" height="350">Tweets @i3Geo</a> | ||
| 207 | - <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> | ||
| 208 | - </td> | ||
| 209 | - </tr> | ||
| 210 | - </table> | ||
| 211 | - </a> | ||
| 212 | - <a href="#" class="r" style="width: 230px; height: 380px;"> | ||
| 213 | - <table> | ||
| 214 | - <tr> | ||
| 215 | - <td> | ||
| 216 | - <a class="twitter-timeline" href="https://twitter.com/search?q=@i3geo" data-widget-id="288053202174222336" width="220" height="350">Tweets #i3Geo</a> | ||
| 217 | - <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> | ||
| 218 | - </td> | ||
| 219 | - </tr> | ||
| 220 | - </table> | ||
| 221 | - </a> | ||
| 222 | - <a href="#" class="r" style="width: 345px; height: 220px;"> | ||
| 223 | - <table> | ||
| 224 | - <tr> | ||
| 225 | - <td> | ||
| 226 | - <script type="text/javascript" src="http://www.openhub.net/p/150688/widgets/project_basic_stats.js"></script> | ||
| 227 | - </td> | ||
| 228 | - </tr> | ||
| 229 | - </table> | ||
| 230 | - </a> | 203 | + <div style="float: left;"> |
| 204 | + <div class="r" style="width: 230px; height: 380px;"> | ||
| 205 | + <div class="ri"> | ||
| 206 | + <a class="twitter-timeline" href="https://twitter.com/i3geo" data-widget-id="288061915689787392" width="220" height="350">Tweets @i3Geo</a> | ||
| 207 | + <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> | ||
| 208 | + </div> | ||
| 209 | + </div> | ||
| 210 | + <div class="r" style="width: 230px; height: 380px;"> | ||
| 211 | + <div class="ri" > | ||
| 212 | + <a class="twitter-timeline" href="https://twitter.com/search?q=@i3geo" data-widget-id="288053202174222336" width="220" height="350">Tweets #i3Geo</a> | ||
| 213 | + </div> | ||
| 214 | + </div> | ||
| 215 | + <div class="r" style="width: 345px; height: 220px;"> | ||
| 216 | + <div class="ri"> | ||
| 217 | + <script type="text/javascript" src="http://www.openhub.net/p/150688/widgets/project_basic_stats.js"></script> | ||
| 218 | + </div> | ||
| 219 | + </div> | ||
| 231 | </div> | 220 | </div> |
| 232 | </div> | 221 | </div> |
| 233 | </body> | 222 | </body> |
interface/osmdebug.htm
| @@ -175,14 +175,14 @@ | @@ -175,14 +175,14 @@ | ||
| 175 | OpenLayers.ImgPath = "../pacotes/openlayers/img/"; | 175 | OpenLayers.ImgPath = "../pacotes/openlayers/img/"; |
| 176 | (function() { | 176 | (function() { |
| 177 | function getTileURL(bounds) { | 177 | function getTileURL(bounds) { |
| 178 | - console.info(this) | 178 | + console.info(bounds) |
| 179 | var res = this.map.getResolution(); | 179 | var res = this.map.getResolution(); |
| 180 | //var m = i3GEO.util.projGeo2OSM(i3geoOL.maxExtent); | 180 | //var m = i3GEO.util.projGeo2OSM(i3geoOL.maxExtent); |
| 181 | //bounds = i3GEO.util.projGeo2OSM(bounds) | 181 | //bounds = i3GEO.util.projGeo2OSM(bounds) |
| 182 | //this.map.zoomIn() | 182 | //this.map.zoomIn() |
| 183 | var m = (this.maxExtent); | 183 | var m = (this.maxExtent); |
| 184 | - var x = Math.round((bounds.left - m.left) / (res * 256)); | ||
| 185 | - var y = Math.round((m.top - bounds.top) / (res * 256)); | 184 | + var x = Math.round((bounds.left - m.left) / ((res) * 256)); |
| 185 | + var y = Math.round((m.top - bounds.top) / ((res) * 256)); | ||
| 186 | var z = this.map.getZoom(); | 186 | var z = this.map.getZoom(); |
| 187 | var limit = Math.pow(2, z); | 187 | var limit = Math.pow(2, z); |
| 188 | 188 | ||
| @@ -243,13 +243,13 @@ | @@ -243,13 +243,13 @@ | ||
| 243 | visibility : false | 243 | visibility : false |
| 244 | }); | 244 | }); |
| 245 | 245 | ||
| 246 | - var layMSNOsmRoad = new OpenLayers.Layer.TMS("OSM Roads", "http://korona.geog.uni-heidelberg.de/tiles/roads/", { | 246 | + var layMSNOsmRoad = new OpenLayers.Layer.OSM("OSM Roads", ["http://korona.geog.uni-heidelberg.de/tiles/roads/x=${x}&y=${y}&z=${z}"], { |
| 247 | + displayOutsideMaxExtent: true, | ||
| 247 | type : 'png', | 248 | type : 'png', |
| 248 | - getURL : getTileURL, | 249 | + //getURL : getTileURL, |
| 249 | isBaseLayer : true, | 250 | isBaseLayer : true, |
| 250 | visibility : false, | 251 | visibility : false, |
| 251 | - attribution : mapSurfer, | ||
| 252 | - displayOutsideMaxExtent: true | 252 | + attribution : mapSurfer |
| 253 | }); | 253 | }); |
| 254 | 254 | ||
| 255 | var layMSNOsmRoadsGray = | 255 | var layMSNOsmRoadsGray = |
| @@ -272,9 +272,8 @@ | @@ -272,9 +272,8 @@ | ||
| 272 | attribution : mapSurfer | 272 | attribution : mapSurfer |
| 273 | }); | 273 | }); |
| 274 | 274 | ||
| 275 | - var layMSNOsmHybrid = new OpenLayers.Layer.TMS("OSM Semitransparent", "http://korona.geog.uni-heidelberg.de/tiles/hybrid/", { | ||
| 276 | - type : 'png', | ||
| 277 | - getURL : getTileURL, | 275 | + var layMSNOsmHybrid = new OpenLayers.Layer.OSM("OSM Semitransparent", "http://korona.geog.uni-heidelberg.de/tiles/hybrid/x=${x}&y=${y}&z=${z}", { |
| 276 | + displayOutsideMaxExtent: true, | ||
| 278 | visibility : false, | 277 | visibility : false, |
| 279 | isBaseLayer : true, | 278 | isBaseLayer : true, |
| 280 | attribution : mapSurfer | 279 | attribution : mapSurfer |