13 files changed, 22 insertions, 234 deletions
diff --git a/mod/profile/views/default/profile/box.php b/mod/profile/views/default/profile/box.php
new file mode 100644
index 000000000..9d97ddc35
--- /dev/null
+++ b/mod/profile/views/default/profile/box.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Profile info box
+ */
+
+?>
+<div class="profile">
+<?php
+	echo elgg_view('profile/sidebar');
+	echo elgg_view('profile/details', array('entity' => elgg_get_page_owner()));
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/profile/views/default/profile/commentwall/commentwall.php b/mod/profile/views/default/profile/commentwall/commentwall.php
deleted file mode 100644
index 56670dcf0..000000000
--- a/mod/profile/views/default/profile/commentwall/commentwall.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Elgg Commentwall display page
- */
-//start the div which will wrap all the message board contents
-echo "<div id='comment_wall_display'>";	 
-
-// If there is any content to view, view it
-if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {		
-	//loop through all annotations and display
-	foreach($vars['annotation'] as $content) {
-		echo elgg_view("profile/commentwall/commentwall_content", array('annotation' => $content));
-	}			
-} else {
-	echo "<p class='margin-top'>" . elgg_echo("profile:commentwall:none") . "</p>";
-}
-//close the wrapper div
-echo "</div>";
-\ No newline at end of file
diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php
deleted file mode 100644
index a0785b565..000000000
--- a/mod/profile/views/default/profile/commentwall/commentwall_content.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
-* Elgg Message board individual item display page
- */
-?>
-<div class="entity-listing clearfix">
-    <!-- display the user icon of the user that posted the message -->
-    <div class="entity-listing-icon">	        
-        <?php
-            echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));
-        ?>
-    </div>
-    
-    <div class="entity-listing-info">
-	<?php
-        // if the user looking at the comment can edit, show the delete link
-	    if ($vars['annotation']->canEdit()) {
-			       echo "<div class='entity-metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array(
-							'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,
-								'text' => elgg_echo('delete'),
-								'confirm' => elgg_echo('deleteconfirm'),
-							)) . "</span></div>";
-	    } //end of can edit if statement
-	?>
-	    <!-- display the user's name who posted and the date/time -->
-	    <p class="entity-subtext">
-	        <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>
-	    </p>	
-		<!-- output the actual comment -->
-		<?php echo elgg_view("output/longtext",array("value" => parse_urls($vars['annotation']->value))); ?>  
-	</div>
-</div>
diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php
deleted file mode 100644
index dcb520ea1..000000000
--- a/mod/profile/views/default/profile/commentwall/commentwalladd.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Elgg profile comment wall add
- */ 
-?>
-<div id="comment_wall_add">
-<form action="<?php echo elgg_get_site_url(); ?>action/profile/addcomment" method="post" name="messageboardForm">
-    <!-- textarea for the contents -->
-    <textarea name="message_content" value="" class="commentwall"></textarea><br />
-    <!-- the person posting an item on the message board -->
-    <input type="hidden" name="guid" value="<?php echo get_loggedin_userid(); ?>"  />
-    <!-- the page owner, this will be the profile owner -->
-    <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>"  />
-    <?php echo elgg_view('input/securitytoken'); ?>
-    <!-- submit messages input -->
-    <input type="submit" id="postit" value="<?php echo elgg_echo('profile:commentwall:add'); ?>">
-</form>
-</div>
diff --git a/mod/profile/views/default/profile/content_wrapper.php b/mod/profile/views/default/profile/content_wrapper.php
deleted file mode 100644
index 4fb43e7c9..000000000
--- a/mod/profile/views/default/profile/content_wrapper.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Wrapper for profile content
- *
- * @uses string $vars['content'] - Profile body
- */
-
-$content = elgg_get_array_value('content', $vars, '');
-
-?>
-<div id="profile_content">
-	<?php echo $content; ?>
-</div>
-\ No newline at end of file
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 812daf16d..4522f7f6e 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -8,6 +8,16 @@
 /* ***************************************
 	main layout blocks
 *************************************** */
+.profile {
+	float: left;
+	width: 625px;
+	margin: 0 5px 15px;
+	padding: 5px;
+	border: 2px solid #dedede;
+}
+#widget-col-1 {
+	min-height: 300px;
+}
 #profile_content {
 	float:right;
 	width:700px;
