Download as
Browse Code »

Commit 7f6332289c7eac0fa63d9c228c8b54d3ffc851e6

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

Formatação da ferramenta tabela, para adaptação ao uso do bootstrap. Criação de … 

…uma classe css temporária para ajustes dos estilos css nas janelas flutuantes, mantendo a compatibilidade com a versão 6.
Showing 8 changed files with 150 additions and 69 deletions   Show diff stats
css/default.css
  Diff comments   View file @7f63322
... ... @@ -65,6 +65,11 @@ hr {
65 65 margin: 4px;
66 66 }
67 67  
  68 +.form-group.condensed {
  69 + margin: 0px;
  70 + padding: 0px;
  71 +}
  72 +
68 73 .withripple.condensed,.pager.condensed {
69 74 margin: 0px;
70 75 }
... ... @@ -567,26 +572,44 @@ Configuracoes especificas dos elementos que ficam no rodape
567 572 .bd .lista td, .bd .lista1 td, .bd .lista2 td, .bd .lista3 td, .bd .lista4 td, .bd .lista5 td, .bd .lista6 td, .bd .lista7 td, .bd .lista8 td {
568 573 color: white;
569 574 }
  575 +.bd.i3geo6 .lista td, .bd.i3geo6 .lista1 td, .bd.i3geo6 .lista2 td, .bd.i3geo6 .lista3 td, .bd.i3geo6 .lista4 td, .bd.i3geo6 .lista5 td, .bd.i3geo6 .lista6 td, .bd.i3geo6 .lista7 td, .bd.i3geo6 .lista8 td {
  576 + color: white;
  577 +}
570 578  
571 579 .bd select {
572 580 background: white;
573 581 }
  582 +.bd.i3geo6 select {
  583 + background: white;
  584 +}
574 585  
575 586 .bd textarea {
576 587 color: black;
577 588 }
  589 +.bd.i3geo6 textarea {
  590 + color: black;
  591 +}
578 592  
579 593 .bd div {
580 594 text-align: left;
581 595 }
  596 +.bd.i3geo6 div {
  597 + text-align: left;
  598 +}
582 599  
583 600 .bd a, .bd a:focus, .bd a:hover {
584 601 color: #9ceaea;;
585 602 }
  603 +.bd.i3geo6 a, .bd.i3geo6 a:focus, .bd.i3geo6 a:hover {
  604 + color: #9ceaea;;
  605 +}
586 606  
587 607 .bd p {
588 608 text-align: left;
589 609 }
  610 +.bd.i3geo6 p {
  611 + text-align: left;
  612 +}
