hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
v1.18.x
Baris Soner Usakli 11 years ago
parent 574e981de9
commit c17b8ae9a1
8 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File

6
public/templates/account.tpl
Unescape Escape View File

@ -1,9 +1,9 @@
<div class="well account"> <div class="account-username-box" data-userslug="{userslug}">
<div class="account-username-box" data-userslug="{userslug}"> </div>
</div> <div class="well account">
<div class="row"> <div class="row">
<div class="col-md-5 account-block"> <div class="col-md-5 account-block">

10
public/templates/accountedit.tpl
Unescape Escape View File

@ -1,3 +1,7 @@
<div class="account-username-box" data-userslug="{userslug}">
</div>
<div class="well account"> <div class="well account">
<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true"> <div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
@ -30,10 +34,6 @@
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
</div><!-- /.modal --> </div><!-- /.modal -->
<div class="account-username-box clearfix" data-userslug="{userslug}">
</div>
<div class="row"> <div class="row">
<div class="col-md-2" style="text-align: center; margin-bottom:20px;"> <div class="col-md-2" style="text-align: center; margin-bottom:20px;">
<div class="account-picture-block text-center"> <div class="account-picture-block text-center">
@ -150,5 +150,7 @@
</div> </div>
</div> </div>
<input type="hidden" template-variable="yourid" value="{yourid}" />
<input type="hidden" template-variable="theirid" value="{theirid}" />
<input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" /> <input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" />
<input type="hidden" template-variable="uploadedpicture" value="{uploadedpicture}" /> <input type="hidden" template-variable="uploadedpicture" value="{uploadedpicture}" />

10
public/templates/accountposts.tpl
Unescape Escape View File

@ -1,7 +1,8 @@
<div class="well favourites"> <div class="account-username-box clearfix" data-userslug="{userslug}" data-uid="{uid}">
<div class="account-username-box clearfix" data-userslug="{userslug}" data-uid="{uid}">
</div> </div>
<div class="well favourites">
<!-- IF !posts.length --> <!-- IF !posts.length -->
<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div> <div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
@ -39,3 +40,6 @@
</div> </div>
</div> </div>
</div> </div>
<input type="hidden" template-variable="yourid" value="{yourid}" />
<input type="hidden" template-variable="theirid" value="{theirid}" />

9
public/templates/accountsettings.tpl
Unescape Escape View File

@ -1,8 +1,8 @@
<div class="well account"> <div class="account-username-box clearfix" data-userslug="{userslug}">
<div class="account-username-box clearfix" data-userslug="{userslug}"> </div>
</div> <div class="well account">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@ -22,3 +22,6 @@
<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a> <a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
</div> </div>
</div> </div>
<input type="hidden" template-variable="yourid" value="{yourid}" />
<input type="hidden" template-variable="theirid" value="{theirid}" />

10
public/templates/favourites.tpl
Unescape Escape View File

@ -1,7 +1,8 @@
<div class="well favourites"> <div class="account-username-box clearfix" data-userslug="{userslug}">
<div class="account-username-box clearfix" data-userslug="{userslug}">
</div> </div>
<div class="well favourites">
<!-- IF !posts.length --> <!-- IF !posts.length -->
<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div> <div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
@ -39,3 +40,6 @@
</div> </div>
</div> </div>
</div> </div>
<input type="hidden" template-variable="yourid" value="{yourid}" />
<input type="hidden" template-variable="theirid" value="{theirid}" />

7
public/templates/followers.tpl
Unescape Escape View File

@ -1,9 +1,8 @@
<div class="well users account"> <div class="account-username-box clearfix" data-userslug="{userslug}">
<div class="account-username-box clearfix" data-userslug="{userslug}">
</div> </div>
<div class="well users account">
<div> <div>
<!-- BEGIN followers --> <!-- BEGIN followers -->
<div class="users-box"> <div class="users-box">

7
public/templates/following.tpl
Unescape Escape View File

@ -1,9 +1,8 @@
<div class="well users account"> <div class="account-username-box clearfix" data-userslug="{userslug}">
<div class="account-username-box clearfix" data-userslug="{userslug}">
</div> </div>
<div class="well users account">
<div> <div>
<!-- BEGIN following --> <!-- BEGIN following -->
<div class="users-box"> <div class="users-box">

7
src/routes/user.js
Unescape Escape View File

@ -311,6 +311,9 @@ var fs = require('fs'),
} else { } else {
userData.showemail = ""; userData.showemail = "";
} }
userData.theirid = uid;
userData.yourid = callerUID;
res.json(userData); res.json(userData);
} else { } else {
res.json(404, { res.json(404, {
@ -350,6 +353,8 @@ var fs = require('fs'),
return next(err); return next(err);
} }
userData.theirid = uid;
userData.yourid = callerUID;
userData.posts = favourites.posts; userData.posts = favourites.posts;
userData.nextStart = favourites.nextStart; userData.nextStart = favourites.nextStart;
@ -386,6 +391,8 @@ var fs = require('fs'),
return next(err); return next(err);
} }
userData.uid = uid; userData.uid = uid;
userData.theirid = uid;
userData.yourid = callerUID;
userData.posts = userPosts.posts; userData.posts = userPosts.posts;
userData.nextStart = userPosts.nextStart; userData.nextStart = userPosts.nextStart;

Write Preview
Loading…
Cancel
Save