Fixes #2481 - moving tabbed_profile plugin into the plugins repo from core - it needs some updates to reflect changes to the core profile plugin

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

41 files changed, 0 insertions, 1486 deletions

diff --git a/mod/tabbed_profile/actions/addcomment.php b/mod/tabbed_profile/actions/addcomment.php
deleted file mode 100644
index 07f72ef8e..000000000
--- a/mod/tabbed_profile/actions/addcomment.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Elgg profile commentwall: add message action
- */
-
-// Make sure we're logged in; forward to the front page if not
-if (!isloggedin()) forward();
-
-// Get input
-$message_content = get_input('message_content'); // the actual message
-$page_owner = get_input("pageOwner"); // the message board owner
-$message_owner = get_input("guid"); // the user posting the message
-$user = get_entity($page_owner); // the commentwall owner details
-
-// Let's see if we can get a user entity from the specified page_owner
-if ($user && !empty($message_content)) {
-
-	// If posting the comment was successful, say so
-	if ($user->annotate('commentwall',$message_content,$user->access_id, get_loggedin_userid())) {
-
-			global $CONFIG;
-
-			if ($user->getGUID() != get_loggedin_userid())
-			notify_user($user->getGUID(), get_loggedin_userid(), elgg_echo('profile:comment:subject'),
-			elgg_echo('profile:comment:body', array(
-							get_loggedin_user()->name,
-							$message_content,
-							elgg_get_site_url() . "pg/profile/" . $user->username,
-							get_loggedin_user()->name,
-							get_loggedin_user()->getURL()
-						))
-			);
-
-			system_message(elgg_echo("profile:commentwall:posted"));
-			// add to river
-			add_to_river('river/object/profile/commentwall/create','commentwall',get_loggedin_userid(),$user->guid);
-
-	} else {
-		register_error(elgg_echo("profile:commentwall:failure"));
-	}
-
-} else {
-	register_error(elgg_echo("profile:commentwall:blank"));
-}
-
-// Forward back to the messageboard
-forward(REFERER);
\ No newline at end of file
diff --git a/mod/tabbed_profile/actions/deletecomment.php b/mod/tabbed_profile/actions/deletecomment.php
deleted file mode 100644
index 233d53069..000000000
--- a/mod/tabbed_profile/actions/deletecomment.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Elgg profile commentwall: delete message action
- */
-
-// Ensure we're logged in
-if (!isloggedin()) forward();
-		
-// Make sure we can get the comment in question
-$annotation_id = (int) get_input('annotation_id');
-		
-//make sure that there is a message on the commentwall matching the passed id
-if ($message = get_annotation($annotation_id)) {
-	//grab the user or group entity
-	$entity = get_entity($message->entity_guid);
-   //check to make sure the current user can actually edit the commentwall
-	if ($message->canEdit()) {
-   			//delete the comment
-			$message->delete();
-			//display message
-			system_message(elgg_echo("profile:commentwall:deleted"));
-			forward(REFERER);
-	}
-		
-} else {
-	system_message(elgg_echo("profile:commentwall:notdeleted"));
-}
-		
-forward(REFERER);
\ No newline at end of file
diff --git a/mod/tabbed_profile/graphics/defaultlarge.gif b/mod/tabbed_profile/graphics/defaultlarge.gif
deleted file mode 100644
index 6ea3bd4cd..000000000
--- a/mod/tabbed_profile/graphics/defaultlarge.gif
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/defaultmaster.gif b/mod/tabbed_profile/graphics/defaultmaster.gif
deleted file mode 100644
index 5bfd67a2d..000000000
--- a/mod/tabbed_profile/graphics/defaultmaster.gif
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/defaultmedium.gif b/mod/tabbed_profile/graphics/defaultmedium.gif
deleted file mode 100644
index c6b2e6a6d..000000000
--- a/mod/tabbed_profile/graphics/defaultmedium.gif
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/defaultsmall.gif b/mod/tabbed_profile/graphics/defaultsmall.gif
deleted file mode 100644
index 661d72f04..000000000
--- a/mod/tabbed_profile/graphics/defaultsmall.gif
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/defaulttiny.gif b/mod/tabbed_profile/graphics/defaulttiny.gif
deleted file mode 100644
index 1775346bc..000000000
--- a/mod/tabbed_profile/graphics/defaulttiny.gif
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/defaulttopbar.gif b/mod/tabbed_profile/graphics/defaulttopbar.gif
deleted file mode 100644
index c3616aeb5..000000000
--- a/mod/tabbed_profile/graphics/defaulttopbar.gif
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/drag_handle.png b/mod/tabbed_profile/graphics/drag_handle.png
deleted file mode 100644
index 2e9bc42be..000000000
--- a/mod/tabbed_profile/graphics/drag_handle.png
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/speech_bubble_tail.gif b/mod/tabbed_profile/graphics/speech_bubble_tail.gif
deleted file mode 100644
index 31d1bc90d..000000000
--- a/mod/tabbed_profile/graphics/speech_bubble_tail.gif
+++ /dev/null
diff --git a/mod/tabbed_profile/graphics/twitter16px.png b/mod/tabbed_profile/graphics/twitter16px.png
deleted file mode 100644
index de51c6953..000000000
--- a/mod/tabbed_profile/graphics/twitter16px.png
+++ /dev/null
diff --git a/mod/tabbed_profile/icon.php b/mod/tabbed_profile/icon.php
deleted file mode 100644
index 48ccc16c2..000000000
--- a/mod/tabbed_profile/icon.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
-* Elgg profile icon
-*
-* @package ElggProfile
-*/
-
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-// Get the owning user
-$user = elgg_get_page_owner();
-
-// Get the size
-$size = strtolower(get_input('size'));
-if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
-	$size = "medium";
-
-// If user doesn't exist, return default icon
-if (!$user) {
-	$path = elgg_view("icon/user/default/$size");
-	header("Location: $path");
-	exit;
-}
-
-// Try and get the icon
-$filehandler = new ElggFile();
-$filehandler->owner_guid = $user->getGUID();
-$filehandler->setFilename("profile/" .  $user->getGUID() . $size . ".jpg");
-
-$success = false;
-if ($filehandler->open("read")) {
-	if ($contents = $filehandler->read($filehandler->size())) {
-		$success = true;
-	}
-}
-
-if (!$success) {
-	global $CONFIG;
-	$path = elgg_view('icon/user/default/'.$size);
-	header("Location: {$path}");
-	exit;
-}
-
-header("Content-type: image/jpeg");
-header('Expires: ' . date('r',time() + 864000));
-header("Pragma: public");
-header("Cache-Control: public");
-header("Content-Length: " . strlen($contents));
-
-$splitString = str_split($contents, 1024);
-
-foreach($splitString as $chunk) {
-	echo $chunk;
-}
\ No newline at end of file
diff --git a/mod/tabbed_profile/icondirect.php b/mod/tabbed_profile/icondirect.php
deleted file mode 100644
index fe4726d1a..000000000
--- a/mod/tabbed_profile/icondirect.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Elgg profile icon cache/bypass
- * 
- * @package ElggProfile
- */
-
-
-// Get DB settings
-require_once(dirname(dirname(dirname(__FILE__))). '/engine/settings.php');
-
-global $CONFIG;
-
-$joindate = (int)$_GET['joindate'];
-$guid = (int)$_GET['guid'];
-
-$size = strtolower($_GET['size']);
-if (!in_array($size,array('large','medium','small','tiny','master','topbar'))) {
-	$size = "medium";
-}
-
-$mysql_dblink = @mysql_connect($CONFIG->dbhost,$CONFIG->dbuser,$CONFIG->dbpass, true);
-if ($mysql_dblink) {
-	if (@mysql_select_db($CONFIG->dbname,$mysql_dblink)) {
-
-		// get dataroot and simplecache_enabled in one select for efficiency
-		if ($result = mysql_query("select name, value from {$CONFIG->dbprefix}datalists where name in ('dataroot','simplecache_enabled')",$mysql_dblink)) {
-			$simplecache_enabled = true;
-			$row = mysql_fetch_object($result);
-			while ($row) {
-				if ($row->name == 'dataroot') {
-					$dataroot = $row->value;
-				} else if ($row->name == 'simplecache_enabled') {
-					$simplecache_enabled = $row->value;
-				}
-				$row = mysql_fetch_object($result);
-			}
-		}
-
-		@mysql_close($mysql_dblink);
-
-		// if the simplecache is enabled, we get icon directly
-		if ($simplecache_enabled) {
-
-			// first try to read icon directly
-			$user_path = date('Y/m/d/', $joindate) . $guid;
-			$filename = "$dataroot$user_path/profile/{$guid}{$size}.jpg";
-			$contents = @file_get_contents($filename);
-			if (!empty($contents)) {
-				header("Content-type: image/jpeg");
-				header('Expires: ' . date('r',time() + 864000));
-				header("Pragma: public");
-				header("Cache-Control: public");
-				header("Content-Length: " . strlen($contents));
-				$splitString = str_split($contents, 1024);
-				foreach($splitString as $chunk) {
-					echo $chunk;
-				}
-				exit;
-			}
-		}
-	}
-
-}
-
-// simplecache is not turned on or something went wrong so load engine and try that way
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-$user = get_entity($guid);
-set_input('username', $user->username);
-require_once(dirname(__FILE__).'/icon.php');
diff --git a/mod/tabbed_profile/languages/en.php b/mod/tabbed_profile/languages/en.php
deleted file mode 100644
index 6017a590c..000000000
--- a/mod/tabbed_profile/languages/en.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Elgg profile plugin language pack
- */
-
-$english = array(
-
-/**
- * Profile
- */
-
-	'profile' => "Profile",
-	'profile:edit:default' => 'Profile fields',
-	'profile:preview' => 'Preview',
-
-/**
- * Profile menu items and titles
- */
-
-	'profile:yours' => "My profile",
-	'profile:user' => "%s's profile",
-
-	'profile:edit' => "Edit profile",
-	'profile:profilepictureinstructions' => "Your avatar is the image that's displayed on your profile page. <br /> You can change it as often as you'd like. (File formats accepted: GIF, JPG or PNG)",
-	'profile:icon' => "Avatar",
-	'profile:createicon' => "Create your avatar",
-	'profile:currentavatar' => "Current avatar",
-	'profile:createicon:header' => "Profile picture",
-	'profile:profilepicturecroppingtool' => "Avatar cropping tool",
-	'profile:createicon:instructions' => "Click and drag a square below to match how you want your avatar cropped.  A preview will appear in the box on the right.  When you are happy with the preview, click 'Create your avatar'. This cropped version will be used throughout the site as your avatar. ",
-
-	'profile:editdetails' => "Edit profile",
-	'profile:editicon' => "Edit avatar",
-
-	'profile:aboutme' => "About me",
-	'profile:description' => "About me",
-	'profile:briefdescription' => "Brief description",
-	'profile:location' => "Location",
-	'profile:skills' => "Skills",
-	'profile:interests' => "Interests",
-	'profile:contactemail' => "Contact email",
-	'profile:phone' => "Telephone",
-	'profile:mobile' => "Mobile phone",
-	'profile:website' => "Website",
-
-	'profile:banned' => 'This user account has been suspended.',
-	'profile:deleteduser' => 'Deleted user',
-
-	'profile:river:update' => "%s updated their profile",
-	'profile:river:iconupdate' => "%s updated their profile icon",
-
-	'profile:label' => "Profile label",
-	'profile:type' => "Profile type",
-	'profile:twitter' => "Twitter username",
-	'twitter:visit' => "Visit this Twitter account",
-	'profile:editdefault:fail' => 'Default profile could not be saved',
-	'profile:editdefault:success' => 'Item successfully added to default profile',
-
-
-	'profile:editdefault:delete:fail' => 'Removed default profile item field failed',
-	'profile:editdefault:delete:success' => 'Default profile item deleted!',
-
-	'profile:defaultprofile:reset' => 'Default system profile reset',
-
-	'profile:resetdefault' => 'Reset default profile',
-	'profile:explainchangefields' => 'You can replace the existing profile fields with your own using the form below. <br /><br />Give the new profile field a label, for example, \'Favorite team\', then select the field type (eg. text, url, tags), and click the \'Add\' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label\'s text to make it editable. <br />At any time you can revert back to the default profile set up, but you will loose any information already entered into custom fields on profile pages.',
-
-
-/**
- * Profile status messages
- */
-
-	'profile:saved' => "Your profile was successfully saved.",
-	'profile:icon:uploaded' => "Your profile picture was successfully uploaded.",
-
-/**
- * Profile comment wall
- **/
-	'profile:commentwall:add' => "Add to the wall",
-	'profile:commentwall' => "Comment Wall",
-	'profile:commentwall:posted' => "You successfully posted on the comment wall.",
-	'profile:commentwall:deleted' => "You successfully deleted the message.",
-	'profile:commentwall:blank' => "Sorry; you need to actually put something in the message area before we can save it.",
-	'profile:commentwall:notfound' => "Sorry; we could not find the specified item.",
-	'profile:commentwall:notdeleted' => "Sorry; we could not delete this message.",
-	'profile:commentwall:none' => "No comment wall posts found.",
-	'profile:commentwall:somethingwentwrong' => "Something went wrong when trying to save your message, make sure you actually wrote a message.",
-	'profile:commentwall:failure' => "An unexpected error occurred when adding your message. Please try again.",
-
-/**
- * Email messages commentwall
- */
-
-	'profile:comment:subject' => 'You have a new message on your comment wall!',
-	'profile:comment:body' => "You have a new message on your comment wall from %s. It reads:
-
-
-%s
-
-
-To view your message board comments, click here:
-
-	%s
-
-To view %s's profile, click here:
-
-	%s
-
-You cannot reply to this email.",
-
-/**
- * Profile error messages
- */
-
-	'profile:no_friends' => 'This person hasn\'t added any friends yet!',
-	'profile:no_groups' => 'This user has not joined any groups yet.',
-	'profile:noaccess' => "You do not have permission to edit this profile.",
-	'profile:notfound' => "Sorry, we could not find the specified profile.",
-	'profile:icon:notfound' => "Sorry, there was a problem uploading your profile picture.",
-	'profile:icon:noaccess' => 'You cannot change this profile icon',
-	'profile:field_too_long' => 'Cannot save your profile information because the "%s" section is too long.',
-
-);
-
-add_translation('en', $english);
\ No newline at end of file
diff --git a/mod/tabbed_profile/manifest.xml b/mod/tabbed_profile/manifest.xml
deleted file mode 100644
index 57709065e..000000000
--- a/mod/tabbed_profile/manifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
-	<field key="author" value="Curverider ltd" />
-	<field key="version" value="1.8" />
-	<field key="category" value="bundled" />
-	<field key="category" value="social" />
-	<field key="description" value="Elgg profile plugin." />
-	<field key="website" value="http://www.elgg.org/" />
-	<field key="copyright" value="(C) Curverider 2008-2010" />
-	<field key="licence" value="GNU Public License version 2" />
-	<field key="elgg_version" value="2010030101" />
-	<field key="admin_interface" value="advanced" />
-</plugin_manifest>
diff --git a/mod/tabbed_profile/start.php b/mod/tabbed_profile/start.php
deleted file mode 100644
index 59771ab30..000000000
--- a/mod/tabbed_profile/start.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Elgg profile plugin
- *
- * @package ElggProfile
- */
-
-elgg_register_event_handler('init', 'system', 'profile_init', 1);
-
-/**
- * Profile init function; sets up the profile functions
- *
- */
-function profile_init() {
-	global $CONFIG;
-
-	// Register a URL handler for users - this means that profile_url()
-	// will dictate the URL for all ElggUser objects
-	register_entity_url_handler('profile_url', 'user', 'all');
-
-	// Metadata on users needs to be independent
-	register_metadata_as_independent('user');
-
-	elgg_view_register_simplecache('icon/user/default/tiny');
-	elgg_view_register_simplecache('icon/user/default/topbar');
-	elgg_view_register_simplecache('icon/user/default/small');
-	elgg_view_register_simplecache('icon/user/default/medium');
-	elgg_view_register_simplecache('icon/user/default/large');
-	elgg_view_register_simplecache('icon/user/default/master');
-
-	// Register a page handler, so we can have nice URLs
-	register_page_handler('profile', 'profile_page_handler');
-
-	elgg_extend_view('html_head/extend', 'profile/metatags');
-	elgg_extend_view('css/screen', 'profile/css');
-
-	// Register actions
-	elgg_register_action("profile/addcomment", $CONFIG->pluginspath . "tabbed_profile/actions/addcomment.php");
-	elgg_register_action("profile/deletecomment", $CONFIG->pluginspath . "tabbed_profile/actions/deletecomment.php");
-
-	elgg_register_event_handler('profileupdate', 'all', 'object_notifications');
-	
-	// allow ECML in parts of the profile
-	elgg_register_plugin_hook_handler('get_views', 'ecml', 'profile_ecml_views_hook');
-}
-
-/**
- * Profile page handler
- *
- * @param array $page Array of page elements, forwarded by the page handling mechanism
- */
-function profile_page_handler($page) {
-	global $CONFIG;
-
-	if (isset($page[0])) {
-		$username = $page[0];
-		$user = get_user_by_username($username);
-		elgg_set_page_owner_guid($user->guid);
-	}
-
-	// short circuit if invalid or banned username
-	if (!$user || ($user->isBanned() && !isadminloggedin())) {
-		register_error(elgg_echo('profile:notfound'));
-		forward();
-	}
-
-	$action = NULL;
-	if (isset($page[1])) {
-		$action = $page[1];
-	}
-
-	switch ($action) {
-		case 'edit':
-			// use for the core profile edit page
-			require $CONFIG->path . 'pages/profile/edit.php';
-			return;
-			break;
-
-		default:
-			if (isset($page[1])) {
-				$section = $page[1];
-			} else {
-				$section = 'activity';
-			}
-			$content = profile_get_user_profile_html($user, $section);
-			$content = elgg_view_layout('one_column', array('content' => $content));
-			break;
-	}
-
-	echo elgg_view_page($title, $content);
-}
-
-/**
- * Returns the html for a user profile.
- *
- * @param string $username The username of the profile to display
- * @param string $section Which section is currently selected.
- *
- * @todo - This should really use a plugin hook to get the list of plugin tabs
- *
- * @return mixed FALSE or html for the profile.
- */
-function profile_get_user_profile_html($user, $section = 'activity') {
-	$body = elgg_view('profile/tab_navigation', array('section' => $section, 'entity' => $user));
-	$view_options = array('entity' => $user);
-
-	$content = elgg_view("profile/tabs/$section", $view_options);
-
-	$body .= elgg_view('profile/content_wrapper', array('content' => $content));
-
-	$body .= elgg_view('profile/sidebar', array('section' => $section));
-	return $body;
-}
-
-/**
- * Profile URL generator for $user->getUrl();
- *
- * @param ElggUser $user
- * @return string User URL
- */
-function profile_url($user) {
-	return elgg_get_site_url() . "pg/profile/" . $user->username;
-}
-
-/**
- * Parse ECML on parts of the profile
- *
- * @param unknown_type $hook
- * @param unknown_type $entity_type
- * @param unknown_type $return_value
- * @param unknown_type $params
- */
-function profile_ecml_views_hook($hook, $entity_type, $return_value, $params) {
-	$return_value['profile/profile_content'] = elgg_echo('profile');
-
-	return $return_value;
-}
diff --git a/mod/tabbed_profile/views/default/icon/user/default/large.php b/mod/tabbed_profile/views/default/icon/user/default/large.php
deleted file mode 100644
index ac28f8e9a..000000000
--- a/mod/tabbed_profile/views/default/icon/user/default/large.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-	echo elgg_get_site_url() . "mod/profile/graphics/defaultlarge.gif";
-?>
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/icon/user/default/master.php b/mod/tabbed_profile/views/default/icon/user/default/master.php
deleted file mode 100644
index 129b0d375..000000000
--- a/mod/tabbed_profile/views/default/icon/user/default/master.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-	echo elgg_get_site_url() . "mod/profile/graphics/defaultmaster.gif";
-?>
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/icon/user/default/medium.php b/mod/tabbed_profile/views/default/icon/user/default/medium.php
deleted file mode 100644
index 8815a65bc..000000000
--- a/mod/tabbed_profile/views/default/icon/user/default/medium.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-	echo elgg_get_site_url() . "mod/profile/graphics/defaultmedium.gif";
-?>
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/icon/user/default/small.php b/mod/tabbed_profile/views/default/icon/user/default/small.php
deleted file mode 100644
index 895aa15cc..000000000
--- a/mod/tabbed_profile/views/default/icon/user/default/small.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-	echo elgg_get_site_url() . "mod/profile/graphics/defaultsmall.gif";
-?>
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/icon/user/default/tiny.php b/mod/tabbed_profile/views/default/icon/user/default/tiny.php
deleted file mode 100644
index 866c61533..000000000
--- a/mod/tabbed_profile/views/default/icon/user/default/tiny.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-	echo elgg_get_site_url() . "mod/profile/graphics/defaulttiny.gif";
-?>
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/icon/user/default/topbar.php b/mod/tabbed_profile/views/default/icon/user/default/topbar.php
deleted file mode 100644
index 0ff3dbaaa..000000000
--- a/mod/tabbed_profile/views/default/icon/user/default/topbar.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-	echo elgg_get_site_url() . "mod/profile/graphics/defaulttopbar.gif";
-?>
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/profile/commentwall/commentwall.php b/mod/tabbed_profile/views/default/profile/commentwall/commentwall.php
deleted file mode 100644
index 56670dcf0..000000000
--- a/mod/tabbed_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/tabbed_profile/views/default/profile/commentwall/commentwall_content.php b/mod/tabbed_profile/views/default/profile/commentwall/commentwall_content.php
deleted file mode 100644
index a0785b565..000000000
--- a/mod/tabbed_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/tabbed_profile/views/default/profile/commentwall/commentwalladd.php b/mod/tabbed_profile/views/default/profile/commentwall/commentwalladd.php
deleted file mode 100644
index dcb520ea1..000000000
--- a/mod/tabbed_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/tabbed_profile/views/default/profile/content_wrapper.php b/mod/tabbed_profile/views/default/profile/content_wrapper.php
deleted file mode 100644
index 4fb43e7c9..000000000
--- a/mod/tabbed_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/tabbed_profile/views/default/profile/css.php b/mod/tabbed_profile/views/default/profile/css.php
deleted file mode 100644
index 2b4ef11a3..000000000
--- a/mod/tabbed_profile/views/default/profile/css.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-/**
- * Elgg Profile 
- * 
- * @package Profile
- */
-?>
-/* ***************************************
-	main layout blocks
-*************************************** */
-#profile_content {
-	float:right;
-	width:700px;
-	position: relative;
-}
-#profile_sidebar {
-	width:230px;
-	float:left;
-}
-.elgg-horizontal-tabbed-nav.profile {
-	margin-top:0px;
-	margin-bottom:25px;
-	position:relative;
-}
-.elgg-horizontal-tabbed-nav.profile .profile_name {
-	display:block;
-	width:265px;
-	position:absolute;
-}
-.elgg-horizontal-tabbed-nav.profile .profile_name h2 {
-	margin:0;
-	padding:0;
-	border:none;
-}
-.elgg-horizontal-tabbed-nav.profile ul {
-	margin-left:260px;
-}
-
-/* ***************************************
-	default avatar icons
-*************************************** */
-.elgg-user-icon {
-	position:relative;
-}
-.elgg-user-icon.tiny,
-img.tiny {
-	width:25px;
-	height:25px;
-	/* remove the border-radius if you don't want rounded avatars in supported browsers */
-	-webkit-border-radius: 3px; 
-	-moz-border-radius: 3px;
-	-moz-background-clip:  border;
-	
-	-o-background-size: 25px;
-	-webkit-background-size: 25px;
-	-khtml-background-size: 25px;
-	-moz-background-size: 25px;
-}
-.elgg-user-icon.small,
-img.small {
-	width:40px;
-	height:40px;
-	/* remove the border-radius if you don't want rounded avatars in supported browsers */
-	-webkit-border-radius: 5px; 
-	-moz-border-radius: 5px;
-	-moz-background-clip:  border;
-	
-	-o-background-size: 40px;
-	-webkit-background-size: 40px;
-	-khtml-background-size: 40px;
-	-moz-background-size: 40px;
-}
-img.large {
-	width:200px;
-	height:200px;
-}
-img.medium {
-	width:100px;
-	height:100px;
-}
-
-/* ***************************************
-	ownerblock in sidebar
-*************************************** */
-#profile_sidebar #owner_block {
-	background-color: #eeeeee;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	padding:15px;
-	min-height:270px;
-}
-#elgg-sidebar #owner_block {
-	background-color: white;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	padding:5px;
-	margin-bottom:10px;
-}
-#owner_block .owner_block_icon {
-	float:left;
-	padding:0;
-	margin:0;
-}
-#owner_block .owner_block_icon.large {
-	width:200px;
-	height:200px;
-	overflow: hidden;
-	float:none;
-}
-#owner_block .owner_block_contents {
-	margin-left: 50px;
-}
-#elgg-sidebar #owner_block .owner_block_contents {
-	margin-left: 34px;
-}
-#owner_block .owner_block_contents h3 {
-	margin-top:-4px;
-	border-bottom:none;
-	margin-bottom:0;
-	padding-bottom:0;
-}
-#owner_block .owner_block_contents p.profile_info {
-	margin:0;
-	padding:0;
-	color: #666666;
-}
-#owner_block .owner_block_contents p.profile_info.briefdescription {
-	font-size: 90%;
-	line-height:1.2em;
-	font-style: italic;
-}
-#owner_block .owner_block_contents p.profile_info.location {
-	font-size: 90%;
-}
-#owner_block .profile_actions {
-	margin-top:10px;
-}
-#owner_block .profile_actions a.elgg-action-button {
-	margin-bottom:4px;
-	display: table;
-}
-/* ownerblock links to owners tools */
-#owner_block .owners_content_links {
-	border-top:1px dotted #cccccc;
-	margin-top:4px;
-	padding-top:2px;
-}
-#owner_block .owners_content_links ul {
-	margin:0;
-	padding:0;
-}
-#owner_block .owners_content_links ul li {
-	display:block;
-	float:left;
-	width:95px;
-	font-size: 90%;
-}
-/* profile pages - ownerblock links to owners tools */
-.owner_block_links {
-	margin-top:5px;
-}
-.owner_block_links ul {
-	margin:0;
-	padding:0;
-	list-style: none;
-}
-.owner_block_links ul li.selected a {
-	background: #4690D6;
-	color:white;
-}
-.owner_block_links ul li a {
-	display:block;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	background-color:white;
-	margin:3px 0 5px 0;
-	padding:2px 4px 2px 8px;
-}
-.owner_block_links ul li a:hover {
-	background:#0054A7;
-	color:white;
-	text-decoration:none;
-}
-
-
-/* ***************************************
-	admin menu in sidebar
-*************************************** */
-.owner_block_links .admin_menu_options {
-	display: none;
-}
-.owner_block_links ul.admin_menu {
-	background-color:white;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	cursor:pointer;
-}
-.owner_block_links ul.admin_menu li a {
-	background-color: white;
-	color:red;
-	margin-bottom:0;
-}
-.owner_block_links ul.admin_menu li a:hover {
-	color:black;
-}
-.owner_block_links ul.admin_menu li ul.admin_menu_options li a {
-	color:red;
-	background-color:white;
-	display:block;
-	margin:0px;
-	padding:2px 4px 2px 13px;
-}
-.owner_block_links ul.admin_menu li ul.admin_menu_options li a:hover {
-	color:black;
-	background:none;
-	text-decoration: underline;
-}
-
-
-/* ***************************************
-	full profile info panel
-*************************************** */
-#profile_content .odd {
-	background-color:#f4f4f4;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
-	margin:0 0 7px 0;
-	padding:2px 4px 2px 4px;
-}
-#profile_content .even {
-	background-color:#f4f4f4;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
-	margin:0 0 7px 0;
-	padding:2px 4px 2px 4px;
-}
-#profile_content .aboutme_title {
-	background-color:#f4f4f4;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
-	margin:0 0 0px 0;
-	padding:2px 4px 2px 4px;
-}
-#profile_content .aboutme_contents {
-	padding:2px 0 0 3px;
-}
-
-
-/* ***************************************
-	friends panel within profile
-*************************************** */
-#profile_content .entity-listing .entity-listing-info {
-	width:664px;
-}
-
-
-/* ***************************************
-	commentwall within profile
-*************************************** */
-#comment_wall_add textarea {
-	width:685px;
-}
-#comment_wall_add #postit {
-	float:right;
-}
-
-
-/* ***************************************
-	twitter panel within profile
-*************************************** */
-ul#twitter_update_list {
-	padding-left:0;
-}
-ul#twitter_update_list li {
-	background-image: url(<?php echo elgg_get_site_url(); ?>mod/profile/graphics/speech_bubble_tail.gif);
-	background-position:right bottom;
-	background-repeat: no-repeat;
-	list-style-image:none;
-	list-style-position:outside;
-	list-style-type:none;
-	margin:0 0 5px 0;
-	padding:0;
-	overflow-x: hidden;
-}
-ul#twitter_update_list li span {
-	color:#666666;
-	background:#ececec;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
-	padding:3px 5px 4px 5px;
-	display:block;
-}
-ul#twitter_update_list li a {
-	display:block;
-	margin:-2px 0 0 4px;
-}
-ul#twitter_update_list li span a {
-	display:inline !important;
-}
-p.visit_twitter a {
-    background:url(<?php echo elgg_get_site_url(); ?>mod/profile/graphics/twitter16px.png) left no-repeat;
-    padding:0 0 0 20px;
-    margin:0;
-}
-.visit_twitter {
-	padding:5px 0;
-	margin:0 0 0 0;
-	border-top:1px solid #dedede;
-}
-
-/* ***************************************
-	banned user
-*************************************** */
-/* banned user full profile panel */
-#profile_content .banned_user {
-	border:2px solid red;
-	padding:4px 8px;
-	-webkit-border-radius: 6px; 
-	-moz-border-radius: 6px;
-}
-/* banned user in friends lists */
-.entity-listing-info p.entity-title.user.banned {
-	text-decoration: line-through;
-}
-.entity-listing-info p.entity-title.user.banned a {
-	color:red;
-}
-
-
-/* ***************************************
-	admin area - custom profile fields
-*************************************** */
-.default_profile_reset {
-	border-top: 1px solid #dedede;
-	margin-top:30px;
-}
-.default_profile_reset .elgg-action-button {
-	float:right;
-}
-/* field re-order */
-#sortable_profile_fields {
-	list-style: none;
-	padding:0;
-	margin:0;
-	border-top:1px solid #cccccc;
-}
-#sortable_profile_fields li {
-	padding:5px 0 5px 0;
-	border-bottom:1px solid #cccccc;
-}
-#sortable_profile_fields li img.handle {
-	margin-right: 7px;
-	cursor: move;
-}
-#sortable_profile_fields .ui-sortable-helper {
-	background: #eeeeee;
-	color:#333333;
-	padding: 5px 0 5px 0;
-	margin: 0;
-	width:100%;
-}
-
-
-/* ***************************************
-	avatar drop-down menu
-*************************************** */
-.avatar_menu_button {
-	width:15px;
-	height:15px;
-	position:absolute;
-	cursor:pointer;
-	display:none;
-	right:0;
-	bottom:0;
-}
-.avatar_menu_arrow {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px top;
-	width:15px;
-	height:15px;
-}
-.avatar_menu_arrow_on {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -16px;
-	width:15px;
-	height:15px;
-}
-.avatar_menu_arrow_hover {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -32px;
-	width:15px;
-	height:15px;
-}
-/* user avatar submenu options */
-.elgg-user-icon .sub_menu { 
-	display:none; 
-	position:absolute; 
-	padding:0; 
-	margin:0; 
-	border-top:solid 1px #E5E5E5; 
-	border-left:solid 1px #E5E5E5; 
-	border-right:solid 1px #999999; 
-	border-bottom:solid 1px #999999;  
-	width:164px; 
-	background:#FFFFFF; 
-	text-align:left;
-	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
-	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
-	font-size:14px;
-}
-div.elgg-user-icon a.icon img {
-	z-index:10;
-}
-.elgg-user-icon .sub_menu a:link, 
-.elgg-user-icon .sub_menu a:visited, 
-.elgg-user-icon .sub_menu a:hover { 
-	display:block;
-	font-weight: normal;
-}	
-.elgg-user-icon .sub_menu a:hover {
-	background:#cccccc;
-	text-decoration:none;
-}
-.elgg-user-icon .sub_menu .displayname {
-	padding:0 !important;
-	margin:0 !important;
-	border-bottom:solid 1px #dddddd !important;
-	font-size:14px !important;
-}
-.elgg-user-icon .sub_menu .displayname a {
-	padding:3px 3px 3px 8px;
-	font-size:14px;
-	font-weight: bold;
-}
-.elgg-user-icon .sub_menu .displayname a .username {
-	display:block;
-	font-weight: normal;
-	font-size:12px;
-	text-align: left;
-	margin:0;
-}
-.sub_menu ul.sub_menu_list {
-	list-style: none;
-	margin-bottom:0;
-	padding-left:0;
-}
-.elgg-user-icon .sub_menu a {
-	padding:2px 3px 2px 8px;
-	font-size:12px;
-}
-/* admin menu options in avatar submenu */
-.user_menu_admin {
-	border-top:solid 1px #dddddd;
-}
-.elgg-user-icon .sub_menu li.user_menu_admin a {
-	color:red;
-}
-.elgg-user-icon .sub_menu li.user_menu_admin a:hover {
-	color:white;
-	background:red;
-}
diff --git a/mod/tabbed_profile/views/default/profile/listing.php b/mod/tabbed_profile/views/default/profile/listing.php
deleted file mode 100644
index 489b1d50e..000000000
--- a/mod/tabbed_profile/views/default/profile/listing.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Elgg user display (small)
- *
- * @package ElggProfile
- *
- * @uses $vars['entity'] The user entity
- */
-
-$icon = elgg_view(
-		"profile/icon", array(
-								'entity' => $vars['entity'],
-								'size' => 'tiny',
-							  )
-);
-			
-$banned = $vars['entity']->isBanned();
-	
-// Simple XFN
-$rel_type = "";
-if (get_loggedin_userid() == $vars['entity']->guid) {
-	$rel_type = 'me';
-} elseif (check_entity_relationship(get_loggedin_userid(), 'friend', $vars['entity']->guid)) {
-	$rel_type = 'friend';
-}
-
-if ($rel_type) {
-	$rel = "rel=\"$rel_type\"";
-}
-
-if (!$banned) {
-	$info .= "<p class='entity-title user'><a href=\"" . $vars['entity']->getUrl() . "\" $rel>" . $vars['entity']->name . "</a></p>";
-	$location = $vars['entity']->location;
-	if (!empty($location)) {
-		$info .= "<p class='entity-subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
-	}
-	//create a view that a status plugin could extend - in the default case, this is the wire
-	$info .= elgg_view("profile/status", array("entity" => $vars['entity']));
-}else{
-	$info .= "<p class='entity-title user banned'>";
-	if (isadminloggedin())
-		$info .= "<a href=\"" . $vars['entity']->getUrl() . "\">";
-	$info .= $vars['entity']->name;
-	if (isadminloggedin())
-		$info .= "</a>";
-	$info .= "</p>";
-}
-		
-echo elgg_view_image_block($icon, $info);
diff --git a/mod/tabbed_profile/views/default/profile/menu/adminlinks.php b/mod/tabbed_profile/views/default/profile/menu/adminlinks.php
deleted file mode 100644
index 39807764a..000000000
--- a/mod/tabbed_profile/views/default/profile/menu/adminlinks.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Profile admin context links
- * 
- * @package ElggProfile
- * 
- * @uses $vars['entity'] The user entity
- */
-
-if (isadminloggedin()){
-	if (get_loggedin_userid()!=$vars['entity']->guid){
-?>
-		<a href="<?php echo elgg_get_site_url(); ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a>
-<?php 
-			if (!$vars['entity']->isBanned()) {
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "action/admin/user/ban?guid={$vars['entity']->guid}"));
-			} else {
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "action/admin/user/unban?guid={$vars['entity']->guid}")); 
-			}
-			echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "action/admin/user/delete?guid={$vars['entity']->guid}"));
-			echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "action/admin/user/resetpassword?guid={$vars['entity']->guid}"));
-			if (!$vars['entity']->isAdmin()) { 
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "action/admin/user/makeadmin?guid={$vars['entity']->guid}"));
-			} else {
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "action/admin/user/removeadmin?guid={$vars['entity']->guid}"));
-			}
-		}
-	}
diff --git a/mod/tabbed_profile/views/default/profile/menu/friendlinks.php b/mod/tabbed_profile/views/default/profile/menu/friendlinks.php
deleted file mode 100644
index ed13edb8b..000000000
--- a/mod/tabbed_profile/views/default/profile/menu/friendlinks.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg profile icon avatar menu: Add / Remove friend links
- * 
- * @package ElggProfile
- * 
- * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
- */
-$ts = time();
-$token = generate_action_token($ts);
-if ($vars['entity']->isFriend()) {
-	echo elgg_view('output/confirmlink', array(
-		'href' => "action/friends/remove?friend={$vars['entity']->getGUID()}",
-		'text' => elgg_echo('friend:remove'),
-		'class' => 'remove_friend'
-	));
-} else {
-	echo elgg_view('output/confirmlink', array(
-		'href' => "action/friends/add?friend={$vars['entity']->getGUID()}",
-		'text' => elgg_echo('friend:add'),
-		'class' => 'add_friend'
-	));
-}
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/profile/menu/links.php b/mod/tabbed_profile/views/default/profile/menu/links.php
deleted file mode 100644
index 4233d7ec5..000000000
--- a/mod/tabbed_profile/views/default/profile/menu/links.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Elgg profile icon avatar menu: view for plugins to extend
- * 
- * @package ElggProfile
- * 
- * @uses $vars['entity'] The user entity. If none specified, the current user is assumed. 
- */
-?>
diff --git a/mod/tabbed_profile/views/default/profile/metatags.php b/mod/tabbed_profile/views/default/profile/metatags.php
deleted file mode 100644
index 1197a2e0a..000000000
--- a/mod/tabbed_profile/views/default/profile/metatags.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * FOAF
- * 
- * @package ElggProfile
- * 
- */
-
-if (elgg_get_page_owner()) {
-?>
-	<link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo full_url(); ?>?view=foaf" />
-<?php
-
-}
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/profile/ownerblock.php b/mod/tabbed_profile/views/default/profile/ownerblock.php
deleted file mode 100755
index 8f6d333a5..000000000
--- a/mod/tabbed_profile/views/default/profile/ownerblock.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * A simple owner block which houses info about the user whose 'stuff' you are looking at
- */
-
-// get the user who owns this profile
-if ($vars['entity']) {
-	if ($vars['context'] == 'edit') {
-		$user = get_entity($vars['entity']->container_guid);
-	} else {
-		$user = get_entity($vars['entity']->guid);
-	}
-} else {
-	$user = elgg_get_page_owner();
-}
-if (!$user) {
-	// no user so we quit view
-	echo elgg_echo('viewfailure', array(__FILE__));
-	return TRUE;
-}
-
-$more_info = '';
-
-$location = elgg_view("output/tags",array('value' => $user->location));
-$section = $vars['section'];
-if ($section == 'details') {
-	$icon = elgg_view("profile/icon",array('entity' => $user, 'size' => 'large', 'override' => 'true'));
-	$icon_class = "large";
-} else {
-	$icon = elgg_view("profile/icon",array('entity' => $user, 'size' => 'small'));
-	$more_info = "<div class='owner_block_contents clearfix'>";
-	$more_info .= "<h3><a href='{$url}'>{$user->name}</a></h3>";
-	$more_info .= "<p class='profile_info briefdescription'>{$user->briefdescription}</p>";
-	$more_info .= "<p class='profile_info location'>{$location}</p>";
-	$more_info .= "</div>";
-}
-$profile_actions = "";
-if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) {
-	$profile_actions = "<div class='clearfix profile_actions'>";
-	$profile_actions .= "<a href='".elgg_get_site_url()."pg/profile/{$user->username}/edit/details' class='elgg-action-button'>". elgg_echo('profile:edit') ."</a>";
-	$profile_actions .= "<a href='".elgg_get_site_url()."pg/avatar/edit/{$user->username}' class='elgg-action-button'>". elgg_echo('avatar:edit') ."</a>";
-	$profile_actions .= "</div>";
-} else {
-	$profile_actions = "<div class='profile_actions'>";
-	if (isloggedin()) {
-		if (get_loggedin_userid() != $user->getGUID()) {
-			if ($user->isFriend()) {
-				$url = elgg_get_site_url()."action/friends/remove?friend={$user->getGUID()}";
-				$url = elgg_add_action_tokens_to_url($url);
-				$profile_actions .= "<a href=\"$url\" class='elgg-action-button'>" . elgg_echo('friend:remove') . "</a>";
-			} else {
-				$url = elgg_get_site_url()."action/friends/add?friend={$user->getGUID()}";
-				$url = elgg_add_action_tokens_to_url($url);
-				$profile_actions .= "<a href=\"$url\" class='elgg-action-button'>" . elgg_echo('friend:add') . "</a>";
-			}
-		}
-	}
-	if (is_plugin_enabled('messages') && isloggedin()) {
-		$profile_actions .= "<a href=\"".elgg_get_site_url()."mod/messages/send.php?send_to={$user->guid}\" class='elgg-action-button'>". elgg_echo('messages:send') ."</a>";
-	}
-	$profile_actions .= "</div>";
-}
-
-$username = $user->username;
-$email = $user->email;
-$phone = $user->phone;
-
-
-// if admin display admin links
-$admin_links = '';
-if (isadminloggedin() && get_loggedin_userid() != elgg_get_page_owner_guid()) {
-	$params = array(
-		'user' => elgg_get_page_owner(),
-		'toggle' => true,
-		'sort_by' => 'order',
-	);
-	$admin_links = elgg_view_menu('user_admin', $params);
-	$admin_links = "<div class=\"owner_block_links\">$admin_links</div>";
-}
-
-
-//check tools are enabled - hard-coded for phase1
-// @todo - provide a view to extend for profile pages ownerblock tool-links
-if(is_plugin_enabled('blog')){
-	$blog_link = "<li><a href=\"".elgg_get_site_url()."pg/blog/{$username}\">Blog</a></li>";
-}else{
-	$blog_link = "";
-}
-if(is_plugin_enabled('bookmarks')){
-	$bookmark_link = "<li><a href=\"".elgg_get_site_url()."pg/bookmarks/{$username}\">Bookmarks</a></li>";
-}else{
-	$bookmark_link = "";
-}
-if(is_plugin_enabled('document')){
-	$docs_link = "<li><a href=\"".elgg_get_site_url()."pg/document/{$username}\">Documents</a></li>";
-}else{
-	$docs_link = "";
-}
-if(is_plugin_enabled('feeds')){
-	$feeds_link = "<li><a href=\"".elgg_get_site_url()."pg/feeds/{$username}\">Feeds</a></li>";
-}else{
-	$feeds_link = "";
-}
-if(is_plugin_enabled('tidypics')){
-	$tidypics_link = "<li><a href=\"".elgg_get_site_url()."pg/photos/owned/{$username}\">Photos</a></li>";
-}else{
-	$tidypics_link = "";
-}
-if(is_plugin_enabled('videolist')){
-	$video_link = "<li><a href=\"".elgg_get_site_url()."pg/videolist/owned/{$username}\">Videos</a></li>";
-}else{
-	$video_link = "";
-}
-
-//contruct the display
-$display = <<<EOT
-
-<div id="owner_block">
-	<div class="owner_block_icon {$icon_class}">
-		{$icon}
-	</div>
-	{$more_info}
-	{$profile_actions}
-	<div class="owner_block_links">
-		<ul>
-		{$blog_link}
-		{$bookmark_link}
-		{$docs_link}
-		{$feeds_link}
-		{$tidypics_link}
-		{$video_link}
-		</ul>
-	</div>
-	<!-- if admin user -->
-	{$admin_links}
-</div>
-
-EOT;
-
-echo $display;
diff --git a/mod/tabbed_profile/views/default/profile/sidebar.php b/mod/tabbed_profile/views/default/profile/sidebar.php
deleted file mode 100644
index 525a2da81..000000000
--- a/mod/tabbed_profile/views/default/profile/sidebar.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg profile icon edit form
- *
- * @package ElggProfile
- */
-?>
-<div id="profile_sidebar">
-<?php
-	$section = $vars['section'];
-	echo elgg_view('profile/ownerblock', array('section' => $section));
-?>
-</div>
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/profile/tab_navigation.php b/mod/tabbed_profile/views/default/profile/tab_navigation.php
deleted file mode 100755
index ca0873ebd..000000000
--- a/mod/tabbed_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/tabbed_profile/views/default/profile/tabs/activity.php b/mod/tabbed_profile/views/default/profile/tabs/activity.php
deleted file mode 100755
index 7a7bffb94..000000000
--- a/mod/tabbed_profile/views/default/profile/tabs/activity.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg user display (details)
- * @uses $vars['entity'] The user entity
- */
-
-echo elgg_view('profile/status', array("entity" => $vars['entity']));
-
-$params = array(
-	'subject_guid' => $vars['entity']->guid,
-	'limit' => 5,
-);
-echo elgg_list_river($params);
diff --git a/mod/tabbed_profile/views/default/profile/tabs/commentwall.php b/mod/tabbed_profile/views/default/profile/tabs/commentwall.php
deleted file mode 100644
index bf54bd7e7..000000000
--- a/mod/tabbed_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/tabbed_profile/views/default/profile/tabs/details.php b/mod/tabbed_profile/views/default/profile/tabs/details.php
deleted file mode 100755
index 27b0f943b..000000000
--- a/mod/tabbed_profile/views/default/profile/tabs/details.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Elgg user display (details)
- * @uses $vars['entity'] The user entity
- */
-
-$even_odd = null;
-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)) {
-				//This function controls the alternating class
-				$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
-				?>
-				<p class="<?php echo $even_odd; ?>">
-				<b><?php
-						echo elgg_echo("profile:{$shortname}");
-				?>: </b>
-				<?php
-					echo elgg_view("output/{$valtype}", array('value' => $vars['entity']->$shortname));
-				?>
-				</p>
-				<?php
-			}
-		}
-	}
-}
-
-if (!get_plugin_setting('user_defined_fields', 'profile')) {
-	if ($vars['entity']->isBanned()) {
-		echo "<div class='banned_user'>";
-		echo elgg_echo('profile:banned');
-		echo "</div>";
-	} else {
-		if ($vars['entity']->description) {
-			echo "<p class='aboutme_title'><b>" . elgg_echo("profile:aboutme") . "</b></p>";
-			echo "<div class='aboutme_contents'>" . elgg_view('output/longtext', array('value' => $vars['entity']->description)) . "</div>";
-		}
-	}
-}
diff --git a/mod/tabbed_profile/views/default/profile/tabs/friends.php b/mod/tabbed_profile/views/default/profile/tabs/friends.php
deleted file mode 100755
index 0871d3e3a..000000000
--- a/mod/tabbed_profile/views/default/profile/tabs/friends.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Profile friends
- */
-
-$friends = $vars['entity']->listFriends();
-
-if (!$friends) {
-	$friends = '<p>' . elgg_echo('profile:no_friends') . '</p>';
-}
-
-echo $friends;
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/profile/tabs/groups.php b/mod/tabbed_profile/views/default/profile/tabs/groups.php
deleted file mode 100644
index bb5467a17..000000000
--- a/mod/tabbed_profile/views/default/profile/tabs/groups.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php

-/**

- * Profile groups

- */

-

-$groups = $vars['entity']->listGroups();

-

-if (!$groups) {

-	$groups = '<p>' . elgg_echo('profile:no_groups') . '</p>';

-}

-

-echo $groups;
\ No newline at end of file
diff --git a/mod/tabbed_profile/views/default/profile/tabs/twitter.php b/mod/tabbed_profile/views/default/profile/tabs/twitter.php
deleted file mode 100755
index 06a0551d4..000000000
--- a/mod/tabbed_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