Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 16:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed the data passing to accountedit.tpl

Browse Source
This commit is contained in:
Baris Usakli
2013-05-14 11:32:37 -04:00
parent 0bb0fd5789
commit d564811b71
3 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/templates/account.tpl
View File

@@ -6,48 +6,47 @@
<p></p> <p></p>
</div> </div>
<!-- BEGIN user -->
<div class="account-username-box"> <div class="account-username-box">
<span class="account-username"><a href="/users/{user.username}">{user.username}</a></span> <span class="account-username"><a href="/users/{username}">{username}</a></span>
<span id="editLink" class="pull-right"><a href="/users/{user.username}/edit">edit</a></span> <span id="editLink" class="pull-right"><a href="/users/{username}/edit">edit</a></span>
</div> </div>
<div class="account-picture-block"> <div class="account-picture-block">
<img src="{user.picture}?s=128" class="user-profile-picture"/> <img src="{picture}" class="user-profile-picture"/>
</div> </div>
<div class="account-bio-block"> <div class="account-bio-block">
<span class="account-bio-label">email</span> <span class="account-bio-label">email</span>
<span>{user.email}</span> <span>{email}</span>
<br/> <br/>
<span class="account-bio-label">full name</span> <span class="account-bio-label">full name</span>
<span>{user.fullname}</span> <span>{fullname}</span>
<br/> <br/>
<span class="account-bio-label">website</span> <span class="account-bio-label">website</span>
<span><a href="{user.website}">{user.website}</a></span> <span><a href="{user.website}">{website}</a></span>
<br/> <br/>
<span class="account-bio-label">location</span> <span class="account-bio-label">location</span>
<span>{user.location}</span> <span>{location}</span>
<br/> <br/>
<span class="account-bio-label">age</span> <span class="account-bio-label">age</span>
<span>{user.age}</span> <span>{age}</span>
<br/> <br/>
<span class="account-bio-label">member for</span> <span class="account-bio-label">member for</span>
<span>{user.joindate}</span> <span>{joindate}</span>
<br/> <br/>
<span class="account-bio-label">reputation</span> <span class="account-bio-label">reputation</span>
<span id='reputation'>{user.reputation}</span> <span id='reputation'>{reputation}</span>
<br/> <br/>
<span class="account-bio-label">posts</span> <span class="account-bio-label">posts</span>
<span id='postcount'>{user.postcount}</span> <span id='postcount'>{postcount}</span>
</div> </div>

49
public/templates/accountedit.tpl
View File

