Use defaultavatars

4 files changed, 4 insertions, 6 deletions

diff --git a/settings/js/personal.js b/settings/js/personal.js
index e873eb1336e..03f4fbc9da9 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -49,8 +49,8 @@ function selectAvatar (path) {
 }
 
 function updateAvatar () {
-	$avatarimg = $('#avatar img');
-	$avatarimg.attr('src', $avatarimg.attr('src') + '#');
+	$('header .avatardiv').avatar(OC.currentUser, 32);
+	$('#avatar .avatardiv').avatar(OC.currentUser, 128);
 }
 
 function showAvatarCropper() {
diff --git a/settings/personal.php b/settings/personal.php
index 7ab25177b43..b0d62645d5a 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -18,8 +18,6 @@ OC_Util::addStyle( '3rdparty', 'chosen' );
 \OC_Util::addScript('files', 'jquery.fileupload');
 \OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
 \OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min');
-\OC_Util::addScript('3rdparty', 'md5/md5.min');
-\OC_Util::addScript('core', 'placeholder');
 OC_App::setActiveNavigationEntry( 'personal' );
 
 $storageInfo=OC_Helper::getStorageInfo('/');
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b94b8452585..c488623a088 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -83,7 +83,7 @@ if($_['passwordChangeSupported']) {
 <form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('Profile Image')); ?></strong></legend>
-		<img src="<?php print_unescaped(\OC_Helper::linkToRoute('core_avatar_get').'/'.OC_User::getUser().'/128'); ?>"><br>
+		<div class="avatardiv"></div><br>
 		<em><?php p($l->t('Has to be square and either PNG or JPG')); ?></em><br>
 		<div class="warning hidden"></div>
 		<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 32ca6e0b106..2fe0b83cf33 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -97,7 +97,7 @@ $_['subadmingroups'] = array_flip($items);
 		<?php foreach($_["users"] as $user): ?>
 		<tr data-uid="<?php p($user["name"]) ?>"
 			data-displayName="<?php p($user["displayName"]) ?>">
-			<td class="avatar"><img src="<?php print_unescaped(\OC_Helper::linkToRoute('core_avatar_get')); ?>/<?php p($user['name']); ?>/32"></td>
+			<td class="avatar"><div class="avatardiv"></div></td>
 			<td class="name"><?php p($user["name"]); ?></td>
 			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
 				src="<?php p(image_path('core', 'actions/rename.svg'))?>"