Merge branch 'master' of /var/www/trunk

5 files changed, 102 insertions, 17 deletions

diff --git a/lib/profilesection.php b/lib/profilesection.php
index 14068b082..91a3dfa34 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -58,13 +58,13 @@ class ProfileSection extends Section
 
         $cnt = 0;
 
-        $this->out->elementStart('ul', 'entities users xoxo');
-
+        $this->out->elementStart('table');
+        $this->out->elementStart('tbody');
         while ($profiles->fetch() && ++$cnt <= PROFILES_PER_SECTION) {
             $this->showProfile($profiles);
         }
-
-        $this->out->elementEnd('ul');
+        $this->out->elementEnd('tbody');
+        $this->out->elementEnd('table');
 
         return ($cnt > PROFILES_PER_SECTION);
     }
diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php
new file mode 100644
index 000000000..8ca5dd200
--- /dev/null
+++ b/lib/searchgroupnav.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Menu for search actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Menu
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Menu for public group of actions
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Widget
+ */
+
+class SearchGroupNav extends Widget
+{
+    var $action = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+        $this->action = $action;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $action_name = $this->action->trimmed('action');
+        $this->action->elementStart('ul', array('class' => 'nav'));
+        $this->out->menuItem(common_local_url('people'), _('People'),
+            _('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people');
+        $this->out->menuItem(common_local_url('notice'), _('Notice'),
+            _('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice');
+        $this->action->elementEnd('ul');
+    }
+}
+
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index 7a3d46aa5..4701ca83f 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -71,7 +71,9 @@ class TopPostersSection extends ProfileSection
 
     function showProfile($profile)
     {
-        $this->out->elementStart('li', 'vcard');
+        $this->out->elementStart('tr');
+        $this->out->elementStart('td');
+        $this->out->elementStart('span', 'vcard');        
         $this->out->elementStart('a', array('title' => ($profile->fullname) ?
                                        $profile->fullname :
                                        $profile->nickname,
@@ -87,11 +89,14 @@ class TopPostersSection extends ProfileSection
                                     $profile->fullname :
                                     $profile->nickname));
         $this->out->element('span', 'fn nickname', $profile->nickname);
+        $this->out->elementEnd('span');        
         $this->out->elementEnd('a');
+        $this->out->elementEnd('td');
         if ($profile->value) {
-            $this->out->element('span', 'value', $profile->value);
+            $this->out->element('td', 'value', $profile->value);
         }
-        $this->out->elementEnd('li');
+
+        $this->out->elementEnd('tr');
     }
 
     function title()
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 44dbff5da..c55b3fd23 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1057,28 +1057,27 @@ background-color:#fff;
 /*END: LOAD ALONG WITH JS*/
 
 /* TOP_POSTERS */
-#top-posters caption {
+#top_posters caption {
 text-align:left;
 text-transform:uppercase;
 }
 
-#top-posters thead {
+#top_posters thead {
 display:none;
 }
-#top-poster_user {
+#top_poster_user {
 width:199px;
 }
-#top-poster_number-of-notices {
+#top_poster_number-of-notices {
 width:123px;
 }
-#top-posters tbody td {
+#top_posters tbody td {
 padding-right:11px;
 padding-bottom:4px;
 }
-#top-posters img {
+#top_posters img {
 margin-right:7px;
-height:24px;
-width:24px;
+margin-bottom:0;
 }
 
 /* tagcloud */
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 5d07cfd9a..c16dc9fd7 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -214,8 +214,8 @@ background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-re
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
-div.entry-content,
-div.notice-options {
+.notices div.entry-content,
+.notices div.notice-options {
 opacity:0.3;
 }
 .notices li.hover div.entry-content,