mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up oc_avatars

This commit is contained in:
kondou 2013-09-04 12:56:14 +02:00
parent 32a7ba9823
commit a1e7614d73
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/routes.php
View File

@ -60,8 +60,8 @@ $this->create('core_lostpassword_reset_password', '/lostpassword/reset/{token}/{
// Avatar routes // Avatar routes
$this->create('core_avatar_get_tmp', '/avatar/tmp') $this->create('core_avatar_get_tmp', '/avatar/tmp')
->get() ->get()
->action('OC_Core_Avatar_Controller', 'getTmpAvatar'); ->action('OC_Core_Avatar_Controller', 'getTmpAvatar');
$this->create('core_avatar_get', '/avatar/{user}/{size}') $this->create('core_avatar_get', '/avatar/{user}/{size}')
->get() ->get()
->action('OC_Core_Avatar_Controller', 'getAvatar'); ->action('OC_Core_Avatar_Controller', 'getAvatar');

1
core/templates/layout.user.php
View File

@ -45,7 +45,6 @@
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<ul id="settings" class="svg"> <ul id="settings" class="svg">
<span id="expand" tabindex="0" role="link"> <span id="expand" tabindex="0" role="link">
<span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>

14
settings/js/personal.js
View File

@ -44,10 +44,6 @@ function changeDisplayName(){
} }
} }
function selectAvatar (path) {
$.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler);
}
function updateAvatar () { function updateAvatar () {
$('#header .avatardiv').avatar(OC.currentUser, 32, true); $('#header .avatardiv').avatar(OC.currentUser, 32, true);
$('#displayavatar .avatardiv').avatar(OC.currentUser, 128, true); $('#displayavatar .avatardiv').avatar(OC.currentUser, 128, true);
@ -89,7 +85,6 @@ function sendCropData() {
w: cropperdata.w, w: cropperdata.w,
h: cropperdata.h h: cropperdata.h
}; };
$('#cropperbox').remove();
$.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler); $.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler);
} }
@ -207,7 +202,14 @@ $(document).ready(function(){
$('#uploadavatar').fileupload(uploadparms); $('#uploadavatar').fileupload(uploadparms);
$('#selectavatar').click(function(){ $('#selectavatar').click(function(){
OC.dialogs.filepicker(t('settings', "Select a profile picture"), selectAvatar, false, "image"); OC.dialogs.filepicker(
t('settings', "Select a profile picture"),
function(){
$.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler);
},
false,
"image"
);
}); });
$('#removeavatar').click(function(){ $('#removeavatar').click(function(){