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,7 +1,10 @@
-h3 Channels on #{connection}
+extends layout
-div#backlink 
+
+block content
+    h3 Channels on #{connection}
+    div#backlink 
         a(href='/connections') « Connection List
-ul#quotelist
+    ul#quotelist
       -each channel in channels
         a(href='/users/'+connection+'/'+channel.substr(1,channel.length))
           li.quotes #{channel}

views/connections.jade

@@ -1,5 +1,8 @@
-h3 Current Connections
+extends layout
-div#backlink 
+
+block content
+    h3 Current Connections
+    div#backlink 
         a(href='/') « Home
 #modulelinks
       -each connection in connections

views/index.jade

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

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,8 +1,11 @@
-div#backlink 
+extends layout
+
+block content
+    div#backlink 
         a(href='/') « Home
-div#controls
+    div#controls
         input(type="text", name="search", id="search-text", oninput="search(this.value)")
-ul#quotelist
+    ul#quotelist
         -each poll in polllist
             a(href='/polls/'+poll)
                 li.quotes #{poll}

views/quotelist.jade

@@ -1,8 +1,11 @@
-div#backlink 
+extends layout
+
+block content
+    div#backlink 
         a(href='/') « Home
-div#controls
+    div#controls
         input(type="text", name="search", id="search-text", oninput="search(this.value)")
-ul#quotelist
+    ul#quotelist
         -each quote in quotelist
             a(href='/quotes/'+quote)
                 li.quotes #{quote}

views/quotes.jade

@@ -1,6 +1,9 @@
-div#backlink 
+extends layout
+
+block content
+    div#backlink 
         a(href='/quotes/') « Quote list
-ul#quotelist
+    ul#quotelist
         -var hasYouTubeVids=false
         -each quote in quotes
             -if(quote.match(locals.url_regex))

views/user.jade

@@ -1,11 +1,14 @@
-h3 #{user}'s profile
+extends layout
-div#backlink 
+
+block content
+    h3 #{user}'s profile
+    div#backlink 
         a(href='/users/'+connection+'/'+channel.substr(1,channel.length)) « #{channel} Nick List
 
-div.quotecount
+    div.quotecount
       #{cleanUser} is filled with 
       a(href='/quotes/'+cleanUser) #{quotecount} quotes
       .
 
-div.kickcount
+    div.kickcount
       #{cleanUser} has kicked people #{kicked} times and has been kicked #{kicks} times.

views/users.jade

@@ -1,7 +1,10 @@
-h3 Users currently in #{channel} on #{connection}
+extends layout
-div#backlink 
+
+block content
+    h3 Users currently in #{channel} on #{connection}
+    div#backlink 
         a(href='/channels/'+connection) « Channel List
-ul#quotelist
+    ul#quotelist
       -each nick in nicks
         a(href='/user/'+connection+'/'+channel.substr(1,channel.length)+'/'+nick)
           li.quotes #{nick}