[1.1.2] #2 Show versions number in Site

MONICA-Project · Mar 8, 2019 · f4bb38d · f4bb38d
1 parent 7afb64e
commit f4bb38d
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 20 deletions.
diff --git a/mqtt-map/app.manifest → mqtt-map/Adminrights.manifest b/mqtt-map/app.manifest → mqtt-map/Adminrights.manifest
diff --git a/mqtt-map/Googlelocation.cs b/mqtt-map/Googlelocation.cs
@@ -6,10 +6,10 @@
 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
@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{95D6F48A-9488-42A6-A973-941B45B26DB8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Fraunhofer.Fit.IoT.MqttMap</RootNamespace>
+    <RootNamespace>Fraunhofer.Fit.IoT.LoraMap</RootNamespace>
     <AssemblyName>Lora-Map</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -32,7 +32,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationManifest>Adminrights.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -51,7 +51,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.manifest" />
+    <None Include="Adminrights.manifest" />
     <None Include="config-example\settings.conf.example">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/mqtt-map/Model/Botclient.cs b/mqtt-map/Model/Botclient.cs
@@ -6,7 +6,7 @@
 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
@@ -3,7 +3,7 @@
 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<String>() { "/etc/loramap", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\loramap" });

diff --git 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 @@
 // 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
- */
+* 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
@@ -40,6 +40,7 @@ chmod 644 $EXEC/*
 chmod 755 $EXEC
 
 cp $OUTPUT/resources $EXEC -r
+sed -i s/"<div id=\"version\">vx.x.x"/"<div id=\"version\">$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
@@ -16,15 +16,29 @@ 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
 }
 
 #menucollumn .pos {
     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;
 }
diff --git a/mqtt-map/resources/index.html b/mqtt-map/resources/index.html
@@ -12,6 +12,7 @@
     <div id="menucollumn">
         <span class="pos"></span>
     </div>
+    <div id="version">vx.x.x</div>
     <script type="text/javascript" src="js/leaflet/leaflet.js"></script>
     <script type="text/javascript" src="js/nav.js"></script>
 </body>