diff options
author | Philip Häusler <msquare@notrademark.de> | 2014-08-23 02:47:06 +0200 |
---|---|---|
committer | Philip Häusler <msquare@notrademark.de> | 2014-08-23 02:47:06 +0200 |
commit | f30bc252460e74ca4c71677663acd3d91a8657d6 (patch) | |
tree | 13bf648860ac0b924eb6881e14ec0e5fee3aef8b | |
parent | c5331c44fd5f0251e7ec572c3bfc50a9f52c86bf (diff) |
minor bugfixes
-rw-r--r-- | includes/sys_menu.php | 2 | ||||
-rw-r--r-- | includes/sys_template.php | 6 | ||||
-rw-r--r-- | includes/view/ShiftEntry_view.php | 2 | ||||
-rw-r--r-- | includes/view/User_view.php | 38 | ||||
-rw-r--r-- | themes/base.scss | 4 |
5 files changed, 26 insertions, 26 deletions
diff --git a/includes/sys_menu.php b/includes/sys_menu.php index de7fc071..4bfcb696 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -24,7 +24,7 @@ function header_toolbar() { $toolbar_items[] = toolbar_item_link(page_link_to('register'), 'plus', register_title(), $p == 'register'); if (in_array('user_myshifts', $privileges)) - $toolbar_items[] = toolbar_item_link(page_link_to('users') . '&action=view', ' icon-icon_angel', $user['Nick'], $p == 'user_myshifts'); + $toolbar_items[] = toolbar_item_link(page_link_to('users') . '&action=view', ' icon-icon_angel', $user['Nick'], $p == 'users'); if (in_array('user_settings', $privileges)) $toolbar_items[] = toolbar_item_link(page_link_to('user_settings'), 'list-alt', settings_title(), $p == 'user_settings'); diff --git a/includes/sys_template.php b/includes/sys_template.php index 24e6797b..2015a0d7 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -256,16 +256,16 @@ function table($columns, $rows_raw, $data = true) { $html .= '<table class="table ' . ($data ? ' data' : '') . '">'; $html .= '<thead><tr>'; foreach ($columns as $key => $column) - $html .= '<th class="' . $key . '">' . $column . '</th>'; + $html .= '<th class="column_' . $key . '">' . $column . '</th>'; $html .= '</tr></thead>'; $html .= '<tbody>'; foreach ($rows as $row) { $html .= '<tr>'; foreach ($columns as $key => $column) if (isset($row[$key])) - $html .= '<td class="' . $key . '">' . $row[$key] . '</td>'; + $html .= '<td class="column_' . $key . '">' . $row[$key] . '</td>'; else - $html .= '<td class="' . $key . '"> </td>'; + $html .= '<td class="column_' . $key . '"> </td>'; $html .= '</tr>'; } $html .= '</tbody>'; diff --git a/includes/view/ShiftEntry_view.php b/includes/view/ShiftEntry_view.php index c8690689..6cb8ba00 100644 --- a/includes/view/ShiftEntry_view.php +++ b/includes/view/ShiftEntry_view.php @@ -18,7 +18,7 @@ function ShiftEntry_edit_view($angel, $date, $location, $title, $type, $comment, form_textarea('freeload_comment', _("Freeload comment (Only for shift coordination):"), $freeload_comment) ); } else { - $freeload_form = ""; + $freeload_form = array(); } return page_with_title(_("Edit shift entry"), array( form(array( diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 04a0fa3f..baa02591 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -1,5 +1,24 @@ <?php +/** + * Available T-Shirt sizes + */ +$tshirt_sizes = array( + '' => _("Please select..."), + 'S' => "S", + 'M' => "M", + 'L' => "L", + 'XL' => "XL", + '2XL' => "2XL", + '3XL' => "3XL", + '4XL' => "4XL", + '5XL' => "5XL", + 'S-G' => "S Girl", + 'M-G' => "M Girl", + 'L-G' => "L Girl", + 'XL-G' => "XL Girl" +); + function User_shift_mode_render($shift_mode) { if ($shift_mode == 0) return '<span class="text-success">' . _("Free") . '</span>'; @@ -125,25 +144,6 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_shift } /** - * Available T-Shirt sizes - */ -$tshirt_sizes = array( - '' => _("Please select..."), - 'S' => "S", - 'M' => "M", - 'L' => "L", - 'XL' => "XL", - '2XL' => "2XL", - '3XL' => "3XL", - '4XL' => "4XL", - '5XL' => "5XL", - 'S-G' => "S Girl", - 'M-G' => "M Girl", - 'L-G' => "L Girl", - 'XL-G' => "XL Girl" -); - -/** * View for password recovery step 1: E-Mail */ function User_password_recovery_view() { diff --git a/themes/base.scss b/themes/base.scss index 70d1a4b7..e2a6d56a 100644 --- a/themes/base.scss +++ b/themes/base.scss @@ -8,5 +8,5 @@ body { } .footer a { - color: $text-muted; -}
\ No newline at end of file + color: $text-muted; +} |