Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-05 23:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into user-icons

Browse Source
This commit is contained in:
nodebb-misty
2015-10-29 15:29:42 -04:00
parent ae43c16227 aa3fa477e3
commit 4ec57d4110
6 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/helpers.js
View File

@@ -140,7 +140,7 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
results.user.showHidden = results.user.isSelf || results.isAdmin;
results.user.profile_links = results.profile_links;
results['cover:url'] = results['cover:url'] || nconf.get('relative_path') + '/images/cover-default.png';
results['cover:url'] = results['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(results.user.uid);
results['cover:position'] = results['cover:position'] || '50% 50%';
next(null, results.user);

5
src/controllers/accounts/profile.js
View File

@@ -72,6 +72,11 @@ profileController.get = function(req, res, callback) {
userData.isFollowing = results.isFollowing;
userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username}]);
userData.title = userData.username;
userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid);
userData['cover:position'] = userData['cover:position'] || '50% 50%';
console.log(userData['cover:url']);
if (!userData.profileviews) {
userData.profileviews = 1;
}

32
src/coverPhoto.js Normal file
View File

@@ -0,0 +1,32 @@
"use strict";
var coverPhoto = {};
var meta = require('./meta');
var nconf = require('nconf');
coverPhoto.getDefaultGroupCover = function(groupName) {
return getCover('groups', groupName);
};
coverPhoto.getDefaultProfileCover = function(uid) {
return getCover('profile', parseInt(uid, 10));
};
function getCover(type, id) {
if (meta.config[type + ':defaultCovers']) {
var covers = meta.config[type + ':defaultCovers'].split(/\s*?,\s*?/g);
if (typeof id === 'string') {
id = (id.charCodeAt(0) + id.charCodeAt(1)) % covers.length;
} else {
id = id % covers.length;
}
return covers[id];
}
return nconf.get('relative_path') + '/images/cover-default.png';
}
module.exports = coverPhoto;

14
src/groups.js
View File

@@ -163,11 +163,8 @@ var async = require('async'),
return callback(new Error('[[error:no-group]]'));
}
// Default image
if (!results.base['cover:url']) {
results.base['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png';
results.base['cover:position'] = '50% 50%';
}
results.base['cover:url'] = results.base['cover:url'] || require('./coverPhoto').getDefaultGroupCover(groupName);
results.base['cover:position'] = results.base['cover:position'] || '50% 50%';
plugins.fireHook('filter:parse.raw', results.base.description, function(err, descriptionParsed) {
if (err) {
@@ -406,10 +403,9 @@ var async = require('async'),
group.hidden = parseInt(group.hidden, 10) === 1;
group.system = parseInt(group.system, 10) === 1;
group.private = parseInt(group.private, 10) === 1;
if (!group['cover:url']) {
group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png';
group['cover:position'] = '50% 50%';
}
group['cover:url'] = group['cover:url'] || require('./coverPhoto').getDefaultGroupCover(group.name);
group['cover:position'] = group['cover:position'] || '50% 50%';
}
});

13
src/views/admin/settings/group.tpl
View File

@@ -32,4 +32,17 @@
</div>
</div>
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">Group Cover Image</div>
<div class="col-sm-10 col-xs-12">
<form role="form">
<label for="groups:defaultCovers"><strong>Default Cover Images</strong></label>
<p class="help-block">
Add comma-separated default cover images for groups that don't have an uploaded cover image
</p>
<input type="text" class="form-control input-lg" id="groups:defaultCovers" data-field="groups:defaultCovers" value="{config.relative_path}/images/cover-default.png" placeholder="https://example.com/group1.png, https://example.com/group2.png" /><br />
</form>
</div>
</div>
<!-- IMPORT admin/settings/footer.tpl -->

13
src/views/admin/settings/user.tpl
View File

@@ -107,6 +107,19 @@
</div>
</div>
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">Profile Cover Image</div>
<div class="col-sm-10 col-xs-12">
<form>
<label for="profile:defaultCovers"><strong>Default Cover Images</strong></label>
<p class="help-block">
Add comma-separated default cover images for accounts that don't have an uploaded cover image
</p>
<input type="text" class="form-control input-lg" id="profile:defaultCovers" data-field="profile:defaultCovers" value="{config.relative_path}/images/cover-default.png" placeholder="https://example.com/group1.png, https://example.com/group2.png" />
</form>
</div>
</div>
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">Themes</div>
<div class="col-sm-10 col-xs-12">