Download as
Browse Code »

Commit d617b350b713b1bed53a2a40ef743779e9cf0f98

Authored by Edmar Moretti
1 parent 9a0b32e3
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 3 changed files with 18 additions and 18 deletions   Show diff stats
admin/admin.db
View file @d617b35
No preview for this file type
classesphp/graficos.php
  Diff comments   View file @d617b35
... ... @@ -524,7 +524,7 @@ function dadosLinhaDoTempo($map_file,$tema,$ext="")
524 524 else {$link = $dado[$link];}
525 525 $titulo = $dado[$itemtitulo];
526 526 $desc = $dado[$itemdescricao];
527   - if(function_exists("mb_convert_encoding") && $converteE == "sim"){
  527 + if(function_exists("mb_convert_encoding") && strtolower($converteE) == "sim"){
528 528 $titulo = mb_convert_encoding($titulo,"UTF-8","ISO-8859-1");
529 529 $desc = mb_convert_encoding($desc,"UTF-8","ISO-8859-1");
530 530 }
... ...
ferramentas/linhadotempo/index.php
  Diff comments   View file @d617b35
... ... @@ -3,7 +3,7 @@
3 3 <script src="../../classesjs/i3geo.js" type="text/javascript"></script>
4 4 <script>
5 5 Timeline_ajax_url="../../pacotes/simile/timeline_2.3.0/timeline_ajax/simile-ajax-api.js";
6   -Timeline_urlPrefix='../../pacotes/simile/timeline_2.3.0/timeline_js/';
  6 +Timeline_urlPrefix='../../pacotes/simile/timeline_2.3.0/timeline_js/';
7 7 Timeline_parameters='bundle=true';
8 8 </script>
9 9 <script src="../../pacotes/simile/timeline_2.3.0/timeline_js/timeline-api.js" type="text/javascript"></script>
... ... @@ -123,8 +123,8 @@ function bandas(){
123 123 theme1.autoWidth = false;
124 124 bandInfos = [
125 125 Timeline.createBandInfo({
126   - width: "20%",
127   - intervalUnit: Timeline.DateTime.DECADE,
  126 + width: "20%",
  127 + intervalUnit: Timeline.DateTime.DECADE,
128 128 intervalPixels: 200,
129 129 overview: true,
130 130 eventSource: eventSource1
... ... @@ -132,7 +132,7 @@ function bandas(){
132 132  
133 133 Timeline.createBandInfo({
134 134 width: "80%",
135   - intervalUnit: Timeline.DateTime.YEAR,
  135 + intervalUnit: Timeline.DateTime.YEAR,
136 136 intervalPixels: 200,
137 137 eventSource: eventSource1,
138 138 theme: theme1,
... ... @@ -147,7 +147,7 @@ function bandas(){
147 147 bandInfos = [
148 148 Timeline.createBandInfo({
149 149 width: "100%",
150   - intervalUnit: Timeline.DateTime.DECADE,
  150 + intervalUnit: Timeline.DateTime.DECADE,
151 151 intervalPixels: 200,
152 152 eventSource: eventSource1,
153 153 theme: theme1,
... ... @@ -172,9 +172,9 @@ function carregaDados(){
172 172 //eventSource1.clear();
173 173 $i("totaleventos").innerHTML = retorno.data.events.length+" eventos";
174 174 tl = Timeline.create(tl_el, bandInfos, Timeline.HORIZONTAL);
175   - eventSource1.loadJSON(retorno.data, '.'); // The data was stored into the
  175 + eventSource1.loadJSON(retorno.data, '.'); // The data was stored into the
176 176 tl.layout(); // display the Timeline
177   - tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime(retorno.data.maiorano));
  177 + tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime(retorno.data.maiorano));
178 178 }
179 179 var p = window.parent.i3GEO.configura.locaplic+"/classesphp/mapa_controle.php?funcao=dadosLinhaDoTempo&g_sid="+window.parent.i3GEO.configura.sid+"&tema="+$i("tema").value+"&ext="+window.parent.i3GEO.parametros.mapexten;
180 180 cpJSON.call(p,"void",retorna);
... ... @@ -234,8 +234,8 @@ function tituloclique(wkt){
234 234 window.parent.i3GEO.atualiza(retorno);
235 235 window.parent.i3GEO.Interface.atualizaTema(retorno,$i("tema").value);
236 236 };
237   -
238   - window.parent.i3GEO.janela.abreAguarde("i3GEO.atualiza",$trad("o1"));
  237 +
  238 + //window.parent.i3GEO.janela.abreAguarde("i3GEO.atualiza",$trad("o1"));
239 239 window.parent.i3GEO.php.selecaopt(retorna,$i("tema").value,wkt[0]+" "+wkt[1],"adiciona",0);
240 240 }
241 241 /*
... ... @@ -252,15 +252,15 @@ Function: onResize
252 252  
253 253 Modifica o tamanho da linha do tempo se a janela da ferramenta tiver seu tamanho modificado
254 254 */
255   -function onResize() {
256   - if (resizeTimerID == null) {
257   - resizeTimerID = window.setTimeout(function() {
258   - resizeTimerID = null;
259   - tl.layout();
260   - }, 500);
261   - }
  255 +function onResize() {
  256 + if (resizeTimerID == null) {
  257 + resizeTimerID = window.setTimeout(function() {
  258 + resizeTimerID = null;
  259 + tl.layout();
  260 + }, 500);
  261 + }
262 262 }
263   -</script>
  263 +</script>
264 264 </body>
265 265  
266 266 </html>
267 267 \ No newline at end of file
... ...