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

move instructions to top in openid pages

Browse Source 
darcs-hash:20080618190202-84dde-20cc79646144076090c36fe25d78f2d0e399d5ad.gz
This commit is contained in:
Evan Prodromou 2008-06-18 15:02:02 -04:00
parent f341780e1f
commit 03a08efce9
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/openidlogin.php
View File

@ -38,14 +38,17 @@ class OpenidloginAction extends Action {
} }
} }
function show_form($error=NULL) { function show_top($error=NULL) {
common_show_header(_t('OpenID Login'));
if ($error) { if ($error) {
common_element('div', array('class' => 'error'), $error); common_element('div', array('class' => 'error'), $error);
} else { } else {
common_element('div', 'instructions', common_element('div', 'instructions',
_t('Login with an OpenID account.')); _t('Login with an OpenID account.'));
} }
}
function show_form($error=NULL) {
common_show_header(_t('OpenID Login'), NULL, $error, array($this, 'show_top'));
$formaction = common_local_url('openidlogin'); $formaction = common_local_url('openidlogin');
common_element_start('form', array('method' => 'POST', common_element_start('form', array('method' => 'POST',
'id' => 'openidlogin', 'id' => 'openidlogin',

17
actions/openidsettings.php
View File

@ -24,11 +24,9 @@ require_once(INSTALLDIR.'/lib/openid.php');
class OpenidsettingsAction extends SettingsAction { class OpenidsettingsAction extends SettingsAction {
function show_form($msg=NULL, $success=false) { function show_top($arr) {
$msg = $arr[0];
$user = common_current_user(); $success = $arr[1];
common_show_header(_t('OpenID settings'), NULL, NULL, array($this, 'settings_menu'));
if ($msg) { if ($msg) {
$this->message($msg, $success); $this->message($msg, $success);
@ -36,6 +34,15 @@ class OpenidsettingsAction extends SettingsAction {
common_element('div', 'instructions', common_element('div', 'instructions',
_t('Manage your associated OpenIDs from here.')); _t('Manage your associated OpenIDs from here.'));
} }
}
function show_form($msg=NULL, $success=false) {
$user = common_current_user();
common_show_header(_t('OpenID settings'), NULL, array($msg, $success),
array($this, 'show_top'));
common_element_start('form', array('method' => 'POST', common_element_start('form', array('method' => 'POST',
'id' => 'openidadd', 'id' => 'openidadd',
'action' => 'action' =>