From 118e59fa7a8980356cd326bef558afb7902af1be Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 24 Jun 2008 11:12:19 +0000
Subject: updated profile box

git-svn-id: https://code.elgg.org/elgg/trunk@1093 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/views/default/profile/css.php         |  6 ++++-
 mod/profile/views/default/profile/userdetails.php | 31 +++++++++++++++--------
 mod/profile/views/default/user/user.php           |  2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'mod/profile/views')

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 3b4bd031d..655e072ad 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -2,6 +2,8 @@
 
 ?>
 
+/* 
+
 #user_menu {
 	position:absolute;
 	border:1px solid #333333;
@@ -34,4 +36,6 @@
 	background-color: #336699;
 	color: #fff;
 	text-decoration: none;
-}
\ No newline at end of file
+}
+
+*/
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/userdetails.php b/mod/profile/views/default/profile/userdetails.php
index bee3598b2..30de55189 100644
--- a/mod/profile/views/default/profile/userdetails.php
+++ b/mod/profile/views/default/profile/userdetails.php
@@ -18,11 +18,11 @@
 		$iconsize = "medium";
 	}
 	
-	//wrap the icon and links in a div
-	echo "<div style=\"float:left;width:200px;\">";
+	// wrap all profile info
+	echo "<div id=\"profile_info\">";
 	
-	// display the users name
-	// echo "<h2><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></h2>";
+	// wrap the icon and links in a div
+	echo "<div id=\"profile_info_column_left\">";
 	
 	// get the user's main profile picture
 	echo elgg_view(
@@ -34,16 +34,19 @@
 					);
     
     //display relevant links			
-    echo "<div style=\"clear:both\">" . elgg_view("profile/profilelinks", array("entity" => $vars['entity'])) . "</div>";
+    echo "<div style=\"clear:both\"></div>" . elgg_view("profile/profilelinks", array("entity" => $vars['entity']));
     
-    //close the icon and links div
+    // close the icon and links div
     echo "</div>";
 
 ?>
 
-	<div style="margin:0 0 0 210px; width:300px;" >
+	<div id="profile_info_column_right" >
 
 	<?php 
+	
+	// display the users name
+	echo "<h2><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></h2> <br />";
 
 		if ($vars['full'] == true) {
 	
@@ -80,7 +83,11 @@
 		}
 	
 	?>
-	</div>
+	</div><!-- /#profile_info_column_right -->
+	
+	<div style="clearfloat"></div>
+	
+	<div id="profile_info_wide">
 	<p><b><?php echo elgg_echo("profile:aboutme"); ?></b><br /><?php echo nl2br($vars['entity']->description); ?></p>
 
 <?php
@@ -88,7 +95,7 @@
 	if ($vars['entity']->canEdit()) {
 
 ?>
-		<p>
+		<p class="profile_info_edit_buttons">
 			<a href="<?php echo $vars['url']; ?>mod/profile/edit.php"><?php echo elgg_echo("edit"); ?></a>
 		</p>
 <?php
@@ -108,4 +115,8 @@
 <?php 
 				}
 			}
-?>
\ No newline at end of file
+?>
+
+</div><!-- /#profile_info_wide -->
+
+</div><!-- /#profile_info -->
diff --git a/mod/profile/views/default/user/user.php b/mod/profile/views/default/user/user.php
index 4a8b9ee0b..0b808769a 100644
--- a/mod/profile/views/default/user/user.php
+++ b/mod/profile/views/default/user/user.php
@@ -12,6 +12,6 @@
 	 * @uses $vars['entity'] The user entity
 	 */
 
-		echo elgg_view_layout("one_column",elgg_view("profile/userdetails",$vars));
+		echo elgg_view("profile/userdetails",$vars);
 	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3