From 29b6d3fd2703162f4db34e9f060427562d0fb256 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Tue, 9 Apr 2019 09:21:08 +0200 Subject: [PATCH] Continue with nameseditor --- Lora-Map/Lora-Map.csproj | 12 ++++ Lora-Map/resources/admin/css/global.css | 45 ++++++++++++ Lora-Map/resources/admin/js/menu.js | 74 +++++++++++++++++--- Lora-Map/resources/icons/general/add.png | Bin 0 -> 733 bytes Lora-Map/resources/icons/general/edit.png | Bin 0 -> 450 bytes Lora-Map/resources/icons/general/remove.png | Bin 0 -> 715 bytes Lora-Map/resources/icons/general/save.png | Bin 0 -> 620 bytes Lora-Map/resources/index.html | 1 + 8 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 Lora-Map/resources/icons/general/add.png create mode 100644 Lora-Map/resources/icons/general/edit.png create mode 100644 Lora-Map/resources/icons/general/remove.png create mode 100644 Lora-Map/resources/icons/general/save.png diff --git a/Lora-Map/Lora-Map.csproj b/Lora-Map/Lora-Map.csproj index 96a0d02..4d0008f 100644 --- a/Lora-Map/Lora-Map.csproj +++ b/Lora-Map/Lora-Map.csproj @@ -111,6 +111,18 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/Lora-Map/resources/admin/css/global.css b/Lora-Map/resources/admin/css/global.css index ec50778..811945a 100644 --- a/Lora-Map/resources/admin/css/global.css +++ b/Lora-Map/resources/admin/css/global.css @@ -28,4 +28,49 @@ #content { margin-left: 210px; + border-left: 1px solid black; +} +#content #nameeditor .title { + margin-bottom: 20px; + font-weight: bold; +} +#content #nameeditor #nametable { + margin-left: 15px; + border-collapse: collapse; +} +#content #nameeditor #nametable thead { + background-color: rgba(0,0,0,0.2); +} +#content #nameeditor #nametable thead th { + text-align: left; +} +#content #nameeditor #nametable thead .rowid { + width: 60px; +} +#content #nameeditor #nametable thead .rowicon { + width: 65px; +} +#content #nameeditor #nametable thead .rowedit { + width: 50px; +} +#content #nameeditor #nametable thead .rowname { + width: 250px; +} +#content #nameeditor #nametable tbody tr:nth-child(odd) { + background-color: rgba(20,0,250,0.1); +} +#content #nameeditor #nametable tbody tr:nth-child(even) { + background-color: rgba(250,59,0,0.1); +} +#content #nameeditor #nametable tbody tr:hover { + background-color: rgba(0,0,0,0.1) !important; +} +#content #nameeditor #nametable tfoot { + background-color: rgba(0,0,0,0.1); +} +#content #nameeditor .pointer { + cursor: pointer; +} +#content #nameeditor #nametable tbody input.name { + width: 55px; } \ No newline at end of file diff --git a/Lora-Map/resources/admin/js/menu.js b/Lora-Map/resources/admin/js/menu.js index bce5b59..1dbeccb 100644 --- a/Lora-Map/resources/admin/js/menu.js +++ b/Lora-Map/resources/admin/js/menu.js @@ -2,7 +2,7 @@ var parsenames = new XMLHttpRequest(); parsenames.onreadystatechange = function() { if(parsenames.readyState === 4 && parsenames.status === 200) { - NamesEditor.parseJson(parsenames.responseText); + NamesEditor.ParseJson(parsenames.responseText); } }; parsenames.open("GET", "http://{%REQUEST_URL_HOST%}:8080/admin/get_json_names", true); @@ -22,19 +22,77 @@ function menu_import() { } var NamesEditor = { - parseJson: function (jsontext) { + ParseJson: function (jsontext) { document.getElementById("content").innerHTML = ""; var namesconfig = JSON.parse(jsontext); - var html = "
Einträge
"; + var html = "
Namenseinträge in den Einstellungen
"; + html += ""; + html += ""; for (var id in namesconfig) { if (namesconfig.hasOwnProperty(id)) { var nameentry = namesconfig[id]; - html += "
" + - "" + id + "" + - ""+nameentry["name"]+""+ - "
"; + html += "" + + "" + + ""; + if (nameentry.hasOwnProperty("marker.svg")) { + html += ""; + } else if (nameentry.hasOwnProperty("icon")) { + html += ""; + } else { + html += ""; + } + html += "" + + ""; } } - document.getElementById("content").innerHTML = html; + html += ""; + html += "
IDNameIcon
" + id + "" + nameentry["name"] + "" + this.ParseIcon(nameentry["marker.svg"]) + "kein Icon
"; + document.getElementById("content").innerHTML = html + "
"; + }, + ParseIcon: function (markerobj) { + var url = "../icons/marker/Marker.svg"; + if (markerobj.hasOwnProperty("person")) { + url += "?icon=person&marker-bg=hidden"; + if (markerobj["person"].hasOwnProperty("org")) { + url += "&person-org=" + markerobj["person"]["org"]; + } + if(markerobj["person"].hasOwnProperty("funct")) { + url += "&person-funct=" + markerobj["person"]["funct"]; + } + if(markerobj["person"].hasOwnProperty("rang")) { + url += "&person-rang=" + markerobj["person"]["rang"]; + } + if(markerobj["person"].hasOwnProperty("text")) { + url += "&person-text=" + markerobj["person"]["text"]; + } + } + return ""; + }, + Add: function () { + var newrow = document.createElement("tr"); + newrow.innerHTML = ""; + newrow.innerHTML += ""; + newrow.innerHTML += "wähle Icon"; + newrow.innerHTML += " "; + document.getElementById("nametable").children[1].appendChild(newrow); + }, + Save: function () { + alert("Save"); + }, + Delete: function (el) { + var name = el.firstChild.innerHTML; + var answ = window.prompt("Wollen sie den Eintrag für \"" + name + "\" wirklich löschen?", ""); + if (answ !== null) { + el.parentNode.removeChild(el); + } + }, + Edit: function (el) { + alert("Edit " + el); + }, + Abort: function (el) { + el.parentNode.removeChild(el); + }, + SaveRow: function (el) { + alert("Save Row"); } }; \ No newline at end of file diff --git a/Lora-Map/resources/icons/general/add.png b/Lora-Map/resources/icons/general/add.png new file mode 100644 index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898 GIT binary patch literal 733 zcmV<30wVp1P)9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2ZulL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@ z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2pgg+heWDyked|3R$$kL@A z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6< zT=e_Y=vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxEDK}O3T04USJ P00000NkvXXu0mjf^IS-S literal 0 HcmV?d00001 diff --git a/Lora-Map/resources/icons/general/edit.png b/Lora-Map/resources/icons/general/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..0bfecd50ee9f5bc5828f0c0745aa3e0effcbe250 GIT binary patch literal 450 zcmV;z0X_bSP)Rq1}l<=psl5*5Xz9i;M}s*NP=ugs7Q#8Z;Dyx|}!`#}xw_C3!B-yaPC&0j)XcpuX@rNfq|q}N(wJOjA& z>u+z?dfJEuLePrqzy!)73pvLjxk4d6XNZt?hm_iYES{i}J5y3l?}PPNYDBR7oPc~6 zL^d)Bi4Q2L3pnp!nFxN9c2E+=@XAl&+;2m6a~kZj1r3Mz3C=hmUG<{+vWR@t4q?fJ zhFc(ozZD#Mx`^Q~g1v=K6!QnfuqyD4>U4EjF0eamL}Jx| z%&`kR-H+3GBYr*Qx}frLU4`%n9(`uSomzw)t%%NagXkA*R5Mbv9VLDp1wMo$cOMa~ s3Wm%r7^bwK$2$}-<~D8p`#1iScU4^XCLAA~0ssI207*qoM6N<$g3sK(Qvd(} literal 0 HcmV?d00001 diff --git a/Lora-Map/resources/icons/general/remove.png b/Lora-Map/resources/icons/general/remove.png new file mode 100644 index 0000000000000000000000000000000000000000..08f249365afd29594b51210c6e21ba253897505d GIT binary patch literal 715 zcmV;+0yO=JP)C4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;yxzh{5!Htr?51 zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7 zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l z!7?%Uwib*ROP67Hw`ika)gX-(8Ia`-u_IEhxG7U<13kSsMW+$lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc literal 0 HcmV?d00001 diff --git a/Lora-Map/resources/icons/general/save.png b/Lora-Map/resources/icons/general/save.png new file mode 100644 index 0000000000000000000000000000000000000000..99d532e8b1750115952f97302a92d713c0486f97 GIT binary patch literal 620 zcmV-y0+aoTP)~H+MJzd|s z^YP1Hc07G_>)Lgir!F1{Qn4GcTg%?koHo<=1qRN{}nPDolOeI^o4N5I>! zU$N=L=sg~ zDx#dOA*B0N~cqPsWI(^rbbkh)DS0_H_UN0C4l_kvWIm2#Kyy6%BCh z(yIUf003&1xdx>t$*eR2ZvXxT0001Z_R$y3Iju92q*wg58};}zm(OaAH=p|y0002M zh5O5#fxp|~jc?yi@+7$`d4Q6Hl%z;WiWG??NXR{Hx%)pMd~SE0000OQI literal 0 HcmV?d00001 diff --git a/Lora-Map/resources/index.html b/Lora-Map/resources/index.html index 302a257..996915a 100644 --- a/Lora-Map/resources/index.html +++ b/Lora-Map/resources/index.html @@ -32,6 +32,7 @@