iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better layout for user settings

This commit is contained in:
Philip Häusler 2014-08-23 14:30:45 +02:00
parent f30bc25246
commit 51cecb27e5
3 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/pages/user_settings.php
View File

@ -166,8 +166,10 @@ function user_settings() {
sprintf(_("Hello %s, here you can change your personal settings i.e. password, color settings etc."), User_Nick_render($user)), sprintf(_("Hello %s, here you can change your personal settings i.e. password, color settings etc."), User_Nick_render($user)),
$msg, $msg,
msg(), msg(),
div('row', array(
div('col-md-6', array(
form(array( form(array(
form_info("", _("Here you can change your user details.")), form_info(_("Here you can change your user details.")),
form_text('nick', _("Nick") . "*", $nick), form_text('nick', _("Nick") . "*", $nick),
form_text('lastname', _("Last name"), $lastname), form_text('lastname', _("Last name"), $lastname),
form_text('prename', _("First name"), $prename), form_text('prename', _("First name"), $prename),
@ -182,24 +184,28 @@ function user_settings() {
$enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '', $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size"), $tshirt_sizes, $tshirt_size) : '',
form_checkboxes('angel_types', _("What do you want to do?") . sprintf(" (<a href=\"%s\">%s</a>)", page_link_to('angeltypes') . '&action=about', _("Description of job types")), $angel_types, $selected_angel_types), form_checkboxes('angel_types', _("What do you want to do?") . sprintf(" (<a href=\"%s\">%s</a>)", page_link_to('angeltypes') . '&action=about', _("Description of job types")), $angel_types, $selected_angel_types),
form_submit('submit', _("Save")) form_submit('submit', _("Save"))
))
)), )),
div('col-md-6', array(
form(array( form(array(
form_info("", _("Here you can change your password.")), form_info(_("Here you can change your password.")),
form_password('password', _("Old password:")), form_password('password', _("Old password:")),
form_password('new_password', _("New password:")), form_password('new_password', _("New password:")),
form_password('new_password2', _("Password confirmation:")), form_password('new_password2', _("Password confirmation:")),
form_submit('submit_password', _("Save")) form_submit('submit_password', _("Save"))
)), )),
form(array( form(array(
form_info("", _("Here you can choose your color settings:")), form_info(_("Here you can choose your color settings:")),
form_select('theme', _("Color settings:"), $themes, $selected_theme), form_select('theme', _("Color settings:"), $themes, $selected_theme),
form_submit('submit_theme', _("Save")) form_submit('submit_theme', _("Save"))
)), )),
form(array( form(array(
form_info("", _("Here you can choose your language:")), form_info(_("Here you can choose your language:")),
form_select('language', _("Language:"), $locales, $selected_language), form_select('language', _("Language:"), $locales, $selected_language),
form_submit('submit_language', _("Save")) form_submit('submit_language', _("Save"))
)) ))
))
))
)); ));
} }
?> ?>

9
includes/sys_menu.php
View File

@ -16,9 +16,12 @@ function page_link_to_absolute($page) {
function header_toolbar() { function header_toolbar() {
global $p, $privileges, $user; global $p, $privileges, $user;
$toolbar_items = array( $toolbar_items = array();
make_langselect()
); if (isset($user))
$toolbar_items[] = toolbar_item_link('#', 'time', User_shift_mode_render(User_shift_state($user)));
$toolbar_items[] = make_langselect();
if (in_array('register', $privileges)) if (in_array('register', $privileges))
$toolbar_items[] = toolbar_item_link(page_link_to('register'), 'plus', register_title(), $p == 'register'); $toolbar_items[] = toolbar_item_link(page_link_to('register'), 'plus', register_title(), $p == 'register');

2
includes/sys_template.php
View File

@ -149,7 +149,7 @@ function form_radio($name, $label, $selected, $value) {
/** /**
* Rendert einen Infotext in das Formular * Rendert einen Infotext in das Formular
*/ */
function form_info($label, $text) { function form_info($label, $text = "") {
if ($label == "") if ($label == "")
return '<span class="help-block">' . $text . '</span>'; return '<span class="help-block">' . $text . '</span>';
if ($text == "") if ($text == "")