move instructions up to the "whats up" area

darcs-hash:20080618035739-84dde-a562cffe186780d5f03cf53798ea249b2bda9fb1.gz

1 files changed, 11 insertions, 8 deletions

diff --git a/actions/login.php b/actions/login.php
index 5544fd878..5acb157f4 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -60,14 +60,7 @@ class LoginAction extends Action {
 	}
 
 	function show_form($error=NULL) {
-		common_show_header(_t('Login'));
-		if ($error) {
-			common_element('div', array('class' => 'error'), $error);
-		} else {
-			common_element('div', 'instructions', 
-						   _t('Login with your username and password. ' .
-							  'Don\'t have a username yet? Choose register above. '));
-		}
+		common_show_header(_t('Login'), NULL, $error, array($this, 'show_top'));
 		common_element_start('form', array('method' => 'POST',
 										   'id' => 'login',
 										   'action' => common_local_url('login')));
@@ -77,4 +70,14 @@ class LoginAction extends Action {
 		common_element_end('form');
 		common_show_footer();
 	}
+	
+	function show_top($error=NULL) {
+		if ($error) {
+			common_element('p', 'error', $error);
+		} else {
+			common_element('p', 'instructions', 
+						   _t('Login with your username and password. ' .
+							  'Don\'t have a username yet? Choose register above. '));
+		}
+	}
 }