diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-02 08:03:51 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-25 21:04:45 +0200 |
| commit | 252548c62cf099e5186ffc323e3cf9494fae3768 (patch) | |
| tree | 9336f2a84a7059e98385e13080485d43fe46f461 /settings/templates | |
| parent | a58d270684110334aab1b296b69e98def6cc6558 (diff) | |
| download | nextcloud-server-252548c62cf099e5186ffc323e3cf9494fae3768.tar.gz nextcloud-server-252548c62cf099e5186ffc323e3cf9494fae3768.zip | |
Improve styling & enable avatar-upload at personal page
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/admin.php | 21 | ||||
| -rw-r--r-- | settings/templates/personal.php | 2 |
2 files changed, 9 insertions, 14 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index e5b941f2b2f..f7d6a576d9e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -121,10 +121,9 @@ if (!$_['internetconnectionworking']) { <table class="nostyle"> <tr> <td> - <input type="radio" name="avatarmode" value="gravatar" - id="avatar_gravatar" <?php if ($_['avatar'] === "gravatar") { - print_unescaped('checked="checked"'); - } ?>> + <input type="radio" name="avatarmode" value="gravatar" id="avatar_gravatar" + <?php if ($_['avatar'] === "gravatar") { p('checked'); } ?> + <?php if (!$_['internetconnectionworking']) { p('disabled'); } ?>> <label for="avatar_gravatar">Gravatar</label><br> <em><?php print_unescaped($l->t('Use <a href="http://gravatar.com/">gravatar</a> for avatars')); ?></em><br> <em><?php p($l->t('This sends data to gravatar')); ?></em> @@ -135,22 +134,18 @@ if (!$_['internetconnectionworking']) { </tr> <tr> <td> - <input type="radio" name="avatarmode" value="local" - id="avatar_local" <?php if ($_['avatar'] === "local") { - print_unescaped('checked="checked"'); - } ?>> + <input type="radio" name="avatarmode" value="local" id="avatar_local" + <?php if ($_['avatar'] === "local") { p('checked'); } ?>> <label for="avatar_local"><?php p($l->t('Local avatars')); ?></label><br> <em><?php p($l->t('Use local avatars, which each user has to upload themselves')); ?></em> </td> </tr> <tr> <td> - <input type="radio" name="avatarmode" value="none" - id="avatar_none" <?php if ($_['avatar'] === "none") { - print_unescaped('checked="checked"'); - } ?>> + <input type="radio" name="avatarmode" value="none" id="avatar_none" + <?php if ($_['avatar'] === "none") { p('checked'); } ?>> <label for="avatar_none"><?php p($l->t('No avatars')); ?></label><br> - <em><?php print_unescaped($l->t('Do not provide avatars')); ?></em> + <em><?php p($l->t('Do not provide avatars')); ?></em> </td> </tr> </table> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 01415a6f9a1..e0e91cb7de4 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -87,7 +87,7 @@ if($_['passwordChangeSupported']) { <form id="avatar"> <fieldset class="personalblock"> <legend><strong><?php p($l->t('Avatar')); ?></strong></legend> - <img src="<?php print_unescaped(\OC_Avatar::get(\OC_User::getUser(), 128)); ?>"><br> + <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> <div class="inlineblock button" id="uploadavatar"><?php p($l->t('Upload a new avatar')); ?></div> <div class="inlineblock button" id="selectavatar"><?php p($l->t('Select a new avatar from your files')); ?></div> |