move instructions to top in openid pages

darcs-hash:20080618190202-84dde-20cc79646144076090c36fe25d78f2d0e399d5ad.gz

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 6ce4bb191adfaab16a2805ad23ff489b62286303..ecc4e6bff630a49332edde2ab93c8632cfbcdb53 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -38,14 +38,17 @@ class OpenidloginAction extends Action {
                }
        }
 
-       function show_form($error=NULL) {
-               common_show_header(_t('OpenID Login'));
+       function show_top($error=NULL) {
                if ($error) {
                        common_element('div', array('class' => 'error'), $error);
                } else {
                        common_element('div', 'instructions',
                                                   _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');
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'openidlogin',

diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 742ef2757bdab35bca387f7b03a2a90c07501bb3..aceb8023b5bbe882c428d80fa018af187a2bfbf1 100644 (file)
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -24,18 +24,25 @@ require_once(INSTALLDIR.'/lib/openid.php');
 
 class OpenidsettingsAction extends SettingsAction {
 
-       function show_form($msg=NULL, $success=false) {
-               
-               $user = common_current_user();
+       function show_top($arr) {
+               $msg = $arr[0];
+               $success = $arr[1];
                
-               common_show_header(_t('OpenID settings'), NULL, NULL, array($this, 'settings_menu'));
-
                if ($msg) {
                        $this->message($msg, $success);
                } else {
                        common_element('div', 'instructions',
                                                   _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',
                                                                                   'id' => 'openidadd',
                                                                                   'action' =>