add a profile block to left column

diff --git a/lib/action.php b/lib/action.php
index 12464c2c68e768432ebc5bcaf274547efbf9f9d1..aa85c40f22fdbd1a41b529c9c1f62131bb57a08c 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -716,10 +716,26 @@ class Action extends HTMLOutputter // lawsuit
         // Need to have this ID for CSS; I'm too lazy to add it to
         // all menus
         $this->elementStart('div', array('id' => 'site_nav_local_views'));
+        // Cheat cheat cheat!
+        $this->showProfileBlock();
         $this->showLocalNav();
         $this->elementEnd('div');
     }
 
+    /**
+     * If there's a logged-in user, show a bit of login context
+     *
+     * @return nothing
+     */
+
+    function showProfileBlock()
+    {
+        if (common_logged_in()) {
+            $block = new DefaultProfileBlock($this);
+            $block->show();
+        }
+    }
+
     /**
      * Show local navigation.
      *

diff --git a/lib/defaultprofileblock.php b/lib/defaultprofileblock.php
new file mode 100644 (file)
index 0000000..a072b56
--- /dev/null
+++ b/lib/defaultprofileblock.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Default profile block to show current user's info
+ * 
+ * PHP version 5
+ *
+ * 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  Widget
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Default profile block
+ *
+ * @category  Widget
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class DefaultProfileBlock extends ProfileBlock
+{
+    protected $profile = null;
+
+    function __construct($out)
+    {
+        parent::__construct($out);
+        $user = common_current_user();
+        if (empty($user)) {
+            throw new Exception("DefaultProfileBlock with no user.");
+        }
+        $this->profile = $user->getProfile();
+    }
+
+    function avatar()
+    {
+        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        if (empty($avatar)) {
+            $avatar = $this->profile->getAvatar(73);
+        }
+        return (!empty($avatar)) ? 
+            $avatar->displayUrl() : 
+            Avatar::defaultImage(AVATAR_PROFILE_SIZE);
+    }
+
+    function name()
+    {
+        return $this->profile->getBestName();
+    }
+
+    function url()
+    {
+        return $this->profile->profileurl;
+    }
+
+    function canEdit()
+    {
+        return true;
+    }
+
+    function editUrl()
+    {
+        return common_local_url('profilesettings');
+    }
+
+    function editText()
+    {
+        return _('Edit');
+    }
+
+    function location()
+    {
+        return $this->profile->location;
+    }
+
+    function homepage()
+    {
+        return $this->profile->homepage;
+    }
+
+    function description()
+    {
+        return $this->profile->bio;
+    }
+}
\ No newline at end of file

diff --git a/lib/profileblock.php b/lib/profileblock.php
new file mode 100644 (file)
index 0000000..3e8e929
--- /dev/null
+++ b/lib/profileblock.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for profile blocks
+ * 
+ * PHP version 5
+ *
+ * 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  Widget
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Class comment
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+abstract class ProfileBlock extends Widget
+{
+    abstract function avatar();
+    abstract function name();
+    abstract function url();
+    abstract function canEdit();
+    abstract function editUrl();
+    abstract function editText();
+    abstract function location();
+    abstract function homepage();
+    abstract function description();
+
+    function show()
+    {
+        $this->out->elementStart('div', 'profile_block');
+
+        $this->out->element('img', array('src' => $this->avatar(),
+                                         'class' => 'profile_block_avatar',
+                                         'alt' => $this->name(),
+                                         'width' => AVATAR_PROFILE_SIZE,
+                                         'height' => AVATAR_PROFILE_SIZE));
+
+        if ($this->canEdit()) {
+            $this->out->element('a', array('href' => $this->editUrl()),
+                                $this->editText());
+        }
+
+        $name = $this->name();
+
+        if (!empty($name)) {
+            $url = $this->url();
+            if (!empty($url)) {
+                $this->out->element('a', array('href' => $url),
+                                    $name);
+            } else {
+                $this->out->element('span', 'profile_block_name', $name);
+            }
+        }
+
+        $location = $this->location();
+
+        if (!empty($location)) {
+            $this->out->element('span', 'profile_block_location', $location);
+        }
+
+        $homepage = $this->homepage();
+
+        if (!empty($homepage)) {
+            $this->out->element('a', 'profile_block_homepage', $homepage);
+        }
+
+        $description = $this->description();
+
+        if (!empty($description)) {
+            $this->out->element('p',
+                                'profile_block_description',
+                                $description);
+        }
+
+        $this->out->elementEnd('div');
+    }
+}