harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve the register text until the new register page is finished

Browse Source
This commit is contained in:
friendica
2013-12-25 16:53:59 -08:00
parent c5c5e8b4e0
commit eda7c24c4e
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mod/register.php
View File

@@ -135,12 +135,19 @@ function register_post(&$a) {
function register_content(&$a) { function register_content(&$a) {
$registration_is = '';
$other_sites = '';
if(get_config('system','register_policy') == REGISTER_CLOSED) { if(get_config('system','register_policy') == REGISTER_CLOSED) {
require_once('mod/pubsites.php'); require_once('mod/pubsites.php');
return pubsites_content($a); return pubsites_content($a);
} }
if(get_config('system','register_policy') == REGISTER_APPROVE) {
$registration_is = t('Registration on this site/hub is by approval only.');
$other_sites = t('<a href="pubsites">Register at another affiliated site/hub</a>');
}
$max_dailies = intval(get_config('system','max_daily_registrations')); $max_dailies = intval(get_config('system','max_daily_registrations'));
if($max_dailies) { if($max_dailies) {
$r = q("select count(account_id) as total from account where account_created > UTC_TIMESTAMP() - INTERVAL 1 day"); $r = q("select count(account_id) as total from account where account_created > UTC_TIMESTAMP() - INTERVAL 1 day");
@@ -175,10 +182,14 @@ function register_content(&$a) {
$invite_code = ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "" ); $invite_code = ((x($_REQUEST,'invite_code')) ? strip_tags(trim($_REQUEST['invite_code'])) : "" );
$o = replace_macros(get_markup_template('register.tpl'), array( $o = replace_macros(get_markup_template('register.tpl'), array(
'$title' => t('Registration'), '$title' => t('Registration'),
'$reg_is' => $registration_is,
'$registertext' => get_config('system','register_text'), '$registertext' => get_config('system','register_text'),
'$other_sites' => $other_sites,
'$invitations' => get_config('system','invitation_only'), '$invitations' => get_config('system','invitation_only'),
'$invite_desc' => t('Membership on this site is by invitation only.'), '$invite_desc' => t('Membership on this site is by invitation only.'),
'$label_invite' => t('Please enter your invitation code'), '$label_invite' => t('Please enter your invitation code'),

5
view/css/mod_register.css
View File

@@ -10,6 +10,11 @@ h2 {
margin-top: 5%; margin-top: 5%;
} }
#register-desc, #register-text, #register-sites {
font-weight: bold;
margin-bottom: 15px;
}
.register-label { .register-label {
float: left; float: left;
width: 275px; width: 275px;

10
view/tpl/register.tpl
View File

@@ -2,8 +2,14 @@
<form action="register" method="post" id="register-form"> <form action="register" method="post" id="register-form">
{{if $registertext}}
<div id="register-desc" class="descriptive-paragraph">{{$registertext}}</div>
{{if $reg_is}}
<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}
{{/if}}
{{if $registertext}}<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div>
{{/if}}
{{if $other_sites}}<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
{{/if}} {{/if}}
{{if $invitations}} {{if $invitations}}