diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-24 00:54:03 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-24 00:54:03 +0000 |
| commit | 1e00e19d1e06d6eed784c92850c387ce7cde1df3 (patch) | |
| tree | 5faeabda7bdca4b85408d604530c29209115410e | |
| parent | 01afda7ed87e7def6a411d871daf49522e977b26 (diff) | |
| download | elgg-1e00e19d1e06d6eed784c92850c387ce7cde1df3.tar.gz elgg-1e00e19d1e06d6eed784c92850c387ce7cde1df3.tar.bz2 | |
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
| -rw-r--r-- | views/default/core/avatar/crop.php | 2 | ||||
| -rw-r--r-- | views/default/core/avatar/upload.php | 24 | ||||
| -rw-r--r-- | views/default/css/elements/misc.php | 11 | ||||
| -rw-r--r-- | 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 @@ */ ?> -<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); 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'); ?> <div> - <img id="user-avatar" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" /> + <img id="user-avatar" class="mrl" src="<?php echo $master_image; ?>" alt="<?php echo elgg_echo('avatar'); ?>" /> </div> <div class="clearfloat"></div> |