Commit 4e36b58aa2701c3750a9c4b747a9194f2df0a1ef
1 parent
c226b3cf
Exists in
master
and in
7 other branches
Aplicação do padrão de título de janela na ferramenta de navegação GoogleMaps
Showing
7 changed files
with
56 additions
and
45 deletions
Show diff stats
ferramentas/storymap/index.js
@@ -123,19 +123,24 @@ i3GEOF.storymap = | @@ -123,19 +123,24 @@ i3GEOF.storymap = | ||
123 | } | 123 | } |
124 | $i(iddiv).innerHTML = i3GEOF.storymap.html(); | 124 | $i(iddiv).innerHTML = i3GEOF.storymap.html(); |
125 | if (!$i("i3GEOFstoComboCabecaSel")) { | 125 | if (!$i("i3GEOFstoComboCabecaSel")) { |
126 | - i3GEO.janela.comboCabecalhoTemasBs("i3GEOFstoComboCabeca", "i3GEOFstoComboCabecaSel", "storymap", "ligadosComTabela",function(evt){ | ||
127 | - var botao = evt.target; | ||
128 | - if (botao) { | ||
129 | - if (botao.value != "") { | ||
130 | - i3GEO.mapa.ativaTema(botao.value); | ||
131 | - i3GEOF.storymap.tema = botao.value; | ||
132 | - $i(iddiv).innerHTML = ""; | ||
133 | - i3GEOF.storymap.inicia(iddiv); | ||
134 | - } else { | ||
135 | - $i(iddiv).innerHTML = ""; | 126 | + i3GEO.janela.comboCabecalhoTemasBs( |
127 | + "i3GEOFstoComboCabeca", | ||
128 | + "i3GEOFstoComboCabecaSel", | ||
129 | + "storymap", | ||
130 | + "ligadosComTabela", | ||
131 | + function(evt){ | ||
132 | + var botao = evt.target; | ||
133 | + if (botao) { | ||
134 | + if (botao.value != "") { | ||
135 | + i3GEO.mapa.ativaTema(botao.value); | ||
136 | + i3GEOF.storymap.tema = botao.value; | ||
137 | + $i(iddiv).innerHTML = ""; | ||
138 | + i3GEOF.storymap.inicia(iddiv); | ||
139 | + } else { | ||
140 | + $i(iddiv).innerHTML = ""; | ||
141 | + } | ||
136 | } | 142 | } |
137 | - } | ||
138 | - }); | 143 | + }); |
139 | } | 144 | } |
140 | if (i3GEO.login.verificaCookieLogin() === true && i3GEO.parametros.editor === "sim") { | 145 | if (i3GEO.login.verificaCookieLogin() === true && i3GEO.parametros.editor === "sim") { |
141 | $(".i3GEOstorymap").find(".hidden").removeClass("hidden"); | 146 | $(".i3GEOstorymap").find(".hidden").removeClass("hidden"); |
ferramentas/storymap/template_mst.html
1 | <div class='container-fluid i3GEOstorymap'> | 1 | <div class='container-fluid i3GEOstorymap'> |
2 | - <div id='i3GEOFstoComboCabeca' class='form-group condensed' style='width:100%'></div> | 2 | + |
3 | + <div id='i3GEOFstoComboCabeca' class='form-group condensed' style='width: 100%'> | ||
4 | + <span class="material-icons iconeComboTemas">playlist_add_check</span> | ||
5 | + </div> | ||
6 | + | ||
7 | + <div id='i3GEOFstoComboCabeca' class='form-group condensed' style='width: 100%'></div> | ||
3 | 8 | ||
4 | <div class='form-group label-fixed condensed'> | 9 | <div class='form-group label-fixed condensed'> |
5 | <label class="control-label" for="i3GEOStocabecalho">{{{cabecalho}}}</label> | 10 | <label class="control-label" for="i3GEOStocabecalho">{{{cabecalho}}}</label> |
@@ -12,37 +17,37 @@ | @@ -12,37 +17,37 @@ | ||
12 | <div class='form-group label-fixed condensed'> | 17 | <div class='form-group label-fixed condensed'> |
13 | <label class="control-label" for="i3GEOstocolcabecalho">{{{colcabecalho}}}</label> | 18 | <label class="control-label" for="i3GEOstocolcabecalho">{{{colcabecalho}}}</label> |
14 | <div style="width: 100%;" class="input-group"> | 19 | <div style="width: 100%;" class="input-group"> |
15 | - <div id='i3GEOstocolcabecalho'></div> | 20 | + <div id='i3GEOstocolcabecalho'></div> |
16 | </div> | 21 | </div> |
17 | </div> | 22 | </div> |
18 | <div class='form-group label-fixed condensed'> | 23 | <div class='form-group label-fixed condensed'> |
19 | <label class="control-label" for="i3GEOstocoltexto">{{{coltexto}}}</label> | 24 | <label class="control-label" for="i3GEOstocoltexto">{{{coltexto}}}</label> |
20 | <div style="width: 100%;" class="input-group"> | 25 | <div style="width: 100%;" class="input-group"> |
21 | - <div id='i3GEOstocoltexto'></div> | 26 | + <div id='i3GEOstocoltexto'></div> |
22 | </div> | 27 | </div> |
23 | </div> | 28 | </div> |
24 | <div class='form-group label-fixed condensed'> | 29 | <div class='form-group label-fixed condensed'> |
25 | <label class="control-label" for="i3GEOstocollocal">{{{collocal}}}</label> | 30 | <label class="control-label" for="i3GEOstocollocal">{{{collocal}}}</label> |
26 | <div style="width: 100%;" class="input-group"> | 31 | <div style="width: 100%;" class="input-group"> |
27 | - <div id='i3GEOstocollocal'></div> | 32 | + <div id='i3GEOstocollocal'></div> |
28 | </div> | 33 | </div> |
29 | </div> | 34 | </div> |
30 | <div class='form-group label-fixed condensed'> | 35 | <div class='form-group label-fixed condensed'> |
31 | <label class="control-label" for="i3GEOstocolmedia">{{{colmedia}}}</label> | 36 | <label class="control-label" for="i3GEOstocolmedia">{{{colmedia}}}</label> |
32 | <div style="width: 100%;" class="input-group"> | 37 | <div style="width: 100%;" class="input-group"> |
33 | - <div id='i3GEOstocolmedia'></div> | 38 | + <div id='i3GEOstocolmedia'></div> |
34 | </div> | 39 | </div> |
35 | </div> | 40 | </div> |
36 | <div class='form-group label-fixed condensed'> | 41 | <div class='form-group label-fixed condensed'> |
37 | <label class="control-label" for="i3GEOstocollon">{{{collon}}}</label> | 42 | <label class="control-label" for="i3GEOstocollon">{{{collon}}}</label> |
38 | <div style="width: 100%;" class="input-group"> | 43 | <div style="width: 100%;" class="input-group"> |
39 | - <div id='i3GEOstocollon'></div> | 44 | + <div id='i3GEOstocollon'></div> |
40 | </div> | 45 | </div> |
41 | </div> | 46 | </div> |
42 | <div class='form-group label-fixed condensed'> | 47 | <div class='form-group label-fixed condensed'> |
43 | <label class="control-label" for="i3GEOstocollat">{{{collat}}}</label> | 48 | <label class="control-label" for="i3GEOstocollat">{{{collat}}}</label> |
44 | <div style="width: 100%;" class="input-group"> | 49 | <div style="width: 100%;" class="input-group"> |
45 | - <div id='i3GEOstocollat'></div> | 50 | + <div id='i3GEOstocollat'></div> |
46 | </div> | 51 | </div> |
47 | </div> | 52 | </div> |
48 | 53 |
ferramentas/tme/index.js
@@ -462,7 +462,7 @@ i3GEOF.tme = | @@ -462,7 +462,7 @@ i3GEOF.tme = | ||
462 | + url | 462 | + url |
463 | + "</a>"; | 463 | + "</a>"; |
464 | 464 | ||
465 | - $i("i3GEOTMEresultado").innerHTML = ins; | 465 | + $("#i3GEOTMEresultado").removeClass("hidden").html(ins); |
466 | $i("i3GEOTMEresultado").scrollIntoView(true); | 466 | $i("i3GEOTMEresultado").scrollIntoView(true); |
467 | 467 | ||
468 | }; | 468 | }; |
ferramentas/tme/templateLista_mst.html
1 | -<table class=lista8> | ||
2 | - <tr> | ||
3 | - </tr> | ||
4 | - {{#linhas}} | ||
5 | - <tr> | ||
6 | - <td> | ||
7 | - <div class="checkbox condensed"> | ||
8 | - <label> | ||
9 | - <input name="{{{item}}}" type=checkbox id="i3GEOtme{{{item}}}" /> | ||
10 | - <span class="checkbox-material noprint"> | ||
11 | - <span class="check"></span> | ||
12 | - </span> | ||
13 | - </label> | ||
14 | - </div> | ||
15 | - </td> | ||
16 | - <td>{{{item}}}</td> | ||
17 | - </tr> | ||
18 | - {{/linhas}} | ||
19 | -</table> | ||
20 | \ No newline at end of file | 1 | \ No newline at end of file |
2 | + {{#linhas}} | ||
3 | +<div class="checkbox condensed"> | ||
4 | + <label> | ||
5 | + <input name="{{{item}}}" type=checkbox id="i3GEOtme{{{item}}}" /> | ||
6 | + <span class="checkbox-material noprint"> | ||
7 | + <span class="check"></span> | ||
8 | + </span> | ||
9 | + {{{item}}} | ||
10 | + </label> | ||
11 | +</div> | ||
12 | +{{/linhas}} |
ferramentas/tme/template_mst.html
@@ -2,8 +2,7 @@ | @@ -2,8 +2,7 @@ | ||
2 | <div id='i3GEOFtmeComboCabeca' class='form-group condensed' style='width:100%'> | 2 | <div id='i3GEOFtmeComboCabeca' class='form-group condensed' style='width:100%'> |
3 | <span class="material-icons iconeComboTemas">playlist_add_check</span> | 3 | <span class="material-icons iconeComboTemas">playlist_add_check</span> |
4 | </div> | 4 | </div> |
5 | - | ||
6 | - <div class="alert alert-info" id='i3GEOTMEresultado'></div> | 5 | + <div class="alert alert-info hidden" id='i3GEOTMEresultado'></div> |
7 | <div class="hidden" id='parametrosComLogin'> | 6 | <div class="hidden" id='parametrosComLogin'> |
8 | <div class="checkbox text-left"> | 7 | <div class="checkbox text-left"> |
9 | <label> | 8 | <label> |
js/janela.js
@@ -214,7 +214,7 @@ i3GEO.janela = | @@ -214,7 +214,7 @@ i3GEO.janela = | ||
214 | } | 214 | } |
215 | ins += '</div><div id="' + id + '_corpo" class="bd ' + classeAdicional + '" style="display:block;padding:0px">'; | 215 | ins += '</div><div id="' + id + '_corpo" class="bd ' + classeAdicional + '" style="display:block;padding:0px">'; |
216 | if (wsrc !== "") { | 216 | if (wsrc !== "") { |
217 | - ins += '<iframe name="' + id + 'i" id="' + id + 'i" valign="top" style="border:0px white solid;width:100%"></iframe>'; | 217 | + ins += '<div class="container-fluid"><iframe name="' + id + 'i" id="' + id + 'i" valign="top" style="border:0px white solid;width:100%"></iframe></div>'; |
218 | } | 218 | } |
219 | ins += '</div>'; | 219 | ins += '</div>'; |
220 | if(idajuda){ | 220 | if(idajuda){ |
js/navega.js
@@ -990,9 +990,19 @@ i3GEO.navega = | @@ -990,9 +990,19 @@ i3GEO.navega = | ||
990 | + "/ferramentas/googlemaps1/index.php", | 990 | + "/ferramentas/googlemaps1/index.php", |
991 | "", | 991 | "", |
992 | "", | 992 | "", |
993 | - "</div><a class=i3GeoTituloJanelaBs target=_blank href='" | ||
994 | - + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=7&idajuda=68' >Google maps</a>", | ||
995 | - idgoogle | 993 | + "<span class='i3GeoTituloJanelaBsNolink' >Google maps</span></div>", |
994 | + idgoogle, | ||
995 | + false, | ||
996 | + "hd", | ||
997 | + "", | ||
998 | + "", | ||
999 | + "", | ||
1000 | + false, | ||
1001 | + "", | ||
1002 | + "", | ||
1003 | + "", | ||
1004 | + "", | ||
1005 | + "68" | ||
996 | ); | 1006 | ); |
997 | 1007 | ||
998 | temp = function() { | 1008 | temp = function() { |