diff --git a/Lora-Map/Properties/AssemblyInfo.cs b/Lora-Map/Properties/AssemblyInfo.cs index b05a0f2..8ab8c4c 100644 --- a/Lora-Map/Properties/AssemblyInfo.cs +++ b/Lora-Map/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Fraunhofer FIT")] [assembly: AssemblyProduct("Lora-Map")] -[assembly: AssemblyCopyright("Copyright © 2018 - 30.03.2019")] +[assembly: AssemblyCopyright("Copyright © 2018 - 03.04.2019")] [assembly: AssemblyTrademark("Fraunhofer FIT, BlubbFish")] [assembly: AssemblyCulture("")] [assembly: NeutralResourcesLanguage("de-DE")] @@ -33,8 +33,8 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.5")] -[assembly: AssemblyFileVersion("1.1.5")] +[assembly: AssemblyVersion("1.1.6")] +[assembly: AssemblyFileVersion("1.1.6")] /* * 1.1.1 Add Debian package config @@ -42,4 +42,5 @@ using System.Runtime.InteropServices; * 1.1.3 #1 Click on icon and show details * 1.1.4 #3 Create icons for devices * 1.1.5 Add support for alert button +* 1.1.6 #5 Create admin area */ diff --git a/Lora-Map/dpkg/create-Builds.bat b/Lora-Map/dpkg/create-Builds.bat index d28e857..debc84c 100644 --- a/Lora-Map/dpkg/create-Builds.bat +++ b/Lora-Map/dpkg/create-Builds.bat @@ -1,2 +1,3 @@ bash.exe -c "./make-deb.sh armhf" +bash.exe -c "./make-deb.sh amd64" pause \ No newline at end of file diff --git a/Lora-Map/resources/css/global.css b/Lora-Map/resources/css/global.css index 40e11f1..d2264c3 100644 --- a/Lora-Map/resources/css/global.css +++ b/Lora-Map/resources/css/global.css @@ -155,4 +155,33 @@ object { } #pannels #pannels_version .cicons ul li { font-weight: normal; +} + +#pannels #pannels_admin { + padding: 5px; + display: none; +} +#pannels #pannels_admin a { + color: black; + text-decoration: underline; + font-size: 18px; + font-weight: bold; +} +#pannels #pannels_admin a:hover { + text-decoration: none; +} +#pannels #pannels_admin div { + margin-bottom: 5px; +} +#pannels #pannels_admin div .label { + width: 70px; + font-weight: bold; + display: inline-block; +} +#pannels #pannels_admin div input { + width: 150px; +} +#pannels #pannels_admin div .login input { + width: auto; + margin-left: 70px; } \ No newline at end of file diff --git a/Lora-Map/resources/js/menu.js b/Lora-Map/resources/js/menu.js index 0b49c1c..340bc71 100644 --- a/Lora-Map/resources/js/menu.js +++ b/Lora-Map/resources/js/menu.js @@ -117,5 +117,34 @@ function createOverviewElement(positionItem, id) { function update_pannels_admin() { - alert("update admin"); + var testadmin = new XMLHttpRequest(); + testadmin.onreadystatechange = parseAjaxPannelAdmin; + testadmin.open("GET", "http://{%REQUEST_URL_HOST%}:8080/admin", true); + testadmin.send(); +} + +function parseAjaxPannelAdmin() { + if (this.readyState === 4 && this.status === 403) { + var html = "

Login to Adminpannel

"; + html += "
Username:
"; + html += "
Passwort:
"; + html += "
"; + document.getElementById("pannels_admin").innerHTML = html; + } else if (this.readyState === 4 && this.status === 200) { + document.getElementById("pannels_admin").innerHTML = "Adminpannel"; + } +} + +function submitloginform() { + var adminlogin = new XMLHttpRequest(); + adminlogin.onreadystatechange = parseAjaxLogin; + adminlogin.open("POST", "http://{%REQUEST_URL_HOST%}:8080/admin/login", true); + adminlogin.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); + adminlogin.send("user=" + encodeURI(document.getElementById("pannels_admin_name").value) + "&pass=" + encodeURI(document.getElementById("pannels_admin_pass").value)); +} + +function parseAjaxLogin() { + if (this.readyState === 4 && this.status === 200) { + update_pannels_admin(); + } } \ No newline at end of file