590 613  
591 614 .linha {
592 615 color: white;
... ... @@ -865,6 +888,9 @@ bd .i3geoFormIconeEdita {
865 888 .bd .paragrafo {
866 889 color: rgba(255, 255, 255, 0.6);
867 890 }
  891 +.bd.i3geo6 .paragrafo {
  892 + color: rgba(255, 255, 255, 0.6);
  893 +}
868 894  
869 895 .yui-skin-sam .yui-panel-container {
870 896 padding: 0 1px;
... ... @@ -929,6 +955,20 @@ bd .i3geoFormIconeEdita {
929 955 text-align: left;
930 956 border: 0px;
931 957 }
  958 +.yui-skin-sam .yui-panel .hd.i3geo6 {
  959 + background-color: #F2F2F2;
  960 + color: #000000;
  961 + font-size: 93%;
  962 + font-weight: bold;
  963 + line-height: 2;
  964 + height: 40px;
  965 + background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
  966 + padding-top: 0px;
  967 + padding-bottom: 15px;
  968 + padding-left: 10px;
  969 + text-align: left;
  970 + border: 0px;
  971 +}
932 972  
933 973 .hd span {
934 974 font-family: trebuchet ms;
... ... @@ -936,6 +976,12 @@ bd .i3geoFormIconeEdita {
936 976 opacity: 1.0;
937 977 }
938 978  
  979 +.hd.i3geo6 span {
  980 + font-family: trebuchet ms;
  981 + color: white;
  982 + opacity: 1.0;
  983 +}
  984 +
939 985 .yui-panel-container div .bd, .paragrafo > label{
940 986 background-color: none;
941 987 padding: 10px;
... ... @@ -946,6 +992,16 @@ bd .i3geoFormIconeEdita {
946 992 color: rgba(255, 255, 255, 0.6);
947 993 }
948 994  
  995 +.yui-panel-container div .bd.i3geo6, .bd.paragrafo > label{
  996 + background-color: none;
  997 + padding: 10px;
  998 + position: relative;
  999 + font-family: trebuchet ms;
  1000 + font-size: 14px;
  1001 + font-weight: bold;
  1002 + color: rgba(255, 255, 255, 0.6);
  1003 +}
  1004 +
949 1005 .yui-skin-sam .yui-tt .bd {
950 1006 background-color: rgba(9, 70, 114, 0.75);
951 1007 border-radius: 13px 13px 13px 13px;
... ...
css/geral.css
  Diff comments   View file @7f63322
... ... @@ -15,6 +15,7 @@ para nao selecionar
15 15 -o-user-select: text;
16 16 user-select: text;
17 17 }
  18 +
18 19 #i3GEOlogoMarca {
19 20 display: block;
20 21 top: 4em;
... ...
css/input.css
  Diff comments   View file @7f63322
... ... @@ -6,7 +6,7 @@ input[type=text], textarea, input[type=number]{
6 6 user-select: text;
7 7 }
8 8  
9   -.bd input[type=text] {
  9 +.bd.i3geo6 input[type=text] {
10 10 color: white;
11 11 background: none !IMPORTANT;
12 12  
... ... @@ -18,6 +18,20 @@ input[type=text], textarea, input[type=number]{
18 18  
19 19 }
20 20  
  21 +.bd.i3geo6 input[type=text] {
  22 + color: white;
  23 + background: none !IMPORTANT;
  24 + padding: 0;
  25 + border: 1px solid rgb(180, 180, 180);
  26 + text-align: center;
  27 + cursor: text;
  28 + height: 22px;
  29 +}
  30 +
  31 +.bd input[type=text] {
  32 +
  33 +}
  34 +
21 35 input[type=number] {
22 36 font-size: 12px;
23 37 color: #2F4632;
... ...
ferramentas/legenda/index.js
  Diff comments   View file @7f63322
... ... @@ -485,10 +485,22 @@ i3GEOF.legenda =
485 485 + "/ajuda_usuario.php?idcategoria=5&idajuda=41' > "
486 486 + $trad("t33")
487 487 +"</a>";
488   - janela =
489   - i3GEO.janela.cria("590px", "350px", "", "", "", titulo, "i3GEOF.legenda", false, "hd", cabecalho, minimiza, function() {
490   - i3GEO.guias.ajustaGuiaFerramenta("i3GEOF.legenda", "i3GEOlegenda");
491   - }, true, "", "", "nao");
  488 + janela = i3GEO.janela.cria(
  489 + "590px",
  490 + "350px",
  491 + "",
  492 + "",
  493 + "",
  494 + titulo,
  495 + "i3GEOF.legenda",
  496 + false,
  497 + "hd",
  498 + cabecalho,
  499 + minimiza,
  500 + function() {i3GEO.guias.ajustaGuiaFerramenta("i3GEOF.legenda", "i3GEOlegenda");},
  501 + true
  502 + );
  503 +
492 504 divid = janela[2].id;
493 505 i3GEOF.legenda.aguarde = $i("i3GEOF.legenda_imagemCabecalho").style;
494 506 $i("i3GEOF.legenda_corpo").style.backgroundColor = "white";
... ...
ferramentas/tabela/index.js
  Diff comments   View file @7f63322
... ... @@ -190,24 +190,6 @@ i3GEOF.tabela =
190 190  
191 191  
192 192  
193   - b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotaoLista", {
194   - onclick : {
195   - fn : function() {
196   - i3GEOF.tabela.pegaRegistros(idjanela);
197   - }
198   - }
199   - });
200   - b.addClass("rodar100");
201   -
202   - b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotao4", {
203   - onclick : {
204   - fn : function() {
205   - i3GEOF.tabela.estatistica(idjanela);
206   - }
207   - }
208   - });
209   - b.addClass("abrir");
210   -
211 193 b = new YAHOO.widget.Button(idjanela + "i3GEOtabelabotao7", {
212 194 onclick : {
213 195 fn : function() {
... ... @@ -225,8 +207,6 @@ i3GEOF.tabela =
225 207 });
226 208 b.addClass("abrir");
227 209  
228   - i3GEO.util.mensagemAjuda(idjanela + "i3GEOtabelamen1", $i(idjanela + "i3GEOtabelamen1").innerHTML);
229   -
230 210 if (i3GEO.parametros.r.toLowerCase() !== "sim") {
231 211 $i(idjanela + "i3GEOtabelaguia4obj").innerHTML = $trad("x22");
232 212 }
... ... @@ -303,9 +283,25 @@ i3GEOF.tabela =
303 283 + i3GEO.configura.locaplic
304 284 + "/ajuda_usuario.php?idcategoria=5&idajuda=39' >"+$trad('tabela', i3GEOF.tabela.dicionario)+"</a>";
305 285  
306   - janela = i3GEO.janela.cria("570px", "400px", "", "", "", titulo, id, false, "hd", cabecalho, minimiza, function() {
307   - i3GEO.guias.ajustaGuiaFerramenta(id, id + "i3GEOtabela");
308   - }, true, "", duplica, "nao");
  286 + janela = i3GEO.janela.cria(
  287 + "570px",
  288 + "400px",
  289 + "",
  290 + "",
  291 + "",
  292 + titulo,
  293 + id,
  294 + false,
  295 + "hd",
  296 + cabecalho,
  297 + minimiza,
  298 + function() { i3GEO.guias.ajustaGuiaFerramenta(id, id + "i3GEOtabela");},
  299 + true,
  300 + "",
  301 + duplica,
  302 + "",
  303 + ""
  304 + );
309 305 divid = janela[2].id;
310 306 if (i3GEOF.tabela.janelas.length > 1) {
311 307 temp = janela[0].cfg.config;
... ... @@ -368,11 +364,6 @@ i3GEOF.tabela =
368 364 i3GEOF.tebela.atualizaListaDeRegistros();
369 365 });
370 366 }
371   - if (i3GEO.Interface.ATUAL === "googleearth" && !tabelaDragend) {
372   - tabelaDragend = google.earth.addEventListener(i3GeoMap.getView(), "viewchangeend", function() {
373   - i3GEOF.tabela.atualizaListaDeRegistros();
374   - });
375   - }
376 367 },
377 368 atualizaCombosCabecalhos : function() {
378 369 var i, id, n = i3GEOF.tabela.janelas.length, onButtonClick;
... ... @@ -1175,7 +1166,7 @@ i3GEOF.tabela =
1175 1166 } else {
1176 1167 $i(idjanela + "i3GEOtabelaitensGuia3").innerHTML = retorno.dados;
1177 1168 }
1178   - }, idjanela + "i3GEOtabelaitensGuia3", "");
  1169 + }, idjanela + "i3GEOtabelaitensGuia3", "","sim","","form-control");
