From fb125354d94ad2784e73886a57476e4fc1dc72aa Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 3 Dec 2010 13:29:09 +0000 Subject: Refs #2189 the beginning of semantic markup for entity lists - needs some reorganization git-svn-id: http://code.elgg.org/elgg/trunk@7516 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/views.php | 10 +++--- views/default/entities/list.php | 63 ++++++++++++++++++++++++++++++++++++ views/default/entities/list_item.php | 19 +++++++++++ 3 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 views/default/entities/list.php create mode 100644 views/default/entities/list_item.php diff --git a/engine/lib/views.php b/engine/lib/views.php index 73a12cc8d..ccba3d173 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -840,8 +840,8 @@ function elgg_view_annotation(ElggAnnotation $annotation, $bypass = true, $debug * @return string The list of entities * @access private */ -function elgg_view_entity_list($entities, $count, $offset, $limit, $fullview = true, -$listtypetoggle = true, $pagination = true) { +function elgg_view_entity_list($entities, $count, $offset, $limit, $full_view = true, +$list_type_toggle = true, $pagination = true) { $count = (int) $count; $limit = (int) $limit; @@ -853,15 +853,15 @@ $listtypetoggle = true, $pagination = true) { $context = elgg_get_context(); - $html = elgg_view('entities/entity_list', array( + $html = elgg_view('entities/list', array( 'entities' => $entities, 'count' => $count, 'offset' => $offset, 'limit' => $limit, 'baseurl' => $_SERVER['REQUEST_URI'], - 'fullview' => $fullview, + 'fullview' => $full_view, 'context' => $context, - 'listtypetoggle' => $listtypetoggle, + 'listtypetoggle' => $list_type_toggle, 'listtype' => get_input('listtype', 'list'), 'pagination' => $pagination )); diff --git a/views/default/entities/list.php b/views/default/entities/list.php new file mode 100644 index 000000000..d35c66500 --- /dev/null +++ b/views/default/entities/list.php @@ -0,0 +1,63 @@ + 0 && $list_type_toggle) { + $nav .= elgg_view('navigation/listtype', array( + 'baseurl' => $base_url, + 'offset' => $offset, + 'count' => $count, + 'listtype' => $list_type, + )); +} + +if ($pagination) { + $nav .= elgg_view('navigation/pagination', array( + 'baseurl' => $base_url, + 'offset' => $offset, + 'count' => $count, + 'limit' => $limit, + )); +} + +if ($list_type == 'list') { + if (is_array($entities) && sizeof($entities) > 0) { + $html .= ''; + } +} else { + if (is_array($entities) && sizeof($entities) > 0) { + $html .= elgg_view('entities/gallery', array('entities' => $entities)); + } +} + +if ($count) { + $html .= $nav; +} + +echo $html; diff --git a/views/default/entities/list_item.php b/views/default/entities/list_item.php new file mode 100644 index 000000000..4b6636db7 --- /dev/null +++ b/views/default/entities/list_item.php @@ -0,0 +1,19 @@ + +
+
+ +
+
+ +
+
-- cgit v1.2.3