Register page layout rework

As discussed with @MyIgel the whole register page is in dire need of gasoline and a lighter. I started to refactor it by rearranging the row & column grid (removed 2 nesting levels) and changed the order of the field to something with a little more sense. The page still needs to be moved to a proper view...
main
Lena Schneider 3 years ago committed by Igor Scheller
parent b338f9d719
commit 200ac26b24

@ -343,82 +343,112 @@ function guest_register()
return page_with_title(register_title(), [ return page_with_title(register_title(), [
__('By completing this form you\'re registering as a Chaos-Angel. This script will create you an account in the angel task scheduler.'), __('By completing this form you\'re registering as a Chaos-Angel. This script will create you an account in the angel task scheduler.'),
form_info(entry_required() . ' = ' . __('Entry required!')),
$msg, $msg,
msg(), msg(),
form([ form([
div('row', [ div('row', [
div('col-md-6', [ div('col', [
div('row', [ form_text(
div('col-sm-4', [ 'username',
form_text( __('Nick') . ' ' . entry_required(),
'username', $nick,
__('Nick') . ' ' . entry_required(), false,
$nick, 24,
false, 'nickname'
24, ),
'nickname' form_info('',
), __('Use up to 24 letters, numbers, connecting punctuations or spaces for your nickname.'))
form_info('', ]),
__('Use up to 24 letters, numbers, connecting punctuations or spaces for your nickname.'))
]), $enable_pronoun ? div('col', [
div('col-sm-8', [ form_text('pronoun', __('Pronoun'), $pronoun, false, 15)
form_email( ]) : '',
'email', ]),
__('E-Mail') . ' ' . entry_required(),
$email, $enable_user_name ? div('row', [
false, div('col', [
'email', form_text('prename', __('First name'), $preName, false, 64, 'given-name')
254 ]),
), div('col', [
form_checkbox( form_text('lastname', __('Last name'), $lastName, false, 64, 'family-name')
'email_shiftinfo', ])
__( ]) : '',
'The %s is allowed to send me an email (e.g. when my shifts change)',
[config('app_name')] div('row', [
), div('col', [
$email_shiftinfo form_email(
), 'email',
form_checkbox( __('E-Mail') . ' ' . entry_required(),
'email_news', $email,
__('Notify me of new news'), false,
$email_news 'email',
), 254
form_checkbox( ),
'email_by_human_allowed', form_checkbox(
__('Allow heaven angels to contact you by e-mail.'), 'email_shiftinfo',
$email_by_human_allowed __(
), 'The %s is allowed to send me an email (e.g. when my shifts change)',
config('enable_goody') ? [config('app_name')]
form_checkbox( ),
'email_goody', $email_shiftinfo
__('To receive vouchers, give consent that nick, email address, worked hours and shirt size will be stored until the next similar event.') ),
. (config('privacy_email') ? ' ' . __('To withdraw your approval, send an email to <a href="mailto:%s">%1$s</a>.', [config('privacy_email')]) : ''), form_checkbox(
$email_goody 'email_news',
) : '', __('Notify me of new news'),
]) $email_news
]), ),
div('row', [ form_checkbox(
div('col-sm-6', [ 'email_by_human_allowed',
form_password('password', __('Password') . ' ' . entry_required()) __('Allow heaven angels to contact you by e-mail.'),
]), $email_by_human_allowed
div('col-sm-6', [ ),
form_password('password2', __('Confirm password') . ' ' . entry_required()) config('enable_goody') ?
]) form_checkbox(
]), 'email_goody',
div('row', [ __('To receive vouchers, give consent that nick, email address, worked hours and shirt size will be stored until the next similar event.')
$enable_planned_arrival ? div('col-sm-6', [ . (config('privacy_email') ? ' ' . __('To withdraw your approval, send an email to <a href="mailto:%s">%1$s</a>.', [config('privacy_email')]) : ''),
form_date( $email_goody
'planned_arrival_date', ) : '',
__('Planned date of arrival') . ' ' . entry_required(), ]),
$planned_arrival_date, $buildup_start_date, $teardown_end_date
) $enable_dect ? div('col', [
]) : '', form_text('dect', __('DECT'), $dect, false, 40, 'tel-local')
div('col-sm-6', [ ]) : '',
$enable_tshirt_size ? form_select('tshirt_size',
__('Shirt size') . ' ' . entry_required(), div('col', [
$tshirt_sizes, $tshirt_size, __('Please select...')) : '' form_text('mobile', __('Mobile'), $mobile, false, 40, 'tel-national')
]) ])
]), ]),
div('row', [
div('col', [
form_password('password', __('Password') . ' ' . entry_required())
]),
$enable_planned_arrival ? div('col', [
form_date(
'planned_arrival_date',
__('Planned date of arrival') . ' ' . entry_required(),
$planned_arrival_date, $buildup_start_date, $teardown_end_date
)
]) : '',
]),
div('row', [
div('col', [
form_password('password2', __('Confirm password') . ' ' . entry_required())
]),
div('col', [
$enable_tshirt_size ? form_select('tshirt_size',
__('Shirt size') . ' ' . entry_required(),
$tshirt_sizes, $tshirt_size, __('Please select...')) : ''
]),
]),
div('row', [
div('col', [
form_checkboxes( form_checkboxes(
'angel_types', 'angel_types',
__('What do you want to do?') . sprintf( __('What do you want to do?') . sprintf(
@ -433,30 +463,9 @@ function guest_register()
'', '',
__('Some angel types have to be confirmed later by a supporter at an introduction meeting. You can change your selection in the options section.') __('Some angel types have to be confirmed later by a supporter at an introduction meeting. You can change your selection in the options section.')
) )
]),
div('col-md-6', [
div('row', [
$enable_dect ? div('col-sm-4', [
form_text('dect', __('DECT'), $dect, false, 40, 'tel-local')
]) : '',
div($enable_dect ? 'col-sm-4' : 'col-sm-12', [
form_text('mobile', __('Mobile'), $mobile, false, 40, 'tel-national')
]),
$enable_pronoun ? div('col-sm-4', [
form_text('pronoun', __('Pronoun'), $pronoun, false, 15)
]) : '',
]),
$enable_user_name ? div('row', [
div('col-sm-6', [
form_text('prename', __('First name'), $preName, false, 64, 'given-name')
]),
div('col-sm-6', [
form_text('lastname', __('Last name'), $lastName, false, 64, 'family-name')
])
]) : '',
form_info(entry_required() . ' = ' . __('Entry required!'))
]) ])
]), ]),
form_submit('submit', __('Register')) form_submit('submit', __('Register'))
]) ])
]); ]);

Loading…
Cancel
Save