Commit d76c0dd0aeb471a30147f6927b3798c502947293
1 parent
0f2a4719
Exists in
master
and in
7 other branches
--no commit message
Showing
5 changed files
with
18 additions
and
12 deletions
Show diff stats
classesphp/classe_legenda.php
... | ... | @@ -353,20 +353,20 @@ array |
353 | 353 | for ($c = 0;$c < $nc;$c++){ |
354 | 354 | $classe = $layer->getclass($c); |
355 | 355 | $imgi = $classe->createlegendicon(30,15); |
356 | - $classe->drawlegendicon(30,15,$imgi,5,5); | |
356 | + $classe->drawlegendicon(30,15,$imgi,0,0); | |
357 | 357 | $nomes = nomeRandomico(12); |
358 | 358 | $nomer = ($imgi->imagepath)."icone".$nomes.".png"; |
359 | 359 | $imgi->saveImage($nomer); |
360 | 360 | $i = ($imgi->imageurl).basename($nomer); |
361 | 361 | $nomeclasse = $classe->name; |
362 | - | |
362 | + | |
363 | 363 | //if (function_exists("mb_convert_encoding")) |
364 | 364 | //{$nomeclasse = mb_convert_encoding($nomeclasse,"UTF-8","ISO-8859-1");} |
365 | 365 | $nomeclasse = $this->converte($nomeclasse); |
366 | 366 | $nomeexp = $classe->getExpressionString(); |
367 | 367 | if (function_exists("mb_convert_encoding")) |
368 | 368 | {$nomeexp = mb_convert_encoding($nomeexp,"UTF-8","ISO-8859-1");} |
369 | - | |
369 | + | |
370 | 370 | $linhas[] = array("tema"=>$l,"idclasse"=>$c,"nomeclasse"=>$nomeclasse,"expressao"=>$nomeexp,"imagem"=>$i,"proc"=>"","minScale"=>$classe->minscaledenom,"maxScale"=>$classe->maxscaledenom); |
371 | 371 | } |
372 | 372 | if (($totaliza=="sim") && ($nc > 1)){ | ... | ... |
classesphp/classe_mapa.php
... | ... | @@ -218,8 +218,11 @@ class Mapa |
218 | 218 | |
219 | 219 | array("chaves"=>array(),"valores"=>array(array()))) |
220 | 220 | */ |
221 | + //TODO verificar fonte em cada tema | |
221 | 222 | function parametrosTemas() |
222 | 223 | { |
224 | + //obtem os dados sobre todos os temas no banco de dados de administracao | |
225 | + | |
223 | 226 | $temas = array(); |
224 | 227 | $existesel = false; |
225 | 228 | $dir = dirname($this->arquivo); | ... | ... |
css/geral.css
... | ... | @@ -1208,6 +1208,7 @@ h1 { |
1208 | 1208 | border: 1px solid #DDDDDD; |
1209 | 1209 | height: 22px; |
1210 | 1210 | border-radius: 2px; |
1211 | + text-overflow: ellipsis; | |
1211 | 1212 | } |
1212 | 1213 | |
1213 | 1214 | .styled-select150 { |
... | ... | @@ -1228,13 +1229,13 @@ h1 { |
1228 | 1229 | -webkit-appearance: none; |
1229 | 1230 | -moz-appearance: none; |
1230 | 1231 | text-indent: 0.01px; |
1231 | - text-overflow: 'ellipsis'; | |
1232 | + text-overflow: ellipsis; | |
1232 | 1233 | font-size: 12px; |
1233 | 1234 | appearance: none; |
1234 | - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 8px; | |
1235 | + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | |
1235 | 1236 | @media (-webkit-min-device-pixel-ratio: 2), |
1236 | 1237 | (min-resolution: 192dpi) { |
1237 | - background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 8px; | |
1238 | + background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | |
1238 | 1239 | background-size: 16px 144px; |
1239 | 1240 | } |
1240 | 1241 | } | ... | ... |
css/i3geo6.css
... | ... | @@ -1071,6 +1071,7 @@ background: #F8F8F8; |
1071 | 1071 | border: 1px solid #DDDDDD; |
1072 | 1072 | height: 22px; |
1073 | 1073 | border-radius: 2px; |
1074 | +text-overflow: ellipsis; | |
1074 | 1075 | } |
1075 | 1076 | .styled-select150 { |
1076 | 1077 | width: 150px; |
... | ... | @@ -1089,13 +1090,13 @@ line-height: 1.5; |
1089 | 1090 | -webkit-appearance: none; |
1090 | 1091 | -moz-appearance: none; |
1091 | 1092 | text-indent: 0.01px; |
1092 | -text-overflow: 'ellipsis'; | |
1093 | +text-overflow: ellipsis; | |
1093 | 1094 | font-size: 12px; |
1094 | 1095 | appearance: none; |
1095 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 8px; | |
1096 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | |
1096 | 1097 | @media (-webkit-min-device-pixel-ratio: 2), |
1097 | 1098 | (min-resolution: 192dpi) { |
1098 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 8px; | |
1099 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | |
1099 | 1100 | background-size: 16px 144px; |
1100 | 1101 | } |
1101 | 1102 | } | ... | ... |
css/i3geo6.css.php
... | ... | @@ -1071,6 +1071,7 @@ background: #F8F8F8; |
1071 | 1071 | border: 1px solid #DDDDDD; |
1072 | 1072 | height: 22px; |
1073 | 1073 | border-radius: 2px; |
1074 | +text-overflow: ellipsis; | |
1074 | 1075 | } |
1075 | 1076 | .styled-select150 { |
1076 | 1077 | width: 150px; |
... | ... | @@ -1089,13 +1090,13 @@ line-height: 1.5; |
1089 | 1090 | -webkit-appearance: none; |
1090 | 1091 | -moz-appearance: none; |
1091 | 1092 | text-indent: 0.01px; |
1092 | -text-overflow: 'ellipsis'; | |
1093 | +text-overflow: ellipsis; | |
1093 | 1094 | font-size: 12px; |
1094 | 1095 | appearance: none; |
1095 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 8px; | |
1096 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | |
1096 | 1097 | @media (-webkit-min-device-pixel-ratio: 2), |
1097 | 1098 | (min-resolution: 192dpi) { |
1098 | -background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 8px; | |
1099 | +background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll 99% 6px; | |
1099 | 1100 | background-size: 16px 144px; |
1100 | 1101 | } |
1101 | 1102 | } | ... | ... |