Improved nav bar

diff --git a/plugins/GNUsocialPhotos/actions/photo.php b/plugins/GNUsocialPhotos/actions/photo.php
index 6a77a59ed3d79ee0ca55fd80b4b60aa1447de0a8..5eb91cbe68bf25246f82e8b9440239d107ee0aa3 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/photo.php
+++ b/plugins/GNUsocialPhotos/actions/photo.php
@@ -77,7 +77,7 @@ class PhotoAction extends Action
 
     function showLocalNav()
     {
-        $nav = new GNUsocialPhotoNav($this);
+        $nav = new GNUsocialPhotoNav($this, $this->user->nickname);
         $nav->show();
     }
 

diff --git a/plugins/GNUsocialPhotos/actions/photoupload.php b/plugins/GNUsocialPhotos/actions/photoupload.php
index cfe588fc6499703b3fa9d1d7d07c58c274fd9648..c9e3d79af708af3da30066bc6545c424642267bb 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/photoupload.php
+++ b/plugins/GNUsocialPhotos/actions/photoupload.php
@@ -23,6 +23,7 @@
  * @package   GNU Social
  * @author    Ian Denhardt <ian@zenhack.net>
  * @author    Sean Corbett <sean@gnu.org>
+ * @author    Max Shinn    <trombonechamp@gmail.com>
  * @copyright 2010 Free Software Foundation, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  */

diff --git a/plugins/GNUsocialPhotos/lib/photonav.php b/plugins/GNUsocialPhotos/lib/photonav.php
index c464648803085083493c88154b8bd15e1d649a11..217392907ee58ee10d228ab9231dbf92aab6baf1 100644 (file)
--- a/plugins/GNUsocialPhotos/lib/photonav.php
+++ b/plugins/GNUsocialPhotos/lib/photonav.php
@@ -32,23 +32,27 @@ if(!defined('STATUSNET')) {
 class GNUsocialPhotoNav extends Widget {
     var $action = null;
 
-    function __construct($action = null)
+    function __construct($action = null, $nickname = null)
     {
         parent::__construct($action);
         $this->action = $action;
+        $this->nickname = $nickname;
     }
 
     function show()
     {
-        $nickname = $this->action->trimmed('nickname');
+        if (empty($this->nickname)) 
+            $this->nickname = $this->action->trimmed('nickname');
         
         $this->out->elementStart('ul', array('class' => 'nav'));
 
-        $this->out->menuItem(common_local_url('photos', array('nickname' => $nickname)),
-            'Photos', null, true);
+        $this->out->menuItem(common_local_url('showstream', array('nickname' => $this->nickname)), _('Profile'));
+
+        $this->out->menuItem(common_local_url('photos', array('nickname' => $this->nickname)),
+            _('Photos'));
         
         $this->out->menuItem(common_local_url('photoupload', array()),
-            'Upload Photos');
+            _('Upload Photos'));
 
         $this->out->elementEnd('ul');
     }