diff options
| -rw-r--r-- | views/default/entities/entity_list.php | 120 | ||||
| -rw-r--r-- | views/default/entities/entity_listing.php | 48 |
2 files changed, 82 insertions, 86 deletions
diff --git a/views/default/entities/entity_list.php b/views/default/entities/entity_list.php index 81fd102e3..ec9ebd6ed 100644 --- a/views/default/entities/entity_list.php +++ b/views/default/entities/entity_list.php @@ -1,62 +1,66 @@ <?php +/** + * View a list of entities + * + * @package Elgg + * @author Curverider Ltd <info@elgg.com> + * @link http://elgg.com/ + * + */ - $context = $vars['context']; - $offset = $vars['offset']; - $entities = $vars['entities']; - $limit = $vars['limit']; - $count = $vars['count']; - $baseurl = $vars['baseurl']; - $context = $vars['context']; - $viewtype = $vars['viewtype']; - $pagination = $vars['pagination']; - $fullview = $vars['fullview']; - - $html = ""; - $nav = ""; - - if (isset($vars['viewtypetoggle'])) { - $viewtypetoggle = $vars['viewtypetoggle']; - } else { - $viewtypetoggle = true; +$context = $vars['context']; +$offset = $vars['offset']; +$entities = $vars['entities']; +$limit = $vars['limit']; +$count = $vars['count']; +$baseurl = $vars['baseurl']; +$context = $vars['context']; +$viewtype = $vars['viewtype']; +$pagination = $vars['pagination']; +$fullview = $vars['fullview']; + +$html = ""; +$nav = ""; + +if (isset($vars['viewtypetoggle'])) { + $viewtypetoggle = $vars['viewtypetoggle']; +} else { + $viewtypetoggle = true; +} + +if ($context == "search" && $count > 0 && $viewtypetoggle) { + $nav .= elgg_view('navigation/viewtype', array( + 'baseurl' => $baseurl, + 'offset' => $offset, + 'count' => $count, + 'viewtype' => $viewtype, + )); +} + +if ($pagination) { + $nav .= elgg_view('navigation/pagination',array( + 'baseurl' => $baseurl, + 'offset' => $offset, + 'count' => $count, + 'limit' => $limit, + )); +} + +$html .= $nav; +if ($viewtype == 'list') { + if (is_array($entities) && sizeof($entities) > 0) { + foreach($entities as $entity) { + $html .= elgg_view_entity($entity, $fullview); } + } +} else { + if (is_array($entities) && sizeof($entities) > 0) { + $html .= elgg_view('entities/gallery', array('entities' => $entities)); + } +} + +if ($count) { + $html .= $nav; +} - if ($context == "search" && $count > 0 && $viewtypetoggle) { - $nav .= elgg_view("navigation/viewtype",array( - - 'baseurl' => $baseurl, - 'offset' => $offset, - 'count' => $count, - 'viewtype' => $viewtype, - - )); - } - - if ($pagination) - $nav .= elgg_view('navigation/pagination',array( - - 'baseurl' => $baseurl, - 'offset' => $offset, - 'count' => $count, - 'limit' => $limit, - - )); - - $html .= $nav; - - if ($viewtype == "list") { - if (is_array($entities) && sizeof($entities) > 0) { - foreach($entities as $entity) { - $html .= elgg_view_entity($entity, $fullview); - } - } - } else { - if (is_array($entities) && sizeof($entities) > 0) - $html .= elgg_view("entities/gallery",array('entities' => $entities)); - } - - if ($count) - $html .= $nav; - - echo $html; - -?> +echo $html;
\ No newline at end of file diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php index dd07e7d01..f6157e11a 100644 --- a/views/default/entities/entity_listing.php +++ b/views/default/entities/entity_listing.php @@ -1,37 +1,29 @@ <?php +/** + * Elgg entity listing + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ +?> - /** - * Elgg search listing - * - * @package Elgg - * @subpackage Core - - * @author Curverider Ltd +<div class="entity_listing"> - * @link http://elgg.org/ - */ + <div class="entity_listing_icon"> + <?php -?> + echo $vars['icon']; - <div class="entity_listing"> - - <div class="entity_listing_icon"> - <?php + ?> + </div> + <div class="entity_listing_info"> + <?php - echo $vars['icon']; - - ?> - </div> - <div class="entity_listing_info"> - <?php + echo $vars['info']; - echo $vars['info']; - - ?> - </div> - + ?> </div> - -<?php -?>
\ No newline at end of file +</div> |