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

closes #675

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-12-24 13:12:25 -05:00
parent a18e366493
commit 2c489c600c
5 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/templates/account.tpl
View File

@@ -91,12 +91,14 @@
<br/> <br/>
<hr/> <hr/>
<!-- IF !disableSignatures -->
<!-- IF signature --> <!-- IF signature -->
<span class="account-bio-label">[[user:signature]]</span> <span class="account-bio-label">[[user:signature]]</span>
<div class="post-signature"> <div class="post-signature">
<span id='signature'>{signature}</span> <span id='signature'>{signature}</span>
</div> </div>
<!-- ENDIF signature --> <!-- ENDIF signature -->
<!-- ENDIF !disableSignatures -->
</div> </div>
</div> </div>
</div> </div>

2
public/templates/accountedit.tpl
View File

@@ -83,12 +83,14 @@
</div> </div>
</div> </div>
<!-- IF !disableSignatures -->
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputSignature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small> <label class="control-label" for="inputSignature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
<div class="controls"> <div class="controls">
<textarea class="form-control" id="inputSignature" rows="5">{signature}</textarea> <textarea class="form-control" id="inputSignature" rows="5">{signature}</textarea>
</div> </div>
</div> </div>
<!-- ENDIF !disableSignatures -->
<input type="hidden" id="inputUID" value="{uid}"><br /> <input type="hidden" id="inputUID" value="{uid}"><br />

5
public/templates/admin/settings.tpl
View File

@@ -82,6 +82,11 @@
<input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong> <input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong>
</label> </label>
</div> </div>
<div class="checkbox">
<label>
<input type="checkbox" data-field="disableSignatures"> <strong>Disable signatures</strong>
</label>
</div>
<strong>Minimum Username Length</strong><br /> <strong>Minimum Username Length</strong><br />
<input type="text" class="form-control" value="2" data-field="minimumUsernameLength"><br /> <input type="text" class="form-control" value="2" data-field="minimumUsernameLength"><br />
<strong>Maximum Username Length</strong><br /> <strong>Maximum Username Length</strong><br />

3
src/posts.js
View File

@@ -213,7 +213,10 @@ var db = require('./database'),
post.user_postcount = userData.postcount || 0; post.user_postcount = userData.postcount || 0;
post.user_banned = parseInt(userData.banned, 10) === 1; post.user_banned = parseInt(userData.banned, 10) === 1;
post.picture = userData.picture || gravatar.url('', {}, https = nconf.get('https')); post.picture = userData.picture || gravatar.url('', {}, https = nconf.get('https'));
if(meta.config.disableSignatures === undefined || parseInt(meta.config.disableSignatures, 10) === 0) {
post.signature = signature; post.signature = signature;
}
for (var info in customUserInfo) { for (var info in customUserInfo) {
if (customUserInfo.hasOwnProperty(info)) { if (customUserInfo.hasOwnProperty(info)) {

2
src/routes/user.js
View File

@@ -548,6 +548,8 @@ var fs = require('fs'),
data.yourid = callerUID; data.yourid = callerUID;
data.theirid = uid; data.theirid = uid;
data.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
user.getFollowingCount(uid, function (followingCount) { user.getFollowingCount(uid, function (followingCount) {
user.getFollowerCount(uid, function (followerCount) { user.getFollowerCount(uid, function (followerCount) {
data.followingCount = followingCount; data.followingCount = followingCount;