Merge branch 'New_Structure' of https://gitlab.com/Cholgrrr/m4labplatform into New_Structure

serveralternative.js

@@ -1002,7 +1002,7 @@ function buildFavJson(inputData,type){
 
          JsonFeature.push({
           "type":"Feature",
-          "properties": { "id": id, "name": "datapoint" , "contenttext": contenttext, "timestamp": timestamp, "lat":lat, "lon":lon},
+          "properties": { "id": id, "name": "datapoint" , "contenttext": contenttext, "timestamp": timestamp, "date": timestamp.getUTCDate(), "month": timestamp.getMonth(), "year": timestamp.getUTCFullYear(), "lat":lat, "lon":lon},
           "geometry":{
               "type":"MultiPoint",
               "coordinates": [ [parseFloat(lon), parseFloat(lat)]]

vcm/config.json

@@ -150,18 +150,9 @@
           "template": [
             "<div class='balloon' id='myBalloon'>",
             "<div class='balloon-content'>",
-            "<h1 class='balloon-title'>Balloon header</h1>",
-            "<% for (var key in obj) { %>",
-            "<% if (obj[key] instanceof Object){%>",
-            "<% for (var key2 in obj[key]) { %>",
-            "<p class='balloon-text'><span class='balloon-street'> <strong> <%=key%>.<%=key2%> </strong> : <%=obj[key][key2]%></span><br></p>",
-            "<% } %>",
-            "<% } else{ %>",
-            "<p class='balloon-text'>",
-            "<span class='balloon-street'> <strong> <%=key%> </strong> : <%=obj[key]%></span><br>",
-            "</p>",
-            "<% } %>",
-            "<% } %>",
+            "<h1 class='balloon-title'>Lieblingsort <%= obj.id %></h1>",
+            "<p class='contentOne'><strong><%= obj.contenttext %></strong></p>",
+            "<p class='contentOne'><strong>Vom:</strong> <%=obj.date%>.<%=obj.month%>.<%=obj.year%></p>",
             "</div>",
             "<div class='balloon-close-col'>",
             "<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
@@ -185,20 +176,9 @@
           "template": [
             "<div class='balloon' id='myBalloon'>",
             "<div class='balloon-content'>",
-            "<h1 class='balloon-title'>Write your Comment here:</h1>",
-            "<% for (var key in obj) { %>",
-            "<% if (obj[key] instanceof Object){%>",
-            "<% for (var key2 in obj[key]) { %>",
-            "<p class='balloon-text'><span class='balloon-street'> <strong> <%=key%>.<%=key2%> </strong> : <%=obj[key][key2]%></span><br></p>",
-            "<% } %>",
-            "<% } else{ %>",
-            "<p class='balloon-text'>",
-            "<span class='balloon-street'> <strong> <%=key%> </strong> : <%=obj[key]%></span><br>",
-            "</p>",
-            "<% } %>",
-            "<% } %>",
+            "<h1 class='balloon-title'>Bitte Geben Sie hier einen Kommentar zu Ihrem Lieblingsort ab:</h1>",
             "</div>",
-            "<div><textarea id='favoritText' rows='4' cols='50' maxlength='250'>Bitte geben Sie hier Ihre Gedanken ein.</textarea></div>",
+            "<div><textarea id='favoritText' rows='4' cols='50' maxlength='250' style='resize:vertical; width:100%, height:140px;' placeholder='Bitte geben Sie hier Ihre Gedanken ein.'></textarea></div>",
             "<button id='FavSaveButton' type='button' onclick='this.disabled=true;disableButton();saveFavPoint();' class='top-nav buttonset one btn_home btn_size' style='text-decoration: none;'>Speichern</button>",
             "<div class='balloon-close-col'>",
             "<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",