GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

* Show the right menus in the aside after successful registration 

* Events surrounding successful registration output
This commit is contained in:
Zach Copley 2011-04-14 15:45:05 -07:00
parent 70c8de4354
commit 951ee1faff
2 changed files with 62 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EVENTS.txt
View File

@ -1375,3 +1375,9 @@ EndProfileGetAvatar: After getting an avatar for a profile
- $profile: profile - $profile: profile
- $size: size of the avatar - $size: size of the avatar
- &$avatar: avatar - &$avatar: avatar
StartRegisterSuccess: Before showing the registration success message
- $action: the registration action
StartRegisterSuccess: After showing the registration success message
- $action: the registration action

99
actions/register.php
View File

@ -605,48 +605,53 @@ class RegisterAction extends Action
*/ */
function showSuccessContent() function showSuccessContent()
{ {
$nickname = $this->arg('nickname'); if (Event::handle('onStartRegisterSuccess', array($this))) {
$profileurl = common_local_url('showstream', $nickname = $this->arg('nickname');
array('nickname' => $nickname));
$this->elementStart('div', 'success'); $profileurl = common_local_url('showstream',
// TRANS: Text displayed after successful account registration. array('nickname' => $nickname));
// TRANS: %1$s is the registered nickname, %2$s is the profile URL.
// TRANS: This message contains Markdown links in the form [link text](link)
// TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
$instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
'From here, you may want to...'. "\n\n" .
'* Go to [your profile](%2$s) '.
'and post your first message.' . "\n" .
'* Add a [Jabber/GTalk address]'.
'(%%%%action.imsettings%%%%) '.
'so you can send notices '.
'through instant messages.' . "\n" .
'* [Search for people](%%%%action.peoplesearch%%%%) '.
'that you may know or '.
'that share your interests. ' . "\n" .
'* Update your [profile settings]'.
'(%%%%action.profilesettings%%%%)'.
' to tell others more about you. ' . "\n" .
'* Read over the [online docs](%%%%doc.help%%%%)'.
' for features you may have missed. ' . "\n\n" .
'Thanks for signing up and we hope '.
'you enjoy using this service.'),
$nickname, $profileurl);
$this->raw(common_markup_to_html($instr)); $this->elementStart('div', 'success');
// TRANS: Text displayed after successful account registration.
// TRANS: %1$s is the registered nickname, %2$s is the profile URL.
// TRANS: This message contains Markdown links in the form [link text](link)
// TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
$instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
'From here, you may want to...'. "\n\n" .
'* Go to [your profile](%2$s) '.
'and post your first message.' . "\n" .
'* Add a [Jabber/GTalk address]'.
'(%%%%action.imsettings%%%%) '.
'so you can send notices '.
'through instant messages.' . "\n" .
'* [Search for people](%%%%action.peoplesearch%%%%) '.
'that you may know or '.
'that share your interests. ' . "\n" .
'* Update your [profile settings]'.
'(%%%%action.profilesettings%%%%)'.
' to tell others more about you. ' . "\n" .
'* Read over the [online docs](%%%%doc.help%%%%)'.
' for features you may have missed. ' . "\n\n" .
'Thanks for signing up and we hope '.
'you enjoy using this service.'),
$nickname, $profileurl);
$have_email = $this->trimmed('email'); $this->raw(common_markup_to_html($instr));
if ($have_email) {
// TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail. $have_email = $this->trimmed('email');
$emailinstr = _('(You should receive a message by email '. if ($have_email) {
'momentarily, with ' . // TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
'instructions on how to confirm '. $emailinstr = _('(You should receive a message by email '.
'your email address.)'); 'momentarily, with ' .
$this->raw(common_markup_to_html($emailinstr)); 'instructions on how to confirm '.
'your email address.)');
$this->raw(common_markup_to_html($emailinstr));
}
$this->elementEnd('div');
Event::handle('onEndRegisterSuccess', array($this));
} }
$this->elementEnd('div');
} }
/** /**
@ -656,15 +661,23 @@ class RegisterAction extends Action
*/ */
function showLocalNav() function showLocalNav()
{ {
$nav = new LoginGroupNav($this); if (common_logged_in()) {
$nav->show(); parent::showLocalNav();
} } else {
$nav = new LoginGroupNav($this);
function showNoticeForm() $nav->show();
{ }
} }
/**
* Show a bit of login context
*
* @return nothing
*/
function showProfileBlock() function showProfileBlock()
{ {
if (common_logged_in()) {
parent::showProfileBlock();
}
} }
} }