GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-23 09:52:46 +01:00
commit 25ff381486
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
actions/openidlogin.php
View File

@ -90,16 +90,27 @@ class OpenidloginAction extends Action
function showContent() { function showContent() {
$formaction = common_local_url('openidlogin'); $formaction = common_local_url('openidlogin');
$this->elementStart('form', array('method' => 'post', $this->elementStart('form', array('method' => 'post',
'id' => 'openidlogin', 'id' => 'form_openid_login',
'class' => 'form_settings',
'action' => $formaction)); 'action' => $formaction));
$this->elementStart('fieldset');
$this->element('legend', null, _('OpenID login'));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('openid_url', _('OpenID URL'), $this->input('openid_url', _('OpenID URL'),
$this->openid_url, $this->openid_url,
_('Your OpenID URL')); _('Your OpenID URL'));
$this->elementEnd('li');
$this->elementStart('li', array('id' => 'settings_rememberme'));
$this->checkbox('rememberme', _('Remember me'), false, $this->checkbox('rememberme', _('Remember me'), false,
_('Automatically login in the future; ' . _('Automatically login in the future; ' .
'not for shared computers!')); 'not for shared computers!'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->submit('submit', _('Login')); $this->submit('submit', _('Login'));
$this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
} }

6
theme/base/css/display.css
View File

@ -145,7 +145,8 @@ font-weight:bold;
#newgroup legend, #newgroup legend,
#editgroup legend, #editgroup legend,
#form_tag_user legend, #form_tag_user legend,
#form_remote_subscribe legend { #form_remote_subscribe legend,
#form_openid_login legend {
display:none; display:none;
} }
@ -173,7 +174,8 @@ width:90%;
} }
#form_login p.form_guide, #form_login p.form_guide,
#form_register #settings_rememberme p.form_guide { #form_register #settings_rememberme p.form_guide,
#form_openid_login #settings_rememberme p.form_guide {
margin-left:0; margin-left:0;
} }