Commit 1158eab183e3062d51521c810bdadf52cea09f29
1 parent
56228768
Exists in
master
and in
7 other branches
Utilização de template para geração da ferramenta tabela
Showing
5 changed files
with
65 additions
and
110 deletions
Show diff stats
css/input.css
1 | -input{ | ||
2 | - font-family: Verdana, Arial, Helvetica, sans-serif; | ||
3 | -} | ||
4 | input[type=text], textarea, input[type=number]{ | 1 | input[type=text], textarea, input[type=number]{ |
5 | -webkit-user-select: text; | 2 | -webkit-user-select: text; |
6 | -khtml-user-select: text; | 3 | -khtml-user-select: text; |
@@ -10,13 +7,15 @@ input[type=text], textarea, input[type=number]{ | @@ -10,13 +7,15 @@ input[type=text], textarea, input[type=number]{ | ||
10 | } | 7 | } |
11 | 8 | ||
12 | .bd input[type=text] { | 9 | .bd input[type=text] { |
13 | - color: #2F4632; | ||
14 | - background-color: rgb(250, 250, 250); | 10 | + color: white; |
11 | + background: none !IMPORTANT; | ||
12 | + | ||
15 | padding: 0; | 13 | padding: 0; |
16 | border: 1px solid rgb(180, 180, 180); | 14 | border: 1px solid rgb(180, 180, 180); |
17 | text-align: center; | 15 | text-align: center; |
18 | cursor: text; | 16 | cursor: text; |
19 | height: 22px; | 17 | height: 22px; |
18 | + | ||
20 | } | 19 | } |
21 | 20 | ||
22 | input[type=number] { | 21 | input[type=number] { |
ferramentas/tabela/index.js
@@ -187,30 +187,9 @@ i3GEOF.tabela = | @@ -187,30 +187,9 @@ i3GEOF.tabela = | ||
187 | } | 187 | } |
188 | }, idjanela + "i3GEOtabelaagrupamento", ""); | 188 | }, idjanela + "i3GEOtabelaagrupamento", ""); |
189 | }; | 189 | }; |
190 | - b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotao2", { | ||
191 | - onclick : { | ||
192 | - fn : function() { | ||
193 | - i3GEOF.tabela.ativaSelecao(idjanela); | ||
194 | - } | ||
195 | - } | ||
196 | - }); | ||
197 | - b.addClass("rodar100"); | ||
198 | - b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotao3", { | ||
199 | - onclick : { | ||
200 | - fn : function() { | ||
201 | - i3GEOF.tabela.limpaSelecao(idjanela); | ||
202 | - } | ||
203 | - } | ||
204 | - }); | ||
205 | - b.addClass("rodar100"); | ||
206 | - b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotao6", { | ||
207 | - onclick : { | ||
208 | - fn : function() { | ||
209 | - i3GEOF.tabela.criaNovoTema(idjanela); | ||
210 | - } | ||
211 | - } | ||
212 | - }); | ||
213 | - b.addClass("rodar100"); | 190 | + |
191 | + | ||
192 | + | ||
214 | b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotaoLista", { | 193 | b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotaoLista", { |
215 | onclick : { | 194 | onclick : { |
216 | fn : function() { | 195 | fn : function() { |
@@ -219,20 +198,6 @@ i3GEOF.tabela = | @@ -219,20 +198,6 @@ i3GEOF.tabela = | ||
219 | } | 198 | } |
220 | }); | 199 | }); |
221 | b.addClass("rodar100"); | 200 | b.addClass("rodar100"); |
222 | - b = new YAHOO.widget.Button(idjanela + "i3GEOtabelaGraficoI", { | ||
223 | - onclick : { | ||
224 | - fn : function() { | ||
225 | - i3GEO.mapa.ativaTema(i3GEOF.tabela.propJanelas[idjanela].tema); | ||
226 | - i3GEO.analise.dialogo.graficoInterativo1(); | ||
227 | - } | ||
228 | - } | ||
229 | - }); | ||
230 | - b.addClass("rodar100"); | ||
231 | - $i(idjanela + "i3GEOtabelabotaoLista-button").style.minHeight = "2em"; | ||
232 | - $i(idjanela + "i3GEOtabelabotaoLista-button").style.padding = "0px 15px"; | ||
233 | - $i(idjanela + "i3GEOtabelabotaoLista-button").style.lineHeight = "1.5"; | ||
234 | - $i(idjanela + "i3GEOtabelabotaoLista").style.position = "relative"; | ||
235 | - $i(idjanela + "i3GEOtabelabotaoLista").style.top = "2px"; | ||
236 | 201 | ||
237 | b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotao4", { | 202 | b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotao4", { |
238 | onclick : { | 203 | onclick : { |
@@ -259,14 +224,7 @@ i3GEOF.tabela = | @@ -259,14 +224,7 @@ i3GEOF.tabela = | ||
259 | } | 224 | } |
260 | }); | 225 | }); |
261 | b.addClass("abrir"); | 226 | b.addClass("abrir"); |
262 | - b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotaoVinculos", { | ||
263 | - onclick : { | ||
264 | - fn : function() { | ||
265 | - i3GEOF.tabela.vinculos.iniciaJanelaFlutuante(); | ||
266 | - } | ||
267 | - } | ||
268 | - }); | ||
269 | - b.addClass("abrir100"); | 227 | + |
270 | i3GEO.util.mensagemAjuda(idjanela + "i3GEOtabelamen1", $i(idjanela + "i3GEOtabelamen1").innerHTML); | 228 | i3GEO.util.mensagemAjuda(idjanela + "i3GEOtabelamen1", $i(idjanela + "i3GEOtabelamen1").innerHTML); |
271 | 229 | ||
272 | if (i3GEO.parametros.r.toLowerCase() !== "sim") { | 230 | if (i3GEO.parametros.r.toLowerCase() !== "sim") { |
@@ -356,18 +314,6 @@ i3GEOF.tabela = | @@ -356,18 +314,6 @@ i3GEOF.tabela = | ||
356 | } | 314 | } |
357 | $i(id + "_corpo").style.backgroundColor = "white"; | 315 | $i(id + "_corpo").style.backgroundColor = "white"; |
358 | 316 | ||
359 | - // indica se a janela sera atualizada na navegacao | ||
360 | - temp = 'i3GEOF.tabela.propJanelas["' + id + '"].atualiza = this.checked'; | ||
361 | - janela[0] | ||
362 | - .setFooter("<div id='i3GEOFtabelaRodape" + id | ||
363 | - + "' class='i3GeoRodapeJanela' ><input class='inputsb' checked style='cursor:pointer;position:relative;top:2px;' onclick='" | ||
364 | - + temp | ||
365 | - + "' type=checkbox /> " | ||
366 | - + $trad('atualizaAoNavegar', i3GEOF.tabela.dicionario) | ||
367 | - + " (" | ||
368 | - + id | ||
369 | - + ")</div>"); | ||
370 | - | ||
371 | temp = function() { | 317 | temp = function() { |
372 | i3GEOF.tabela.janelas.remove(id); | 318 | i3GEOF.tabela.janelas.remove(id); |
373 | i3GEOF.tabela.propJanelas[id] = null; | 319 | i3GEOF.tabela.propJanelas[id] = null; |
@@ -381,9 +327,6 @@ i3GEOF.tabela = | @@ -381,9 +327,6 @@ i3GEOF.tabela = | ||
381 | google.maps.event.removeListener(tabelaDragend); | 327 | google.maps.event.removeListener(tabelaDragend); |
382 | google.maps.event.removeListener(tabelaZoomend); | 328 | google.maps.event.removeListener(tabelaZoomend); |
383 | } | 329 | } |
384 | - if (i3GEO.Interface.ATUAL === "googleearth") { | ||
385 | - google.earth.removeEventListener(tabelaDragend); | ||
386 | - } | ||
387 | } | 330 | } |
388 | }; | 331 | }; |
389 | YAHOO.util.Event.addListener(janela[0].close, "click", temp); | 332 | YAHOO.util.Event.addListener(janela[0].close, "click", temp); |
ferramentas/tabela/template_mst.html
1 | <!-- Guias --> | 1 | <!-- Guias --> |
2 | -<div id='{{{idjanela}}}' class='yui-navset' style='top: 0px; cursor: pointer; left: 0px;'> | 2 | +<div id='{{{idjanela}}}' class='yui-navset' style='top: 0px; cursor: pointer; left: 2px;'> |
3 | <ul class='yui-nav' style='border-width: 0pt 0pt 0px; border-color: rgb(240, 240, 240); border-bottom-color: white;'> | 3 | <ul class='yui-nav' style='border-width: 0pt 0pt 0px; border-color: rgb(240, 240, 240); border-bottom-color: white;'> |
4 | <li> | 4 | <li> |
5 | <div id='{{{idjanela}}}i3GEOtabelaguia6' style='text-align: center; left: 0px;'> | 5 | <div id='{{{idjanela}}}i3GEOtabelaguia6' style='text-align: center; left: 0px;'> |
6 | - <a> | ||
7 | - <em><img class='ticPropriedades2' style='height: 14px' title='{{{propriedades}}}' src='{{{locaplic}}}/imagens/branco.gif'></em> | 6 | + <a title='{{{propriedades}}}'> |
7 | + <em><span class="material-icons">settings</span></em> | ||
8 | </a> | 8 | </a> |
9 | </div> | 9 | </div> |
10 | </li> | 10 | </li> |
@@ -35,47 +35,60 @@ | @@ -35,47 +35,60 @@ | ||
35 | <!-- Local onde a tabela e renderizada --> | 35 | <!-- Local onde a tabela e renderizada --> |
36 | <div id='{{{idjanela}}}i3GEOtabelaresultadotab' style='background-color: #F2F2F2; position: relative; top: 5px; left: 0px'></div> | 36 | <div id='{{{idjanela}}}i3GEOtabelaresultadotab' style='background-color: #F2F2F2; position: relative; top: 5px; left: 0px'></div> |
37 | <!-- Guia Propriedades --> | 37 | <!-- Guia Propriedades --> |
38 | -<div id='{{{idjanela}}}i3GEOtabelaguia6obj' style='width: 99%'> | ||
39 | - <table summary='' class='lista2'> | ||
40 | - <tr> | ||
41 | - <td> | ||
42 | - <input style='cursor: pointer; border: 0px solid white;' onclick='i3GEOF.tabela.pegaRegistros({{{idjanelaA}}})' type='checkbox' id='{{{idjanela}}}i3GEOtabelatipolista' /> | ||
43 | - </td> | ||
44 | - <td> | ||
45 | - <span class='paragrafo'>{{{atuatab}}}</span> | ||
46 | - </td> | ||
47 | - </tr> | ||
48 | - <tr> | ||
49 | - <td> | ||
50 | - <input style='cursor: pointer; border: 0px solid white;' onclick='i3GEOF.tabela.pegaRegistros({{{idjanelaA}}})' type='checkbox' id='{{{idjanela}}}i3GEOtabelalegenda' /> | ||
51 | - </td> | ||
52 | - <td> | ||
53 | - <span class='paragrafo'>{{{colleg}}}</span> | ||
54 | - </td> | ||
55 | - </tr> | ||
56 | - </table> | 38 | +<div id='{{{idjanela}}}i3GEOtabelaguia6obj' style='width: 99%;padding-left:5px;'> |
39 | + <div class="checkbox text-left"> | ||
40 | + <label style="padding:12px;"> | ||
41 | + <input id='{{{idjanela}}}i3GEOtabelatipolista' type="checkbox" onclick="i3GEOF.tabela.pegaRegistros('{{{idjanela}}}')"> | ||
42 | + <span class="checkbox-material noprint"><span class="check"></span></span> {{{atuatab}}} | ||
43 | + </label> | ||
44 | + </div> | ||
45 | + <div class="checkbox text-left"> | ||
46 | + <label style="padding:12px;"> | ||
47 | + <input id='{{{idjanela}}}i3GEOtabelalegenda' type="checkbox" onclick="i3GEOF.tabela.pegaRegistros('{{{idjanela}}}')"> | ||
48 | + <span class="checkbox-material noprint"><span class="check"></span></span> {{{colleg}}} | ||
49 | + </label> | ||
50 | + </div> | ||
51 | + <div class="checkbox text-left"> | ||
52 | + <label style="padding:12px;"> | ||
53 | + <input checked id='i3GEOFtabelaRodape{{{idjanela}}}' type="checkbox" onclick="i3GEOF.tabela.propJanelas['{{{idjanela}}}'].atualiza = this.checked;"> | ||
54 | + <span class="checkbox-material noprint"><span class="check"></span></span> {{{atualizaAoNavegar}}} | ||
55 | + </label> | ||
56 | + </div> | ||
57 | </div> | 57 | </div> |
58 | <!-- Registros da tabela --> | 58 | <!-- Registros da tabela --> |
59 | -<div id='{{{idjanela}}}i3GEOtabelaguia1obj' style='width: 99%'> | 59 | +<div id='{{{idjanela}}}i3GEOtabelaguia1obj' style='width: 99%;padding-left:5px;'> |
60 | <div id='{{{idjanela}}}i3GEOtabelacombot' style='position: relative; top: 5px; left: 0px; display: none;'></div> | 60 | <div id='{{{idjanela}}}i3GEOtabelacombot' style='position: relative; top: 5px; left: 0px; display: none;'></div> |
61 | - <input title='{{{sellinhas}}}' id='{{{idjanela}}}i3GEOtabelabotao2' size='25' type='button' value='{{{atvsel}}}' /> | ||
62 | - <input title='{{{limpselmap}}}' id='{{{idjanela}}}i3GEOtabelabotao3' size='25' type='button' value='{{{limpsel}}}' /> | ||
63 | - <input title='{{{criatemasel}}}' id='{{{idjanela}}}i3GEOtabelabotao6' size='30' type='button' value='{{{criatema}}}' /> | ||
64 | - <input id='{{{idjanela}}}i3GEOtabelaGraficoI' type='button' value='{{{grafico}}}' /> | ||
65 | - <input title='{{{vinctab}}}' id='{{{idjanela}}}i3GEOtabelabotaoVinculos' size='30' type='button' value='{{{vinculos}}}' /> | ||
66 | - <div id='{{{idjanela}}}i3GEOtabelacontador' style='padding:2px 0px 3px 0px;background-color: rgb(240, 240, 240); width: 100%; position: relative; top: 15px; left: 0px; text-align: left; height: 25px;'> | ||
67 | - {{{de}}} | ||
68 | - <img style='cursor: pointer;position:relative;top:2px;' onclick='i3GEOF.tabela.menos({{{idjanelaA}}})' src='{{{locaplic}}}/imagens/oxygen/16x16/media-seek-backward.png' /> | ||
69 | - {{{ini}}} {{{ate}}} | ||
70 | - <img style='cursor: pointer;position:relative;top:2px;' onclick='i3GEOF.tabela.mais({{{idjanelaA}}})' src='{{{locaplic}}}/imagens/oxygen/16x16/media-seek-forward.png' /> | ||
71 | - {{{fim}}} | ||
72 | - <img title='{{{vertodos}}}' style='cursor: pointer; position: relative;top:2px;' onclick='i3GEOF.tabela.todos({{{idjanelaA}}})' src='{{{locaplic}}}/imagens/oxygen/16x16/media-skip-forward.png' /> | ||
73 | - <input title='{{{atuareg}}}' id='{{{idjanela}}}i3GEOtabelabotaoLista' size='25' style='position: relative;' type='button' value='{{{listar}}}' /> | 61 | + |
62 | + <a href='javascript:void(0)' onclick="i3GEOF.tabela.ativaSelecao('{{{idjanela}}}')" class='btn btn-primary btn-sm btn-raised'>{{{atvsel}}}</a> | ||
63 | + <a title='{{{limpselmap}}}' href='javascript:void(0)' onclick="i3GEOF.tabela.limpaSelecao('{{{idjanela}}}')" class='btn btn-primary btn-sm btn-raised'>{{{limpsel}}}</a> | ||
64 | + <a title='{{{criatemasel}}}' href='javascript:void(0)' onclick="i3GEOF.tabela.criaNovoTema('{{{idjanela}}}')" class='btn btn-primary btn-sm btn-raised'>{{{criatema}}}</a> | ||
65 | + <a href='javascript:void(0)' onclick="i3GEO.mapa.ativaTema(i3GEOF.tabela.propJanelas['{{{idjanela}}}'].tema);i3GEO.analise.dialogo.graficoInterativo1();" class='btn btn-primary btn-sm btn-raised'>{{{grafico}}}</a> | ||
66 | + <a title='{{{vinctab}}}' href='javascript:void(0)' onclick="i3GEOF.tabela.vinculos.iniciaJanelaFlutuante()" class='btn btn-primary btn-sm btn-raised'>{{{vinculos}}}</a> | ||
67 | + | ||
68 | + <div> | ||
69 | + {{{de}}} | ||
70 | + <input id="{{{idjanela}}}i3GEOtabelainicio" size="5" value="1" type="text"> | ||
71 | + {{{ate}}} | ||
72 | + <input id="{{{idjanela}}}i3GEOtabelafim" size="5" value="20" type="text"> | ||
73 | + | ||
74 | + <button onclick='i3GEOF.tabela.menos("{{{idjanela}}}")' class="btn btn-xs" style="margin:2px;padding:2px;"> | ||
75 | + <span class="material-icons">remove_circle_outline</span> | ||
76 | + </button> | ||
77 | + <button onclick='i3GEOF.tabela.mais("{{{idjanela}}}")' class="btn btn-xs" style="margin:2px;padding:2px;"> | ||
78 | + <span class="material-icons">add_circle_outline</span> | ||
79 | + </button> | ||
80 | + <button title='{{{vertodos}}}' onclick='i3GEOF.tabela.todos("{{{idjanela}}}")' class="btn btn-xs" style="margin:2px;padding:2px;"> | ||
81 | + <span class="material-icons">last_page</span> | ||
82 | + </button> | ||
83 | + <button title='{{{atuareg}}}' onclick='i3GEOF.tabela.pegaRegistros("{{{idjanela}}}")' class="btn btn-xs" style="margin:2px;padding:2px;"> | ||
84 | + <span class="material-icons">refresh</span> | ||
85 | + </button> | ||
74 | </div> | 86 | </div> |
75 | - <div id='{{{idjanela}}}i3GEOtabelaregistros' style='position: relative; top: 20px; left: 2px; text-align: left;'></div> | 87 | + |
88 | + <div id='{{{idjanela}}}i3GEOtabelaregistros' style='top: 10px;'></div> | ||
76 | </div> | 89 | </div> |
77 | <!-- Estatisticas --> | 90 | <!-- Estatisticas --> |
78 | -<div id='{{{idjanela}}}i3GEOtabelaguia3obj' style='display: none; width: 95%;'> | 91 | +<div id='{{{idjanela}}}i3GEOtabelaguia3obj' style='display: none; width: 95%;padding-left:5px;'> |
79 | <p class='paragrafo'> | 92 | <p class='paragrafo'> |
80 | <label>{{{itemcalc}}}:</label> | 93 | <label>{{{itemcalc}}}:</label> |
81 | <div class='styled-select' id='{{{idjanela}}}i3GEOtabelaitensGuia3'></div> | 94 | <div class='styled-select' id='{{{idjanela}}}i3GEOtabelaitensGuia3'></div> |
@@ -95,7 +108,7 @@ | @@ -95,7 +108,7 @@ | ||
95 | </div> | 108 | </div> |
96 | </div> | 109 | </div> |
97 | <!-- Relatorio --> | 110 | <!-- Relatorio --> |
98 | -<div id='{{{idjanela}}}i3GEOtabelaguia5obj' style='width: 95%; display: none;'> | 111 | +<div id='{{{idjanela}}}i3GEOtabelaguia5obj' style='width: 95%; display: none;padding-left:5px;'> |
99 | <p class='paragrafo'>{{{itensrel}}}: | 112 | <p class='paragrafo'>{{{itensrel}}}: |
100 | <p class='paragrafo'> | 113 | <p class='paragrafo'> |
101 | <div id='{{{idjanela}}}i3GEOtabelaitensrelatorio' class='digitar' style='text-align: left; overflow: auto; height: 80px'></div> | 114 | <div id='{{{idjanela}}}i3GEOtabelaitensrelatorio' class='digitar' style='text-align: left; overflow: auto; height: 80px'></div> |
js/util.js
@@ -671,14 +671,14 @@ i3GEO.util = | @@ -671,14 +671,14 @@ i3GEO.util = | ||
671 | if (!onch) { | 671 | if (!onch) { |
672 | onch = ""; | 672 | onch = ""; |
673 | } | 673 | } |
674 | - return "<span class=digitar onmouseover='javascript:this.className=\"digitarOver\";' onmouseout='javascript:this.className=\"digitar\";' ><input onchange=\"" + onch | ||
675 | - + "\" tabindex='0' onclick='javascript:this.select();' id='" | 674 | + return "<span ><input onchange=\"" + onch |
675 | + + "\" tabindex='0' id='" | ||
676 | + idInput | 676 | + idInput |
677 | + "' title='" | 677 | + "' title='" |
678 | + titulo | 678 | + titulo |
679 | + "' type='text' size='" | 679 | + "' type='text' size='" |
680 | + digitos | 680 | + digitos |
681 | - + "' class='digitar' value='" | 681 | + + "' value='" |
682 | + valor | 682 | + valor |
683 | + "' name='" | 683 | + "' name='" |
684 | + nome | 684 | + nome |
ms_configura.php
@@ -681,7 +681,7 @@ Tipo: | @@ -681,7 +681,7 @@ Tipo: | ||
681 | {string} | 681 | {string} |
682 | 682 | ||
683 | */ | 683 | */ |
684 | -$conexaoadmin = "";//"/var/www/conexaoms.php"; | 684 | +$conexaoadmin = "";//"/var/www/conexaoms.php" |
685 | /* | 685 | /* |
686 | Variable: $esquemaadmin | 686 | Variable: $esquemaadmin |
687 | 687 | ||
@@ -690,7 +690,7 @@ Indica em qual esquema do banco de dados de administracao estao armazenadas as t | @@ -690,7 +690,7 @@ Indica em qual esquema do banco de dados de administracao estao armazenadas as t | ||
690 | Tipo: | 690 | Tipo: |
691 | {string} | 691 | {string} |
692 | */ | 692 | */ |
693 | -$esquemaadmin = ""; | 693 | +$esquemaadmin = "";//"public" |
694 | /* | 694 | /* |
695 | Variable: interfacePadrao | 695 | Variable: interfacePadrao |
696 | 696 |