TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-23 10:53:34 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #162 from javorszky/iss132

Browse Source 
/register/ => /signup/
This commit is contained in:
Hannah Wolfe 2013-06-16 01:45:57 -07:00
commit 49999a7f15
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app.js
View File

@ -132,9 +132,9 @@
*/ */
ghost.app().get(/^\/logout\/?$/, admin.logout); ghost.app().get(/^\/logout\/?$/, admin.logout);
ghost.app().get('/ghost/login/', admin.login); ghost.app().get('/ghost/login/', admin.login);
ghost.app().get('/ghost/register/', admin.register); ghost.app().get('/ghost/signup/', admin.signup);
ghost.app().post('/ghost/login/', admin.auth); ghost.app().post('/ghost/login/', admin.auth);
ghost.app().post('/ghost/register/', admin.doRegister); ghost.app().post('/ghost/signup/', admin.doRegister);
ghost.app().get('/ghost/editor/:id', auth, admin.editor); ghost.app().get('/ghost/editor/:id', auth, admin.editor);
ghost.app().get('/ghost/editor', auth, admin.editor); ghost.app().get('/ghost/editor', auth, admin.editor);
ghost.app().get('/ghost/content', auth, admin.content); ghost.app().get('/ghost/content', auth, admin.content);
@ -162,4 +162,4 @@
}); });
}, errors.logAndThrowError); }, errors.logAndThrowError);
}()); }());

8
core/admin/controllers/index.js
View File

@ -75,8 +75,8 @@
res.redirect('/ghost/login/'); res.redirect('/ghost/login/');
}); });
}, },
'register': function (req, res) { 'signup': function (req, res) {
res.render('register', { res.render('signup', {
bodyClass: 'ghost-login', bodyClass: 'ghost-login',
hideNavbar: true, hideNavbar: true,
adminNav: setSelected(adminNavbar, 'login') adminNav: setSelected(adminNavbar, 'login')
@ -95,7 +95,7 @@
res.redirect('/ghost/login/'); res.redirect('/ghost/login/');
}, function (error) { }, function (error) {
req.flash('error', error.message); req.flash('error', error.message);
res.redirect('/ghost/register/'); res.redirect('/ghost/signup/');
}); });
} else { } else {
req.flash('error', "The password is too short. Have at least 6 characters in there"); req.flash('error', "The password is too short. Have at least 6 characters in there");
@ -191,4 +191,4 @@
}; };
module.exports = adminControllers; module.exports = adminControllers;
}()); }());

4
core/admin/views/login.hbs
View File

@ -9,7 +9,7 @@
</div> </div>
<button class="button-save" type="submit">Log in</button> <button class="button-save" type="submit">Log in</button>
<section class="meta"> <section class="meta">
<a class="forgotten-password" href="#">Forgotten password?</a> &bull; <a href="/ghost/register/">Register new user</a> <a class="forgotten-password" href="#">Forgotten password?</a> &bull; <a href="/ghost/signup/">Register new user</a>
</section> </section>
</form> </form>
</section> </section>

4
core/admin/views/register.hbs → core/admin/views/signup.hbs
View File

@ -1,5 +1,5 @@
{{!< default}} {{!< default}}
<section class="login-box"> <section class="login-box js-login-container">
<form id="register" method="post"> <form id="register" method="post">
<div class="email-wrap"> <div class="email-wrap">
<input class="email_address" type="text" placeholder="Email Address" name="email_address"> <input class="email_address" type="text" placeholder="Email Address" name="email_address">
@ -12,4 +12,4 @@
<a href="/ghost/login/">Log in</a> <a href="/ghost/login/">Log in</a>
</section> </section>
</form> </form>
</section> </section>