profile box fixes

git-svn-id: https://code.elgg.org/elgg/trunk@1113 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 146 insertions, 131 deletions

diff --git a/mod/profile/views/default/profile/userdetails.php b/mod/profile/views/default/profile/userdetails.php
index 30de55189..aacc17c03 100644
--- a/mod/profile/views/default/profile/userdetails.php
+++ b/mod/profile/views/default/profile/userdetails.php
@@ -1,122 +1,134 @@
-<?php

-

-	/**

-	 * Elgg user display (details)

-	 * 

-	 * @package ElggProfile

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Ben Werdmuller <ben@curverider.co.uk>

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.com/

-	 * 

-	 * @uses $vars['entity'] The user entity

-	 */

-

-	if ($vars['full'] == true) {

-		$iconsize = "large";

-	} else {

-		$iconsize = "medium";

-	}

-	

-	// wrap all profile info

-	echo "<div id=\"profile_info\">";

-	

-	// 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(

-						"profile/icon", array(

-												'entity' => $vars['entity'],

-												'align' => "left",

-												'size' => $iconsize,

-											  )

-					);

-    

-    //display relevant links			

-    echo "<div style=\"clear:both\"></div>" . elgg_view("profile/profilelinks", array("entity" => $vars['entity']));

-    

-    // close the icon and links div

-    echo "</div>";

-

-?>

-

-	<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) {

-	

-	?>

-	<?php

-

-		if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0)

-			foreach($vars['config']->profile as $shortname => $valtype) {

-				if ($shortname != "description") {

-					$value = $vars['entity']->$shortname;

-					if (!empty($value)) {

-					

-	?>

-

-	<p>

-		<b><?php

-

-			echo elgg_echo("profile:{$shortname}");

-		

-		?>: </b>

-		<?php

-

-			echo elgg_view("output/{$valtype}",array('value' => $vars['entity']->$shortname));

-		

-		?>

-		

-	</p>

-

-	<?php

-					}

-				}

-			}

-			

-		}

-	

-	?>

-	</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

-	

-	if ($vars['entity']->canEdit()) {

-

-?>

-		<p class="profile_info_edit_buttons">

-			<a href="<?php echo $vars['url']; ?>mod/profile/edit.php"><?php echo elgg_echo("edit"); ?></a>

-		</p>

-<?php

-

-	}

-		

-			// TODO: Add admin console options here

-			if (isadminloggedin()){

-				if ($_SESSION['id']!=$vars['entity']->guid){

-?>				

-				<p>

-					<a href="<?php echo $vars['url']; ?>actions/admin/user/ban?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("ban"); ?></a>

-				</p>		

-				<p>

-					<a href="<?php echo $vars['url']; ?>actions/admin/user/delete?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("delete"); ?></a>

-				</p>	

-<?php 

-				}

-			}

-?>

-

-</div><!-- /#profile_info_wide -->

-

-</div><!-- /#profile_info -->

+<?php
+
+	/**
+	 * Elgg user display (details)
+	 * 
+	 * @package ElggProfile
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Ben Werdmuller <ben@curverider.co.uk>
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 * 
+	 * @uses $vars['entity'] The user entity
+	 */
+
+	if ($vars['full'] == true) {
+		$iconsize = "large";
+	} else {
+		$iconsize = "medium";
+	}
+	
+	// wrap all profile info
+	echo "<div id=\"profile_info\">";
+
+?>
+
+<table>
+<tr>
+<td>
+
+<?php	
+	
+	// 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(
+						"profile/icon", array(
+												'entity' => $vars['entity'],
+												//'align' => "left",
+												'size' => $iconsize,
+											  )
+					);
+
+    // display relevant links			
+    echo elgg_view("profile/profilelinks", array("entity" => $vars['entity']));
+    
+    // close the icon and links div
+    echo "</div>";
+
+?>
+<!-- /#profile_info_column_left -->
+</td>
+<td>
+	
+	<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) {
+	
+	?>
+	<?php
+
+		if (is_array($vars['config']->profile) && sizeof($vars['config']->profile) > 0)
+			foreach($vars['config']->profile as $shortname => $valtype) {
+				if ($shortname != "description") {
+					$value = $vars['entity']->$shortname;
+					if (!empty($value)) {
+					
+	?>
+
+	<p>
+		<b><?php
+
+			echo elgg_echo("profile:{$shortname}");
+		
+		?>: </b>
+		<?php
+
+			echo elgg_view("output/{$valtype}",array('value' => $vars['entity']->$shortname));
+		
+		?>
+		
+	</p>
+
+	<?php
+					}
+				}
+			}
+			
+		}
+	
+	?>
+	</div><!-- /#profile_info_column_right -->
+
+</td>
+</tr>
+</table>
+
+	<div id="profile_info_wide">
+	<p><b><?php echo elgg_echo("profile:aboutme"); ?></b><br /><?php echo nl2br($vars['entity']->description); ?></p>
+
+<?php
+	
+	if ($vars['entity']->canEdit()) {
+
+?>
+		<p class="profile_info_edit_buttons">
+			<a href="<?php echo $vars['url']; ?>mod/profile/edit.php"><?php echo elgg_echo("edit"); ?></a>
+		
+<?php
+
+	}
+		
+			// TODO: Add admin console options here
+			if (isadminloggedin()){
+				if ($_SESSION['id']!=$vars['entity']->guid){
+?>				
+				
+				&nbsp; <a href="<?php echo $vars['url']; ?>actions/admin/user/ban?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("ban"); ?></a>
+				
+				&nbsp; <a href="<?php echo $vars['url']; ?>actions/admin/user/delete?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("delete"); ?></a>
+					
+<?php 
+				}
+			}
+?>
+</p>
+</div><!-- /#profile_info_wide -->
+
+</div><!-- /#profile_info -->
diff --git a/views/default/css.php b/views/default/css.php
index cc9d9ece4..341d344d8 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -721,34 +721,37 @@ input[type="submit"] {
 	margin:0 0 20px 0;
 	border-bottom:1px solid #cccccc;
 }
+#profile_menu_wrapper {
+	margin:10px 0 10px 0;
+}
 #profile_menu_wrapper p {
 	border-bottom:1px solid #cccccc;
-	padding:0 0 0 3px;
 }
 #profile_menu_wrapper p:first-child {
 	border-top:1px solid #cccccc;
 }
-#profile_menu_wrapper p:hover {
-	background:#4690d6;
+#profile_menu_wrapper a {
+	display:block;
+	padding:0 0 0 3px;
 }
 #profile_menu_wrapper a:hover {
 	color:#ffffff;
+	background:#4690d6;
 	text-decoration:none;
 }
-p.user_menu_friends, p.user_menu_profile, p.user_menu_removefriend, p.user_menu_friends_of {
+p.user_menu_friends, p.user_menu_profile, 
+p.user_menu_removefriend, 
+p.user_menu_friends_of {
 	margin:0;
 }
 #profile_info_column_left {
 	float:left;
 	width:200px;
-	margin: 0 20px 0 0;
+	padding: 0 20px 0 0;
 }
 #profile_info_column_right {
 	float:left;
-	width:305px;
-}
-#profile_info_column_left img {
-	padding:0 0 20px 0;
+	width:296px;
 }
 #profile_info_column_right p {
 	margin:7px 0 7px 0;