summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frontend.js6
-rw-r--r--model_fs.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/frontend.js b/frontend.js
index ed093f4..c99a361 100644
--- a/frontend.js
+++ b/frontend.js
@@ -29,12 +29,12 @@ exports.start = function(config) {
var eventStr = '';
for(var date in slides['events']) {
if(!slides['events'].hasOwnProperty(date)) { continue; }
- eventStr = eventStr + '<h4>'+date+'</h4><hr><ul>';
+ eventStr = eventStr + '<div class="event"><div class="eventDate">'+date+'</div><ul class="eventList">';
for(var ev in slides['events'][date]) {
if(!slides['events'][date].hasOwnProperty(ev)) { continue; }
- eventStr = eventStr + '<li>'+slides['events'][date][ev]['time']+' - '+slides['events'][date][ev]['summary']+'</li>';
+ eventStr = eventStr + '<li class="eventEl">'+slides['events'][date][ev]['time']+' - '+slides['events'][date][ev]['summary']+'</li>';
}
- eventStr = eventStr + '</ul>';
+ eventStr = eventStr + '</ul></div>';
}
body = body.replace("$IMAGES", slideStr);
body = body.replace("$EVENTS", eventStr);
diff --git a/model_fs.js b/model_fs.js
index 23d113f..82dd559 100644
--- a/model_fs.js
+++ b/model_fs.js
@@ -108,7 +108,7 @@ exports.rebuildFiles = function() {
for (var k in data) {
if (!data.hasOwnProperty(k)) { continue; }
var ev = data[k];
- ev.time = ev.start.toTimeString();
+ ev.time = ev.start.toLocaleTimeString();
if(ev.start && ev.summary) {
if(typeof compEv[ev.start.toDateString()] == "undefined") {
compEv[ev.start.toDateString()] = [];