From 1e00e19d1e06d6eed784c92850c387ce7cde1df3 Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 24 Feb 2011 00:54:03 +0000 Subject: cutting down the amount of css required for the avatar page git-svn-id: http://code.elgg.org/elgg/trunk@8453 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/core/avatar/crop.php | 2 +- views/default/core/avatar/upload.php | 24 +++++++++++++++++------- views/default/css/elements/misc.php | 11 +---------- views/default/forms/avatar/crop.php | 2 +- 4 files changed, 20 insertions(+), 19 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 @@ */ ?> -
+

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); + ?>

-
- - "; ?> + +
+ avatar
+HTML; +$body = << - 'multipart/form-data'); - echo elgg_view_form('avatar/upload', $form_params, $vars); -?> + $upload_form
+HTML; + +echo elgg_view_image_block($image, $upload_form); diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php index 705cb41a5..64962b890 100644 --- a/views/default/css/elements/misc.php +++ b/views/default/css/elements/misc.php @@ -23,24 +23,15 @@ /* *************************************** AVATAR UPLOADING & CROPPING *************************************** */ -#avatar-upload { - height:145px; -} + #current-user-avatar { - float:left; - width:160px; - height:130px; border-right:1px solid #cccccc; - margin:0 20px 0 0; } #avatar-croppingtool { border-top: 1px solid #cccccc; - margin:20px 0 0 0; - padding:10px 0 0 0; } #user-avatar { float: left; - margin-right: 20px; } #user-avatar-preview { float: left; diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php index 380a4bb6c..857a54e1f 100644 --- a/views/default/forms/avatar/crop.php +++ b/views/default/forms/avatar/crop.php @@ -9,7 +9,7 @@ $master_image = $vars['entity']->getIcon('master'); ?>
- <?php echo elgg_echo('avatar'); ?> + <?php echo elgg_echo('avatar'); ?>
-- cgit v1.2.3