From dd8ff039f642b9eb6ea65cc1a58017ce867ec7b3 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 13 Dec 2009 02:03:17 +0000
Subject: fixed display of some album pages - caused a cascade of changes
 required

---
 views/default/tidypics/content_wrapper.php |  2 ++
 views/default/tidypics/css.php             |  9 ++++++++-
 views/default/tidypics/gallery.php         | 12 +++---------
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'views/default/tidypics')

diff --git a/views/default/tidypics/content_wrapper.php b/views/default/tidypics/content_wrapper.php
index 08fd74aff..757d069bb 100644
--- a/views/default/tidypics/content_wrapper.php
+++ b/views/default/tidypics/content_wrapper.php
@@ -2,7 +2,9 @@
 	echo elgg_view_title($vars['title']);
 ?>
 <div class="contentWrapper">
+<div class="clearfloat"></div>
 <?php
 	echo $vars['content'];
 ?>
+<div class="clearfloat"></div>
 </div>
\ No newline at end of file
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index b65d73789..556787da7 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -80,7 +80,7 @@ text-align:center;
 .tidypics_album_cover {
 padding:2px;
 border:1px solid #dedede;
-margin:8px 0;
+margin:5px 0;
 }
 
 .tidypics_album_widget_single_item {
@@ -88,9 +88,16 @@ margin-bottom:8px;
 }
 
 .tidypics_album_gallery_item {
+float:left;
+margin-bottom:20px;
+padding: 4px;
 text-align:center;
 }
 
+.tidypics_gallery_title {
+font-weight:bold;
+}
+
 .tidypics_popup {
 border:1px solid #3B5999; 
 width:200px; 
diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php
index dd7c1cdcf..b9a50bdab 100644
--- a/views/default/tidypics/gallery.php
+++ b/views/default/tidypics/gallery.php
@@ -43,15 +43,9 @@ if ($pagination) {
 }
 
 $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 (is_array($entities) && sizeof($entities) > 0) {
+	foreach($entities as $entity) {
+		$html .= elgg_view_entity($entity, $fullview);
 	}
 }
 
-- 
cgit v1.2.3