Download as
Browse Code »

Commit 8ae9b14a171252bd87bf56289604ffe3316c53e2

Authored by Edmar Moretti
1 parent 3897f5a8
Exists in master and in 1 other branch unmaintened

Ajustes nas barras de rolagem. Ajustes na interface do editor de legendas. Alter… 

…ação da cor do menu das páginas principais
Showing 2 changed files with 81 additions and 55 deletions   Show diff stats
ferramentas/legenda/index.js
  Diff comments   View file @8ae9b14
... ... @@ -99,7 +99,7 @@ i3GEOF.legenda =
99 99 i3GEO.guias.mostraGuiaFerramenta("i3GEOlegendaguia2", "i3GEOlegendaguia");
100 100 };
101 101 $i("i3GEOlegendaguia3").onclick = function() {
102   - i3GEO.janela.tempoMsg($trad('ajuda', i3GEOF.legenda.dicionario));
  102 + i3GEO.janela.snackBar({content: $trad("ajuda",i3GEOF.legenda.dicionario),style: "red"});
103 103 };
104 104 $i("i3GEOlegendaguia4").onclick = function() {
105 105 i3GEOF.legenda.mostraGrafico();
... ... @@ -314,7 +314,7 @@ i3GEOF.legenda =
314 314 */
315 315 aviso : function() {
316 316 if (i3GEOF.legenda.aviso == true) {
317   - i3GEO.janela.tempoMsg($trad('msgAplicaAlteracao', i3GEOF.legenda.dicionario));
  317 + i3GEO.janela.snackBar({content: $trad("msgAplicaAlteracao",i3GEOF.legenda.dicionario),style: "red"});
318 318 i3GEOF.legenda.aviso == false;
319 319 }
320 320 },
... ... @@ -524,7 +524,7 @@ i3GEOF.legenda =
524 524 + "&maxScales="
525 525 + maxScales);
526 526 } catch (e) {
527   - i3GEO.janela.tempoMsg("Erro: " + e);
  527 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
528 528 i3GEOF.legenda.aguarde.visibility = "hidden";
529 529 }
530 530 },
... ... @@ -579,7 +579,7 @@ i3GEOF.legenda =
579 579 + i3GEOF.legenda._parameters.tema, cp = new cpaint();
580 580 cp.set_response_type("JSON");
581 581 cp.call(p, "contagemclasse", i3GEOF.legenda.montaLegenda);
582   - i3GEO.janela.tempoMsg($trad('consideraElementosVisiveis', i3GEOF.legenda.dicionario));
  582 + i3GEO.janela.snackBar({content: $trad('consideraElementosVisiveis', i3GEOF.legenda.dicionario)});
