diff --git a/controllers/users.coffee b/controllers/users.coffee index fcbbba3..45f78cf 100644 --- a/controllers/users.coffee +++ b/controllers/users.coffee @@ -1,13 +1,14 @@ cradle = require 'cradle' crypto = require 'crypto' config = require('../config').config +admin = require('../config').admin class User constructor: () -> @connect = new cradle.Connection config.db.host, config.db.port, { cache: true raw: false - auth: {username: config.db.user, password: config.db.pass} + auth: {username: admin.user, password: admin.pass} } @db = @connect.database '_users' diff --git a/main.coffee b/main.coffee index e08c71a..cb43a72 100644 --- a/main.coffee +++ b/main.coffee @@ -86,9 +86,9 @@ app.post '/register', (req, res) -> type: 'user' users.register data, (err,docs) -> if err - res.render 'register', + res.render front + 'register', locals: - title: config.site.title + title: config.site.title + ' / Register' message: JSON.stringify err config: config else diff --git a/views/admin/editor.jade b/views/admin/editor.jade index d961ebb..f2567d6 100644 --- a/views/admin/editor.jade +++ b/views/admin/editor.jade @@ -25,4 +25,4 @@ form#editor(method= 'post', action= '/admin/edit') textarea.editor-html(name= 'body', rows= '20')!= article.body input#submit(type="submit", value="Publish") script(type= 'text/javascript', src= 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js') -script(type= 'text/javascript', src= '/js/editor.js') \ No newline at end of file +script(type= 'text/javascript', src= '/admin/js/editor.js') \ No newline at end of file diff --git a/views/admin/new.jade b/views/admin/new.jade index 66231da..0d779ae 100644 --- a/views/admin/new.jade +++ b/views/admin/new.jade @@ -24,4 +24,4 @@ form#editor(method= 'post', action= '/admin/edit') textarea.editor-html(name="body", rows="20") input#submit(type="submit", value="Publish") script(type= 'text/javascript', src= 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js') -script(type= 'text/javascript', src= '/js/editor.js') \ No newline at end of file +script(type= 'text/javascript', src= '/admin/js/editor.js') \ No newline at end of file diff --git a/views/admin/public/css/style.css b/views/admin/public/css/style.css index 7a9ffba..ecd7ae5 100644 --- a/views/admin/public/css/style.css +++ b/views/admin/public/css/style.css @@ -1,5 +1,5 @@ ::selection { - background: #FFA; + background: #FFC; } * {