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/object/album.php             |  8 +++++---
 views/default/tidypics/content_wrapper.php |  2 ++
 views/default/tidypics/css.php             |  9 ++++++++-
 views/default/tidypics/gallery.php         | 12 +++---------
 views/rss/object/album.php                 |  9 +++++++++
 views/rss/tidypics/content_wrapper.php     |  2 ++
 6 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 views/rss/tidypics/content_wrapper.php

(limited to 'views')

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 6ef6bc356..31e46d46d 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -22,20 +22,22 @@
  *
  *  Gallery view of an album object
  * 
- *  This is called when looking at page of albums (index.php).
+ *  This is called when looking at page of albums
  *
  *
  *****************************************************************************/
 
 			//get album cover if one was set 
 			if ($album->cover)
-				$album_cover = '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=small" class="tidypics_album_cover" alt="thumbnail"/>';
+				$album_cover = '<img src="' . $vars['url'] . 'pg/photos/thumbnail/' . $album->cover . '/small/" class="tidypics_album_cover" alt="' . $title . '"/>';
 			else
 				$album_cover = '<img src="' . $vars['url'] . 'mod/tidypics/graphics/empty_album.png" class="tidypics_album_cover" alt="new album">';
 
 ?>
 <div class="tidypics_album_gallery_item">
-	<a href="<?php echo $album->getURL();?>"><?php echo $title;?></a><br>
+	<div class="tidypics_gallery_title">
+		<a href="<?php echo $album->getURL();?>"><?php echo $title;?></a>
+	</div>
 	<a href="<?php echo $album->getURL();?>"><?php echo $album_cover;?></a><br>
 	<small><a href="<?php echo $vars['url'];?>pg/profile/<?php echo $owner->username;?>"><?php echo $owner->name;?></a> <?php echo $friendlytime;?><br>
 <?php
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);
 	}
 }
 
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 2ad4ed9f7..9c037b20f 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -5,7 +5,16 @@
 
 // for now catch the albums view and ignore it
 if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
+?>
+	<item>
+	  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
+	  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+	  <link><?php echo $vars['entity']->getURL(); ?></link>
+	  <title><![CDATA[<?php echo $$vars['entity']->title; ?>]]></title>
+	  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
+	</item>
 
+<?php
 } else {
 
 	$album = $vars['entity'];
diff --git a/views/rss/tidypics/content_wrapper.php b/views/rss/tidypics/content_wrapper.php
new file mode 100644
index 000000000..20d98862e
--- /dev/null
+++ b/views/rss/tidypics/content_wrapper.php
@@ -0,0 +1,2 @@
+<?php
+echo $vars['content'];
-- 
cgit v1.2.3