Merge branch 'master' of gitorious.org:statusnet/mainline
This commit is contained in:
commit
0b7abf1595
|
@ -357,36 +357,17 @@ class TwitterauthorizationAction extends Action
|
||||||
$this->elementStart('fieldset', array('id' => 'settings_twitter_connect_options'));
|
$this->elementStart('fieldset', array('id' => 'settings_twitter_connect_options'));
|
||||||
// TRANS: Fieldset legend.
|
// TRANS: Fieldset legend.
|
||||||
$this->element('legend', null, _m('Connection options'));
|
$this->element('legend', null, _m('Connection options'));
|
||||||
$this->elementStart('ul', 'form_data');
|
|
||||||
$this->elementStart('li');
|
|
||||||
$this->element('input', array('type' => 'checkbox',
|
|
||||||
'id' => 'license',
|
|
||||||
'class' => 'checkbox',
|
|
||||||
'name' => 'license',
|
|
||||||
'value' => 'true'));
|
|
||||||
$this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
|
|
||||||
// TRANS: Text for license agreement checkbox.
|
|
||||||
// TRANS: %s is the license as configured for the StatusNet site.
|
|
||||||
$message = _m('My text and files are available under %s ' .
|
|
||||||
'except this private data: password, ' .
|
|
||||||
'email address, IM address, and phone number.');
|
|
||||||
$link = '<a href="' .
|
|
||||||
htmlspecialchars(common_config('license', 'url')) .
|
|
||||||
'">' .
|
|
||||||
htmlspecialchars(common_config('license', 'title')) .
|
|
||||||
'</a>';
|
|
||||||
$this->raw(sprintf(htmlspecialchars($message), $link));
|
|
||||||
$this->elementEnd('label');
|
|
||||||
$this->elementEnd('li');
|
|
||||||
$this->elementEnd('ul');
|
|
||||||
$this->hidden('access_token_key', $this->access_token->key);
|
$this->hidden('access_token_key', $this->access_token->key);
|
||||||
$this->hidden('access_token_secret', $this->access_token->secret);
|
$this->hidden('access_token_secret', $this->access_token->secret);
|
||||||
$this->hidden('twuid', $this->twuid);
|
$this->hidden('twuid', $this->twuid);
|
||||||
$this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']);
|
$this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']);
|
||||||
$this->hidden('tw_fields_name', $this->tw_fields['fullname']);
|
$this->hidden('tw_fields_name', $this->tw_fields['fullname']);
|
||||||
|
|
||||||
$this->elementStart('fieldset');
|
|
||||||
$this->hidden('token', common_session_token());
|
$this->hidden('token', common_session_token());
|
||||||
|
|
||||||
|
// Don't allow new account creation if site is flagged as invite only
|
||||||
|
if (common_config('site', 'inviteonly') == false) {
|
||||||
|
$this->elementStart('fieldset');
|
||||||
$this->element('legend', null,
|
$this->element('legend', null,
|
||||||
// TRANS: Fieldset legend.
|
// TRANS: Fieldset legend.
|
||||||
_m('Create new account'));
|
_m('Create new account'));
|
||||||
|
@ -420,6 +401,7 @@ class TwitterauthorizationAction extends Action
|
||||||
// TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
|
// TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
|
||||||
$this->submit('create', _m('BUTTON','Create'));
|
$this->submit('create', _m('BUTTON','Create'));
|
||||||
$this->elementEnd('fieldset');
|
$this->elementEnd('fieldset');
|
||||||
|
}
|
||||||
|
|
||||||
$this->elementStart('fieldset');
|
$this->elementStart('fieldset');
|
||||||
$this->element('legend', null,
|
$this->element('legend', null,
|
||||||
|
@ -438,10 +420,37 @@ class TwitterauthorizationAction extends Action
|
||||||
$this->password('password', _m('Password'));
|
$this->password('password', _m('Password'));
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
$this->elementEnd('ul');
|
$this->elementEnd('ul');
|
||||||
// TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
|
|
||||||
$this->submit('connect', _m('BUTTON','Connect'));
|
|
||||||
$this->elementEnd('fieldset');
|
$this->elementEnd('fieldset');
|
||||||
|
|
||||||
|
$this->elementStart('fieldset');
|
||||||
|
$this->element('legend', null,
|
||||||
|
// TRANS: Fieldset legend.
|
||||||
|
_m('License'));
|
||||||
|
$this->elementStart('ul', 'form_data');
|
||||||
|
$this->elementStart('li');
|
||||||
|
$this->element('input', array('type' => 'checkbox',
|
||||||
|
'id' => 'license',
|
||||||
|
'class' => 'checkbox',
|
||||||
|
'name' => 'license',
|
||||||
|
'value' => 'true'));
|
||||||
|
$this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
|
||||||
|
// TRANS: Text for license agreement checkbox.
|
||||||
|
// TRANS: %s is the license as configured for the StatusNet site.
|
||||||
|
$message = _m('My text and files are available under %s ' .
|
||||||
|
'except this private data: password, ' .
|
||||||
|
'email address, IM address, and phone number.');
|
||||||
|
$link = '<a href="' .
|
||||||
|
htmlspecialchars(common_config('license', 'url')) .
|
||||||
|
'">' .
|
||||||
|
htmlspecialchars(common_config('license', 'title')) .
|
||||||
|
'</a>';
|
||||||
|
$this->raw(sprintf(htmlspecialchars($message), $link));
|
||||||
|
$this->elementEnd('label');
|
||||||
|
$this->elementEnd('li');
|
||||||
|
$this->elementEnd('ul');
|
||||||
|
$this->elementEnd('fieldset');
|
||||||
|
// TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
|
||||||
|
$this->submit('connect', _m('BUTTON','Connect'));
|
||||||
$this->elementEnd('fieldset');
|
$this->elementEnd('fieldset');
|
||||||
$this->elementEnd('form');
|
$this->elementEnd('form');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user