cotugno/recorder
2
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2024-11-15 09:58:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

clean html using Mustache

Browse Source
This commit is contained in:
Jan-Piet Mens 2016-01-31 18:08:04 +01:00
parent 923db37de1
commit 7ba887cf34
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docroot/last/functions.js
View File

@ -126,25 +126,28 @@ function map_marker(loc)
var s = loc.topic.split('/');
var username = (s[0]) ? s[1] : s[2]; /* cater for leading / in topic */
var device = (s[0]) ? s[2] : s[3]; /* cater for leading / in topic */
var userdev = username + "/" + device;
var dt = moment.utc(loc.tst * 1000).local();
var fulldate = dt.format("DD MMM YYYY HH:mm:ss");
var ghash = loc.ghash ? loc.ghash : "unknown";
var extrainfo = ghash + " (" + loc.lat + "," + loc.lon + ") " + fulldate;
extrainfo = "<span class='extrainfo'>" + extrainfo + "</span>";
var data = {
userdev: username + "/" + device,
ghash: loc.ghash ? loc.ghash : 'unknown',
addr: loc.addr,
lat: loc.lat,
lon: loc.lon,
fulldate: dt.format("DD MMM YYYY HH:mm:ss"),
};
if (loc.addr) {
htmldesc = "<b>" + userdev + "</b><br />" + loc.addr + "<br/>" + extrainfo;
shortdesc = userdev + " " + loc.addr;
htmldesc = "<b>{{userdev}}</b><br/>{{addr}}<br/><span class='extrainfo'>{{ghash}} <span class='latlon'>({{lat}},{{lon}})</span> {{fulldate}}</span>";
shortdesc = "{{userdev}} {{addr}}";
} else {
htmldesc = "<b>" + userdev + "</b><br />" + loc.lat + ", " + loc.lon + "<br/>" + extrainfo;
shortdesc = userdev + " " + loc.lat + ", " + loc.lon;
htmldesc = "<b>{{userdev}}</b><br/>{{lat}}, {{lon}}<br/><span class='extrainfo'>{{ghash}} <span class='latlon'>({{lat}},{{lon}})</span> {{fulldate}}</span>";
shortdesc = "{{userdev}} {{lat}},{{lon}}";
}
loc.description = shortdesc;
loc.htmldesc = htmldesc;
loc.description = Mustache.render(shortdesc, data);
loc.htmldesc = Mustache.render(htmldesc, data);
if (markers.hasOwnProperty(id)) {
clog("UPD", id, JSON.stringify(loc));

2
docroot/last/index.html
View File

@ -25,12 +25,14 @@
.extrainfo {
font-size: 80%;
}
.latlon { color: gray; }
</style>
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&signed_in=true"></script>
<script src="functions.js"></script>
<script src="websock.js"></script>
<script src="../table/js/moment.min.js"></script>
<script src="../table/js/mustache.js"></script>
</head>
<body>
<div id="output"></div>