do some commits

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index d25d59cf73c08d034dc010d1f7db220d587c4552..5acb157f4f0315ebdb16c8d7276b111e7e524243 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -60,11 +60,7 @@ class LoginAction extends Action {
        }
 
        function show_form($error=NULL) {
-
-               common_show_header(_t('Login'));
-               if (!is_null($error)) {
-                       common_element('div', array('class' => 'error'), $msg);
-               }
+               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')));
@@ -74,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. '));
+               }
+       }
 }