X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fgalleryaction.php;h=975933f6cceeb492c393f985d0d64594b1663b29;hb=d2104b89d93d40bf68884055196340465f3f6497;hp=b389fc00f805634b92f3dd1eddc52e20dcaa5ff4;hpb=29bebdb50bf008a02e6c3e9530b3dff3bdd2b821;p=quix0rs-gnu-social.git

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index b389fc00f8..975933f6cc 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -27,7 +27,8 @@ require_once INSTALLDIR.'/lib/profilelist.php';
 
 define('AVATARS_PER_PAGE', 80);
 
-class GalleryAction extends OwnerDesignAction
+// @todo FIXME: Class documentation missing.
+class GalleryAction extends ProfileAction
 {
     var $profile = null;
     var $page = null;
@@ -50,21 +51,20 @@ class GalleryAction extends OwnerDesignAction
                 $args['page'] = $this->arg['page'];
             }
             common_redirect(common_local_url($this->trimmed('action'), $args), 301);
-            return false;
         }
 
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
             $this->clientError(_('No such user.'), 404);
-            return false;
         }
 
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
-            return false;
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -84,22 +84,15 @@ class GalleryAction extends OwnerDesignAction
     {
         parent::handle($args);
 
-		# Post from the tag dropdown; redirect to a GET
+		// Post from the tag dropdown; redirect to a GET
 
 		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 		    common_redirect($this->selfUrl(), 303);
-            return;
 		}
 
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new SubGroupNav($this, $this->user);
-        $nav->show();
-    }
-
     function showContent()
     {
         $this->showTagsDropdown();
@@ -117,8 +110,8 @@ class GalleryAction extends OwnerDesignAction
             $content[$t] = $t;
         }
         if ($tags) {
-            $this->elementStart('dl', array('id'=>'filter_tags'));
-            $this->element('dt', null, _('Filter tags'));
+            $this->elementStart('dl', array('id' => 'filter_tags'));
+            $this->element('dt', null, _('Tags'));
             $this->elementStart('dd');
             $this->elementStart('ul');
             $this->elementStart('li', array('id' => 'filter_tags_all',
@@ -128,17 +121,25 @@ class GalleryAction extends OwnerDesignAction
                                  common_local_url($this->trimmed('action'),
                                                   array('nickname' =>
                                                         $this->user->nickname))),
-                           _('All'));
+                           // TRANS: List element on gallery action page to show all tags.
+                           _m('TAGS','All'));
             $this->elementEnd('li');
             $this->elementStart('li', array('id'=>'filter_tags_item'));
             $this->elementStart('form', array('name' => 'bytag',
-                                               'id' => 'bytag',
-                                               'action' => common_path('?action=' . $this->trimmed('action')),
+                                               'id' => 'form_filter_bytag',
+                                              'action' => common_path('?action=' . $this->trimmed('action')),
                                                'method' => 'post'));
+            $this->elementStart('fieldset');
+            // TRANS: Fieldset legend on gallery action page.
+            $this->element('legend', null, _('Select tag to filter'));
+            // TRANS: Dropdown field label on gallery action page for a list containing tags.
             $this->dropdown('tag', _('Tag'), $content,
-                            _('Choose a tag to narrow list'), false, $tag);
+                            // TRANS: Dropdown field title on gallery action page for a list containing tags.
+                            _('Choose a tag to narrow list.'), false, $tag);
             $this->hidden('nickname', $this->user->nickname);
-            $this->submit('submit', _('Go'));
+            // TRANS: Submit button text on gallery action page.
+            $this->submit('submit', _m('BUTTON','Go'));
+            $this->elementEnd('fieldset');
             $this->elementEnd('form');
             $this->elementEnd('li');
             $this->elementEnd('ul');
@@ -148,7 +149,6 @@ class GalleryAction extends OwnerDesignAction
     }
 
     // Get list of tags we tagged other users with
-
     function getTags($lst, $usr)
     {
         $profile_tag = new Notice_tag();
@@ -170,4 +170,10 @@ class GalleryAction extends OwnerDesignAction
     {
         return array();
     }
+
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();
+    }
 }