fixed some display issues with the common lists

5 files changed, 32 insertions, 6 deletions

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