1179 1170 },
1180 1171 estatistica : function(idjanela) {
1181 1172 if ($i(idjanela + "i3GEOtabelaComboItensGuia3").value === "") {
... ... @@ -1193,9 +1184,10 @@ i3GEOF.tabela =
1193 1184 if (retorno.data.indices) {
1194 1185 n = retorno.data.indices.length;
1195 1186 for (i = 0; i < n; i++) {
1196   - nome = eval("retorno.data.variaveis." + retorno.data.indices[i]);
1197   - valor = eval("retorno.data.valores." + retorno.data.indices[i]);
1198   - ins += "<p style='text-align:left'> <span style='color:gray'>" + nome + ": </span>" + valor + "</p>";
  1187 + nome =retorno.data.variaveis[retorno.data.indices[i]];
  1188 + valor = retorno.data.valores[retorno.data.indices[i]];
  1189 + ins += '<div class="row-content"><h4 class="list-group-item-heading">'+nome+'</h4><p class="list-group-item-text">'+valor+'</p></div>';
  1190 + ins += '<div class="list-group-separator">&nbsp;</div>';
1199 1191 }
1200 1192 }
1201 1193 } else {
... ...
ferramentas/tabela/template_mst.html
  Diff comments   View file @7f63322
1 1 <!-- Guias -->
2   -<div id='{{{idjanela}}}' class='yui-navset' style='top: 0px; cursor: pointer; left: 2px;'>
  2 +<div id='{{{idjanela}}}' class='yui-navset' style='top: 0px; cursor: pointer; margin-left: 2px;'>
3 3 <ul class='yui-nav' style='border-width: 0pt 0pt 0px; border-color: rgb(240, 240, 240); border-bottom-color: white;'>
4 4 <li>
5 5 <div id='{{{idjanela}}}i3GEOtabelaguia6' style='text-align: center; left: 0px;'>
... ... @@ -35,7 +35,7 @@
35 35 <!-- Local onde a tabela e renderizada -->
36 36 <div id='{{{idjanela}}}i3GEOtabelaresultadotab' style='background-color: #F2F2F2; position: relative; top: 5px; left: 0px'></div>
37 37 <!-- Guia Propriedades -->
38   -<div id='{{{idjanela}}}i3GEOtabelaguia6obj' style='width: 99%;padding-left:5px;'>
  38 +<div id='{{{idjanela}}}i3GEOtabelaguia6obj' class="container-fluid">
39 39 <div class="checkbox text-left">
40 40 <label style="padding:12px;">
41 41 <input id='{{{idjanela}}}i3GEOtabelatipolista' type="checkbox" onclick="i3GEOF.tabela.pegaRegistros('{{{idjanela}}}')">
... ... @@ -56,7 +56,7 @@
56 56 </div>
57 57 </div>
58 58 <!-- Registros da tabela -->
59   -<div id='{{{idjanela}}}i3GEOtabelaguia1obj' style='width: 99%;padding-left:5px;'>
  59 +<div id='{{{idjanela}}}i3GEOtabelaguia1obj' class='container'>
60 60 <div id='{{{idjanela}}}i3GEOtabelacombot' style='position: relative; top: 5px; left: 0px; display: none;'></div>
61 61  
62 62 <a href='javascript:void(0)' onclick="i3GEOF.tabela.ativaSelecao('{{{idjanela}}}')" class='btn btn-primary btn-sm btn-raised'>{{{atvsel}}}</a>
... ... @@ -65,11 +65,11 @@
65 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 66 <a title='{{{vinctab}}}' href='javascript:void(0)' onclick="i3GEOF.tabela.vinculos.iniciaJanelaFlutuante()" class='btn btn-primary btn-sm btn-raised'>{{{vinculos}}}</a>
67 67  
68   - <div>
  68 + <div class="form-group condensed">
69 69 {{{de}}} &nbsp;
70   - <input id="{{{idjanela}}}i3GEOtabelainicio" size="5" value="1" type="text"> &nbsp;
  70 + <input class="form-control" style="display:inline;width:50px;" id="{{{idjanela}}}i3GEOtabelainicio" size="5" value="1" type="text"> &nbsp;
71 71 {{{ate}}} &nbsp;
72   - <input id="{{{idjanela}}}i3GEOtabelafim" size="5" value="20" type="text">&nbsp;
  72 + <input class="form-control" style="display:inline;width:50px;" id="{{{idjanela}}}i3GEOtabelafim" size="5" value="20" type="text">&nbsp;
73 73  
74 74 <button onclick='i3GEOF.tabela.menos("{{{idjanela}}}")' class="btn btn-xs" style="margin:2px;padding:2px;">
75 75 <span class="material-icons">remove_circle_outline</span>
... ... @@ -88,27 +88,27 @@
88 88 <div id='{{{idjanela}}}i3GEOtabelaregistros' style='top: 10px;'></div>
89 89 </div>
90 90 <!-- Estatisticas -->
91   -<div id='{{{idjanela}}}i3GEOtabelaguia3obj' style='display: none; width: 95%;padding-left:5px;'>
92   - <p class='paragrafo'>
93   - <label>{{{itemcalc}}}:</label>
94   - <div class='styled-select' id='{{{idjanela}}}i3GEOtabelaitensGuia3'></div>
95   - <br>
96   - <p class='paragrafo' style='position: relative;'>
97   - <label>{{{excluicalc}}}:</label>
98   - <div class='i3geoForm i3geoFormIconeEdita'>
99   - <input type='text' id='{{{idjanela}}}i3GEOtabelafiltro1' value='' />
  91 +<div id='{{{idjanela}}}i3GEOtabelaguia3obj' style='display: none;' class='container-fluid'>
  92 + <div class='form-group condensed' >
  93 + <label class="control-label">{{{itemcalc}}}</label>
  94 + <div id='{{{idjanela}}}i3GEOtabelaitensGuia3'></div>
100 95 </div>
101   - <br>
102   - <p class='paragrafo'>
103   - <input id='{{{idjanela}}}i3GEOtabelabotao4' size='30' type='button' value='{{{calc}}}' />
104   - <div id='{{{idjanela}}}i3GEOtabelaoperacoes' style='font-size: 12px; text-align: left; position: relative; top: 15px; left: 0px;'></div>
105   - <br>
106   - <div id='{{{idjanela}}}i3GEOtabelamen1'>
107   - <p class='paragrafo'>{{{paraqueas}}}
  96 + <div class='form-group condensed' >
  97 + <label class="control-label">{{{excluicalc}}}</label>
  98 + <div>
  99 + <input class="form-control input-lg" type='text' id='{{{idjanela}}}i3GEOtabelafiltro1' value='' />
  100 + </div>
108 101 </div>
  102 + <button onclick="i3GEOF.tabela.estatistica('{{{idjanela}}}')" class='btn btn-primary btn-sm btn-raised'>{{{calc}}}</button>
  103 +
  104 + <div id='{{{idjanela}}}i3GEOtabelaoperacoes' style='font-size: 12px; text-align: left; position: relative; top: 15px; left: 0px;'></div>
  105 +
  106 + <h5 class="alert alert-info">
  107 + {{{paraqueas}}}
  108 + </h5>
109 109 </div>
110 110 <!-- Relatorio -->
111   -<div id='{{{idjanela}}}i3GEOtabelaguia5obj' style='width: 95%; display: none;padding-left:5px;'>
  111 +<div id='{{{idjanela}}}i3GEOtabelaguia5obj' class='container-fluid'>
112 112 <p class='paragrafo'>{{{itensrel}}}:
113 113 <p class='paragrafo'>
114 114 <div id='{{{idjanela}}}i3GEOtabelaitensrelatorio' class='digitar' style='text-align: left; overflow: auto; height: 80px'></div>
... ...
js/janela.js
  Diff comments   View file @7f63322
... ... @@ -145,13 +145,16 @@ i3GEO.janela =
145 145 * {Array} Array contendo objeto YAHOO.panel criado,elemento HTML com o cabecalho, elemento HTML com o corpo
146 146 */
147 147 cria : function(wlargura, waltura, wsrc, nx, ny, texto, id, modal, classe, funcaoCabecalho, funcaoMinimiza, funcaoAposRedim,
148   - dimensionavel, icone, funcaoDuplica) {
  148 + dimensionavel, icone, funcaoDuplica, opacidade, classeAdicional) {
149 149 if (typeof (console) !== 'undefined')
150 150 console.info("i3GEO.janela.cria()");
151 151  
152 152 if (arguments.length < 13 ) {
153 153 dimensionavel = true;
154 154 }
  155 + if(arguments.length < 17){
  156 + classeAdicional = "i3geo6";
  157 + }
155 158 if (!icone) {
156 159 icone = "";
157 160 }
... ... @@ -187,7 +190,7 @@ i3GEO.janela =
187 190 // cria as marca&ccedil;&otilde;es html para a janela
188 191 temp = navm ? 0 : 2;
189 192 wlargurA = parseInt(wlargura, 10) + temp + "px";
190   - ins = '<div id="' + id + '_cabecalho" class="' + classe + '" >';
  193 + ins = '<div id="' + id + '_cabecalho" class="' + classe + ' ' + classeAdicional + '" >';
191 194 if (i3GEO.configura !== undefined) {
192 195 ins +=
193 196 "<img id='" + id
... ... @@ -199,18 +202,18 @@ i3GEO.janela =
199 202 ins += "<img class='i3GeoIconeJanela' src='" + icone + "' >";
200 203 }
201 204 ins += "<span style='font-size:10px;'>" + texto + "</span>";
202   - if (funcaoDuplica) {
  205 + if (funcaoDuplica && funcaoDuplica != "") {
203 206 ins += "<div id='" + id + "_duplicaJanela' class='container-duplica'></div>";
204 207 }
205   - if (funcaoMinimiza) {
  208 + if (funcaoMinimiza && funcaoDuplica != "") {
206 209 ins += "<div id='" + id + "_minimizaCabecalho' class='container-minimiza'></div>";
207 210 }
208   - ins += '</div><div id="' + id + '_corpo" class="bd" style="display:block;padding:0px">';
  211 + ins += '</div><div id="' + id + '_corpo" class="bd ' + classeAdicional + '" style="display:block;padding:0px">';
209 212 if (wsrc !== "") {
210 213 ins += '<iframe name="' + id + 'i" id="' + id + 'i" valign="top" style="border:0px white solid;width:100%"></iframe>';
211 214 }
212 215 ins += '</div>';
213   - ins += '<div class="ft"></div>';
  216 + ins += '<div class="ft ' + classeAdicional + '"></div>';
214 217 novoel = document.createElement("div");
215 218 novoel.id = id;
216 219 novoel.style.display = "block";
... ...
js/util.js
  Diff comments   View file @7f63322
... ... @@ -1689,7 +1689,10 @@ i3GEO.util =
1689 1689 *
1690 1690 * {string} - estilo CSS em linha
1691 1691 */
1692   - comboItens : function(id, tema, funcao, onde, nome, alias, estilo) {
  1692 + comboItens : function(id, tema, funcao, onde, nome, alias, estilo, classe) {
  1693 + if(!classe){
  1694 + classe = "";
  1695 + }
1693 1696 if (!estilo) {
1694 1697 estilo = "";
1695 1698 } else {
... ... @@ -1699,7 +1702,7 @@ i3GEO.util =
1699 1702 alias = "sim";
1700 1703 }
1701 1704 if (arguments.length > 3 && $i(onde)) {
1702   - $i(onde).innerHTML = "<span style=color:red;font-size:10px; >buscando itens...</span>";
  1705 + $i(onde).innerHTML = "<span>buscando itens...</span>";
1703 1706 }
1704 1707 if (arguments.length !== 5) {
1705 1708 nome = "";
... ... @@ -1709,7 +1712,7 @@ i3GEO.util =
1709 1712 var ins, temp, i, nm;
1710 1713 if (retorno.data !== undefined) {
1711 1714 ins = [];
1712   - ins.push("<select " + estilo + " id='" + id + "' name='" + nome + "'>");
  1715 + ins.push("<select class='" + classe + "' " + estilo + " id='" + id + "' name='" + nome + "'>");
1713 1716 ins.push("<option value='' >---</option>");
1714 1717 temp = retorno.data.valores.length;
1715 1718 for (i = 0; i < temp; i++) {
... ...