@@ -7,7 +7,6 @@
<p></p> <p></p>
</div> </div>
<!-- Change Picture Modal --> <!-- Change Picture Modal -->
<div id="change-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="change-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
@@ -65,18 +64,15 @@
</div> </div>
</div> </div>
<!-- BEGIN user -->
<div class="account-username-box"> <div class="account-username-box">
<span class="account-username"><a href="/users/{user.username}">{user.username}</a></span> <span class="account-username"><a href="/users/{username}">{username}</a></span>
<span class="pull-right"><a href="/users/{user.username}/edit">edit</a></span> <span class="pull-right"><a href="/users/{username}/edit">edit</a></span>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span3" style="text-align: center; margin-bottom:20px;"> <div class="span3" style="text-align: center; margin-bottom:20px;">
<div class="account-picture-block text-center"> <div class="account-picture-block text-center">
<img id="user-current-picture" class="user-profile-picture" src="{user.picture}" /><br/> <img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br/>
<a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a> <a id="changePictureBtn" href="#" class="btn btn-primary">change picture</a>
</div> </div>
</div> </div>
@@ -87,64 +83,57 @@
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputEmail">Email</label> <label class="control-label" for="inputEmail">Email</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputEmail" placeholder="Email" value="{user.email}"> <input type="text" id="inputEmail" placeholder="Email" value="{email}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputFullname">Full Name</label> <label class="control-label" for="inputFullname">Full Name</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputFullname" placeholder="Full Name" value="{user.fullname}"> <input type="text" id="inputFullname" placeholder="Full Name" value="{fullname}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputWebsite">Website</label> <label class="control-label" for="inputWebsite">Website</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputWebsite" placeholder="http://website.com" value="{user.website}"> <input type="text" id="inputWebsite" placeholder="http://website.com" value="{website}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputLocation">Location</label> <label class="control-label" for="inputLocation">Location</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputLocation" placeholder="Location" value="{user.location}"> <input type="text" id="inputLocation" placeholder="Location" value="{location}">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputBirthday">Birthday</label> <label class="control-label" for="inputBirthday">Birthday</label>
<div class="controls"> <div class="controls">
<input type="text" id="inputBirthday" placeholder="mm/dd/yyyy" value="{user.birthday}"> <input type="text" id="inputBirthday" placeholder="mm/dd/yyyy" value="{birthday}">
</div> </div>
</div> </div>
<input type="hidden" id="inputUID" value="{user.uid}"> <input type="hidden" id="inputUID" value="{uid}">
<div class="form-actions"> <div class="form-actions">
<a id="submitBtn" href="" class="btn btn-primary">Save changes</a> <a id="submitBtn" href="" class="btn btn-primary">Save changes</a>
<a href="/users/{user.username}" class="btn">Cancel</a> <a href="/users/{username}" class="btn">Cancel</a>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<!-- how to pass data to the script ?? -->
<div id="user-data-picture" class="hide">{user.picture}</div>
<div id="user-data-gravatarpicture" class="hide">{user.gravatarpicture}</div>
<div id="user-data-uploadedpicture" class="hide">{user.uploadedpicture}</div>
<!-- END user -->
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var gravatarPicture = '{gravatarpicture}';
var uploadedPicture = '{uploadedpicture}';
$(document).ready(function() { $(document).ready(function() {
$('#uploadForm').submit(function() { $('#uploadForm').submit(function() {
@@ -180,7 +169,7 @@ $(document).ready(function() {
$('#user-current-picture').attr('src', imageUrlOnServer); $('#user-current-picture').attr('src', imageUrlOnServer);
$('#user-uploaded-picture').attr('src', imageUrlOnServer); $('#user-uploaded-picture').attr('src', imageUrlOnServer);
$('#user-data-uploadedpicture').html(imageUrlOnServer); uploadedPicture = imageUrlOnServer;
setTimeout(function() { setTimeout(function() {
hideAlerts(); hideAlerts();
@@ -254,10 +243,6 @@ $(document).ready(function() {
function updateImages() { function updateImages() {
var currentPicture = $('#user-current-picture').attr('src');
var gravatarPicture = $('#user-data-gravatarpicture').html();
var uploadedPicture = $('#user-data-uploadedpicture').html();
if(gravatarPicture) { if(gravatarPicture) {
$('#user-gravatar-picture').attr('src', gravatarPicture); $('#user-gravatar-picture').attr('src', gravatarPicture);
$('#gravatar-box').show(); $('#gravatar-box').show();
@@ -313,9 +298,9 @@ $(document).ready(function() {
changeUserPicture(selectedImageType); changeUserPicture(selectedImageType);
if(selectedImageType == 'gravatar') if(selectedImageType == 'gravatar')
$('#user-current-picture').attr('src', $('#user-data-gravatarpicture').html()); $('#user-current-picture').attr('src', gravatarPicture);
else if(selectedImageType == 'uploaded') else if(selectedImageType == 'uploaded')
$('#user-current-picture').attr('src', $('#user-data-uploadedpicture').html()); $('#user-current-picture').attr('src', uploadedPicture);
} }
}); });

9
src/webserver.js
View File

@@ -350,11 +350,10 @@ var express = require('express'),
data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear(); data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
data.uid = uid; data.uid = uid;
callback({ data.yourid = (req.user)?req.user.uid : 0;
yourid: (req.user)?req.user.uid : 0, data.theirid = uid;
theirid: uid,
user: data callback(data);
});
} }
else else
callback({user:{}}); callback({user:{}});