]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 01afda7)
cutting down the amount of css required for the avatar page
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 24 Feb 2011 00:54:03 +0000 (00:54 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 24 Feb 2011 00:54:03 +0000 (00:54 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8453 36083f99-b078-4883-b0ff-0f9b5a30f544

views/default/core/avatar/crop.php patch | blob | history
views/default/core/avatar/upload.php patch | blob | history
views/default/css/elements/misc.php patch | blob | history
views/default/forms/avatar/crop.php patch | blob | history

diff --git a/views/default/core/avatar/crop.php b/views/default/core/avatar/crop.php
index 499e2af4e7aa17829a5aa1ffb856e1edb4aa5854..1c59842c84b893b5d2f153336aa350872055ca4d 100644 (file)
--- 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 8d920a900f6fe96377baf7ce886f2e239eb4c78c..6887eab5c4ef4105c8e14ad277b7af6c781e0448 100644 (file)
--- 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 705cb41a50c4f4d04c05ad6c480d3b168d4fcbb4..64962b890534526a399d2690bca7a6c6be7adf80 100644 (file)
--- 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 380a4bb6c441dd7ec3336113f14ab9887095521c..857a54e1f36c816aef97792fd23041bd24bb6fa7 100644 (file)
--- 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>
Social Networking Engine