eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into testing

Browse Source
This commit is contained in:
Brion Vibber
2010-04-23 14:26:57 -07:00
parent 61098faf5d 9c8052e755
commit dd7b95c2cf
11 changed files with 290 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/OpenID/openid.php
View File

@@ -299,11 +299,21 @@ class AutosubmitAction extends Action
function title()
{
return _m('OpenID Auto-Submit');
return _m('OpenID Login Submission');
}
function showContent()
{
$this->raw('<p style="margin: 20px 80px">');
// @fixme this would be better using standard CSS class, but the present theme's a bit scary.
$this->element('img', array('src' => Theme::path('images/icons/icon_processing.gif', 'base'),
// for some reason the base CSS sets <img>s as block display?!
'style' => 'display: inline'));
$this->text(_m('Requesting authorization from your login provider...'));
$this->raw('</p>');
$this->raw('<p style="margin-top: 60px; font-style: italic">');
$this->text(_m('If you are not redirected to your login provider in a few seconds, try pushing the button below.'));
$this->raw('</p>');
$this->raw($this->form_html);
}
@@ -311,8 +321,6 @@ class AutosubmitAction extends Action
{
parent::showScripts();
$this->element('script', null,
'$(document).ready(function() { ' .
' $(\'#'. $this->form_id .'\').submit(); '.
'});');
'document.getElementById(\'' . $this->form_id . '\').submit();');
}
}