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 d1136008506ea70fdd344004eb0f87f95e0ffea5..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,24 +74,38 @@ 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' => 'increasePhotoSize()'), '+');
-        $this->raw(' | ');
-        $this->element('a', array('href' => '#',
-                                  'onclick' => 'decreasePhotoSize()'), '-');
+        //$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->elementStart('div', array('class' => 'photocontainer'));
             $this->elementStart('a', array('href' => $album->getPageLink()));
@@ -106,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;
         }
@@ -126,13 +140,16 @@ class PhotosAction extends Action
             $this->element('a', array('href' => $album->getPageLink() . '?pageid=' . ($page+1) ), 'Next page');
             $this->raw(' | ');
         }
-        $this->element('a', array('href' => '#',
-                                  'onclick' => 'increasePhotoSize()'), '+');
-        $this->raw(' | ');
-        $this->element('a', array('href' => '#',
-                                  'onclick' => 'decreasePhotoSize()'), '-');
+
+        //$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()));