Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
This commit is contained in:
commit
25ff381486
@ -90,16 +90,27 @@ class OpenidloginAction extends Action
|
||||
function showContent() {
|
||||
$formaction = common_local_url('openidlogin');
|
||||
$this->elementStart('form', array('method' => 'post',
|
||||
'id' => 'openidlogin',
|
||||
'id' => 'form_openid_login',
|
||||
'class' => 'form_settings',
|
||||
'action' => $formaction));
|
||||
$this->elementStart('fieldset');
|
||||
$this->element('legend', null, _('OpenID login'));
|
||||
$this->hidden('token', common_session_token());
|
||||
|
||||
$this->elementStart('ul', 'form_data');
|
||||
$this->elementStart('li');
|
||||
$this->input('openid_url', _('OpenID URL'),
|
||||
$this->openid_url,
|
||||
_('Your OpenID URL'));
|
||||
$this->elementEnd('li');
|
||||
$this->elementStart('li', array('id' => 'settings_rememberme'));
|
||||
$this->checkbox('rememberme', _('Remember me'), false,
|
||||
_('Automatically login in the future; ' .
|
||||
'not for shared computers!'));
|
||||
$this->elementEnd('li');
|
||||
$this->elementEnd('ul');
|
||||
$this->submit('submit', _('Login'));
|
||||
$this->elementEnd('fieldset');
|
||||
$this->elementEnd('form');
|
||||
}
|
||||
|
||||
|
@ -145,7 +145,8 @@ font-weight:bold;
|
||||
#newgroup legend,
|
||||
#editgroup legend,
|
||||
#form_tag_user legend,
|
||||
#form_remote_subscribe legend {
|
||||
#form_remote_subscribe legend,
|
||||
#form_openid_login legend {
|
||||
display:none;
|
||||
}
|
||||
|
||||
@ -173,7 +174,8 @@ width:90%;
|
||||
}
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user