From 131d0edab617cf0593324e1d8470fc0cd232c6cf Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Fri, 9 Aug 2013 17:44:43 +0200
Subject: [PATCH] Show avatar on personal.php always (except if avatars are
 disabled)

---
 settings/templates/personal.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index f487c847baa..348716ca02d 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -83,15 +83,21 @@ if($_['passwordChangeSupported']) {
 }
 ?>
 
-<?php if ($_['avatar'] === "local"): ?>
+<?php if ($_['avatar'] !== "none"): ?>
 <form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('settings_ajax_newavatar')); ?>">
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('Avatar')); ?></strong></legend>
 		<img src="<?php print_unescaped(link_to('', 'avatar.php').'?user='.OC_User::getUser().'&size=128'); ?>"><br>
-		<em><?php p($l->t('Your avatar has to be a square and either a PNG or JPG image')); ?></em><br>
-		<input type="file" class="inlineblock button" name="files[]" id="uploadavatar" value="<?php p($l->t('Upload a new avatar')); ?>">
-		<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select a new avatar from your files')); ?></div>
-		<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove my avatar')); ?></div>
+		<?php if ($_['avatar'] === "local"): ?>
+			<em><?php p($l->t('Your avatar has to be a square and either a PNG or JPG image')); ?></em><br>
+			<input type="file" class="inlineblock button" name="files[]" id="uploadavatar" value="<?php p($l->t('Upload a new avatar')); ?>">
+			<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select a new avatar from your files')); ?></div>
+			<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove my avatar')); ?></div>
+		<?php elseif ($_['avatar'] === "gravatar"): ?>
+			<em><?php p($l->t('Your avatar is provided by gravatar, which is based on your Email.')); ?></em>
+		<?php else: ?>
+			<em><?php p($l->t('Your avatar is provided by a custom service, ask your administrator, on how to change your avatar.')); ?></em>
+		<?php endif; ?>
 	</fieldset>
 </form>
 <?php endif; ?>