diff options
Diffstat (limited to 'views/default/user')
| -rw-r--r-- | views/default/user/default.php | 55 | ||||
| -rw-r--r-- | views/default/user/elements/summary.php | 13 | ||||
| -rw-r--r-- | views/default/user/search/finishblurb.php | 38 | ||||
| -rw-r--r-- | views/default/user/search/startblurb.php | 29 | ||||
| -rw-r--r-- | views/default/user/settings/default_access.php | 30 | ||||
| -rw-r--r-- | views/default/user/settings/email.php | 26 | ||||
| -rw-r--r-- | views/default/user/settings/language.php | 33 | ||||
| -rw-r--r-- | views/default/user/settings/name.php | 28 | ||||
| -rw-r--r-- | views/default/user/settings/password.php | 27 |
9 files changed, 88 insertions, 191 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 a8c14f357..a3878a803 100644 --- a/views/default/user/search/finishblurb.php +++ b/views/default/user/search/finishblurb.php @@ -1,20 +1,18 @@ -<?php
-/**
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- * @deprecated 1.7
- */
-
-elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
-
-if ($vars['count'] > $vars['threshold']) {
-
-?>
-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
- echo elgg_echo("user:search:finishblurb");
- ?></a></div>
-<?php
-
-}
+<?php +/** + * @package Elgg + * @subpackage Core + * @deprecated 1.7 + */ + +elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7); + +if ($vars['count'] > $vars['threshold']) { + +?> +<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 e069ec460..806157609 100644 --- a/views/default/user/search/startblurb.php +++ b/views/default/user/search/startblurb.php @@ -1,19 +1,10 @@ -<?php
-/**
- * @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);
-
-?>
-<div class="contentWrapper">
- <?php
-
- echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
-
- ?>
-</div>
+<?php +/** + * @package Elgg + * @subpackage Core + * @deprecated 1.7 + */ + +elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7); + +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 3a6e6842c..000000000 --- a/views/default/user/settings/default_access.php +++ /dev/null @@ -1,30 +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; - } -?> - <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> - -<?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 699f72583..000000000 --- a/views/default/user/settings/email.php +++ /dev/null @@ -1,26 +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) { -?> -<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> - -<?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 a7a66e5c2..000000000 --- a/views/default/user/settings/language.php +++ /dev/null @@ -1,33 +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) { -?> -<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> - -<?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 2cbfd0bb6..000000000 --- a/views/default/user/settings/name.php +++ /dev/null @@ -1,28 +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(); - -if ($user) { -?> - <h3><?php echo elgg_echo('user:set:name'); ?></h3> - <p> - <?php echo elgg_echo('user:name:label'); ?>: - <?php - - echo elgg_view('input/text', array('internalname' => 'name', 'value' => $user->name)); - echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid)); - ?> - </p> - -<?php -}
\ No newline at end of file diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php deleted file mode 100644 index 5cefe3821..000000000 --- a/views/default/user/settings/password.php +++ /dev/null @@ -1,27 +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) { -?> -<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> - -<?php -}
\ No newline at end of file |