diff --git a/mod/profile/views/default/profile/tabs/details.php b/mod/profile/views/default/profile/details.php
index 27b0f943b..27b0f943b 100755..100644
--- a/mod/profile/views/default/profile/tabs/details.php
+++ b/mod/profile/views/default/profile/details.php
diff --git a/mod/profile/views/default/profile/tab_navigation.php b/mod/profile/views/default/profile/tab_navigation.php
deleted file mode 100755
index ca0873ebd..000000000
--- a/mod/profile/views/default/profile/tab_navigation.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-$section = 'activity';
-if (isset($vars['section'])) {
-	$section = $vars['section'];
-}
-
-$user = $vars['entity'];
-if (!$user) {
-	// no user so no profile
-	echo elgg_echo('viewfailure', array(__FILE__));
-	return TRUE;
-}
-
-
-$activity = '';
-$friends = '';
-$extend = '';
-$twitter = '';
-
-$url = "{$user->getURL()}/";
-
-//select section
-switch($section){
-	case 'friends':
-		$friends = 'class="selected"';
-		break;
-
-	case 'details':
-		$details = 'class="selected"';
-		break;
-	case 'groups':
-		$groups = 'class="selected"';
-		break;
-	case 'twitter':
-		$twitter = 'class="selected"';
-		break;
-
-	case 'commentwall':
-		$commentwall = 'class="selected"';
-		break;
-	case 'activity':
-	default:
-		$activity = 'class="selected"';
-		break;
-}
-?>
-<div class="elgg-horizontal-tabbed-nav profile">
-<div class="profile_name"><h2><?php echo $user->name; ?></h2></div>
-<ul>
-	<li <?php echo $activity; ?>><a href="<?php echo $url; ?>"><?php echo elgg_echo('activity'); ?></a></li>
-	<li <?php echo $details; ?>><a href="<?php echo $url . 'details'; ?>"><?php echo elgg_echo('Details'); ?></a></li>
-	<li <?php echo $friends; ?>><a href="<?php echo $url . 'friends'; ?>"><?php echo elgg_echo('friends'); ?></a></li>
-	<li <?php echo $groups; ?>><a href="<?php echo $url . 'groups'; ?>"><?php echo elgg_echo('groups'); ?></a></li>
-	<li <?php echo $commentwall; ?>><a href="<?php echo $url . 'commentwall'; ?>"><?php echo elgg_echo('profile:commentwall'); ?></a></li>
-	<?php
-		//check to see if the twitter username is set
-		if($vars['entity']->twitter){
-	?>
-			<li <?php echo $twitter; ?>><a href="<?php echo $url . 'twitter'; ?>">Twitter</a></li>
-	<?php
-		}
-
-		//insert a view which others can extend
-		echo elgg_view('profile_navigation/extend', array('entity' => $user));
-	?>
-</ul>
-</div>
-\ No newline at end of file
diff --git a/mod/profile/views/default/profile/tabs/activity.php b/mod/profile/views/default/profile/tabs/activity.php
deleted file mode 100755
index ccd2a3915..000000000
--- a/mod/profile/views/default/profile/tabs/activity.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Elgg user display (details)
- * @uses $vars['entity'] The user entity
- *
- * @todo this needs to recieve a list of activity or HTML in $vars that's generated by a plugin hook.
- * None of this logic should be here.
- */
-$limit = 20;
-
-if (is_plugin_enabled('thewire')) {
-	// users last status msg, if they posted one
-	echo elgg_view("profile/status", array("entity" => $vars['entity']));
-}
-
-if (is_plugin_enabled('conversations')) {
-	// users last status msg, if they posted one
-	echo elgg_view("profile/status", array("entity" => $vars['entity']));
-}
-
-if (is_plugin_enabled('riverdashboard')) {
-	//select the correct river
-	if (get_plugin_setting('activitytype', 'riverdashboard') == 'classic') {
-		echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,true);
-	} else {
-		echo elgg_view_river_items($vars['entity']->getGuid(), 0, '', '', '', '', $limit,0,0,false,false);
-		echo elgg_view('riverdashboard/js');
-	}
-} else {
-	// @todo this should not be here.
-	echo "Riverdashboard not loaded";
-}
-\ No newline at end of file
diff --git a/mod/profile/views/default/profile/tabs/commentwall.php b/mod/profile/views/default/profile/tabs/commentwall.php
deleted file mode 100644
index bf54bd7e7..000000000
--- a/mod/profile/views/default/profile/tabs/commentwall.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg profile comment wall
- */
-
-$user = elgg_get_page_owner();
-$comments = $user->getAnnotations('commentwall', 200, 0, 'desc');
-
-if (isloggedin()) {
-	echo elgg_view("profile/commentwall/commentwalladd");
-}
-
-echo elgg_view("profile/commentwall/commentwall", array('annotation' => $comments));
diff --git a/mod/profile/views/default/profile/tabs/friends.php b/mod/profile/views/default/profile/tabs/friends.php
deleted file mode 100755
index 9195629e5..000000000
--- a/mod/profile/views/default/profile/tabs/friends.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Profile friends
- **/
-
-$friends = list_entities_from_relationship('friend', $vars['entity']->getGUID(), FALSE, 'user', '', 0, 10, FALSE);
-
-if(!$friends) {
-	$friends = '<p>' . elgg_echo('profile:no_friends') . '</p>';
-}
-
-echo $friends;
-\ No newline at end of file
diff --git a/mod/profile/views/default/profile/tabs/groups.php b/mod/profile/views/default/profile/tabs/groups.php
deleted file mode 100644
index 323bb61f1..000000000
--- a/mod/profile/views/default/profile/tabs/groups.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Profile groups
- **/
-$groups = list_entities_from_relationship('member',$vars['entity']->getGUID(),false,'group','',0, $limit,false, false);
-
-if(!$groups) {
-	$groups = '<p>' . elgg_echo('profile:no_groups') . '</p>';
-}
-
-echo $groups;
-\ No newline at end of file
diff --git a/mod/profile/views/default/profile/tabs/twitter.php b/mod/profile/views/default/profile/tabs/twitter.php
deleted file mode 100755
index 06a0551d4..000000000
--- a/mod/profile/views/default/profile/tabs/twitter.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Elgg twitter view page
- */
-
-$twitter_username = $vars['entity']->twitter;
-
-// if the twitter username is empty, then do not show
-if($twitter_username){
-?>
-<ul id="twitter_update_list"></ul>
-<p class="visit_twitter"><a href="http://twitter.com/<?php echo $twitter_username; ?>" target="_blank"><?php echo elgg_echo("twitter:visit"); ?></a></p>
-<script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
-<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo $twitter_username; ?>.json?callback=twitterCallback2&count=10"></script>
-
-<?php
-}
-\ No newline at end of file