diff --git a/admin/js/core.js b/admin/js/core.js index 50ee06d..6fb9df7 100644 --- a/admin/js/core.js +++ b/admin/js/core.js @@ -1771,6 +1771,7 @@ function core_parseMustacheBody (hashMustache){ //arquivos css // cssfiles =new Array( + i3GEO.configura.locaplic+"/css/input.css", i3GEO.configura.locaplic+"/admin/html/admin.css" ); } @@ -1814,6 +1815,7 @@ function core_parseMustacheBody (hashMustache){ "../../pacotes/yui290/build/treeview/assets/skins/sam/treeview.css", "../../pacotes/yui290/build/editor/assets/skins/sam/editor.css", "../../pacotes/yui290/build/resize/assets/skins/sam/resize.css", + "../../css/input.css", "../../css/janelaflutuante.css", "../html/admin.css" ); diff --git a/admin/php/estat_mapa_upload.php b/admin/php/estat_mapa_upload.php index a6a1804..73fa128 100755 --- a/admin/php/estat_mapa_upload.php +++ b/admin/php/estat_mapa_upload.php @@ -8,6 +8,7 @@ error_reporting(0); ?> + diff --git a/admin/php/metaestat_mapa_uploadimagem.php b/admin/php/metaestat_mapa_uploadimagem.php index b2d731f..12b165f 100755 --- a/admin/php/metaestat_mapa_uploadimagem.php +++ b/admin/php/metaestat_mapa_uploadimagem.php @@ -12,6 +12,7 @@ error_reporting(0); ?> + diff --git a/admin/php/metaestat_uploadcsv_submit.php b/admin/php/metaestat_uploadcsv_submit.php index 216c127..72d314f 100644 --- a/admin/php/metaestat_uploadcsv_submit.php +++ b/admin/php/metaestat_uploadcsv_submit.php @@ -15,6 +15,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/admin/php/metaestat_uploadshp_submit.php b/admin/php/metaestat_uploadshp_submit.php index 68d2f55..baeb2a1 100755 --- a/admin/php/metaestat_uploadshp_submit.php +++ b/admin/php/metaestat_uploadshp_submit.php @@ -15,6 +15,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/admin/php/uploadgvp.php b/admin/php/uploadgvp.php index 31beb6c..dcb6ec7 100755 --- a/admin/php/uploadgvp.php +++ b/admin/php/uploadgvp.php @@ -9,6 +9,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/admin/principal.html b/admin/principal.html index 54a8b98..06115b4 100755 --- a/admin/principal.html +++ b/admin/principal.html @@ -4,7 +4,7 @@ - + diff --git a/classesjs/compactajs.php b/classesjs/compactajs.php index e9c4d83..bc7174f 100644 --- a/classesjs/compactajs.php +++ b/classesjs/compactajs.php @@ -210,6 +210,7 @@ salvatudojs($jsfiles,$buffer,"i3geo_tudo_compacto6.js","js"); // $cssfiles = array( +"../css/input.css", "../css/geral.css", "../css/botoes2.css", "../css/documentation.css", @@ -236,6 +237,7 @@ $buffer = ""; salvatudojs($cssfiles,$buffer,"../css/i3geo6.css","css"); //css das ferramentas $cssfiles = array( +"../css/input.css", "../css/geral.css", "../css/button.css", "../css/ferramentas.css", diff --git a/classesjs/geradordelinks.js b/classesjs/geradordelinks.js index 9b7b485..0ab5164 100644 --- a/classesjs/geradordelinks.js +++ b/classesjs/geradordelinks.js @@ -50,6 +50,8 @@ Veja // //carrega as dependências // + +//TODO aplicar o padrao de css nos inputs (ver HTML) (function(){ var scriptLocation = ""; var scripts = document.getElementsByTagName('script'); diff --git a/classesjs/i3geonaocompacto.js b/classesjs/i3geonaocompacto.js index ad4eb45..2367451 100644 --- a/classesjs/i3geonaocompacto.js +++ b/classesjs/i3geonaocompacto.js @@ -77,6 +77,7 @@ //css var allCssTags = ""; var cssfiles = new Array( + "../css/input.css", "../css/geral.css", "../css/botoes2.css", "../css/documentation.css", diff --git a/classesphp/classe_analise.php b/classesphp/classe_analise.php index 38619ca..a94f7e7 100644 --- a/classesphp/classe_analise.php +++ b/classesphp/classe_analise.php @@ -1276,7 +1276,7 @@ class Analise $projInObj = $layerorigem->getProjection(); if ($projInObj == "") { - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); } $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=5000000,y_0=10000000"); $origemdestino = array(); @@ -1413,7 +1413,9 @@ class Analise foreach($listaShapes as $shape){ //calcula a extensão geografica $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + //proj=longlat,ellps=WGS84,datum=WGS84,no_defs + //proj=latlong + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=5000000,y_0=10000000"); $poPoint = ms_newpointobj(); $poPoint->setXY($rect->minx, $rect->miny); @@ -1440,8 +1442,7 @@ class Analise //faz a união dos elementos se necessário if($unir == "sim"){ $ns = $buffers[0]; - for($s=1;$s < count($buffers);$s++) - { + for($s=1;$s < count($buffers);$s++){ $ns = $ns->union($buffers[$s]); } $buffers = array($ns); @@ -1465,10 +1466,8 @@ class Analise $db=xbase_open($dbname,2); else $db=dbase_open($dbname,2); - for($i = 0;$i < count($buffers);++$i) - { - foreach ($items as $ni) - { + for($i = 0;$i < count($buffers);++$i){ + foreach ($items as $ni){ if(!empty($shapes[$i]->values[$ni])){ $reg[] = $this->truncaS($shapes[$i]->values[$ni]); } @@ -2646,7 +2645,7 @@ class Analise case "perimetro": $shape = ms_shapeObjFromWkt($g); $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=5000000,y_0=10000000,units=m"); $shape->project($projInObj, $projOutObj); $s = $shape->towkt(); @@ -2657,7 +2656,7 @@ class Analise case "area": $shape = ms_shapeObjFromWkt($g); $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=laea,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=500000,y_0=10000000,ellps=GRS67,units=m,no_defs"); $shape->project($projInObj, $projOutObj); $s = $shape->towkt(); diff --git a/classesphp/classe_selecao.php b/classesphp/classe_selecao.php index 7f84795..14f4ef5 100644 --- a/classesphp/classe_selecao.php +++ b/classesphp/classe_selecao.php @@ -589,7 +589,7 @@ $tipo - Tipo de operação adiciona|retira|inverte|limpa|novo else { error_reporting(0); - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=0,lon_0=".$pt->x.",x_0=5000000,y_0=10000000"); $poPoint = ms_newpointobj(); @@ -976,7 +976,7 @@ $geos - array com os dados function projetaDistancia($shape,$distancia){ error_reporting(0); $pt = $shape->getCentroid(); - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=0,lon_0=".$pt->x.",x_0=5000000,y_0=10000000"); $poPoint = ms_newpointobj(); $poPoint->setXY($pt->x, $pt->y); diff --git a/classesphp/classe_shp.php b/classesphp/classe_shp.php index cbf5387..1a35397 100644 --- a/classesphp/classe_shp.php +++ b/classesphp/classe_shp.php @@ -257,7 +257,7 @@ $projecao - codigo epsg da projeção das coordenadas $poPoint->setXY($xy[$i],$xy[$i+1]); if($projecao != "") { - $projOutObj = ms_newprojectionobj("proj=latlong"); + $projOutObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projInObj = ms_newprojectionobj("init=epsg:".$projecao); $poPoint->project($projInObj, $projOutObj); } diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php index b9be630..e6114f5 100644 --- a/classesphp/funcoes_gerais.php +++ b/classesphp/funcoes_gerais.php @@ -1238,7 +1238,7 @@ array( */ function geo2utm($x,$y,$zona) { - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); if($y < 0){$ns = "south";} else {$ns = "north";} @@ -1920,7 +1920,7 @@ function calculaAreaPixel($map_file,$celsize) { $mapa = ms_newMapObj($map_file); $rect = $mapa->extent; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=poly,ellps=GRS67,lat_0=0,lon_0=".$rect->minx.",x_0=5000000,y_0=10000000"); $y = $rect->maxy - ((($rect->maxy) - ($rect->miny)) / 2); $x = $rect->maxx - ((($rect->maxx) - ($rect->minx)) / 2); diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php index fd1b119..7b83713 100644 --- a/classesphp/mapa_controle.php +++ b/classesphp/mapa_controle.php @@ -2417,7 +2417,7 @@ function projetaExt($map_file,$ext,$separador=" ") $rect = ms_newRectObj(); $rect->setextent($extA[0],$extA[1],$extA[2],$extA[3]); $prjMapa = $mapa->getProjection(); - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj($prjMapa); $rect->project($projInObj, $projOutObj); if($ponto == false) diff --git a/css/geral.css b/css/geral.css index e291b75..ad9cd6d 100644 --- a/css/geral.css +++ b/css/geral.css @@ -8,13 +8,7 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ - -webkit-user-select: text; - -khtml-user-select: text; - -moz-user-select: text; - -o-user-select: text; - user-select: text; -} + /* Para nao marcar links */ @@ -641,43 +635,6 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; } -input { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(180, 180, 180); - text-align: center; - cursor: text; -} - -input[type=checkbox] { - border: 0px solid white; -} - -input[type=file] { - border: 0px solid white; - background-color: none; - background: none; -} - -select { - box-shadow: 1px 1px 3px 0 lightgray; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(230, 230, 230); - text-align: left; - cursor: pointer; -} - -select option:hover { - background-color: #CCFFFF; -} - .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -712,17 +669,6 @@ select option:hover { font-size: 10px; } -.inputsb { - 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; -} - .legendatemas { cursor: pointer; text-align: left; @@ -933,6 +879,7 @@ select option:hover { .digitar input { border: 1px solid rgb(180, 180, 180); } + .digitarOver { margin: 0px; color: #426252; @@ -1385,110 +1332,6 @@ h1 { } } -.styled-select input, .styled-select150 input { - width: 100%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - background-size: 16px 144px; - } -} - -.i3geoForm, .i3geoForm150, .i3geoForm100 { - width: 252px; - overflow: hidden; - background: #F8F8F8; - border: 1px solid #DDDDDD; - height: 22px; - border-radius: 2px; -} - -.i3geoForm150 { - width: 150px; -} - -.i3geoForm100 { - width: 100px; -} - -.i3geoFormIconeEdita { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormSemIcone { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormTag { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - background-size: 16px 144px; - } - border-radius: 8px; - background-color: #F0F0F0; - cursor: pointer; -} - -.i3geoFormIconeAquarela { - cursor: pointer; - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } - -} - -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { - width: 90%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - cursor: text; -} - -.i3geoFormIconeAquarela input{ - width: 80%; -} - -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and - (-webkit-min-device-pixel-ratio:0) { - .inputsb { - border: 1px solid black - } -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/i3geo6.css b/css/i3geo6.css index 6fdfd64..3928ba8 100755 --- a/css/i3geo6.css +++ b/css/i3geo6.css @@ -1,3 +1,164 @@ +input{ +font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ +-webkit-user-select: text; +-khtml-user-select: text; +-moz-user-select: text; +-o-user-select: text; +user-select: text; +} +input[type=text] { +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(180, 180, 180); +text-align: center; +cursor: text; +height: 22px; +} +input[type=checkbox] { +border: 0px solid white; +} +input[type=file] { +border: 0px solid white; +background-color: none; +background: none; +} +select { +box-shadow: 1px 1px 3px 0 lightgray; +font-family: Verdana, Arial, Helvetica, sans-serif; +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(230, 230, 230); +text-align: left; +cursor: pointer; +} +select option:hover { +background-color: #CCFFFF; +} +.inputsb { +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; +} +.styled-select input, .styled-select150 input { +width: 100%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +background-size: 16px 144px; +} +} +.i3geoForm, .i3geoForm150, .i3geoForm100 { +width: 252px; +overflow: hidden; +background: #F8F8F8; +border: 1px solid #DDDDDD; +height: 22px; +border-radius: 2px; +} +.i3geoForm150 { +width: 150px; +} +.i3geoForm100 { +width: 100px; +} +.i3geoFormIconeEdita { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormIconeUsuario { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormIconeSenha { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormSemIcone { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormTag { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +background-size: 16px 144px; +} +border-radius: 8px; +background-color: #F0F0F0; +cursor: pointer; +} +.i3geoFormIconeAquarela { +cursor: pointer; +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { +width: 90%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +cursor: text; +} +.i3geoFormIconeAquarela input{ +width: 80%; +} +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and +(-webkit-min-device-pixel-ratio:0) { +.inputsb { +border: 1px solid black +} +} /* para nao selecionar */ @@ -8,13 +169,6 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ --webkit-user-select: text; --khtml-user-select: text; --moz-user-select: text; --o-user-select: text; -user-select: text; -} /* Para nao marcar links */ @@ -576,38 +730,6 @@ text-align: center; font-size: 12px; font-family: Verdana, Arial, Helvetica, sans-serif; } -input { -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(180, 180, 180); -text-align: center; -cursor: text; -} -input[type=checkbox] { -border: 0px solid white; -} -input[type=file] { -border: 0px solid white; -background-color: none; -background: none; -} -select { -box-shadow: 1px 1px 3px 0 lightgray; -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(230, 230, 230); -text-align: left; -cursor: pointer; -} -select option:hover { -background-color: #CCFFFF; -} .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -639,16 +761,6 @@ background-position: right; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; } -.inputsb { -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; -} .legendatemas { cursor: pointer; text-align: left; @@ -1237,99 +1349,6 @@ background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll background-size: 16px 144px; } } -.styled-select input, .styled-select150 input { -width: 100%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -background-size: 16px 144px; -} -} -.i3geoForm, .i3geoForm150, .i3geoForm100 { -width: 252px; -overflow: hidden; -background: #F8F8F8; -border: 1px solid #DDDDDD; -height: 22px; -border-radius: 2px; -} -.i3geoForm150 { -width: 150px; -} -.i3geoForm100 { -width: 100px; -} -.i3geoFormIconeEdita { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormSemIcone { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormTag { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -background-size: 16px 144px; -} -border-radius: 8px; -background-color: #F0F0F0; -cursor: pointer; -} -.i3geoFormIconeAquarela { -cursor: pointer; -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { -width: 90%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -cursor: text; -} -.i3geoFormIconeAquarela input{ -width: 80%; -} -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and -(-webkit-min-device-pixel-ratio:0) { -.inputsb { -border: 1px solid black -} -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/i3geo6.css.php b/css/i3geo6.css.php index 5b51d32..04b34f3 100755 --- a/css/i3geo6.css.php +++ b/css/i3geo6.css.php @@ -1,4 +1,165 @@ -/* +input{ +font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ +-webkit-user-select: text; +-khtml-user-select: text; +-moz-user-select: text; +-o-user-select: text; +user-select: text; +} +input[type=text] { +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(180, 180, 180); +text-align: center; +cursor: text; +height: 22px; +} +input[type=checkbox] { +border: 0px solid white; +} +input[type=file] { +border: 0px solid white; +background-color: none; +background: none; +} +select { +box-shadow: 1px 1px 3px 0 lightgray; +font-family: Verdana, Arial, Helvetica, sans-serif; +font-size: 10px; +color: #2F4632; +background-color: #FFFFFF; +padding: 0; +border: 1px solid rgb(230, 230, 230); +text-align: left; +cursor: pointer; +} +select option:hover { +background-color: #CCFFFF; +} +.inputsb { +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; +} +.styled-select input, .styled-select150 input { +width: 100%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; +background-size: 16px 144px; +} +} +.i3geoForm, .i3geoForm150, .i3geoForm100 { +width: 252px; +overflow: hidden; +background: #F8F8F8; +border: 1px solid #DDDDDD; +height: 22px; +border-radius: 2px; +} +.i3geoForm150 { +width: 150px; +} +.i3geoForm100 { +width: 100px; +} +.i3geoFormIconeEdita { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormIconeUsuario { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormIconeSenha { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; +background-size: 16px 144px; +} +} +.i3geoFormSemIcone { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoFormTag { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; +background-size: 16px 144px; +} +border-radius: 8px; +background-color: #F0F0F0; +cursor: pointer; +} +.i3geoFormIconeAquarela { +cursor: pointer; +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; +@media (-webkit-min-device-pixel-ratio: 2), +(min-resolution: 192dpi) { +background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; +background-size: 16px 144px; +} +} +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { +width: 90%; +height: 22px; +border: 0; +box-shadow: none; +line-height: 1.5; +-webkit-appearance: none; +-moz-appearance: none; +text-indent: 0.01px; +text-overflow: ''; +font-size: 12px; +appearance: none; +cursor: text; +} +.i3geoFormIconeAquarela input{ +width: 80%; +} +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and +(-webkit-min-device-pixel-ratio:0) { +.inputsb { +border: 1px solid black +} +} +/* para nao selecionar */ * { @@ -8,13 +169,6 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ --webkit-user-select: text; --khtml-user-select: text; --moz-user-select: text; --o-user-select: text; -user-select: text; -} /* Para nao marcar links */ @@ -576,38 +730,6 @@ text-align: center; font-size: 12px; font-family: Verdana, Arial, Helvetica, sans-serif; } -input { -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(180, 180, 180); -text-align: center; -cursor: text; -} -input[type=checkbox] { -border: 0px solid white; -} -input[type=file] { -border: 0px solid white; -background-color: none; -background: none; -} -select { -box-shadow: 1px 1px 3px 0 lightgray; -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -color: #2F4632; -background-color: #FFFFFF; -padding: 0; -border: 1px solid rgb(230, 230, 230); -text-align: left; -cursor: pointer; -} -select option:hover { -background-color: #CCFFFF; -} .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -639,16 +761,6 @@ background-position: right; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; } -.inputsb { -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; -} .legendatemas { cursor: pointer; text-align: left; @@ -1237,99 +1349,6 @@ background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll background-size: 16px 144px; } } -.styled-select input, .styled-select150 input { -width: 100%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; -background-size: 16px 144px; -} -} -.i3geoForm, .i3geoForm150, .i3geoForm100 { -width: 252px; -overflow: hidden; -background: #F8F8F8; -border: 1px solid #DDDDDD; -height: 22px; -border-radius: 2px; -} -.i3geoForm150 { -width: 150px; -} -.i3geoForm100 { -width: 100px; -} -.i3geoFormIconeEdita { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormSemIcone { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoFormTag { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; -background-size: 16px 144px; -} -border-radius: 8px; -background-color: #F0F0F0; -cursor: pointer; -} -.i3geoFormIconeAquarela { -cursor: pointer; -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; -@media (-webkit-min-device-pixel-ratio: 2), -(min-resolution: 192dpi) { -background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; -background-size: 16px 144px; -} -} -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { -width: 90%; -height: 22px; -border: 0; -box-shadow: none; -line-height: 1.5; --webkit-appearance: none; --moz-appearance: none; -text-indent: 0.01px; -text-overflow: ''; -font-size: 12px; -appearance: none; -cursor: text; -} -.i3geoFormIconeAquarela input{ -width: 80%; -} -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and -(-webkit-min-device-pixel-ratio:0) { -.inputsb { -border: 1px solid black -} -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/i3geo_ferramentas6.css b/css/i3geo_ferramentas6.css index 74a1388..1806ccc 100755 --- a/css/i3geo_ferramentas6.css +++ b/css/i3geo_ferramentas6.css @@ -1,3 +1,185 @@ +input{ + font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -o-user-select: text; + user-select: text; +} + +input[type=text] { + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(180, 180, 180); + text-align: center; + cursor: text; + height: 22px; +} + +input[type=checkbox] { + border: 0px solid white; +} + +input[type=file] { + border: 0px solid white; + background-color: none; + background: none; +} + +select { + box-shadow: 1px 1px 3px 0 lightgray; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(230, 230, 230); + text-align: left; + cursor: pointer; +} + +select option:hover { + background-color: #CCFFFF; +} + +.inputsb { + 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; +} + +.styled-select input, .styled-select150 input { + width: 100%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + background-size: 16px 144px; + } +} + +.i3geoForm, .i3geoForm150, .i3geoForm100 { + width: 252px; + overflow: hidden; + background: #F8F8F8; + border: 1px solid #DDDDDD; + height: 22px; + border-radius: 2px; +} + +.i3geoForm150 { + width: 150px; +} + +.i3geoForm100 { + width: 100px; +} + +.i3geoFormIconeEdita { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeUsuario { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeSenha { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormSemIcone { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormTag { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + background-size: 16px 144px; + } + border-radius: 8px; + background-color: #F0F0F0; + cursor: pointer; +} + +.i3geoFormIconeAquarela { + cursor: pointer; + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } + +} + +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { + width: 90%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + cursor: text; +} + +.i3geoFormIconeAquarela input{ + width: 80%; +} + +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and + (-webkit-min-device-pixel-ratio:0) { + .inputsb { + border: 1px solid black + } +} + /* para nao selecionar */ @@ -8,13 +190,7 @@ para nao selecionar -o-user-select: none; user-select: none; } -input[type=text], textarea{ - -webkit-user-select: text; - -khtml-user-select: text; - -moz-user-select: text; - -o-user-select: text; - user-select: text; -} + /* Para nao marcar links */ @@ -641,43 +817,6 @@ td { font-family: Verdana, Arial, Helvetica, sans-serif; } -input { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(180, 180, 180); - text-align: center; - cursor: text; -} - -input[type=checkbox] { - border: 0px solid white; -} - -input[type=file] { - border: 0px solid white; - background-color: none; - background: none; -} - -select { - box-shadow: 1px 1px 3px 0 lightgray; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #2F4632; - background-color: #FFFFFF; - padding: 0; - border: 1px solid rgb(230, 230, 230); - text-align: left; - cursor: pointer; -} - -select option:hover { - background-color: #CCFFFF; -} - .ajuda_usuario { background-image: url(../imagens/oxygen/16x16/dialog-information.png); background-position: 0px 0px; @@ -712,17 +851,6 @@ select option:hover { font-size: 10px; } -.inputsb { - 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; -} - .legendatemas { cursor: pointer; text-align: left; @@ -933,6 +1061,7 @@ select option:hover { .digitar input { border: 1px solid rgb(180, 180, 180); } + .digitarOver { margin: 0px; color: #426252; @@ -1385,110 +1514,6 @@ h1 { } } -.styled-select input, .styled-select150 input { - width: 100%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; - background-size: 16px 144px; - } -} - -.i3geoForm, .i3geoForm150, .i3geoForm100 { - width: 252px; - overflow: hidden; - background: #F8F8F8; - border: 1px solid #DDDDDD; - height: 22px; - border-radius: 2px; -} - -.i3geoForm150 { - width: 150px; -} - -.i3geoForm100 { - width: 100px; -} - -.i3geoFormIconeEdita { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormSemIcone { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } -} - -.i3geoFormTag { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; - background-size: 16px 144px; - } - border-radius: 8px; - background-color: #F0F0F0; - cursor: pointer; -} - -.i3geoFormIconeAquarela { - cursor: pointer; - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 192dpi) { - background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; - background-size: 16px 144px; - } - -} - -.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { - width: 90%; - height: 22px; - border: 0; - box-shadow: none; - line-height: 1.5; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 0.01px; - text-overflow: ''; - font-size: 12px; - appearance: none; - cursor: text; -} - -.i3geoFormIconeAquarela input{ - width: 80%; -} - -/*hack opera */ -@media all and (-webkit-min-device-pixel-ratio:10000) , not all and - (-webkit-min-device-pixel-ratio:0) { - .inputsb { - border: 1px solid black - } -} /* esconde na impressao */ @media print { .noprint { diff --git a/css/input.css b/css/input.css new file mode 100644 index 0000000..45edac0 --- /dev/null +++ b/css/input.css @@ -0,0 +1,181 @@ +input{ + font-family: Verdana, Arial, Helvetica, sans-serif; +} +input[type=text], textarea{ + -webkit-user-select: text; + -khtml-user-select: text; + -moz-user-select: text; + -o-user-select: text; + user-select: text; +} + +input[type=text] { + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(180, 180, 180); + text-align: center; + cursor: text; + height: 22px; +} + +input[type=checkbox] { + border: 0px solid white; +} + +input[type=file] { + border: 0px solid white; + background-color: none; + background: none; +} + +select { + box-shadow: 1px 1px 3px 0 lightgray; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color: #2F4632; + background-color: #FFFFFF; + padding: 0; + border: 1px solid rgb(230, 230, 230); + text-align: left; + cursor: pointer; +} + +select option:hover { + background-color: #CCFFFF; +} + +.inputsb { + 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; +} + +.styled-select input, .styled-select150 input { + width: 100%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 97% 5px; + background-size: 16px 144px; + } +} + +.i3geoForm, .i3geoForm150, .i3geoForm100 { + width: 252px; + overflow: hidden; + background: #F8F8F8; + border: 1px solid #DDDDDD; + height: 22px; + border-radius: 2px; +} + +.i3geoForm150 { + width: 150px; +} + +.i3geoForm100 { + width: 100px; +} + +.i3geoFormIconeEdita { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/gisicons/edit2.png") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeUsuario { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/system-users.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormIconeSenha { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/22x22/preferences-desktop-user-password.png") no-repeat scroll 100% 0px; + background-size: 16px 144px; + } +} + +.i3geoFormSemIcone { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/branco.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } +} + +.i3geoFormTag { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/oxygen/16x16/list-remove.png") no-repeat scroll 100% 3px; + background-size: 16px 144px; + } + border-radius: 8px; + background-color: #F0F0F0; + cursor: pointer; +} + +.i3geoFormIconeAquarela { + cursor: pointer; + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 98% 5px; + @media (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { + background: transparent url("../imagens/aquarela.gif") no-repeat scroll 100% 5px; + background-size: 16px 144px; + } + +} + +.i3geoForm input, .i3geoForm150 input, .i3geoForm100 input { + width: 90%; + height: 22px; + border: 0; + box-shadow: none; + line-height: 1.5; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 0.01px; + text-overflow: ''; + font-size: 12px; + appearance: none; + cursor: text; +} + +.i3geoFormIconeAquarela input{ + width: 80%; +} + +/*hack opera */ +@media all and (-webkit-min-device-pixel-ratio:10000) , not all and + (-webkit-min-device-pixel-ratio:0) { + .inputsb { + border: 1px solid black + } +} diff --git a/ferramentas/aplicarsld/upload.php b/ferramentas/aplicarsld/upload.php index adeb1a7..6a26e40 100644 --- a/ferramentas/aplicarsld/upload.php +++ b/ferramentas/aplicarsld/upload.php @@ -13,6 +13,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"]; ?> + diff --git a/ferramentas/bufferpt/index.js b/ferramentas/bufferpt/index.js index d1db073..b37e5a9 100644 --- a/ferramentas/bufferpt/index.js +++ b/ferramentas/bufferpt/index.js @@ -64,7 +64,6 @@ i3GEOF.bufferpt = { */ mustacheHash : function() { var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.bufferpt.dicionario); - dicionario["distancia"] = $inputText('','','i3GEOFbufferptDistancia','',10,0); dicionario["x"] = i3GEOF.bufferpt.x; dicionario["y"] = i3GEOF.bufferpt.y; return dicionario; @@ -139,7 +138,7 @@ i3GEOF.bufferpt = { titulo = "
" + $trad("u10")+"
"; janela = i3GEO.janela.cria( "290px", - "110px", + "130px", "", "", "", diff --git a/ferramentas/bufferpt/template_mst.html b/ferramentas/bufferpt/template_mst.html index e0b4dc1..eb788e9 100644 --- a/ferramentas/bufferpt/template_mst.html +++ b/ferramentas/bufferpt/template_mst.html @@ -1,8 +1,10 @@

{{{entorno}}}

-{{{distancia}}} -
+
+ +

-

+
+

X: {{{x}}} Y: {{{y}}} \ No newline at end of file diff --git a/ferramentas/carregamapa/upload.php b/ferramentas/carregamapa/upload.php index 90932d9..c20af47 100644 --- a/ferramentas/carregamapa/upload.php +++ b/ferramentas/carregamapa/upload.php @@ -12,6 +12,7 @@ $postgis_mapa = $_SESSION["postgis_mapa"]; ?> + diff --git a/ferramentas/importarwmc/upload.php b/ferramentas/importarwmc/upload.php index 900a1d8..88aae4d 100644 --- a/ferramentas/importarwmc/upload.php +++ b/ferramentas/importarwmc/upload.php @@ -10,6 +10,7 @@ $map_file = $_SESSION["map_file"]; ?> + diff --git a/ferramentas/imprimir/a4l.htm b/ferramentas/imprimir/a4l.htm index 9692030..ab8fb28 100644 --- a/ferramentas/imprimir/a4l.htm +++ b/ferramentas/imprimir/a4l.htm @@ -1,5 +1,6 @@ + diff --git a/ferramentas/imprimir/a4p.htm b/ferramentas/imprimir/a4p.htm index 9692030..ab8fb28 100644 --- a/ferramentas/imprimir/a4p.htm +++ b/ferramentas/imprimir/a4p.htm @@ -1,5 +1,6 @@ + diff --git a/ferramentas/loginusuario/index.js b/ferramentas/loginusuario/index.js index d649c4f..2865580 100644 --- a/ferramentas/loginusuario/index.js +++ b/ferramentas/loginusuario/index.js @@ -113,11 +113,15 @@ i3GEOF.loginusuario = { usuario = ""; } ins = '

'+$trad("x30")+': '+u+"" + - '

'+$trad("x27")+':
' + - '' + - '

'+$trad("x28")+':
' + - '
' + - '

 ' + + '

'+$trad("x27")+':

' + + '
' + + '' + + '
' + + '

'+$trad("x28")+':

' + + '
' + + '
' + + '
' + + '

 ' + '

'+$trad("x32")+'

' + '

'+$trad("x52")+'

' + '
'; diff --git a/ferramentas/tabela/relatorio.php b/ferramentas/tabela/relatorio.php index 9e4cb48..db20c42 100644 --- a/ferramentas/tabela/relatorio.php +++ b/ferramentas/tabela/relatorio.php @@ -291,7 +291,7 @@ function calculaarea($geo) $g = $geo->towkt(); $shape = ms_shapeObjFromWkt($g); $rect = $shape->bounds; - $projInObj = ms_newprojectionobj("proj=latlong"); + $projInObj = ms_newprojectionobj("proj=longlat,ellps=WGS84,datum=WGS84,no_defs"); $projOutObj = ms_newprojectionobj("proj=laea,lat_0=".$rect->miny.",lon_0=".$rect->minx.",x_0=500000,y_0=10000000,ellps=GRS67,units=m,no_defs"); $shape->project($projInObj, $projOutObj); $s = $shape->towkt(); diff --git a/ferramentas/upload/upload.php b/ferramentas/upload/upload.php index baaf60b..37609a7 100644 --- a/ferramentas/upload/upload.php +++ b/ferramentas/upload/upload.php @@ -19,6 +19,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/ferramentas/uploaddbf/upload.php b/ferramentas/uploaddbf/upload.php index 1a41cbb..61321d2 100644 --- a/ferramentas/uploaddbf/upload.php +++ b/ferramentas/uploaddbf/upload.php @@ -13,6 +13,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/ferramentas/uploadgpx/upload.php b/ferramentas/uploadgpx/upload.php index 5a5ef2d..580c671 100644 --- a/ferramentas/uploadgpx/upload.php +++ b/ferramentas/uploadgpx/upload.php @@ -14,6 +14,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/ferramentas/uploadkml/upload.php b/ferramentas/uploadkml/upload.php index 9ff9b43..bfeffba 100644 --- a/ferramentas/uploadkml/upload.php +++ b/ferramentas/uploadkml/upload.php @@ -14,6 +14,7 @@ if (ob_get_level() == 0) ob_start(); ?> + diff --git a/ferramentas/uploadsimbolo/upload.php b/ferramentas/uploadsimbolo/upload.php index c463129..f64b7a8 100755 --- a/ferramentas/uploadsimbolo/upload.php +++ b/ferramentas/uploadsimbolo/upload.php @@ -12,6 +12,7 @@ if (ob_get_level() == 0) ob_start(); + diff --git a/geradordelinks.htm b/geradordelinks.htm index 6abea05..31756f6 100644 --- a/geradordelinks.htm +++ b/geradordelinks.htm @@ -6,6 +6,7 @@ + diff --git a/imagens/oxygen/22x22/preferences-desktop-user-password.png b/imagens/oxygen/22x22/preferences-desktop-user-password.png new file mode 100644 index 0000000..9976e34 Binary files /dev/null and b/imagens/oxygen/22x22/preferences-desktop-user-password.png differ diff --git a/imagens/oxygen/22x22/system-users.png b/imagens/oxygen/22x22/system-users.png new file mode 100644 index 0000000..da48b18 Binary files /dev/null and b/imagens/oxygen/22x22/system-users.png differ diff --git a/js/compactajs.php b/js/compactajs.php index 6d1591d..4743b07 100755 --- a/js/compactajs.php +++ b/js/compactajs.php @@ -211,6 +211,7 @@ salvatudojs($jsfiles,$buffer,"i3geo_tudo_compacto7.js","js"); // $cssfiles = array( +"../css/input.css", "../css/geral.css", "../css/botoes2.css", "../css/documentation.css", @@ -237,6 +238,7 @@ $buffer = ""; salvatudojs($cssfiles,$buffer,"../css/i3geo7.css","css"); //css das ferramentas $cssfiles = array( +"../css/input.css", "../css/geral.css", "../css/button.css", "../css/ferramentas.css", diff --git a/js/i3geonaocompacto.js b/js/i3geonaocompacto.js index 96bb89d..8c05f34 100755 --- a/js/i3geonaocompacto.js +++ b/js/i3geonaocompacto.js @@ -77,6 +77,7 @@ //css var allCssTags = ""; var cssfiles = new Array( + "../css/input.css", "../css/geral.css", "../css/botoes2.css", "../css/documentation.css", -- libgit2 0.21.2