Merge git://github.com/danharibo/depressionbot

modules/web/web.js

@@ -2,9 +2,8 @@ var express = require('express');
 
 var webInterface = function(dbot) {
     var pub = 'public';
-    var app = express.createServer();
+    var app = express();
 
-    app.use(express.compiler({ src: pub, enable: ['sass'] }));
     app.use(express.static(pub));
     app.set('view engine', 'jade');
 

views/channels.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
     h3 Channels on #{connection}
     div#backlink 
         a(href='/connections') « Connection List

views/connections.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
     h3 Current Connections
     div#backlink 
         a(href='/') « Home

views/index.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
   #modulelinks
     a.module(href='/quotes') Quotes  
     a.module(href='/polls') Polls

views/layout.jade

@@ -9,5 +9,5 @@ html(lang='en')
         div#title 
             a(href='/') #{name} web interface
         div#main
-            !{body}
+            block content
     script(type="text/javascript", src="/script.js")

views/polllist.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
     div#backlink 
         a(href='/') « Home
     div#controls

views/quotelist.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
     div#backlink 
         a(href='/') « Home
     div#controls

views/quotes.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
     div#backlink 
         a(href='/quotes/') « Quote list
     ul#quotelist

views/user.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
     h3 #{user}'s profile
     div#backlink 
         a(href='/users/'+connection+'/'+channel.substr(1,channel.length)) « #{channel} Nick List

views/users.jade

@@ -1,3 +1,6 @@
+extends layout
+
+block content
     h3 Users currently in #{channel} on #{connection}
     div#backlink 
         a(href='/channels/'+connection) « Channel List