From 409761ce4b2f919ca40aa8319a13473d9eb789ae Mon Sep 17 00:00:00 2001 From: msquare Date: Fri, 18 Nov 2016 15:36:02 +0100 Subject: rebuild login page --- includes/pages/guest_login.php | 43 +++++++++++++++++++++++-------------- includes/sys_form.php | 25 ++++++++++++++++++++++ includes/view/EventConfig_view.php | 44 ++++++++++++++++++++++++++------------ 3 files changed, 82 insertions(+), 30 deletions(-) (limited to 'includes') diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 69201161..1e6ac41a 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -212,7 +212,7 @@ function guest_register() { ]), div('col-sm-8', [ form_email('mail', _("E-Mail") . ' ' . entry_required(), $mail), - form_checkbox('email_shiftinfo', _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"), $email_shiftinfo), + form_checkbox('email_shiftinfo', _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"), $email_shiftinfo), form_checkbox('email_by_human_allowed', _("Humans are allowed to send me an email (e.g. for ticket vouchers)"), $email_by_human_allowed) ]) ]), @@ -286,9 +286,9 @@ function guest_login() { $nick = ""; unset($_SESSION['uid']); + $valid = true; if (isset($_REQUEST['submit'])) { - $valid = true; if (isset($_REQUEST['nick']) && strlen(User_validate_Nick($_REQUEST['nick'])) > 0) { $nick = User_validate_Nick($_REQUEST['nick']); @@ -326,25 +326,36 @@ function guest_login() { return page([ div('col-md-12', [ div('row', [ - div('col-md-4', [ - EventConfig_countdown_page($event_config) + EventConfig_countdown_page($event_config) + ]), + div('row', []), + div('row', [ + div('col-md-4 text-center', [ + heading(register_title(), 2), + get_register_hint() ]), div('col-md-4', [ - heading(login_title(), 2), - msg(), - form([ - form_text('nick', _("Nick"), $nick), - form_password('password', _("Password")), - form_submit('submit', _("Login")), - buttons([ - button(page_link_to('user_password_recovery'), _("I forgot my password")) + div('panel panel-primary first', [ + div('panel-heading', [ + ' ' . _("Login") ]), - info(_("Please note: You have to activate cookies!"), true) + div('panel-body', [ + msg(), + form([ + form_text_placeholder('nick', _("Nick"), $nick), + form_password_placeholder('password', _("Password")), + form_submit('submit', _("Login")), + ! $valid ? buttons([ + button(page_link_to('user_password_recovery'), _("I forgot my password")) + ]) : '' + ]) + ]), + div('panel-footer', [ + glyph('info-sign') . _("Please note: You have to activate cookies!") + ]) ]) ]), - div('col-md-4', [ - heading(register_title(), 2), - get_register_hint(), + div('col-md-4 text-center', [ heading(_("What can I do?"), 2), '

' . _("Please read about the jobs you can do to help us.") . '

', buttons([ diff --git a/includes/sys_form.php b/includes/sys_form.php index 960be401..98ef2134 100644 --- a/includes/sys_form.php +++ b/includes/sys_form.php @@ -175,6 +175,23 @@ function form_text($name, $label, $value, $disabled = false) { return form_element($label, '', 'form_' . $name); } +/** + * Renders a text input with placeholder instead of label. + * + * @param String $name + * Input name + * @param String $placeholder + * Placeholder + * @param String $value + * The value + * @param Boolean $disabled + * Is the field enabled? + */ +function form_text_placeholder($name, $placeholder, $value, $disabled = false) { + $disabled = $disabled ? ' disabled="disabled"' : ''; + return form_element('', ''); +} + /** * Rendert ein Formular-Emailfeld */ @@ -198,6 +215,14 @@ function form_password($name, $label, $disabled = false) { return form_element($label, '', 'form_' . $name); } +/** + * Renders a password input with placeholder instead of label. + */ +function form_password_placeholder($name, $placeholder, $disabled = false) { + $disabled = $disabled ? ' disabled="disabled"' : ''; + return form_element('', '', 'form_' . $name); +} + /** * Rendert ein Formular-Textfeld */ diff --git a/includes/view/EventConfig_view.php b/includes/view/EventConfig_view.php index d184166f..bf3ad3a4 100644 --- a/includes/view/EventConfig_view.php +++ b/includes/view/EventConfig_view.php @@ -6,33 +6,49 @@ */ function EventConfig_countdown_page($event_config) { if ($event_config == null) { - return info(_("We got no information about the event right now."), true); + return div('col-md-12 text-center', [ + heading(sprintf(_("Welcome to the %s!"), ' ENGELSYSTEM'), 2) + ]); } $elements = []; if ($event_config['event_name'] != null) { - $elements[] = heading($event_config['event_name'], 2); + $elements[] = div('col-md-12 text-center', [ + heading(sprintf(_("Welcome to the %s!"), $event_config['event_name'] . ' ENGELSYSTEM'), 2) + ]); } - if ($event_config['event_start_date'] != null && $event_config['event_end_date'] != null) { - $elements[] = sprintf(_("from %s to %s"), date("Y-m-d", $event_config['event_start_date']), date("Y-m-d", $event_config['event_end_date'])); - } - - if ($event_config['buildup_start_date'] != null && time() < $event_config['buildup_start_date']) { - $elements[] = '

' . _("Buildup starts in %c") . '

'; + if ($event_config['buildup_start_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Buildup starts"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['buildup_start_date']) . '' + ]); } - if ($event_config['event_start_date'] != null && time() < $event_config['event_start_date']) { - $elements[] = '

' . _("Event starts in %c") . '

'; + if ($event_config['event_start_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Event starts"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['event_start_date']) . '' + ]); } - if ($event_config['event_end_date'] != null && time() < $event_config['event_end_date'] && ($event_config['event_start_date'] == null || time() > $event_config['event_start_date'])) { - $elements[] = '

' . _("Event ends in %c") . '

'; + if ($event_config['event_end_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Event ends"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['event_end_date']) . '' + ]); } - if ($event_config['teardown_end_date'] != null && time() < $event_config['teardown_end_date'] && ($event_config['event_start_date'] == null || time() > $event_config['event_start_date'])) { - $elements[] = '

' . _("Teardown ends in %c") . '

'; + if ($event_config['teardown_end_date'] != null) { + $elements[] = div('col-md-3 text-center', [ + heading(_("Teardown ends"), 3), + '

%c

', + '' . date(_("Y-m-d"), $event_config['teardown_end_date']) . '' + ]); } return join("", $elements); -- cgit v1.2.3-70-g09d2