From f4bb38dd0773c20a7e7600b1c83499e229243974 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Fri, 8 Mar 2019 08:50:05 +0100 Subject: [PATCH] [1.1.2] #2 Show versions number in Site --- .../{app.manifest => Adminrights.manifest} | 0 mqtt-map/Googlelocation.cs | 4 +-- mqtt-map/Lora-Map.csproj | 6 ++--- mqtt-map/Model/Botclient.cs | 2 +- mqtt-map/Program.cs | 2 +- mqtt-map/Properties/AssemblyInfo.cs | 26 +++++++++++-------- mqtt-map/dpkg/make-deb.sh | 1 + mqtt-map/resources/css/global.css | 18 +++++++++++-- mqtt-map/resources/index.html | 1 + 9 files changed, 40 insertions(+), 20 deletions(-) rename mqtt-map/{app.manifest => Adminrights.manifest} (100%) diff --git a/mqtt-map/app.manifest b/mqtt-map/Adminrights.manifest similarity index 100% rename from mqtt-map/app.manifest rename to mqtt-map/Adminrights.manifest diff --git a/mqtt-map/Googlelocation.cs b/mqtt-map/Googlelocation.cs index 8fb4d77..ebee39b 100644 --- a/mqtt-map/Googlelocation.cs +++ b/mqtt-map/Googlelocation.cs @@ -6,10 +6,10 @@ using BlubbFish.Utils; using BlubbFish.Utils.IoT.Bots; using BlubbFish.Utils.IoT.Connector; using BlubbFish.Utils.IoT.Events; -using Fraunhofer.Fit.IoT.MqttMap.Model; +using Fraunhofer.Fit.IoT.LoraMap.Model; using LitJson; -namespace Fraunhofer.Fit.IoT.MqttMap { +namespace Fraunhofer.Fit.IoT.LoraMap { class Googlelocation : Webserver diff --git a/mqtt-map/Lora-Map.csproj b/mqtt-map/Lora-Map.csproj index 7476281..df752e9 100644 --- a/mqtt-map/Lora-Map.csproj +++ b/mqtt-map/Lora-Map.csproj @@ -6,7 +6,7 @@ AnyCPU {95D6F48A-9488-42A6-A973-941B45B26DB8} Exe - Fraunhofer.Fit.IoT.MqttMap + Fraunhofer.Fit.IoT.LoraMap Lora-Map v4.7.1 512 @@ -32,7 +32,7 @@ 4 - app.manifest + Adminrights.manifest @@ -51,7 +51,7 @@ - + PreserveNewest diff --git a/mqtt-map/Model/Botclient.cs b/mqtt-map/Model/Botclient.cs index f247166..8c768f1 100644 --- a/mqtt-map/Model/Botclient.cs +++ b/mqtt-map/Model/Botclient.cs @@ -6,7 +6,7 @@ using System.Reflection; using BlubbFish.Utils; using LitJson; -namespace Fraunhofer.Fit.IoT.MqttMap.Model { +namespace Fraunhofer.Fit.IoT.LoraMap.Model { class Botclient { public Botclient(JsonData json) { diff --git a/mqtt-map/Program.cs b/mqtt-map/Program.cs index 30b8b98..b3d31ff 100644 --- a/mqtt-map/Program.cs +++ b/mqtt-map/Program.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using BlubbFish.Utils; using BlubbFish.Utils.IoT.Connector; -namespace Fraunhofer.Fit.IoT.MqttMap { +namespace Fraunhofer.Fit.IoT.LoraMap { class Program { static void Main(String[] args) { InIReader.SetSearchPath(new List() { "/etc/loramap", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\loramap" }); diff --git a/mqtt-map/Properties/AssemblyInfo.cs b/mqtt-map/Properties/AssemblyInfo.cs index 500ec49..8bb39e7 100644 --- a/mqtt-map/Properties/AssemblyInfo.cs +++ b/mqtt-map/Properties/AssemblyInfo.cs @@ -1,18 +1,20 @@ -using System.Reflection; +using System.Resources; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("mqtt-map")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("Lora-Map")] +[assembly: AssemblyDescription("Displays Items with Coordinates from Mqtt on a Map")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("mqtt-map")] -[assembly: AssemblyCopyright("Copyright © 2018 - 06.03.2019")] -[assembly: AssemblyTrademark("")] +[assembly: AssemblyCompany("Fraunhofer FIT")] +[assembly: AssemblyProduct("Lora-Map")] +[assembly: AssemblyCopyright("Copyright © 2018 - 08.03.2019")] +[assembly: AssemblyTrademark("Fraunhofer FIT, BlubbFish")] [assembly: AssemblyCulture("")] +[assembly: NeutralResourcesLanguage("de-DE")] // Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly // für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von @@ -32,8 +34,10 @@ 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.1")] -[assembly: AssemblyFileVersion("1.1.1")] +[assembly: AssemblyVersion("1.1.2")] +[assembly: AssemblyFileVersion("1.1.2")] + /* - * 1.1.1 Add Debian package config - */ \ No newline at end of file +* 1.1.1 Add Debian package config +* 1.1.2 #2 Show versions number in Site +*/ diff --git a/mqtt-map/dpkg/make-deb.sh b/mqtt-map/dpkg/make-deb.sh index 14951f0..2b916f4 100644 --- a/mqtt-map/dpkg/make-deb.sh +++ b/mqtt-map/dpkg/make-deb.sh @@ -40,6 +40,7 @@ chmod 644 $EXEC/* chmod 755 $EXEC cp $OUTPUT/resources $EXEC -r +sed -i s/"
vx.x.x"/"
$VMAJOR.$VMINOR.$VBUILD"/ $EXEC/resources/index.html cp $OUTPUT/config-example/* $CONFIG chmod 644 $CONFIG/* diff --git a/mqtt-map/resources/css/global.css b/mqtt-map/resources/css/global.css index 9ccc014..b8cadb4 100644 --- a/mqtt-map/resources/css/global.css +++ b/mqtt-map/resources/css/global.css @@ -16,10 +16,11 @@ html, body { background-color: white; position: absolute; top: 85px; - bottom: 10px; + bottom: 35px; left: 10px; z-index: 5000; - border: rgba(0,0,0,0.5) 2px solid; + border: #707070 2px solid; + border: rgba(0,0,0,0.4) 2px solid; border-radius: 4px } @@ -27,4 +28,17 @@ html, body { display: block; height: 32px; width: 32px; +} + +#version { + position: absolute; + bottom: 0; + left: 0; + z-index: 50000; + background-color: white; + border-radius: 5px; + height: 20px; + width: 40px; + border: #707070 2px solid; + border: rgba(0,0,0,0.4) 2px solid; } \ No newline at end of file diff --git a/mqtt-map/resources/index.html b/mqtt-map/resources/index.html index 0e15128..736a8be 100644 --- a/mqtt-map/resources/index.html +++ b/mqtt-map/resources/index.html @@ -12,6 +12,7 @@ +
vx.x.x