Merge remote-tracking branch 'evan/blogplugin' into newblogplugin

[quix0rs-gnu-social.git] / lib / galleryaction.php

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index ba60c195c7bb4168d88e4fb11dff3e82b9f212bb..51bb9e3e1a17d17e2af83c2eda6ccea0f6f38cef 100644 (file)
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -28,7 +28,7 @@ require_once INSTALLDIR.'/lib/profilelist.php';
 define('AVATARS_PER_PAGE', 80);
 
 // @todo FIXME: Class documentation missing.
-class GalleryAction extends OwnerDesignAction
+class GalleryAction extends ProfileAction
 {
     var $profile = null;
     var $page = null;
@@ -65,7 +65,7 @@ class GalleryAction extends OwnerDesignAction
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed when trying to perform a gallery action with a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }
@@ -97,12 +97,6 @@ class GalleryAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showObjectNav()
-    {
-        $nav = new SubGroupNav($this, $this->user);
-        $nav->show();
-    }
-
     function showContent()
     {
         $this->showTagsDropdown();
@@ -120,6 +114,9 @@ class GalleryAction extends OwnerDesignAction
             $content[$t] = $t;
         }
         if ($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',
                                              'class' => 'child_1'));
@@ -150,6 +147,8 @@ class GalleryAction extends OwnerDesignAction
             $this->elementEnd('form');
             $this->elementEnd('li');
             $this->elementEnd('ul');
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
     }