put instructions into header div

darcs-hash:20080619190357-84dde-f7e6e0741c5fc9c1bf99b4273ff1c0160056cf39.gz

diff --git a/lib/openid.php b/lib/openid.php
index b066c654db4a6295da0069c63a17a918e99026cd..41102457a32857576e4c9279aae825d02b72fff1 100644 (file)
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -189,11 +189,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
                if (Auth_OpenID::isFailure($form_html)) {
                        $this->show_form(_t('Could not create OpenID form: ') . $form_html->message);
                } else {
-                       common_show_header(_t('OpenID Auto-Submit'));
-                       common_element('p', 'instructions',
-                                                  _t('This form should automatically submit itself. '.
-                                                         'If not, click the submit button to go to your '.
-                                                         'OpenID provider.'));
+                       common_show_header(_t('OpenID Auto-Submit'), NULL, NULL, '_oid_print_instructions');
                        common_raw($form_html);
                        common_element('script', NULL,
                                                   '$(document).ready(function() { ' .
@@ -204,6 +200,15 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
        }
 }
 
+# Half-assed attempt at a module-private function
+
+function _oid_print_instructions() {
+       common_element('p', 'instructions',
+                                  _t('This form should automatically submit itself. '.
+                                         'If not, click the submit button to go to your '.
+                                         'OpenID provider.'));
+}
+
 # update a user from sreg parameters
 
 function oid_update_user(&$user, &$sreg) {