summaryrefslogtreecommitdiff
path: root/includes/pages
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2014-12-25 22:23:18 +0100
committerPhilip Häusler <msquare@notrademark.de>2014-12-25 22:23:18 +0100
commit34e2f4987558a887ab3bc66b47306ec70cdfbd17 (patch)
tree0bacd0717aabf2ac51840d2b740f786065219d06 /includes/pages
parent74b98b8c3e37c2ff578617d3c3b4ab2b02cb06b9 (diff)
shift signup improvements for shift view
Diffstat (limited to 'includes/pages')
-rw-r--r--includes/pages/user_shifts.php18
1 files changed, 10 insertions, 8 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index a727bbcb..603ca993 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -9,8 +9,8 @@ function user_shifts() {
if (User_is_freeloader($user))
redirect(page_link_to('user_myshifts'));
-
- // Locations laden
+
+ // Locations laden
$rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
$room_array = array();
foreach ($rooms as $room)
@@ -62,8 +62,8 @@ function user_shifts() {
if (count($shift) == 0)
redirect(page_link_to('user_shifts'));
$shift = $shift[0];
-
- // Engeltypen laden
+
+ // Engeltypen laden
$types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
$angel_types = array();
$needed_angel_types = array();
@@ -543,14 +543,16 @@ function view_user_shifts() {
// qqqqqq
$is_free = false;
- $shifts_row = date('d.m. H:i', $shift['start']);
+ $shifts_row = '<a href="' . shift_link($shift) . '">' . date('d.m. H:i', $shift['start']);
$shifts_row .= " &ndash; ";
$shifts_row .= date('H:i', $shift['end']);
$shifts_row .= "<br /><b>";
- $shifts_row .= '<a href="' . shift_link($shift) . '">' . ShiftType($shift['shifttype_id'])['name'] . '</a>';
+ $shifts_row .= ShiftType($shift['shifttype_id'])['name'];
$shifts_row .= "</b><br />";
- $shifts_row .= '<a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>';
- $shifts_row .= "<br />";
+ if ($shift['title'] != '') {
+ $shifts_row .= $shift['title'];
+ $shifts_row .= "<br />";
+ }
if (in_array('admin_shifts', $privileges))
$shifts_row .= ' ' . table_buttons(array(
button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'),