aboutsummaryrefslogtreecommitdiff
path: root/views/default/core
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/core')
-rw-r--r--views/default/core/avatar/crop.php2
-rw-r--r--views/default/core/avatar/upload.php24
2 files changed, 18 insertions, 8 deletions
diff --git a/views/default/core/avatar/crop.php b/views/default/core/avatar/crop.php
index 499e2af4e..1c59842c8 100644
--- a/views/default/core/avatar/crop.php
+++ b/views/default/core/avatar/crop.php
@@ -6,7 +6,7 @@
*/
?>
-<div id="avatar-croppingtool">
+<div id="avatar-croppingtool" class="mtl ptm">
<label><?php echo elgg_echo('avatar:crop:title'); ?></label>
<br />
<p>
diff --git a/views/default/core/avatar/upload.php b/views/default/core/avatar/upload.php
index 8d920a900..6887eab5c 100644
--- a/views/default/core/avatar/upload.php
+++ b/views/default/core/avatar/upload.php
@@ -7,20 +7,30 @@
$user_avatar = $vars['entity']->getIcon('medium');
+$current_label = elgg_echo('avatar:current');
+
+$form_params = array('enctype' => 'multipart/form-data');
+$upload_form = elgg_view_form('avatar/upload', $form_params, $vars);
+
?>
<p class="mtm">
<?php echo elgg_echo('avatar:upload:instructions'); ?>
</p>
-<div id="current-user-avatar">
- <label><?php echo elgg_echo('avatar:current'); ?></label>
- <?php echo "<img src=\"{$user_avatar}\" alt=\"avatar\" />"; ?>
+<?php
+
+$image = <<<HTML
+<div id="current-user-avatar" class="mrl prl">
+ <label>$current_label</label><br />
+ <img src="$user_avatar" alt="avatar" />
</div>
+HTML;
+$body = <<<HTML
<div id="avatar-upload">
-<?php
- $form_params = array('enctype' => 'multipart/form-data');
- echo elgg_view_form('avatar/upload', $form_params, $vars);
-?>
+ $upload_form
</div>
+HTML;
+
+echo elgg_view_image_block($image, $upload_form);