Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / actions / photos.php

diff --git a/plugins/GNUsocialPhotos/actions/photos.php b/plugins/GNUsocialPhotos/actions/photos.php
index ede8ba0f73982f8b02eed8830b815a115b976330..a180be8c12098295c3724287184dc8d5c218681a 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/photos.php
+++ b/plugins/GNUsocialPhotos/actions/photos.php
@@ -38,7 +38,7 @@ class PhotosAction extends Action
 {
     var $user = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -48,12 +48,12 @@ class PhotosAction extends Action
         if (common_valid_profile_tag($username) == 0) {
             $this->user = null;
         } else {
-            $this->user = Profile::staticGet('nickname', $username);
+            $this->user = Profile::getKV('nickname', $username);
         }
         return true;
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $this->showPage();
@@ -74,20 +74,43 @@ class PhotosAction extends Action
         $nav->show();
     }
 
+    function showResizeImagesBox()
+    {
+        $this->elementStart('select', array('onchange' => 'return scalePhotosToSize(this.value)'));
+        $this->element('option', array('value' => ''), "");
+        $this->element('option', array('value' => '60'), _("Thumbnail"));
+        $this->element('option', array('value' => '120'), _("Medium"));
+        $this->element('option', array('value' => '400'), _("Normal"));
+        $this->elementEnd('select');
+    }
+
     function showAlbums()
     {
         $album = new GNUsocialPhotoAlbum();
-        $album->user_id = $this->user->id;
+        $album->profile_id = $this->user->id;
 
         $albums = array();
         if (!$album->find()) {
-            GNUsocialPhotoAlbum::newAlbum($cur->id, 'Default');
+            GNUsocialPhotoAlbum::newAlbum($this->user->id, 'Default');
         }
+
+        $this->elementStart('div', array('class' => 'galleryheader'));
+        //$this->element('a', array('href' => '#',
+        //                          'onclick' => 'return increasePhotoSize()'), '+');
+        //$this->raw(' | ');
+        //$this->element('a', array('href' => '#',
+        //                          'onclick' => 'return decreasePhotoSize()'), '-');
+
+        $this->showResizeImagesBox();
+        $this->elementEnd('div');
+
+
+
         while ($album->fetch()) {
-            $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->element('img', array('src' => $album->getThumbUri(),
+                                        'class' => 'albumingallery'));
             $this->elementEnd('a');
             $this->element('h3', array(), $album->album_name);
             $this->elementEnd('div');
@@ -97,7 +120,7 @@ class PhotosAction extends Action
     
     function showAlbum($album_id)
     {
-        $album = GNUSocialPhotoAlbum::staticGet('album_id', $album_id);
+        $album = GNUsocialPhotoAlbum::getKV('album_id', $album_id);
         if (!$album) {
             return;
         }
@@ -108,18 +131,31 @@ class PhotosAction extends Action
         }
 
         $photos = GNUsocialPhoto::getGalleryPage($page, $album->album_id, 9);
+        $this->elementStart('div', array('class' => 'galleryheader'));
         if ($page > 1) { 
             $this->element('a', array('href' => $album->getPageLink() . '?pageid=' . ($page-1)), 'Previous page');
+            $this->raw(' | ');
         }
         if (GNUsocialPhoto::getGalleryPage($page+1, $album->album_id, 9)) {
             $this->element('a', array('href' => $album->getPageLink() . '?pageid=' . ($page+1) ), 'Next page');
+            $this->raw(' | ');
         }
 
-            $this->element('style', array(), '.photocontainer { display: block; background-color: yellow; float: left; padding: 30px; margin: 20px; }');
+        //$this->element('a', array('href' => '#',
+        //                          'onclick' => 'return increasePhotoSize()'), '+');
+        //$this->raw(' | ');
+        //$this->element('a', array('href' => '#',
+        //                          'onclick' => 'return decreasePhotoSize()'), '-');
+        //$this->raw(' | ');
+
+        $this->showResizeImagesBox();
+        $this->elementEnd('div');
+
         foreach ($photos as $photo) {
             $this->elementStart('a', array('href' => $photo->getPageLink()));
             $this->elementStart('div', array('class' => 'photocontainer'));
-            $this->element('img', array('src' => $photo->thumb_uri));
+            $this->element('img', array('src' => $photo->thumb_uri,
+                                        'class' => 'photoingallery'));
             $this->element('div', array('class' => 'phototitle'), $photo->title);
             $this->elementEnd('div');
             $this->elementEnd('a');