Refs #3045 adds a gallery context based view for users

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

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 637e9c4604cf97e665aa6215ef2b42bcdc97d055..ae089add6d1917d627379e5c721241875df9f22e 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1265,7 +1265,7 @@ function elgg_view_list_item($item, array $vars = array()) {
                case 'object':
                case 'group':
                case 'site':
-                       return elgg_view_entity($item, $full_view);
+                       return elgg_view_entity($item, $vars);
                case 'annotation':
                        return elgg_view_annotation($item, $full_view);
                case 'river':

diff --git a/views/default/page/components/gallery.php b/views/default/page/components/gallery.php
index c6764d92ff4bdd6c40488eadf2894379344ce556..8d3052ed9950477d4b0297b5e5c847e486f678d1 100644 (file)
--- a/views/default/page/components/gallery.php
+++ b/views/default/page/components/gallery.php
@@ -23,6 +23,10 @@ $position = elgg_extract('position', $vars, 'after');
 
 $num_columns = 4;
 
+// @todo standardize on full_view - will require backward compatible code
+if (isset($vars['full_view'])) {
+       $vars['full'] = $vars['full_view'];
+}
 
 if ($pagination && $count) {
        $nav .= elgg_view('navigation/pagination', array(

diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index 5e8c8432dc9ee44e268d1d7d7d52605fe5a5bc8c..3a4fc21c8c7d76120839facc510eb50fe9dd0a93 100644 (file)
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -25,7 +25,7 @@ $pagination = elgg_extract('pagination', $vars, true);
 $offset_key = elgg_extract('offset_key', $vars, 'offset');
 $position = elgg_extract('position', $vars, 'after');
 
-// @todo standardize on full - will require backward compatible code
+// @todo standardize on full_view - will require backward compatible code
 if (isset($vars['full_view'])) {
        $vars['full'] = $vars['full_view'];
 }

diff --git a/views/default/user/default.php b/views/default/user/default.php
index 7106e6016144378bc35034a037ceae5cc59b1e13..55be639ab65d8a12db64ff6a2c5b623fffb9d0f3 100644 (file)
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -4,11 +4,15 @@
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['entity'] ElggUser entity
+ * @uses $vars['size']   Size of the icon
  */
 
 $user = $vars['entity'];
+$size = elgg_extract('size', $vars, 'tiny');
 
-$icon = elgg_view_entity_icon($user, 'tiny');
+$icon = elgg_view_entity_icon($user, $size);
 
 // Simple XFN
 $rel = '';
@@ -29,22 +33,26 @@ if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
        $metadata = '';
 }
 
-if ($user->isBanned()) {
-       $params = array(
-               'entity' => $user,
-               'title' => $title,
-               'metadata' => '<ul class="elgg-menu elgg-menu-metadata"><li>banned</li></ul>',
-       );
+if (elgg_get_context() == 'gallery') {
+       echo $icon;
 } else {
-       $params = array(
-               'entity' => $user,
-               'title' => $title,
-               'metadata' => $metadata,
-               'subtitle' => $user->briefdescription,
-               'content' => elgg_view('user/status', array('entity' => $user)),
-       );
+       if ($user->isBanned()) {
+               $params = array(
+                       'entity' => $user,
+                       'title' => $title,
+                       'metadata' => '<ul class="elgg-menu elgg-menu-metadata"><li>banned</li></ul>',
+               );
+       } else {
+               $params = array(
+                       'entity' => $user,
+                       'title' => $title,
+                       'metadata' => $metadata,
+                       'subtitle' => $user->briefdescription,
+                       'content' => elgg_view('user/status', array('entity' => $user)),
+               );
+       }
+
+       $list_body = elgg_view('page/components/list/body', $params);
+
+       echo elgg_view_image_block($icon, $list_body);
 }
-
-$list_body = elgg_view('page/components/list/body', $params);
-
-echo elgg_view_image_block($icon, $list_body);