Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-29 10:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-11 17:16:23 -05:00
parent 4ff62f4e30 2781153640
commit 8ca3b667c7
2 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
public/templates/accountsettings.tpl
View File

@@ -1,35 +1,24 @@
<div class="account-username-box clearfix" data-userslug="{userslug}">
</div>
<div class="account">
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-body">
<div class="checkbox">
<label>
<input id="usePaginationCheckBox" type="checkbox" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong>[[user:paginate_description]]</strong>
</label>
</div>
<strong>[[user:topics_per_page]]</strong><br /> <input id="topicsPerPage" type="text" class="form-control" value="{settings.topicsPerPage}"><br />
<strong>[[user:posts_per_page]]</strong><br /> <input id="postsPerPage" type="text" class="form-control" value="{settings.postsPerPage}"><br />
<div class="col-xs-12">
<h4>[[global:privacy]]</h4>
<div class="well">
<div class="checkbox">
<label>
<input id="showemailCheckBox" type="checkbox" <!-- IF settings.showemail -->checked<!-- ENDIF settings.showemail --> > <strong>[[user:show_email]]</strong>
</label>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-body">
<h4>[[global:privacy]]</h4>
<div class="checkbox">
<label>
<input id="showemailCheckBox" type="checkbox" <!-- IF settings.showemail -->checked<!-- ENDIF settings.showemail --> > [[user:show_email]]
</label>
</div>
<h4>Pagination</h4>
<div class="well">
<div class="checkbox">
<label>
<input id="usePaginationCheckBox" type="checkbox" <!-- IF settings.usePagination -->checked<!-- ENDIF settings.usePagination -->> <strong>[[user:paginate_description]]</strong>
</label>
</div>
<strong>[[user:topics_per_page]]</strong><br /> <input id="topicsPerPage" type="text" class="form-control" value="{settings.topicsPerPage}"><br />
<strong>[[user:posts_per_page]]</strong><br /> <input id="postsPerPage" type="text" class="form-control" value="{settings.postsPerPage}"><br />
</div>
</div>
</div>
@@ -37,7 +26,4 @@
<div class="form-actions">
<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
</div>
</div>
<input type="hidden" template-variable="yourid" value="{yourid}" />
<input type="hidden" template-variable="theirid" value="{theirid}" />
</div>

2
src/routes/user.js
View File

@@ -302,8 +302,6 @@ var fs = require('fs'),
return next(err);
}
userData.theirid = uid;
userData.yourid = callerUID;
userData.settings = settings;
res.json(userData);
});