Merge pull request #5108 from owncloud/fix_avatar_kondou
Hide defaultavatar in #header and don't darken proper avatars in #header
This commit is contained in:
commit
38f68d09db
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -45,12 +45,16 @@ function changeDisplayName(){
|
|||
}
|
||||
}
|
||||
|
||||
function updateAvatar () {
|
||||
function updateAvatar (hidedefault) {
|
||||
$headerdiv = $('#header .avatardiv');
|
||||
$displaydiv = $('#displayavatar .avatardiv');
|
||||
|
||||
$headerdiv.css({'background-color': ''});
|
||||
$headerdiv.avatar(OC.currentUser, 32, true);
|
||||
if(hidedefault) {
|
||||
$headerdiv.hide();
|
||||
} else {
|
||||
$headerdiv.css({'background-color': ''});
|
||||
$headerdiv.avatar(OC.currentUser, 32, true);
|
||||
}
|
||||
$displaydiv.css({'background-color': ''});
|
||||
$displaydiv.avatar(OC.currentUser, 128, true);
|
||||
}
|
||||
|
@ -232,7 +236,7 @@ $(document).ready(function(){
|
|||
type: 'DELETE',
|
||||
url: OC.Router.generate('core_avatar_delete'),
|
||||
success: function(msg) {
|
||||
updateAvatar();
|
||||
updateAvatar(true);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue