From 46b2151f092a46a781860cb3bac3e5f502ccf7d5 Mon Sep 17 00:00:00 2001
From: Max Shinn <trombonechamp@gmail.com>
Date: Tue, 28 Dec 2010 08:57:28 -0600
Subject: [PATCH] Pictures/albums in floating divs

---
 plugins/GNUsocialPhotos/actions/photo.php  |  2 +-
 plugins/GNUsocialPhotos/actions/photos.php | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/GNUsocialPhotos/actions/photo.php b/plugins/GNUsocialPhotos/actions/photo.php
index 663d75a734..e9d87b32d7 100644
--- a/plugins/GNUsocialPhotos/actions/photo.php
+++ b/plugins/GNUsocialPhotos/actions/photo.php
@@ -50,7 +50,7 @@ class PhotoAction extends Action
 
         $this->user = Profile::staticGet('id', $this->notice->profile_id);
         
-        $notices = Notice::conversationStream((int)$this->notice->conversation, null, null); //Why do I have to do -1?
+        $notices = Notice::conversationStream((int)$this->notice->conversation, null, null); 
         $this->conversation = new ConversationTree($notices, $this);
         return true;
 
diff --git a/plugins/GNUsocialPhotos/actions/photos.php b/plugins/GNUsocialPhotos/actions/photos.php
index c16bb80789..ede8ba0f73 100644
--- a/plugins/GNUsocialPhotos/actions/photos.php
+++ b/plugins/GNUsocialPhotos/actions/photos.php
@@ -83,16 +83,15 @@ class PhotosAction extends Action
         if (!$album->find()) {
             GNUsocialPhotoAlbum::newAlbum($cur->id, 'Default');
         }
-        $this->elementStart('ul', array('class' => 'photothumbs'));
         while ($album->fetch()) {
-            $this->elementStart('li');
-            $this->element('h3', array(), $album->title);
+            $this->element('style', array(), '.albumcontainer { display: block; background-color: green; float: left; padding: 30px; margin: 20px; }');
+            $this->elementStart('div', array('class' => 'photocontainer'));
             $this->elementStart('a', array('href' => $album->getPageLink()));
             $this->element('img', array('src' => $album->getThumbUri()));
             $this->elementEnd('a');
-            $this->elementEnd('li');
+            $this->element('h3', array(), $album->album_name);
+            $this->elementEnd('div');
         }
-        $this->elementEnd('ul');
         
     }
     
@@ -116,15 +115,16 @@ class PhotosAction extends Action
             $this->element('a', array('href' => $album->getPageLink() . '?pageid=' . ($page+1) ), 'Next page');
         }
 
-        $this->elementStart('ul', array('class' => 'photothumbs'));
+            $this->element('style', array(), '.photocontainer { display: block; background-color: yellow; float: left; padding: 30px; margin: 20px; }');
         foreach ($photos as $photo) {
-            $this->elementStart('li');
             $this->elementStart('a', array('href' => $photo->getPageLink()));
+            $this->elementStart('div', array('class' => 'photocontainer'));
             $this->element('img', array('src' => $photo->thumb_uri));
+            $this->element('div', array('class' => 'phototitle'), $photo->title);
+            $this->elementEnd('div');
             $this->elementEnd('a');
-            $this->elementEnd('li');
         }
-        $this->elementEnd('ul');
+
     }