583 583 },
584 584 /*
585 585 * Function: adicionaClasse
... ... @@ -667,7 +667,7 @@ i3GEOF.legenda =
667 667 cp.set_response_type("JSON");
668 668 cp.call(p, "alteraCoresClasses", retornapaleta);
669 669 } catch (e) {
670   - i3GEO.janela.tempoMsg("Erro: " + e);
  670 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
671 671 i3GEOF.legenda.aguarde.visibility = "hidden";
672 672 }
673 673 },
... ... @@ -698,7 +698,7 @@ i3GEOF.legenda =
698 698 cp.set_response_type("JSON");
699 699 cp.call(p, "alteraCoresClasses", retornapaleta);
700 700 } catch (e) {
701   - i3GEO.janela.tempoMsg("Erro: " + e);
  701 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
702 702 i3GEOF.legenda.aguarde.visibility = "hidden";
703 703 }
704 704 },
... ... @@ -729,7 +729,7 @@ i3GEOF.legenda =
729 729 cp.set_response_type("JSON");
730 730 cp.call(p, "calculaTamanhoClasses", retornapaleta);
731 731 } catch (e) {
732   - i3GEO.janela.tempoMsg("Erro: " + e);
  732 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
733 733 i3GEOF.legenda.aguarde.visibility = "hidden";
734 734 }
735 735 },
... ... @@ -757,7 +757,7 @@ i3GEOF.legenda =
757 757 cp.set_response_type("JSON");
758 758 cp.call(p, "foo", retornapaleta);
759 759 } catch (e) {
760   - i3GEO.janela.tempoMsg("Erro: " + e);
  760 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
761 761 i3GEOF.legenda.aguarde.visibility = "hidden";
762 762 }
763 763 },
... ... @@ -839,7 +839,7 @@ i3GEOF.legenda =
839 839 i3GEOF.legenda.formEditorSimbolo();
840 840 i3GEOF.legenda.aguarde.visibility = "hidden";
841 841 } catch (e) {
842   - i3GEO.janela.tempoMsg("Erro: " + e);
  842 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
843 843 i3GEOF.legenda.aguarde.visibility = "hidden";
844 844 }
845 845 },
... ... @@ -883,7 +883,7 @@ i3GEOF.legenda =
883 883 cp.set_response_type("JSON");
884 884 cp.call(p, "alteraclasse", fim);
885 885 } catch (e) {
886   - i3GEO.janela.tempoMsg("Erro: " + e);
  886 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
887 887 i3GEOF.legenda.aguarde.visibility = "hidden";
888 888 }
889 889 },
... ... @@ -924,14 +924,14 @@ i3GEOF.legenda =
924 924 }
925 925  
926 926 if (item == "") {
927   - i3GEO.janela.tempoMsg($trad('selecionaUmItem', i3GEOF.legenda.dicionario));
  927 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
928 928 return;
929 929 }
930 930 i3GEOF.legenda.aguarde.visibility = "visible";
931 931 cp.set_response_type("JSON");
932 932 cp.call(p, "alteraclasse", fim);
933 933 } catch (e) {
934   - i3GEO.janela.tempoMsg("Erro: " + e);
  934 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
935 935 i3GEOF.legenda.aguarde.visibility = "hidden";
936 936 }
937 937 },
... ... @@ -967,7 +967,7 @@ i3GEOF.legenda =
967 967 i3GEOF.legenda.aguarde.visibility = "hidden";
968 968 };
969 969 if (item == "") {
970   - i3GEO.janela.tempoMsg("Selecione um item!");
  970 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
971 971 return;
972 972 }
973 973 if ($i("i3GEOFlegendaaplicaextent").checked === true) {
... ... @@ -979,7 +979,7 @@ i3GEOF.legenda =
979 979 cp.set_response_type("JSON");
980 980 cp.call(p, "alteraclasse", fim);
981 981 } catch (e) {
982   - i3GEO.janela.tempoMsg("Erro: " + e);
  982 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
983 983 i3GEOF.legenda.aguarde.visibility = "hidden";
984 984 }
985 985 },
... ... @@ -1016,11 +1016,11 @@ i3GEOF.legenda =
1016 1016 i3GEOF.legenda.aguarde.visibility = "hidden";
1017 1017 };
1018 1018 if (item == "") {
1019   - i3GEO.janela.tempoMsg("Selecione um item!");
  1019 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
1020 1020 return;
1021 1021 }
1022 1022 if (itemid == "") {
1023   - i3GEO.janela.tempoMsg("Selecione um item!");
  1023 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
1024 1024 return;
1025 1025 }
1026 1026 if ($i("i3GEOFlegendaaplicaextent").checked === true) {
... ... @@ -1032,7 +1032,8 @@ i3GEOF.legenda =
1032 1032 cp.set_response_type("JSON");
1033 1033 cp.call(p, "alteraclasse", fim);
1034 1034 } catch (e) {
1035   - i3GEO.janela.tempoMsg("Erro: " + e);
  1035 +
  1036 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1036 1037 i3GEOF.legenda.aguarde.visibility = "hidden";
1037 1038 }
1038 1039 },
... ... @@ -1066,7 +1067,7 @@ i3GEOF.legenda =
1066 1067 i3GEOF.legenda.aguarde.visibility = "hidden";
1067 1068 };
1068 1069 if (item == "") {
1069   - i3GEO.janela.tempoMsg("Selecione um item!");
  1070 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
1070 1071 return;
1071 1072 }
1072 1073 if ($i("i3GEOFlegendaaplicaextent").checked === true) {
... ... @@ -1078,7 +1079,8 @@ i3GEOF.legenda =
1078 1079 cp.set_response_type("JSON");
1079 1080 cp.call(p, "alteraclasse", fim);
1080 1081 } catch (e) {
1081   - i3GEO.janela.tempoMsg("Erro: " + e);
  1082 +
  1083 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1082 1084 i3GEOF.legenda.aguarde.visibility = "hidden";
1083 1085 }
1084 1086 },
... ... @@ -1114,14 +1116,15 @@ i3GEOF.legenda =
1114 1116 i3GEOF.legenda.aguarde.visibility = "hidden";
1115 1117 };
1116 1118 if (item == "") {
1117   - i3GEO.janela.tempoMsg($trad('selecionaUmItem', i3GEOF.legenda.dicionario));
  1119 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
1118 1120 return;
1119 1121 }
1120 1122 i3GEOF.legenda.aguarde.visibility = "visible";
1121 1123 cp.set_response_type("JSON");
1122 1124 cp.call(p, "alteraclasse", fim);
1123 1125 } catch (e) {
1124   - i3GEO.janela.tempoMsg("Erro: " + e);
  1126 +
  1127 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1125 1128 i3GEOF.legenda.aguarde.visibility = "hidden";
1126 1129 }
1127 1130 },
... ... @@ -1157,14 +1160,15 @@ i3GEOF.legenda =
1157 1160 i3GEOF.legenda.aguarde.visibility = "hidden";
1158 1161 };
1159 1162 if (item == "") {
1160   - i3GEO.janela.tempoMsg($trad('selecionaUmItem', i3GEOF.legenda.dicionario));
  1163 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
1161 1164 return;
1162 1165 }
1163 1166 i3GEOF.legenda.aguarde.visibility = "visible";
1164 1167 cp.set_response_type("JSON");
1165 1168 cp.call(p, "alteraclasse", fim);
1166 1169 } catch (e) {
1167   - i3GEO.janela.tempoMsg("Erro: " + e);
  1170 +
  1171 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1168 1172 i3GEOF.legenda.aguarde.visibility = "hidden";
1169 1173 }
1170 1174 },
... ... @@ -1200,14 +1204,15 @@ i3GEOF.legenda =
1200 1204 i3GEOF.legenda.aguarde.visibility = "hidden";
1201 1205 };
1202 1206 if (item == "") {
1203   - i3GEO.janela.tempoMsg($trad('selecionaUmItem', i3GEOF.legenda.dicionario));
  1207 + i3GEO.janela.snackBar({content: $trad("selecionaUmItem",i3GEOF.legenda.dicionario),style: "red"});
1204 1208 return;
1205 1209 }
1206 1210 i3GEOF.legenda.aguarde.visibility = "visible";
1207 1211 cp.set_response_type("JSON");
1208 1212 cp.call(p, "alteraclasse", fim);
1209 1213 } catch (e) {
1210   - i3GEO.janela.tempoMsg("Erro: " + e);
  1214 +
  1215 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1211 1216 i3GEOF.legenda.aguarde.visibility = "hidden";
1212 1217 }
1213 1218 },
... ... @@ -1239,7 +1244,8 @@ i3GEOF.legenda =
1239 1244 cp.set_response_type("JSON");
1240 1245 cp.call(p, "alteraRepresentacao", fim);
1241 1246 } catch (e) {
1242   - i3GEO.janela.tempoMsg("Erro: " + e);
  1247 +
  1248 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1243 1249 i3GEOF.legenda.aguarde.visibility = "hidden";
1244 1250 }
1245 1251 },
... ... @@ -1292,7 +1298,8 @@ i3GEOF.legenda =
1292 1298 i3GEOF.legenda.aguarde.visibility = "hidden";
1293 1299 }
1294 1300 } catch (e) {
1295   - i3GEO.janela.tempoMsg("Erro: " + e);
  1301 +
  1302 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1296 1303 i3GEOF.legenda.aguarde.visibility = "hidden";
1297 1304 }
1298 1305 },
... ... @@ -1314,7 +1321,8 @@ i3GEOF.legenda =
1314 1321 cp.set_response_type("JSON");
1315 1322 cp.call(p, "editasimbolo", i3GEOF.legenda.reMontaEditor);
1316 1323 } catch (e) {
1317   - i3GEO.janela.tempoMsg("Erro: " + e);
  1324 +
  1325 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1318 1326 i3GEOF.legenda.aguarde.visibility = "hidden";
1319 1327 }
1320 1328 },
... ... @@ -1336,7 +1344,8 @@ i3GEOF.legenda =
1336 1344 cp.set_response_type("JSON");
1337 1345 cp.call(p, "editasimbolo", i3GEOF.legenda.reMontaEditor);
1338 1346 } catch (e) {
1339   - i3GEO.janela.tempoMsg("Erro: " + e);
  1347 +
  1348 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1340 1349 i3GEOF.legenda.aguarde.visibility = "hidden";
1341 1350 }
1342 1351 },
... ... @@ -1359,7 +1368,8 @@ i3GEOF.legenda =
1359 1368 i3GEOF.legenda.estilo = i3GEOF.legenda.estilo + 1;
1360 1369 cp.call(p, "editasimbolo", i3GEOF.legenda.reMontaEditor);
1361 1370 } catch (e) {
1362   - i3GEO.janela.tempoMsg("Erro: " + e);
  1371 +
  1372 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1363 1373 i3GEOF.legenda.aguarde.visibility = "hidden";
1364 1374 }
1365 1375 },
... ... @@ -1382,7 +1392,8 @@ i3GEOF.legenda =
1382 1392 cp.set_response_type("JSON");
1383 1393 cp.call(p, "editasimbolo", i3GEOF.legenda.reMontaEditor);
1384 1394 } catch (e) {
1385   - i3GEO.janela.tempoMsg("Erro: " + e);
  1395 +
  1396 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1386 1397 i3GEOF.legenda.aguarde.visibility = "hidden";
1387 1398 }
1388 1399 },
... ... @@ -1455,7 +1466,7 @@ i3GEOF.legenda =
1455 1466 cp.call(p, "editasimbolo", i3GEOF.legenda.listaSimbolos);
1456 1467 i3GEOF.legenda.aguarde.visibility = "hidden";
1457 1468 } catch (e) {
1458   - i3GEO.janela.tempoMsg("Erro: " + i3GEOF.legenda.estilo);
  1469 + i3GEO.janela.snackBar({content: "Erro: " + i3GEOF.legenda.estilo, style: "red"});
1459 1470 i3GEOF.legenda.aguarde.visibility = "hidden";
1460 1471 }
1461 1472 },
... ... @@ -1475,7 +1486,8 @@ i3GEOF.legenda =
1475 1486 }
1476 1487 i3GEOF.legenda.aguarde.visibility = "hidden";
1477 1488 } catch (e) {
1478   - i3GEO.janela.tempoMsg("Erro: " + e);
  1489 +
  1490 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1479 1491 i3GEOF.legenda.aguarde.visibility = "hidden";
1480 1492 }
1481 1493 },
... ... @@ -1571,7 +1583,8 @@ i3GEOF.legenda =
1571 1583 cp.set_response_type("JSON");
1572 1584 cp.call(p, "editasimbolo", fim);
1573 1585 } catch (e) {
1574   - i3GEO.janela.tempoMsg("Erro: " + e);
  1586 +
  1587 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1575 1588 i3GEOF.legenda.aguarde.visibility = "hidden";
1576 1589 }
1577 1590 },
... ... @@ -1609,7 +1622,7 @@ i3GEOF.legenda =
1609 1622 "n;x"
1610 1623 ];
1611 1624 if (retorno.data.length < 2) {
1612   - i3GEO.janela.tempoMsg($trad('msgNumeroClasses', i3GEOF.legenda.dicionario));
  1625 + i3GEO.janela.snackBar({content: $trad("msgNumeroClasses",i3GEOF.legenda.dicionario),style: "red"});
1613 1626 i3GEOF.legenda.aguarde.visibility = "hidden";
1614 1627 return;
1615 1628 } else {
... ... @@ -1645,7 +1658,8 @@ i3GEOF.legenda =
1645 1658 cp.set_response_type("JSON");
1646 1659 cp.call(p, "cocontagemclasse", monta);
1647 1660 } catch (e) {
1648   - i3GEO.janela.tempoMsg("Erro: " + e);
  1661 +
  1662 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1649 1663 i3GEOF.legenda.aguarde.visibility = "hidden";
1650 1664 }
1651 1665 },
... ... @@ -1702,7 +1716,8 @@ i3GEOF.legenda =
1702 1716 cp.set_response_type("JSON");
1703 1717 cp.call(p, "aplicaProcessos", temp);
1704 1718 } catch (e) {
1705   - i3GEO.janela.tempoMsg("Erro: " + e);
  1719 +
  1720 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1706 1721 i3GEOF.legenda.aguarde.visibility = "hidden";
1707 1722 }
1708 1723 },
... ... @@ -1832,7 +1847,8 @@ i3GEOF.legenda =
1832 1847 }
1833 1848 i3GEOF.legenda.aguarde.visibility = "hidden";
1834 1849 }catch(e){
1835   - i3GEO.janela.tempoMsg("Erro. "+e);
  1850 +
  1851 + i3GEO.janela.snackBar({content: "Erro: " + e, style: "red"});
1836 1852 i3GEOF.legenda.aguarde.visibility = "hidden";
1837 1853 }
1838 1854 };
... ...
ferramentas/legenda/template_mst.html
  Diff comments   View file @8ae9b14
... ... @@ -52,28 +52,33 @@
52 52 <div class="row">
53 53 <div class="col-md-4">
54 54 <div class="panel panel-default">
  55 + <div class="panel-heading">{{{legendaImg}}}</div>
55 56 <div class="panel-body">
56   - <div class="form-group label-fixed condensed">
57   - <label class="control-label" for="i3GEOlegendaImg">{{{legendaImg}}}</label>
  57 + <div class="form-group condensed">
58 58 <div class="input-group">
59   - <input id="i3GEOlegendaImg" class="form-control" type="text" value="">
  59 + <div style="display: contents;" class="form-group label-fixed">
  60 + <input id="i3GEOlegendaImg" class="form-control" type="text" value="">
  61 + </div>
60 62 <span class="input-group-btn"> <a onclick="i3GEOF.legenda.aplicarLegendaImg();return false;" role="button" type="button"
61 63 class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
62 64 <span class="material-icons ">send</span>
63 65 </a>
64 66 </span>
65 67 </div>
  68 +
66 69 </div>
67 70 </div>
68 71 </div>
69 72 </div>
70 73 <div class="col-md-4">
71 74 <div class="panel panel-default">
  75 + <div class="panel-heading">{{{offsite}}}</div>
72 76 <div class="panel-body">
73   - <div class="form-group label-fixed condensed">
74   - <label class="control-label" for="i3GEOlegendaImg">{{{offsite}}}</label>
  77 + <div class="form-group condensed">
75 78 <div class="input-group">
76   - <input id="i3GEOoffsite" class="form-control i3geoFormIconeAquarela" type="text" value="-1,-1,-1">
  79 + <div style="display: contents;" class="form-group label-fixed">
  80 + <input id="i3GEOoffsite" class="form-control i3geoFormIconeAquarela" type="text" value="-1,-1,-1">
  81 + </div>
77 82 <span class="input-group-btn"> <a onclick="i3GEOF.legenda.aplicarOffsite();return false;" role="button" type="button" class="btn btn-primary btn-fab btn-fab-max"
78 83 href="javascript:void(0)">
79 84 <span class="material-icons ">send</span>
... ... @@ -86,18 +91,23 @@
86 91 </div>
87 92 <div class="col-md-4">
88 93 <div class="panel panel-default">
  94 + <div class="panel-heading">{{{geraCores}}}</div>
89 95 <div class="panel-body">
90   - <div class="form-group label-fixed condensed">
91   - <label class="control-label" for="i3GEOlegendaImg">{{{geraCores}}}</label>
92   - <br> {{{de}}} &nbsp;
93   - <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacori" size="10" value="0,0,0" type="text">
94   - &nbsp; {{{ate}}} &nbsp;
95   - <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacorf" size="10" value="255,255,255" type="text">
96   - &nbsp; <span class="input-group-btn" style="display: inline;"> <a title='{{{aplicaVariaCores}}}' onclick="i3GEOF.legenda.paleta();return false;" role="button"
97   - type="button" class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
98   - <span class="material-icons ">send</span>
99   - </a>
100   - </span>
  96 + <div class="form-group condensed">
  97 + <div class="input-group">
  98 + <div style="display: contents;" class="form-group label-fixed">
  99 + {{{de}}} &nbsp;
  100 + <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacori" size="10" value="0,0,0" type="text">
  101 + {{{ate}}} &nbsp;
  102 + <input class="form-control i3geoFormIconeAquarela" style="display: inline; width: 100px;" id="i3GEOlegendaacorf" size="10" value="255,255,255" type="text">
  103 + &nbsp;
  104 + </div>
  105 + <span class="input-group-btn"> <a title='{{{aplicaVariaCores}}}' onclick="i3GEOF.legenda.paleta();return false;" role="button"
  106 + type="button" class="btn btn-primary btn-fab btn-fab-max" href="javascript:void(0)">
  107 + <span class="material-icons ">send</span>
  108 + </a>
  109 + </span>
  110 + </div>
101 111 </div>
102 112 </div>
103 113 </div>
... ...