From 330aa8c01588b42b424adb423378ee77513aa47c Mon Sep 17 00:00:00 2001 From: Michael Nutt Date: Fri, 3 Sep 2010 01:11:34 -0400 Subject: [PATCH] Fix things to work with newest version of express --- deps/express | 2 +- monitor.js | 8 +++++--- public/css/main.css | 6 +++--- views/layout.ejs | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deps/express b/deps/express index 02bcef71..20fae6e5 160000 --- a/deps/express +++ b/deps/express @@ -1 +1 @@ -Subproject commit 02bcef71dd9132e66795c2ba73d71fc35c24b0cd +Subproject commit 20fae6e5122853164fa993da0ead7ad552dac0cb diff --git a/monitor.js b/monitor.js index 4919fa94..1ef3f06d 100644 --- a/monitor.js +++ b/monitor.js @@ -1,11 +1,13 @@ require.paths.unshift(__dirname + '/lib'); require.paths.unshift(__dirname); -require.paths.unshift(__dirname + '/deps/express/lib') -require.paths.unshift(__dirname + '/deps/express/support') +require.paths.unshift(__dirname + '/deps'); +require.paths.unshift(__dirname + '/deps/express/support'); +require.paths.unshift(__dirname + '/deps/express/support/connect/lib'); +require.paths.unshift(__dirname + '/deps/node-mongodb-native/lib'); var sys = require('sys'), fs = require('fs'), - mongo = require('deps/node-mongodb-native/lib/mongodb'), + mongo = require('mongodb'), svc = require('service_json'), weekly = require('weekly'); diff --git a/public/css/main.css b/public/css/main.css index 8719f68b..a2054de9 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -112,7 +112,7 @@ div.hummingbird_graph div.axis_right { #login div.logo { - background: url(/public/images/logo.png) top left no-repeat; + background: url(/images/logo.png) top left no-repeat; width: 300px; height: 324px; margin: auto; @@ -158,6 +158,6 @@ div.hummingbird_graph div.axis_right { @font-face { font-family: 'TitilliumText14L800wt'; - src: url('/public/fonts/TitilliumText800wt.eot'); - src: local('TitilliumText14L'), local('TitilliumText14L-800wt'), url('/public/fonts/TitilliumText800wt.woff') format('woff'), url('/public/fonts/TitilliumText800wt.ttf') format('truetype'), url('/public/fonts/TitilliumText800wt.svg#TitilliumText14L-800wt') format('svg'); + src: url('/fonts/TitilliumText800wt.eot'); + src: local('TitilliumText14L'), local('TitilliumText14L-800wt'), url('/fonts/TitilliumText800wt.woff') format('woff'), url('/fonts/TitilliumText800wt.ttf') format('truetype'), url('/fonts/TitilliumText800wt.svg#TitilliumText14L-800wt') format('svg'); } diff --git a/views/layout.ejs b/views/layout.ejs index 97345dd5..1aec1f93 100644 --- a/views/layout.ejs +++ b/views/layout.ejs @@ -14,8 +14,8 @@ <%= app.set('name') %> - - + +