instructions
darcs-hash:20080611163308-84dde-c918f04fe6bba3dd382b822ef59cb70a57bb9504.gz
This commit is contained in:
parent
337d146c46
commit
f81b4421fe
@ -26,7 +26,15 @@ class AvatarAction extends SettingsAction {
|
|||||||
function show_form($msg=NULL, $success=false) {
|
function show_form($msg=NULL, $success=false) {
|
||||||
common_show_header(_t('Avatar'));
|
common_show_header(_t('Avatar'));
|
||||||
$this->settings_menu();
|
$this->settings_menu();
|
||||||
|
if ($msg) {
|
||||||
$this->message($msg, $success);
|
$this->message($msg, $success);
|
||||||
|
} else {
|
||||||
|
common_element('div', 'instructions',
|
||||||
|
_t('You can upload a new "avatar" (user picture) here. ' .
|
||||||
|
'You can\'t edit the picture after you upload it, so you should ' .
|
||||||
|
'edit it in your desktop image-manipulation software first. ' .
|
||||||
|
'Everything works best if your picture is more or less square. '));
|
||||||
|
}
|
||||||
|
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
$profile = $user->getProfile();
|
$profile = $user->getProfile();
|
||||||
|
@ -63,6 +63,11 @@ class LoginAction extends Action {
|
|||||||
common_show_header(_t('Login'));
|
common_show_header(_t('Login'));
|
||||||
if ($error) {
|
if ($error) {
|
||||||
common_element('div', array('class' => 'error'), $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. ' .
|
||||||
|
'(Forgot your password? No way to get it back... yet. It\'s on the TODO list!)'));
|
||||||
}
|
}
|
||||||
common_element_start('form', array('method' => 'POST',
|
common_element_start('form', array('method' => 'POST',
|
||||||
'id' => 'login',
|
'id' => 'login',
|
||||||
|
@ -26,7 +26,12 @@ class PasswordAction extends SettingsAction {
|
|||||||
function show_form($msg=NULL, $success=false) {
|
function show_form($msg=NULL, $success=false) {
|
||||||
common_show_header(_t('Change password'));
|
common_show_header(_t('Change password'));
|
||||||
$this->settings_menu();
|
$this->settings_menu();
|
||||||
|
if ($msg) {
|
||||||
$this->message($msg, $success);
|
$this->message($msg, $success);
|
||||||
|
} else {
|
||||||
|
common_element('div', 'instructions',
|
||||||
|
_t('You can change your password here. Choose a good one!'));
|
||||||
|
}
|
||||||
common_element_start('form', array('method' => 'POST',
|
common_element_start('form', array('method' => 'POST',
|
||||||
'id' => 'password',
|
'id' => 'password',
|
||||||
'action' =>
|
'action' =>
|
||||||
|
@ -28,7 +28,14 @@ class ProfilesettingsAction extends SettingsAction {
|
|||||||
$profile = $user->getProfile();
|
$profile = $user->getProfile();
|
||||||
common_show_header(_t('Profile settings'));
|
common_show_header(_t('Profile settings'));
|
||||||
$this->settings_menu();
|
$this->settings_menu();
|
||||||
|
if ($msg) {
|
||||||
$this->message($msg, $success);
|
$this->message($msg, $success);
|
||||||
|
} else {
|
||||||
|
common_element('div', 'instructions',
|
||||||
|
_t('You can update your personal profile info here so people know more about you. ' .
|
||||||
|
'Nickname must be 1-64 lowercase letters or numbers -- no punctuation or spaces. ' .
|
||||||
|
'Full name, bio, and location can be whatever you want. Email address should be valid.'));
|
||||||
|
}
|
||||||
common_element_start('form', array('method' => 'POST',
|
common_element_start('form', array('method' => 'POST',
|
||||||
'id' => 'profilesettings',
|
'id' => 'profilesettings',
|
||||||
'action' =>
|
'action' =>
|
||||||
|
@ -121,6 +121,11 @@ class RegisterAction extends Action {
|
|||||||
common_show_header(_t('Register'));
|
common_show_header(_t('Register'));
|
||||||
if ($error) {
|
if ($error) {
|
||||||
common_element('div', 'error', $error);
|
common_element('div', '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_start('form', array('method' => 'POST',
|
common_element_start('form', array('method' => 'POST',
|
||||||
'id' => 'login',
|
'id' => 'login',
|
||||||
|
10
doc/TODO
10
doc/TODO
@ -80,11 +80,11 @@
|
|||||||
+ FOAF document for user
|
+ FOAF document for user
|
||||||
+ license in RSS feeds
|
+ license in RSS feeds
|
||||||
+ TOS checkbox on register
|
+ TOS checkbox on register
|
||||||
- registration instructions
|
+ registration instructions
|
||||||
- login instructions
|
+ login instructions
|
||||||
- profile settings instructions
|
+ profile settings instructions
|
||||||
- avatar instructions
|
+ avatar instructions
|
||||||
- password change instructions
|
+ password change instructions
|
||||||
+ fix spacing on notices
|
+ fix spacing on notices
|
||||||
+ fix spacing in profile
|
+ fix spacing in profile
|
||||||
- limit entry in textarea to 140 chars
|
- limit entry in textarea to 140 chars
|
||||||
|
Loading…
Reference in New Issue
Block a user