9 files changed, 62 insertions, 153 deletions
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 8e48b13f6..6c84e84ad 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -2,17 +2,56 @@
 /**
  * Elgg user display
  *
- * @package Elgg
- * @subpackage Core
- * @link http://elgg.org/
+ * @uses $vars['entity'] ElggUser entity
+ * @uses $vars['size']   Size of the icon
  */
 
-if ($vars['full']) {
-	echo elgg_view("profile/userdetails",$vars);
+$entity = $vars['entity'];
+$size = elgg_extract('size', $vars, 'tiny');
+
+$icon = elgg_view_entity_icon($entity, $size, $vars);
+
+// Simple XFN
+$rel = '';
+if (elgg_get_logged_in_user_guid() == $entity->guid) {
+	$rel = 'rel="me"';
+} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $entity->guid)) {
+	$rel = 'rel="friend"';
+}
+
+$title = "<a href=\"" . $entity->getUrl() . "\" $rel>" . $entity->name . "</a>";
+
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $entity,
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+if (elgg_get_context() == 'gallery') {
+	echo $icon;
 } else {
-	if (get_input('search_viewtype') == "gallery") {
-		echo elgg_view('profile/gallery',$vars);
+	if ($entity->isBanned()) {
+		$banned = elgg_echo('banned');
+		$params = array(
+			'entity' => $entity,
+			'title' => $title,
+			'metadata' => $metadata,
+		);
 	} else {
-		echo elgg_view("profile/listing",$vars);
+		$params = array(
+			'entity' => $entity,
+			'title' => $title,
+			'metadata' => $metadata,
+			'subtitle' => $entity->briefdescription,
+			'content' => elgg_view('user/status', array('entity' => $entity)),
+		);
 	}
+
+	$list_body = elgg_view('user/elements/summary', $params);
+
+	echo elgg_view_image_block($icon, $list_body, $vars);
 }
diff --git a/views/default/user/elements/summary.php b/views/default/user/elements/summary.php
new file mode 100644
index 000000000..46d11c14c
--- /dev/null
+++ b/views/default/user/elements/summary.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * User summary
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+echo elgg_view('object/elements/summary', $vars);
diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index e58b1252d..a3878a803 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -2,8 +2,6 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  * @deprecated 1.7
  */
 
@@ -12,7 +10,7 @@ elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
 if ($vars['count'] > $vars['threshold']) {
 
 ?>
-<a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+<a href="<?php echo elgg_get_site_url(); ?>search/users?tag=<?php echo urlencode($vars['tag']); ?>"><?php
 	echo elgg_echo("user:search:finishblurb");
 	?></a>
 <?php
diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php
index 8a3377820..806157609 100644
--- a/views/default/user/search/startblurb.php
+++ b/views/default/user/search/startblurb.php
@@ -2,13 +2,9 @@
 /**
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
  * @deprecated 1.7
- * @link http://elgg.org/
  */
 
 elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);
 
-echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
-
-?>
+echo elgg_echo("user:search:startblurb", array($vars['tag']));
+\ No newline at end of file
diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php
deleted file mode 100644
index 791f3932c..000000000
--- a/views/default/user/settings/default_access.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Provide a way of setting your default access
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-if ($vars['config']->allow_user_default_access) {
-	$user = page_owner_entity();
-
-	if ($user) {
-		if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
-			$default_access = $vars['config']->default_access;
-		}
-?>
-<div class="user_settings access">
-	<h3><?php echo elgg_echo('default_access:settings'); ?></h3>
-	<p>
-		<?php echo elgg_echo('default_access:label'); ?>:
-		<?php
-
-			echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access));
-
-		?>
-	</p>
-</div>
-<?php
-	}
-}
-\ No newline at end of file
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
deleted file mode 100644
index 7b6ea9f00..000000000
--- a/views/default/user/settings/email.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Provide a way of setting your email
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$user = page_owner_entity();
-
-if ($user) {
-?>
-<div class="user_settings email">
-<h3><?php echo elgg_echo('email:settings'); ?></h3>
-<p>
-	<?php echo elgg_echo('email:address:label'); ?>:
-	<?php
-
-		echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
-
-	?>
-</p>
-</div>
-<?php
-}
-\ No newline at end of file
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
deleted file mode 100644
index 36964a638..000000000
--- a/views/default/user/settings/language.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Provide a way of setting your language prefs
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-global $CONFIG;
-$user = page_owner_entity();
-
-if ($user) {
-?>
-<div class="user_settings language">
-<h3><?php echo elgg_echo('user:set:language'); ?></h3>
-<p>
-
-	<?php echo elgg_echo('user:language:label'); ?>: <?php
-
-		$value = $CONFIG->language;
-		if ($user->language) {
-			$value = $user->language;
-		}
-
-		echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
-
-	?>
-
-</p>
-</div>
-<?php
-}
-\ No newline at end of file
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
deleted file mode 100644
index d1d61482a..000000000
--- a/views/default/user/settings/name.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Provide a way of setting your full name.
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
-
-$user = page_owner_entity();
-
-// all hidden, but necessary for properly updating user details
-echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name));
-echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid));
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
deleted file mode 100644
index 68db18136..000000000
--- a/views/default/user/settings/password.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Provide a way of setting your password
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-$user = page_owner_entity();
-
-if ($user) {
-?>
-<div class="user_settings password">
-<h3><?php echo elgg_echo('user:set:password'); ?></h3>
-<p>
-	<?php echo elgg_echo('user:password:label'); ?>:
-	<?php
-		echo elgg_view('input/password',array('internalname' => 'password'));
-	?></p><p>
-	<?php echo elgg_echo('user:password2:label'); ?>: <?php
-		echo elgg_view('input/password',array('internalname' => 'password2'));
-	?>
-</p>
-</div>
-<?php
-}
-\ No newline at end of file