Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-14 09:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source
This commit is contained in:
Julian Lam
2015-10-29 16:14:10 -04:00
parent 9f6dc63fed 5eb3cca9c1
commit 8d4209d42c
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -50,7 +50,7 @@
"nodebb-rewards-essentials": "0.0.5", "nodebb-rewards-essentials": "0.0.5",
"nodebb-theme-lavender": "2.0.11", "nodebb-theme-lavender": "2.0.11",
"nodebb-theme-persona": "3.0.68", "nodebb-theme-persona": "3.0.68",
"nodebb-theme-vanilla": "4.0.32", "nodebb-theme-vanilla": "4.0.33",
"nodebb-widget-essentials": "2.0.3", "nodebb-widget-essentials": "2.0.3",
"npm": "^2.1.4", "npm": "^2.1.4",
"passport": "^0.3.0", "passport": "^0.3.0",

8
public/src/admin/admin.js
View File

@@ -69,6 +69,14 @@
$('#main-page-title').text(menu.text() + (menu.parents('.menu-item').children('a').text() === 'Settings' ? ' Settings' : '')); $('#main-page-title').text(menu.text() + (menu.parents('.menu-item').children('a').text() === 'Settings' ? ' Settings' : ''));
} }
}); });
var acpPath = url.replace('admin/', '').split('/');
acpPath.forEach(function(path, i) {
acpPath[i] = path.charAt(0).toUpperCase() + path.slice(1);
});
acpPath = acpPath.join(' > ');
document.title = (url === 'admin/general/dashboard' ? 'Dashboard' : acpPath) + ' | NodeBB Admin Control Panel';
} }
function setupRestartLinks() { function setupRestartLinks() {

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

@@ -101,6 +101,9 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
userData.signature = validator.escape(userData.signature); userData.signature = validator.escape(userData.signature);
userData.aboutme = validator.escape(userData.aboutme || ''); userData.aboutme = validator.escape(userData.aboutme || '');
userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid);
userData['cover:position'] = userData['cover:position'] || '50% 50%';
next(null, userData); next(null, userData);
} }
], callback); ], callback);
@@ -140,8 +143,8 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
results.user.showHidden = results.user.isSelf || results.isAdmin; results.user.showHidden = results.user.isSelf || results.isAdmin;
results.user.profile_links = results.profile_links; results.user.profile_links = results.profile_links;
results['cover:url'] = results['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(results.user.uid); results.user['cover:url'] = results.user['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(results.user.uid);
results['cover:position'] = results['cover:position'] || '50% 50%'; results.user['cover:position'] = results.user['cover:position'] || '50% 50%';
next(null, results.user); next(null, results.user);
} }

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

@@ -75,7 +75,6 @@ profileController.get = function(req, res, callback) {
userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid); userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid);
userData['cover:position'] = userData['cover:position'] || '50% 50%'; userData['cover:position'] = userData['cover:position'] || '50% 50%';
console.log(userData['cover:url']);
if (!userData.profileviews) { if (!userData.profileviews) {
userData.profileviews = 1; userData.profileviews = 1;

2
src/middleware/admin.js
View File

@@ -112,7 +112,7 @@ middleware.renderHeader = function(req, res, data, next) {
scripts: results.scripts, scripts: results.scripts,
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
env: process.env.NODE_ENV ? true : false, env: process.env.NODE_ENV ? true : false,
title: acpPath + ' | NodeBB Admin Control Panel' title: (acpPath || 'Dashboard') + ' | NodeBB Admin Control Panel'
}; };
templateValues.template = {name: res.locals.template}; templateValues.template = {name: res.locals.template};