summaryrefslogtreecommitdiff
path: root/includes/view
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2014-08-23 02:47:06 +0200
committerPhilip Häusler <msquare@notrademark.de>2014-08-23 02:47:06 +0200
commitf30bc252460e74ca4c71677663acd3d91a8657d6 (patch)
tree13bf648860ac0b924eb6881e14ec0e5fee3aef8b /includes/view
parentc5331c44fd5f0251e7ec572c3bfc50a9f52c86bf (diff)
minor bugfixes
Diffstat (limited to 'includes/view')
-rw-r--r--includes/view/ShiftEntry_view.php2
-rw-r--r--includes/view/User_view.php38
2 files changed, 20 insertions, 20 deletions
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() {