Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / plugins / TwitterBridge / twitterlogin.php

diff --git a/plugins/TwitterBridge/twitterlogin.php b/plugins/TwitterBridge/twitterlogin.php
index ae468ea15c2192d38569b82cbe755620ccbd8412..79421fb27da5a11f66b2ffba24f079578c2cab2f 100644 (file)
--- a/plugins/TwitterBridge/twitterlogin.php
+++ b/plugins/TwitterBridge/twitterlogin.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Settings for Twitter integration
+ * 'Sign in with Twitter' login page
  *
  * PHP version 5
  *
@@ -19,10 +19,11 @@
  * 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  Settings
+ * @category  Login
  * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @author    Julien Chaumond <chaumond@gmail.com>
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -34,19 +35,18 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
 
 /**
- * Settings for Twitter integration
+ * Page for logging in with Twitter
  *
- * @category Settings
+ * @category Login
  * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
  * @author   Julien Chaumond <chaumond@gmail.com>
+ * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
  * @see      SettingsAction
  */
 
-
 class TwitterloginAction extends Action
 {
     function handle($args)
@@ -67,7 +67,7 @@ class TwitterloginAction extends Action
 
     function getInstructions()
     {
-        return _('Login with your Twitter Account');
+        return _('Login with your Twitter account');
     }
 
     function showPageNotice()
@@ -81,9 +81,11 @@ class TwitterloginAction extends Action
 
     function showContent()
     {
-        $this->elementStart('a', array('href' => common_local_url('twitterauthorization')));
-        $this->element('img', array('src' => common_path('plugins/TwitterBridge/twitter_connect.gif'),
-                                    'alt' => 'Connect my Twitter account'));
+        $this->elementStart('a', array('href' => common_local_url('twitterauthorization',
+                                                                  null,
+                                                                  array('signin' => true))));
+        $this->element('img', array('src' => common_path('plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png'),
+                                    'alt' => 'Sign in with Twitter'));
         $this->elementEnd('a');
     }