diff options
| author | kondou <kondou@ts.unde.re> | 2013-10-04 02:27:53 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-10-04 02:27:53 +0200 |
| commit | b0ff10a5365ebaec2741c8095493c0eff836c439 (patch) | |
| tree | 5dfb3ad111f267dfc7245c21f454d8b54834599c /core | |
| parent | de175a4b0f0971c9cbbf912bbc3fd8cbc190b53d (diff) | |
| download | nextcloud-server-b0ff10a5365ebaec2741c8095493c0eff836c439.tar.gz nextcloud-server-b0ff10a5365ebaec2741c8095493c0eff836c439.zip | |
Hide defaultavatar in #header and don't darken proper avatars in #header
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 4 | ||||
| -rw-r--r-- | core/js/avatar.js | 2 | ||||
| -rw-r--r-- | core/js/jquery.avatar.js | 20 |
3 files changed, 20 insertions, 6 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 06b61f0fa68..49a2bdaadb2 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -43,6 +43,10 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari display: inline-block; } +#header .avatardiv img { + opacity: 1; +} + /* INPUTS */ input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea, select, diff --git a/core/js/avatar.js b/core/js/avatar.js index 57e6daa0930..c54c4068768 100644 --- a/core/js/avatar.js +++ b/core/js/avatar.js @@ -1,6 +1,6 @@ $(document).ready(function(){ if (OC.currentUser) { - $('#header .avatardiv').avatar(OC.currentUser, 32); + $('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true); // Personal settings $('#avatar .avatardiv').avatar(OC.currentUser, 128); } diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 88a4c25d1ee..00068101726 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -15,7 +15,7 @@ * You may use this on any <div></div> * Here I'm using <div class="avatardiv"></div> as an example. * - * There are 4 ways to call this: + * There are 5 ways to call this: * * 1. $('.avatardiv').avatar('jdoe', 128); * This will make the div to jdoe's fitting avatar, with a size of 128px. @@ -34,10 +34,15 @@ * 4. $('.avatardiv').avatar('jdoe', 128, true); * This will behave like the first example, except it will also append random * hashes to the custom avatar images, to force image reloading in IE8. + * + * 5. $('.avatardiv').avatar('jdoe', 128, undefined, true); + * This will behave like the first example, but it will hide the avatardiv, if + * it will display the default placeholder. undefined is the ie8fix from + * example 4 and can be either true, or false/undefined, to be ignored. */ (function ($) { - $.fn.avatar = function(user, size, ie8fix) { + $.fn.avatar = function(user, size, ie8fix, hidedefault) { if (typeof(size) === 'undefined') { if (this.height() > 0) { size = this.height(); @@ -69,12 +74,17 @@ var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken; $.get(url, function(result) { if (typeof(result) === 'object') { - if (result.data && result.data.displayname) { - $div.placeholder(user, result.data.displayname); + if (!hidedefault) { + if (result.data && result.data.displayname) { + $div.placeholder(user, result.data.displayname); + } else { + $div.placeholder(user); + } } else { - $div.placeholder(user); + $div.hide(); } } else { + $div.show(); if (ie8fix === true) { $div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">'); } else { |