do some commits

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

diff --git a/actions/register.php b/actions/register.php
index e192d52965de59c67add6239785e49b68b698eef..cad5c2ed708745df0f4daa2c65659fc73966e773 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -115,25 +115,30 @@ class RegisterAction extends Action {
                return $result;
        }
 
-       function show_form($error=NULL) {
-               global $config;
-
-               common_show_header(_t('Register'));
+       function show_top($error=NULL) {
                if ($error) {
-                       common_element('div', 'error', $error);
+                       common_element('p', 'error', $error);
                } else {
-                       common_element('div', 'instructions', 
-                                                  _t('You can create a new account with the following form. ' .
-                                                         'Your user name must be 1-64 characters, only lowercase letters or numbers. ' .
-                                                         'Passwords have to match, and your email address should be valid.'));
+                       common_element('p', 'instructions', 
+                                                  _t('You can create a new account to start posting notices.'));
                }
+       }
+       
+       function show_form($error=NULL) {
+               global $config;
+
+               common_show_header(_t('Register'), NULL, $error, array($this, 'show_top'));
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',
                                                                                   'action' => common_local_url('register')));
-               common_input('nickname', _t('Nickname'));
-               common_password('password', _t('Password'));
-               common_password('confirm', _t('Confirm'));
-               common_input('email', _t('Email'));
+               common_input('nickname', _t('Nickname'), NULL,
+                                        _t('1-64 lowercase letters or numbers, no punctuation or spaces'));
+               common_password('password', _t('Password'),                                             
+                                               _t('6 or more characters'));
+               common_password('confirm', _t('Confirm'),
+                                               _t('Same as password above'));
+               common_input('email', _t('Email'), NULL,
+                                        _t('Used only for updates, announcements, and password recovery'));
                common_element_start('p');
                common_element('input', array('type' => 'checkbox',
                                                                          'id' => 'license',