wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21247 from owncloud/placeholder_size

Browse source 
Add a default size to the avatar placeholders
This commit is contained in:
Thomas Müller 2015-12-18 07:56:23 +01:00
commit d77019f566
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/js/avatar.js
View file

@ -1,9 +0,0 @@
$(document).ready(function(){
if (OC.currentUser) {
}
// User settings
$.each($('td.avatar .avatardiv'), function(i, element) {
$(element).avatar($(element).parent().parent().data('uid'), 32);
});
});

8
core/js/placeholder.js
View file

@ -47,16 +47,20 @@
*/
(function ($) {
$.fn.imageplaceholder = function(seed, text) {
$.fn.imageplaceholder = function(seed, text, size) {
// set optional argument "text" to value of "seed" if undefined
text = text || seed;
var hash = md5(seed),
maxRange = parseInt('ffffffffffffffffffffffffffffffff', 16),
hue = parseInt(hash, 16) / maxRange * 256,
height = this.height();
height = this.height() || size || 32;
this.css('background-color', 'hsl(' + hue + ', 90%, 65%)');
// Placeholders are square
this.height(height);
this.width(height);
// CSS rules
this.css('color', '#fff');
this.css('font-weight', 'normal');

1
lib/private/template.php
View file

@ -119,7 +119,6 @@ class OC_Template extends \OC\Template\Base {
// avatars
if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {
\OC_Util::addScript('avatar', null, true);
\OC_Util::addScript('jquery.avatar', null, true);
\OC_Util::addScript('placeholder', null, true);
}

2
settings/js/users/users.js
View file

@ -68,7 +68,7 @@ var UserList = {
if (user.isAvatarAvailable === true) {
$('div.avatardiv', $tr).avatar(user.name, 32, undefined, undefined, undefined, user.displayname);
} else {
$('div.avatardiv', $tr).imageplaceholder(user.displayname);
$('div.avatardiv', $tr).imageplaceholder(user.displayname, undefined, 32);
}
}