diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-11 18:28:39 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-11 18:28:39 +0000 |
| commit | 71d37062c57d671ced4e0182ebbd90e7431c674b (patch) | |
| tree | db6f0c1dc44b7e67f7814bb950780a8e008b9dd5 | |
| parent | 538a796fceaecd20c145b0912143a9066000e860 (diff) | |
| download | elgg-71d37062c57d671ced4e0182ebbd90e7431c674b.tar.gz elgg-71d37062c57d671ced4e0182ebbd90e7431c674b.tar.bz2 | |
The lists now go through the search/entity_list view.
git-svn-id: https://code.elgg.org/elgg/trunk@1407 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/elgglib.php | 52 | ||||
| -rw-r--r-- | views/default/search/entity_list.php | 50 | ||||
| -rw-r--r-- | views/rss/search/entity_list.php | 9 |
3 files changed, 70 insertions, 41 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index a529921ce..da0699cf8 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -359,49 +359,19 @@ $offset = (int) $offset;
$limit = (int) $limit;
- $html = "";
-
$context = get_context();
- $nav = "";
-
- if ($context == "search" && $count > 0) {
- $viewtype = get_input('search_viewtype','list');
- $nav .= elgg_view("navigation/viewtype",array(
-
- 'baseurl' => $_SERVER['REQUEST_URI'],
- 'offset' => $offset,
- 'count' => $count,
- 'viewtype' => $viewtype,
-
- ));
- }
-
- $nav .= elgg_view('navigation/pagination',array(
-
- 'baseurl' => $_SERVER['REQUEST_URI'],
- '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("search/gallery",array('entities' => $entities));
- }
-
- if ($count)
- $html .= $nav;
-
+ $html = elgg_view('search/entity_list',array(
+ 'entities' => $entities,
+ 'count' => $count,
+ 'offset' => $offset,
+ 'limit' => $limit,
+ 'baseurl' => $_SERVER['REQUEST_URI'],
+ 'fullview' => $fullview,
+ 'context' => $context,
+ 'viewtype' => get_input('search_viewtype','list'),
+ ));
+
return $html;
}
diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php new file mode 100644 index 000000000..50ef380e2 --- /dev/null +++ b/views/default/search/entity_list.php @@ -0,0 +1,50 @@ +<?php
+
+ $context = $vars['context'];
+ $offset = $vars['offset'];
+ $entities = $vars['entities'];
+ $limit = $vars['limit'];
+ $count = $vars['count'];
+ $baseurl = $vars['baseurl'];
+ $context = $vars['context'];
+ $viewtype = $vars['viewtype'];
+
+ if ($context == "search" && $count > 0) {
+ $nav .= elgg_view("navigation/viewtype",array(
+
+ 'baseurl' => $baseurl,
+ 'offset' => $offset,
+ 'count' => $count,
+ 'viewtype' => $viewtype,
+
+ ));
+ }
+
+ $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("search/gallery",array('entities' => $entities));
+ }
+
+ if ($count)
+ $html .= $nav;
+
+ echo $html;
+
+?>
\ No newline at end of file diff --git a/views/rss/search/entity_list.php b/views/rss/search/entity_list.php new file mode 100644 index 000000000..8864b62da --- /dev/null +++ b/views/rss/search/entity_list.php @@ -0,0 +1,9 @@ +<?php
+
+ $entities = $vars['entities'];
+ if (is_array($entities) && sizeof($entities) > 0) {
+ foreach($entities as $entity)
+ echo elgg_view_entity($entity);
+ }
+
+?>
\ No newline at end of file |