Merge pull request #7173 from nupplaphil/task/mod_newmember
Move mod/newmember to src/Module/Welcome
This commit is contained in:
Hypolite Petovan
GitHub
commit
0c9b76a585
4 changed files with 150 additions and 61 deletions
|
|
@ -1,61 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @file mod/newmember.php
|
|
||||||
*/
|
|
||||||
use Friendica\App;
|
|
||||||
use Friendica\Core\Config;
|
|
||||||
use Friendica\Core\L10n;
|
|
||||||
|
|
||||||
function newmember_content(App $a)
|
|
||||||
{
|
|
||||||
$o = '<div class="generic-page-wrapper">';
|
|
||||||
$o .= '<h1>' . L10n::t('Welcome to Friendica') . '</h1>';
|
|
||||||
$o .= '<h3>' . L10n::t('New Member Checklist') . '</h3>';
|
|
||||||
$o .= '<div style="font-size: 120%;">';
|
|
||||||
$o .= L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.');
|
|
||||||
$o .= '<h4>' . L10n::t('Getting Started') . '</h4>';
|
|
||||||
$o .= '<ul>';
|
|
||||||
$o .= '<li> ' . '<a target="newmember" href="help/Quick-Start-guide">' . L10n::t('Friendica Walk-Through') . '</a><br />' . L10n::t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
|
|
||||||
$o .= '</ul>';
|
|
||||||
$o .= '<h4>' . L10n::t('Settings') . '</h4>';
|
|
||||||
$o .= '<ul>';
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="settings">' . L10n::t('Go to Your Settings') . '</a><br />' . L10n::t('On your <em>Settings</em> page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</li>' . EOL;
|
|
||||||
$o .= '<li>' . L10n::t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '</li>' . EOL;
|
|
||||||
$o .= '</ul>';
|
|
||||||
$o .= '<h4>' . L10n::t('Profile') . '</h4>';
|
|
||||||
$o .= '<ul>';
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="profile_photo">' . L10n::t('Upload Profile Photo') . '</a><br />' . L10n::t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.') . '</li>' . EOL;
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="profiles">' . L10n::t('Edit Your Profile') . '</a><br />' . L10n::t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</li>' . EOL;
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="profiles">' . L10n::t('Profile Keywords') . '</a><br />' . L10n::t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.') . '</li>' . EOL;
|
|
||||||
$o .= '</ul>';
|
|
||||||
$o .= '<h4>' . L10n::t('Connecting') . '</h4>';
|
|
||||||
$o .= '<ul>';
|
|
||||||
|
|
||||||
$mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
|
|
||||||
|
|
||||||
if (!$mail_disabled) {
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="settings/connectors">' . L10n::t('Importing Emails') . '</a><br />' . L10n::t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</li>' . EOL;
|
|
||||||
}
|
|
||||||
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="contact">' . L10n::t('Go to Your Contacts Page') . '</a><br />' . L10n::t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog.') . '</li>' . EOL;
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="directory">' . L10n::t("Go to Your Site's Directory") . '</a><br />' . L10n::t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.') . '</li>' . EOL;
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="contact">' . L10n::t('Finding New People') . '</a><br />' . L10n::t("On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.") . '</li>' . EOL;
|
|
||||||
$o .= '</ul>';
|
|
||||||
$o .= '<h4>' . L10n::t('Groups') . '</h4>';
|
|
||||||
$o .= '<ul>';
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="contact">' . L10n::t('Group Your Contacts') . '</a><br />' . L10n::t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.') . '</li>' . EOL;
|
|
||||||
|
|
||||||
if (Config::get('system', 'newuser_private')) {
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="help/Groups-and-Privacy">' . L10n::t("Why Aren't My Posts Public?") . '</a><br />' . L10n::t("Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above.") . '</li>' . EOL;
|
|
||||||
}
|
|
||||||
|
|
||||||
$o .= '</ul>';
|
|
||||||
$o .= '<h4>' . L10n::t('Getting Help') . '</h4>';
|
|
||||||
$o .= '<ul>';
|
|
||||||
$o .= '<li>' . '<a target="newmember" href="help">' . L10n::t('Go to the Help Section') . '</a><br />' . L10n::t('Our <strong>help</strong> pages may be consulted for detail on other program features and resources.') . '</li>' . EOL;
|
|
||||||
$o .= '</ul>';
|
|
||||||
$o .= '</div>';
|
|
||||||
$o .= '</div>';
|
|
||||||
|
|
||||||
return $o;
|
|
||||||
}
|
|
||||||
|
|
@ -160,6 +160,7 @@ class Router
|
||||||
$this->routeCollector->addRoute(['GET'], '/maintenance', Module\Maintenance::class);
|
$this->routeCollector->addRoute(['GET'], '/maintenance', Module\Maintenance::class);
|
||||||
$this->routeCollector->addRoute(['GET'], '/manifest', Module\Manifest::class);
|
$this->routeCollector->addRoute(['GET'], '/manifest', Module\Manifest::class);
|
||||||
$this->routeCollector->addRoute(['GET'], '/modexp/{nick}', Module\PublicRSAKey::class);
|
$this->routeCollector->addRoute(['GET'], '/modexp/{nick}', Module\PublicRSAKey::class);
|
||||||
|
$this->routeCollector->addRoute(['GET'], '/newmember', Module\Welcome::class);
|
||||||
$this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class);
|
$this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class);
|
||||||
$this->routeCollector->addRoute(['GET'], '/nogroup', Module\Group::class);
|
$this->routeCollector->addRoute(['GET'], '/nogroup', Module\Group::class);
|
||||||
$this->routeCollector->addGroup('/notify', function (RouteCollector $collector) {
|
$this->routeCollector->addGroup('/notify', function (RouteCollector $collector) {
|
||||||
|
|
|
||||||
69
src/Module/Welcome.php
Normal file
69
src/Module/Welcome.php
Normal file
|
|
@ -0,0 +1,69 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Friendica\Module;
|
||||||
|
|
||||||
|
use Friendica\BaseModule;
|
||||||
|
use Friendica\Core\L10n;
|
||||||
|
use Friendica\Core\Renderer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Prints the welcome page for new users
|
||||||
|
*/
|
||||||
|
class Welcome extends BaseModule
|
||||||
|
{
|
||||||
|
public static function content()
|
||||||
|
{
|
||||||
|
$config = self::getApp()->getConfig();
|
||||||
|
|
||||||
|
$mail_disabled = ((function_exists('imap_open') &&
|
||||||
|
(!$config->get('system', 'imap_disabled'))));
|
||||||
|
$newuser_private = $config->get('system', 'newuser_private');
|
||||||
|
|
||||||
|
$tpl = Renderer::getMarkupTemplate('welcome.tpl');
|
||||||
|
|
||||||
|
return Renderer::replaceMacros($tpl, [
|
||||||
|
'$welcome' => L10n::t('Welcome to Friendica'),
|
||||||
|
'$checklist' => L10n::t('New Member Checklist'),
|
||||||
|
'$description' => L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.'),
|
||||||
|
|
||||||
|
'$started' => L10n::t('Getting Started'),
|
||||||
|
'$quickstart_link' => L10n::t('Friendica Walk-Through'),
|
||||||
|
'$quickstart_txt' => L10n::t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.'),
|
||||||
|
|
||||||
|
'$settings' => L10n::t('Settings'),
|
||||||
|
'$settings_link' => L10n::t('Go to Your Settings'),
|
||||||
|
'$settings_txt' => L10n::t('On your <em>Settings</em> page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.'),
|
||||||
|
'$settings_other' => L10n::t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.'),
|
||||||
|
|
||||||
|
'$profile' => L10n::t('Profile'),
|
||||||
|
'$profile_photo_link' => L10n::t('Upload Profile Photo'),
|
||||||
|
'$profile_photo_txt' => L10n::t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.'),
|
||||||
|
'$profiles_link' => L10n::t('Edit Your Profile'),
|
||||||
|
'$profiles_txt' => L10n::t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.'),
|
||||||
|
'$profiles_keywords_link' => L10n::t('Profile Keywords'),
|
||||||
|
'$profiles_keywords_txt' => L10n::t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.'),
|
||||||
|
|
||||||
|
'$connecting' => L10n::t('Connecting'),
|
||||||
|
'$mail_disabled' => $mail_disabled,
|
||||||
|
'$import_mail_link' => L10n::t('Importing Emails'),
|
||||||
|
'$import_mail_txt' => L10n::t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX'),
|
||||||
|
'$contact_link' => L10n::t('Go to Your Contacts Page'),
|
||||||
|
'$contact_txt' => L10n::t('Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog.'),
|
||||||
|
'$directory_link' => L10n::t('Go to Your Site\'s Directory'),
|
||||||
|
'$directory_txt' => L10n::t('The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested.'),
|
||||||
|
'$finding_link' => L10n::t('Finding New People'),
|
||||||
|
'$finding_txt' => L10n::t('On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.'),
|
||||||
|
|
||||||
|
'$groups' => L10n::t('Groups'),
|
||||||
|
'$group_contact_link' => L10n::t('Group Your Contacts'),
|
||||||
|
'$group_contact_txt' => L10n::t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.'),
|
||||||
|
'$newuser_private' => $newuser_private,
|
||||||
|
'$private_link' => L10n::t('Why Aren\'t My Posts Public?'),
|
||||||
|
'$private_txt' => L10n::t('Friendica respects your privacy. By default, your posts will only show up to people you\'ve added as friends. For more information, see the help section from the link above.'),
|
||||||
|
|
||||||
|
'$help' => L10n::t('Getting Help'),
|
||||||
|
'$help_link' => L10n::t('Go to the Help Section'),
|
||||||
|
'$help_txt' => L10n::t('Our <strong>help</strong> pages may be consulted for detail on other program features and resources.'),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
80
view/templates/welcome.tpl
Normal file
80
view/templates/welcome.tpl
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
<div id="welcome" class="generic-page-wrapper">
|
||||||
|
<h1>{{$welcome nofilter}}</h1>
|
||||||
|
<h3>{{$checklist nofilter}}</h3>
|
||||||
|
<div style="font-size: 120%;">
|
||||||
|
{{$description nofilter}}
|
||||||
|
<h4>{{$started nofilter}}</h4>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="help/Quick-Start-guide">{{$quickstart_link}}</a><br />
|
||||||
|
{{$quickstart_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<h4>{{$settings nofilter}}</h4>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="settings">{{$settings_link}}</a><br />
|
||||||
|
{{$settings_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
{{$settings_other nofilter}}
|
||||||
|
</ul>
|
||||||
|
<h4>{{$profile nofilter}}</h4>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="profile_photo">{{$profile_photo_link}}</a><br />
|
||||||
|
{{$profile_photo_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="profiles">{{$profiles_link}}</a><br />
|
||||||
|
{{$profiles_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="profiles">{{$profiles_keywords_link}}</a><br />
|
||||||
|
{{$profiles_keywords_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<h4>{{$connecting nofilter}}</h4>
|
||||||
|
<ul>
|
||||||
|
{{if $mail_disabled}}
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="settings/connectors">{{$import_mail_link}}</a><br />
|
||||||
|
{{$import_mail_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
{{/if}}
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="contact">{{$contact_link}}</a><br />
|
||||||
|
{{$contact_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="directory">{{$directory_link}}</a><br />
|
||||||
|
{{$directory_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="contact">{{$finding_link}}</a><br />
|
||||||
|
{{$finding_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<h4>{{$groups nofilter}}</h4>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="contact">{{$group_contact_link}}</a><br />
|
||||||
|
{{$group_contact_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
|
||||||
|
{{if $newuser_private}}
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="help/Groups-and-Privacy">{{$private_link}}</a><br />
|
||||||
|
{{$private_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
{{/if}}
|
||||||
|
</ul>
|
||||||
|
<h4>{{$help}}</h4>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<a target="newmember" href="help">{{$help_link}}</a><br />
|
||||||
|
{{$help_txt nofilter}}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
Loading…
Reference in a new issue