diff --git a/node/public/css/style.css b/node/public/css/style.css index 19948bc..8196d3a 100644 --- a/node/public/css/style.css +++ b/node/public/css/style.css @@ -14,4 +14,9 @@ .status-icon-unknown { background-image: url("/img/yellow.png"); -} \ No newline at end of file +} + +.members { + margin-top: 8pt; + /*padding: 0;*/ +} diff --git a/node/public/js/app.js b/node/public/js/app.js index 14fd97c..8dfbdd7 100644 --- a/node/public/js/app.js +++ b/node/public/js/app.js @@ -57,7 +57,7 @@ angular.module('roomstateapp.services', []). angular.module('roomstateapp.statusfilter', []).filter('statustostring', function() { return function(input) { - return input == true ? 'geöffnet' : input == false ? 'geschlossen' : 'unbekannt'; + return input == true ? 'geƶffnet' : input == false ? 'geschlossen' : 'unbekannt'; }; }); diff --git a/node/statusbot.js b/node/statusbot.js index 1ea4faf..0fff9fd 100644 --- a/node/statusbot.js +++ b/node/statusbot.js @@ -70,9 +70,14 @@ function work() { snmpMac.poll(); ippoll.pollCount(); ippoll.pollState(); +// simpleanswer.names.length = 0; +// for(var i=0;i<4+Math.random() * 100;i++) { +// simpleanswer.names.push("nickname"+i); +// } +// io.sockets.emit('sdata', { "data": simpleanswer }); } -setInterval(work, 20000); +setInterval(work, 10000); work(); app.set('snmpMac', snmpMac); //TODO: wie kann man das schoener machen? (Modul in die Routes reintun) diff --git a/node/views/index.jade b/node/views/index.jade index d25d48d..bee74bb 100644 --- a/node/views/index.jade +++ b/node/views/index.jade @@ -22,11 +22,12 @@ block content .large-80.small-100 - p Personen Anwensend: - ul - li(ng-repeat="name in simple.names") + dl + dt Personen Anwesend: + dd + span(ng-repeat="name in simple.names") {{name}} - - + span(ng-show=" ! $last ") + | , diff --git a/node/views/layout.jade b/node/views/layout.jade index a7e2c4d..fa107bd 100644 --- a/node/views/layout.jade +++ b/node/views/layout.jade @@ -17,8 +17,8 @@ html(ng-app="roomstateapp") header h1 chaostreff status - .main-content - block content + .main-content + block content footer