Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

edit page

Browse Source
This commit is contained in:
Baris Usakli
2013-05-08 12:51:37 -04:00
parent 31e845f4b0
commit 187d5a101a
5 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/css/style.less
View File

@@ -325,6 +325,7 @@ footer.footer {
.account-username-box{ .account-username-box{
border-bottom:1px solid #e3e3e3; border-bottom:1px solid #e3e3e3;
margin-bottom:10px;
} }
.account-username{ .account-username{
@@ -335,6 +336,7 @@ footer.footer {
.account-picture-block{ .account-picture-block{
display:inline-block; display:inline-block;
margin-right:20px; margin-right:20px;
vertical-align:top;
} }
.account-bio-block{ .account-bio-block{
@@ -348,7 +350,6 @@ footer.footer {
} }
.category-icon { .category-icon {
width: 100%; width: 100%;
height: 90px; height: 90px;

9
public/templates/account.tpl
View File

@@ -9,10 +9,9 @@
<!-- BEGIN user --> <!-- BEGIN user -->
<div class="account-username-box"> <div class="account-username-box">
<span class="account-username">{user.username}</span> <span class="account-username"><a href="/users/{user.username}">{user.username}</a></span>
<span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span> <span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span>
</div> </div>
<br/>
<div class="account-picture-block"> <div class="account-picture-block">
<img src="{user.picture}?s=128" /> <img src="{user.picture}?s=128" />
@@ -34,11 +33,7 @@
<span class="account-bio-label">posts</span> <span class="account-bio-label">posts</span>
<span id='postcount'>{user.postcount}</span> <span id='postcount'>{user.postcount}</span>
</div> </div>
<label for="email">Email Address</label><input type="text" placeholder="Enter Email Address" id="email" /><br />
<button class="btn btn-primary" id="reset" type="submit">Reset Password</button>
<!-- END user --> <!-- END user -->

58
public/templates/accountedit.tpl
View File

@@ -8,12 +8,62 @@
<!-- BEGIN user --> <!-- BEGIN user -->
<div class="account-username-box">
<span class="account-username"><a href="/users/{user.username}">{user.username}</a></span>
<span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span>
</div>
<label for="email">Email Address</label><input type="text" placeholder="Enter Email Address" id="email" /><br />
<button class="btn btn-primary" id="reset" type="submit">Reset Password</button>
<div class="account-picture-block">
<img src="{user.picture}?s=128" />
</div>
<div class="inline-block">
<form class='form-horizontal'>
<div class="control-group">
<label class="control-label" for="inputEmail">Email</label>
<div class="controls">
<input type="text" id="inputEmail" placeholder="Email" value="{user.email}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputFullname">Full Name</label>
<div class="controls">
<input type="text" id="inputFullname" placeholder="Full Name" value="{user.fullname}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputWebsite">Website</label>
<div class="controls">
<input type="text" id="inputWebsite" placeholder="http://website.com" value="{user.fullname}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputLocation">Location</label>
<div class="controls">
<input type="text" id="inputLocation" placeholder="Location" value="{user.location}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputBirthday">Birthday</label>
<div class="controls">
<input type="text" id="inputBirthday" placeholder="dd/mm/yyyy" value="{user.birthday}">
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn">Cancel</button>
</div>
</form>
</div>
<!-- END user --> <!-- END user -->

4
src/user.js
View File

@@ -239,6 +239,10 @@ var config = require('../config.js'),
RDB.db.hmset('user:'+uid, { RDB.db.hmset('user:'+uid, {
'username' : username, 'username' : username,
'fullname': '',
'location':'',
'birthday':'',
'website':'',
'email' : email, 'email' : email,
'joindate' : new Date().getTime(), 'joindate' : new Date().getTime(),
'password' : hash, 'password' : hash,

3
src/webserver.js
View File

@@ -406,10 +406,7 @@ passport.deserializeUser(function(uid, done) {
app.get('/users/:uid/edit', function(req, res){ app.get('/users/:uid/edit', function(req, res){
if(req.user && req.params.uid) if(req.user && req.params.uid)
{
//res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("users/' + req.params.uid+'/edit");});</script>' + templates['footer']);
res.send(templates['header'] + create_route('users/'+req.params.uid+'/edit','accountedit') + templates['footer']); res.send(templates['header'] + create_route('users/'+req.params.uid+'/edit','accountedit') + templates['footer']);
}
else else
return res.redirect('/403'); return res.redirect('/403');
}); });