aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2009-11-01 23:25:25 +0000
committerCash Costello <cash.costello@gmail.com>2009-11-01 23:25:25 +0000
commit869a5dfcdb13f80efe912c6337579e4bc00a4526 (patch)
tree9b91997b8acb68f50dd91eca7416283a56bc02d3
parente9c3929aa22606f4974a3f721c2156ec4efcf36b (diff)
downloadelgg-869a5dfcdb13f80efe912c6337579e4bc00a4526.tar.gz
elgg-869a5dfcdb13f80efe912c6337579e4bc00a4526.tar.bz2
fixed some display issues with the common lists
-rw-r--r--lib/tidypics.php20
-rw-r--r--pages/lists/mostrecentimages.php2
-rw-r--r--pages/lists/mostviewedimages.php9
-rw-r--r--pages/lists/recentlycommented.php9
-rw-r--r--pages/lists/recentlyviewed.php9
-rw-r--r--pages/lists/yourmostviewed.php9
-rw-r--r--views/default/tidypics/gallery.php64
7 files changed, 115 insertions, 7 deletions
diff --git a/lib/tidypics.php b/lib/tidypics.php
index 38afc27f2..a5b713ee4 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -169,8 +169,26 @@
$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true);
$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset);
- return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
+ return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
+ }
+
+ function tp_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = false, $pagination = true) {
+ $context = get_context();
+
+ $html = elgg_view('tidypics/gallery',array(
+ 'entities' => $entities,
+ 'count' => $count,
+ 'offset' => $offset,
+ 'limit' => $limit,
+ 'baseurl' => $_SERVER['REQUEST_URI'],
+ 'fullview' => $fullview,
+ 'context' => $context,
+ 'viewtypetoggle' => $viewtypetoggle,
+ 'viewtype' => get_input('search_viewtype','list'),
+ 'pagination' => $pagination
+ ));
+ return $html;
}
/**
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 270817178..5f5116513 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -31,8 +31,6 @@
// grab the html to display the images
$images = tp_list_entities("object", "image", $user_id, $max, false, false, true);
-// echo "<pre>"; var_dump( $images ); echo "</pre>";
- $images .= '<div class="clearfloat"></div>'; // hack until elgg fixes problem with css/list entities html
// this view takes care of the title on the main column and the content wrapper
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index da8a20b5f..b8cc67b51 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -35,7 +35,14 @@
}
$title = elgg_echo("tidypics:mostviewed");
$area2 = elgg_view_title($title);
- $area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+
+ // grab the html to display the images
+ $images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+ // this view takes care of the title on the main column and the content wrapper
+ $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+ if( empty( $area2 )) $area2 = $images;
+
$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index fd1a24454..962732dba 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -46,7 +46,14 @@
}
$title = elgg_echo("tidypics:recentlycommented");
$area2 = elgg_view_title($title);
- $area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+
+ // grab the html to display the images
+ $images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+ // this view takes care of the title on the main column and the content wrapper
+ $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+ if( empty( $area2 )) $area2 = $images;
+
$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 6189b07de..1fa1be0ea 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -39,7 +39,14 @@
$title = elgg_echo("tidypics:recentlyviewed");
$area2 = elgg_view_title($title);
- $area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+
+ // grab the html to display the images
+ $images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+ // this view takes care of the title on the main column and the content wrapper
+ $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+ if( empty( $area2 )) $area2 = $images;
+
$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/pages/lists/yourmostviewed.php b/pages/lists/yourmostviewed.php
index b00ddafa1..9155c4454 100644
--- a/pages/lists/yourmostviewed.php
+++ b/pages/lists/yourmostviewed.php
@@ -36,7 +36,14 @@
$title = elgg_echo("tidypics:yourmostviewed");
$area2 = elgg_view_title($title);
- $area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+
+ // grab the html to display the images
+ $images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+ // this view takes care of the title on the main column and the content wrapper
+ $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+ if( empty( $area2 )) $area2 = $images;
+
$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php
new file mode 100644
index 000000000..29c706bb1
--- /dev/null
+++ b/views/default/tidypics/gallery.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * view a gallery of photos or albums
+ *
+ */
+
+$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));
+ }
+}
+
+$html .= '<div class="clearfloat"></div>';
+
+if ($count) {
+ $html .= $nav;
+}
+
+echo $html; \ No newline at end of file