diff options
| author | blizzz <blizzz@owncloud.com> | 2013-11-26 12:05:32 -0800 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2013-11-26 12:05:32 -0800 |
| commit | 4f15282bc998bb68896b5df67f4f749dd435897d (patch) | |
| tree | d30a978ee443343541cfc9f825bba229da107296 /settings | |
| parent | 1fef97f6a535cd79d0aea600634ec54c5f87bcea (diff) | |
| parent | 69518b901326617a2a80986df0e250038684563b (diff) | |
| download | nextcloud-server-4f15282bc998bb68896b5df67f4f749dd435897d.tar.gz nextcloud-server-4f15282bc998bb68896b5df67f4f749dd435897d.zip | |
Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/personal.php | 1 | ||||
| -rw-r--r-- | settings/templates/personal.php | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/settings/personal.php b/settings/personal.php index 670e18e20ef..44e1048941b 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -90,6 +90,7 @@ $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC $tmpl->assign('displayName', OC_User::getDisplayName()); $tmpl->assign('enableDecryptAll' , $enableDecryptAll); $tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); +$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser())); $forms=OC_App::getForms('personal'); $tmpl->assign('forms', array()); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index a79eeefa796..3eb864655bb 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -87,11 +87,15 @@ if($_['passwordChangeSupported']) { <div id="displayavatar"> <div class="avatardiv"></div><br> <div class="warning hidden"></div> + <?php if ($_['avatarChangeSupported']): ?> <div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div> <input type="file" class="hidden" name="files[]" id="uploadavatar"> <div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div> <div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br> <?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?> + <?php else: ?> + <?php p($l->t('Your avatar is provided by your original account.')); ?> + <?php endif; ?> </div> <div id="cropper" class="hidden"> <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Abort')); ?></div> |