tqt/Ghost
2
1
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2023-12-13 21:00:40 +01:00
Code Issues 1 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

4
app.js
View file

@ -132,9 +132,9 @@
*/
ghost.app().get(/^\/logout\/?$/, admin.logout);
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/register/', admin.doRegister);
ghost.app().post('/ghost/signup/', admin.doRegister);
ghost.app().get('/ghost/editor/:id', auth, admin.editor);
ghost.app().get('/ghost/editor', auth, admin.editor);
ghost.app().get('/ghost/content', auth, admin.content);

6
core/admin/controllers/index.js
View file

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

2
core/admin/views/login.hbs
View file

@ -9,7 +9,7 @@
</div>
<button class="button-save" type="submit">Log in</button>
<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>
</form>
</section>

2
core/admin/views/register.hbs → core/admin/views/signup.hbs
View file

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