Permalink
Browse files

Merge pull request #138 from SpiderStrategies/master

Upgrades for express 3.x
  • Loading branch information...
2 parents e024e32 + 3e41dc7 commit 6339f1b92e88e3bf182cb68d14400481eb36db96 @tj tj committed Nov 20, 2012
Showing with 23 additions and 17 deletions.
  1. +2 −2 lib/http/index.js
  2. +10 −7 lib/http/views/job/list.jade
  3. +10 −7 lib/http/views/layout.jade
  4. +1 −1 package.json
View
@@ -13,7 +13,7 @@ var express = require('express');
// setup
-var app = express.createServer()
+var app = express()
, provides = require('./middleware/provides')
, stylus = require('stylus')
, routes = require('./routes')
@@ -39,7 +39,7 @@ app.set('view options', { doctype: 'html' });
app.set('view engine', 'jade');
app.set('views', __dirname + '/views');
app.set('title', 'Kue');
-app.helpers({ inspect: util.inspect });
+app.locals({ inspect: util.inspect })
// middleware
@@ -1,10 +1,13 @@
-h1 #{state}
+extends ../layout
-script
- o(function(){
- init('#{state}');
- });
+block body
+ h1 #{state}
+ script
+ o(function(){
+ init('#{state}');
+ });
-#jobs
-#loading: canvas(width=50, height=50)
+
+ #jobs
+ #loading: canvas(width=50, height=50)
View
@@ -12,12 +12,15 @@ html
script(src='./javascripts/search.js')
script(src='./javascripts/main.js')
body
- != partial('menu')
+ include _menu
#actions
- != partial('search')
- != partial('filter')
- != partial('sort')
- #content!= body
- script(type='text/template')#job-template!= partial('job')
- script(type='text/template')#row-template!= partial('row')
+ include _search
+ include _filter
+ include _sort
+ #content
+ block body
+ script(type='text/template')#job-template
+ include _job
+ script(type='text/template')#row-template
+ include _row
#error
View
@@ -11,7 +11,7 @@
}
, "dependencies": {
"redis": "0.7.2"
- , "express": "2.5.11"
+ , "express": "3.0.0rc5"
, "jade": "0.26.3"
, "stylus": "0.27.2"
, "nib": "0.5.0"

0 comments on commit 6339f1b

Please sign in to comment.