add basic shift view

7 files changed, 316 insertions, 170 deletions

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 8352092d..58131d2e 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -1,5 +1,66 @@
 <?php
 
+function shift_link($shift) {
+  return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID'];
+}
+
+function shift_delete_link($shift) {
+  return page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'];
+}
+
+function shift_edit_link($shift) {
+  return page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'];
+}
+
+function shift_controller() {
+  global $user, $privileges;
+  
+  if (! in_array('user_shifts', $privileges))
+    redirect(page_link_to('user_shifts'));
+  
+  if (! isset($_REQUEST['shift_id']))
+    redirect(page_link_to('user_shifts'));
+  
+  $shift = Shift($_REQUEST['shift_id']);
+  if ($shift === false)
+    engelsystem_error('Unable to load shift.');
+  if ($shift == null) {
+    error(_('Shift could not be found.'));
+    redirect(page_link_to('user_shifts'));
+  }
+  
+  $shifttype = ShiftType($shift['shifttype_id']);
+  if ($shifttype === false || $shifttype == null)
+    engelsystem_error('Unable to load shift type.');
+  
+  $room = Room($shift['RID']);
+  if ($room === false || $room == null)
+    engelsystem_error('Unable to load room.');
+  
+  $angeltypes = AngelTypes();
+  if ($angeltypes === false)
+    engelsystem_error('Unable to load angeltypes.');
+  
+  User_angeltypes($user);
+  
+  return [
+      $shift['name'],
+      Shift_view($shift, $shifttype, $room, in_array('admin_shifts', $privileges), $angeltypes, in_array('user_shifts_admin', $privileges)) 
+  ];
+}
+
+function shifts_controller() {
+  if (! isset($_REQUEST['action']))
+    redirect(page_link_to('user_shifts'));
+  
+  switch ($_REQUEST['action']) {
+    default:
+      redirect(page_link_to('?'));
+    case 'view':
+      return shift_controller();
+  }
+}
+
 /**
  * Export all shifts using api-key.
  */
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index 1f22ebdb..eca0d141 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -71,7 +71,7 @@ function Shift_create($shift) {
  */
 function Shifts_by_user($user) {
   return sql_select("
-      SELECT * 
+      SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, `ShiftEntry`.*, `Shifts`.*, `Room`.* 
       FROM `ShiftEntry` 
       JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) 
       JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
@@ -138,7 +138,7 @@ function Shift($id) {
       FROM `Shifts` 
       JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
       WHERE `SID`=" . sql_escape($id));
-  $shiftsEntry_source = sql_select("SELECT `TID` , `UID` , `freeloaded` FROM `ShiftEntry` WHERE `SID`=" . sql_escape($id));
+  $shiftsEntry_source = sql_select("SELECT `id`, `TID` , `UID` , `freeloaded` FROM `ShiftEntry` WHERE `SID`=" . sql_escape($id));
   
   if ($shifts_source === false)
     return false;
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 5181d707..bc8e82d6 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -6,17 +6,17 @@ function shifts_title() {
 
 function user_shifts() {
   global $user, $privileges, $max_freeloadable_shifts;
-
+  
   if (User_is_freeloader($user))
     redirect(page_link_to('user_myshifts'));
-
+    
     // Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins
   if (isset($_REQUEST['entry_id']) && in_array('user_shifts_admin', $privileges)) {
     if (isset($_REQUEST['entry_id']) && test_request_int('entry_id'))
       $entry_id = $_REQUEST['entry_id'];
     else
       redirect(page_link_to('user_shifts'));
-
+    
     $shift_entry_source = sql_select("
         SELECT `User`.`Nick`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` 
         FROM `ShiftEntry` 
@@ -28,11 +28,11 @@ function user_shifts() {
         WHERE `ShiftEntry`.`id`=" . sql_escape($entry_id));
     if (count($shift_entry_source) > 0) {
       $shift_entry_source = $shift_entry_source[0];
-
+      
       $result = ShiftEntry_delete($entry_id);
       if ($result === false)
         engelsystem_error('Unable to delete shift entry.');
-
+      
       engelsystem_log("Deleted " . User_Nick_render($shift_entry_source) . "'s shift: " . $shift_entry_source['name'] . " at " . $shift_entry_source['Name'] . " from " . date("y-m-d H:i", $shift_entry_source['start']) . " to " . date("y-m-d H:i", $shift_entry_source['end']) . " as " . $shift_entry_source['angel_type']);
       success(_("Shift entry deleted."));
     } else
@@ -42,16 +42,12 @@ function user_shifts() {
   elseif (isset($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) {
     $msg = "";
     $ok = true;
-
+    
     if (isset($_REQUEST['edit_shift']) && test_request_int('edit_shift'))
       $shift_id = $_REQUEST['edit_shift'];
     else
       redirect(page_link_to('user_shifts'));
-
-      /*
-     * if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1") > 0) { error("Du kannst nur Schichten bearbeiten, bei denen niemand eingetragen ist."); redirect(page_link_to('user_shift')); }
-     */
-
+    
     $shift = sql_select("
         SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.* FROM `Shifts` 
         JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) 
@@ -60,13 +56,13 @@ function user_shifts() {
     if (count($shift) == 0)
       redirect(page_link_to('user_shifts'));
     $shift = $shift[0];
-
+    
     // Locations laden
     $rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
     $room_array = array();
     foreach ($rooms as $room)
       $room_array[$room['RID']] = $room['Name'];
-
+      
       // Engeltypen laden
     $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
     $angel_types = array();
@@ -75,30 +71,30 @@ function user_shifts() {
       $angel_types[$type['id']] = $type;
       $needed_angel_types[$type['id']] = 0;
     }
-
+    
     // Benötigte Engeltypen vom Raum
     $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`");
     foreach ($needed_angel_types_source as $type) {
       if ($type['count'] != "")
         $needed_angel_types[$type['id']] = $type['count'];
     }
-
+    
     // Benötigte Engeltypen von der Schicht
     $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`");
     foreach ($needed_angel_types_source as $type) {
       if ($type['count'] != "")
         $needed_angel_types[$type['id']] = $type['count'];
     }
-
+    
     $name = $shift['name'];
     $rid = $shift['RID'];
     $start = $shift['start'];
     $end = $shift['end'];
-
+    
     if (isset($_REQUEST['submit'])) {
       // Name/Bezeichnung der Schicht, darf leer sein
       $name = strip_request_item('name');
-
+      
       // Auswahl der sichtbaren Locations für die Schichten
       if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']]))
         $rid = $_REQUEST['rid'];
@@ -107,26 +103,26 @@ function user_shifts() {
         $rid = $rooms[0]['RID'];
         $msg .= error(_("Please select a room."), true);
       }
-
+      
       if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start'])))
         $start = $tmp->getTimestamp();
       else {
         $ok = false;
         $msg .= error(_("Please enter a valid starting time for the shifts."), true);
       }
-
+      
       if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end'])))
         $end = $tmp->getTimestamp();
       else {
         $ok = false;
         $msg .= error(_("Please enter a valid ending time for the shifts."), true);
       }
-
+      
       if ($start >= $end) {
         $ok = false;
         $msg .= error(_("The ending time has to be after the starting time."), true);
       }
-
+      
       foreach ($needed_angel_types_source as $type) {
         if (isset($_REQUEST['type_' . $type['id']]) && preg_match("/^[0-9]+$/", trim($_REQUEST['type_' . $type['id']]))) {
           $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]);
@@ -135,7 +131,7 @@ function user_shifts() {
           $msg .= error(sprintf(_("Please check your input for needed angels of type %s."), $type['name']), true);
         }
       }
-
+      
       if ($ok) {
         $shift['name'] = $name;
         $shift['RID'] = $rid;
@@ -150,19 +146,19 @@ function user_shifts() {
           sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count));
           $needed_angel_types_info[] = $angel_types[$type_id]['name'] . ": " . $count;
         }
-
+        
         engelsystem_log("Updated shift '" . $name . "' from " . date("y-m-d H:i", $start) . " to " . date("y-m-d H:i", $end) . " with angel types " . join(", ", $needed_angel_types_info));
         success(_("Shift updated."));
-        redirect(page_link_to('user_shifts'));
+        redirect(shift_link($shift_id));
       }
     }
-
+    
     $room_select = html_select_key('rid', 'rid', $room_array, $rid);
-
+    
     $angel_types = "";
     foreach ($types as $type)
       $angel_types .= form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]);
-
+    
     return page_with_title(shifts_title(), array(
         msg(),
         '<noscript>' . info(_("This page is much more comfortable with javascript."), true) . '</noscript>',
@@ -173,8 +169,8 @@ function user_shifts() {
             form_text('end', _("End:"), date("Y-m-d H:i", $end)),
             '<h2>' . _("Needed angels") . '</h2>',
             $angel_types,
-            form_submit('submit', _("Save"))
-        ))
+            form_submit('submit', _("Save")) 
+        )) 
     ));
   }   // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
   elseif (isset($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) {
@@ -182,7 +178,7 @@ function user_shifts() {
       $shift_id = $_REQUEST['delete_shift'];
     else
       redirect(page_link_to('user_shifts'));
-
+    
     $shift = sql_select("
         SELECT `Shifts`.*, `ShiftTypes`.`name`, `Room`.* 
         FROM `Shifts` 
@@ -192,28 +188,28 @@ function user_shifts() {
     if (count($shift) == 0)
       redirect(page_link_to('user_shifts'));
     $shift = $shift[0];
-
+    
     // Schicht löschen bestätigt
     if (isset($_REQUEST['delete'])) {
       $result = Shift_delete($shift_id);
       if ($result === false)
         engelsystem_error('Unable to delete shift.');
-
+      
       engelsystem_log("Deleted shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']));
       success(_("Shift deleted."));
       redirect(page_link_to('user_shifts'));
     }
-
+    
     return page_with_title(shifts_title(), array(
         error(sprintf(_("Do you want to delete the shift %s from %s to %s?"), $shift['name'], date("Y-m-d H:i", $shift['start']), date("H:i", $shift['end'])), true),
-        '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>'
+        '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>' 
     ));
   } elseif (isset($_REQUEST['shift_id'])) {
     if (isset($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id']))
       $shift_id = $_REQUEST['shift_id'];
     else
       redirect(page_link_to('user_shifts'));
-
+    
     $shift = sql_select("
         SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.* 
         FROM `Shifts` 
@@ -223,18 +219,18 @@ function user_shifts() {
     if (count($shift) == 0)
       redirect(page_link_to('user_shifts'));
     $shift = $shift[0];
-
+    
     if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id']))
       $type_id = $_REQUEST['type_id'];
     else
       redirect(page_link_to('user_shifts'));
-
+      
       // Schicht läuft schon, Eintragen für Engel nicht mehr möglich
     if (! in_array('user_shifts_admin', $privileges) && time() > $shift['start']) {
       error(_("This shift is running now or ended already. Please contact a dispatcher to join the shift."));
-      redirect(page_link_to('user_shifts'));
+      redirect(shift_link($shift));
     }
-
+    
     // Another shift the user is signed up for collides with this one
     if (! in_array('user_shifts_admin', $privileges) && sql_num_query("
         SELECT `Shifts`.`SID` 
@@ -242,18 +238,18 @@ function user_shifts() {
         INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = " . sql_escape($user['UID']) . ") 
         WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) {
       error(_("You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift."));
-      redirect(page_link_to('user_shifts'));
+      redirect(shift_link($shift));
     }
-
+    
     if (in_array('user_shifts_admin', $privileges))
       $type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1");
     else
       $type = sql_select("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `AngelTypes`.`id` = " . sql_escape($type_id) . " AND (`AngelTypes`.`restricted` = 0 OR (`UserAngelTypes`.`user_id` = " . sql_escape($user['UID']) . " AND NOT `UserAngelTypes`.`confirm_user_id` IS NULL)) LIMIT 1");
-
+    
     if (count($type) == 0)
       redirect(page_link_to('user_shifts'));
     $type = $type[0];
-
+    
     if (isset($_REQUEST['submit'])) {
       $selected_type_id = $type_id;
       if (in_array('user_shifts_admin', $privileges)) {
@@ -261,25 +257,25 @@ function user_shifts() {
           $user_id = $_REQUEST['user_id'];
         else
           $user_id = $user['UID'];
-
+        
         if (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($user_id) . " LIMIT 1") == 0)
           redirect(page_link_to('user_shifts'));
-
+        
         if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($_REQUEST['angeltype_id']) . " LIMIT 1") > 0)
           $selected_type_id = $_REQUEST['angeltype_id'];
       } else
         $user_id = $user['UID'];
-
+      
       if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID` = '" . sql_escape($user_id) . "'"))
         return error("This angel does already have an entry for this shift.", true);
-
+      
       $freeloaded = $shift['freeloaded'];
       $freeload_comment = $shift['freeload_comment'];
       if (in_array("user_shifts_admin", $privileges)) {
         $freeloaded = isset($_REQUEST['freeloaded']);
         $freeload_comment = strip_request_item_nl('freeload_comment');
       }
-
+      
       $comment = strip_request_item_nl('comment');
       $result = ShiftEntry_create(array(
           'SID' => $shift_id,
@@ -287,28 +283,28 @@ function user_shifts() {
           'UID' => $user_id,
           'Comment' => $comment,
           'freeloaded' => $freeloaded,
-          'freeload_comment' => $freeload_comment
+          'freeload_comment' => $freeload_comment 
       ));
       if ($result === false)
         engelsystem_error('Unable to create shift entry.');
-
+      
       if ($type['restricted'] == 0 && sql_num_query("SELECT * FROM `UserAngelTypes` INNER JOIN `AngelTypes` ON `AngelTypes`.`id` = `UserAngelTypes`.`angeltype_id` WHERE `angeltype_id` = '" . sql_escape($selected_type_id) . "' AND `user_id` = '" . sql_escape($user_id) . "' ") == 0)
         sql_query("INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES ('" . sql_escape($user_id) . "', '" . sql_escape($selected_type_id) . "')");
-
+      
       $user_source = User($user_id);
       engelsystem_log("User " . User_Nick_render($user_source) . " signed up for shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end']));
       success(_("You are subscribed. Thank you!") . ' <a href="' . page_link_to('user_myshifts') . '">' . _("My shifts") . ' &raquo;</a>');
-      redirect(page_link_to('user_shifts'));
+      redirect(shift_link($shift));
     }
-
+    
     if (in_array('user_shifts_admin', $privileges)) {
       $users = sql_select("SELECT *, (SELECT count(*) FROM `ShiftEntry` WHERE `freeloaded`=1 AND `ShiftEntry`.`UID`=`User`.`UID`) AS `freeloaded` FROM `User` ORDER BY `Nick`");
       $users_select = array();
-
+      
       foreach ($users as $usr)
         $users_select[$usr['UID']] = $usr['Nick'] . ($usr['freeloaded'] == 0 ? "" : " (" . _("Freeloader") . ")");
       $user_text = html_select_key('user_id', 'user_id', $users_select, $user['UID']);
-
+      
       $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
       $angeltypes = array();
       foreach ($angeltypes_source as $angeltype)
@@ -318,7 +314,7 @@ function user_shifts() {
       $user_text = User_Nick_render($user);
       $angeltyppe_select = $type['name'];
     }
-
+    
     return ShiftEntry_edit_view($user_text, date("Y-m-d H:i", $shift['start']) . ' &ndash; ' . date('Y-m-d H:i', $shift['end']) . ' (' . shift_length($shift) . ')', $shift['Name'], $shift['name'], $angeltyppe_select, "", false, null, in_array('user_shifts_admin', $privileges));
   } else {
     return view_user_shifts();
@@ -328,25 +324,25 @@ function user_shifts() {
 function view_user_shifts() {
   global $user, $privileges;
   global $ical_shifts;
-
+  
   $ical_shifts = array();
   $days = sql_select_single_col("
       SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name` 
       FROM `Shifts` 
       ORDER BY `start`");
-
+  
   if (count($days) == 0) {
     error(_("The administration has not configured any shifts yet."));
     redirect('?');
   }
-
+  
   $rooms = sql_select("SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
-
+  
   if (count($rooms) == 0) {
     error(_("The administration has not configured any rooms yet."));
     redirect('?');
   }
-
+  
   if (in_array('user_shifts_admin', $privileges))
     $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `AngelTypes`.`name`");
   else
@@ -356,32 +352,32 @@ function view_user_shifts() {
   $filled = array(
       array(
           'id' => '1',
-          'name' => _('occupied')
+          'name' => _('occupied') 
       ),
       array(
           'id' => '0',
-          'name' => _('free')
-      )
+          'name' => _('free') 
+      ) 
   );
-
+  
   if (count($types) == 0) {
     error(_("The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype."));
     redirect('?');
   }
-
+  
   if (! isset($_SESSION['user_shifts']))
     $_SESSION['user_shifts'] = array();
-
+  
   if (! isset($_SESSION['user_shifts']['filled'])) {
     $_SESSION['user_shifts']['filled'] = array(
-        0
+        0 
     );
   }
-
+  
   foreach (array(
       'rooms',
       'types',
-      'filled'
+      'filled' 
   ) as $key) {
     if (isset($_REQUEST[$key])) {
       $filtered = array_filter($_REQUEST[$key], 'is_numeric');
@@ -392,7 +388,7 @@ function view_user_shifts() {
     if (! isset($_SESSION['user_shifts'][$key]))
       $_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key);
   }
-
+  
   if (isset($_REQUEST['rooms'])) {
     if (isset($_REQUEST['new_style']))
       $_SESSION['user_shifts']['new_style'] = true;
@@ -403,7 +399,7 @@ function view_user_shifts() {
     $_SESSION['user_shifts']['new_style'] = true;
   foreach (array(
       'start',
-      'end'
+      'end' 
   ) as $key) {
     if (isset($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days))
       $_SESSION['user_shifts'][$key . '_day'] = $_REQUEST[$key . '_day'];
@@ -420,24 +416,24 @@ function view_user_shifts() {
     $_SESSION['user_shifts']['end_day'] = $_SESSION['user_shifts']['start_day'];
   if ($_SESSION['user_shifts']['start_day'] == $_SESSION['user_shifts']['end_day'] && $_SESSION['user_shifts']['start_time'] >= $_SESSION['user_shifts']['end_time'])
     $_SESSION['user_shifts']['end_time'] = '23:59';
-
+  
   if (isset($_SESSION['user_shifts']['start_day'])) {
     $starttime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['start_day'] . $_SESSION['user_shifts']['start_time']);
     $starttime = $starttime->getTimestamp();
   } else
     $starttime = now();
-
+  
   if (isset($_SESSION['user_shifts']['end_day'])) {
     $endtime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['end_day'] . $_SESSION['user_shifts']['end_time']);
     $endtime = $endtime->getTimestamp();
   } else
     $endtime = now() + 24 * 60 * 60;
-
+  
   if (! isset($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0)
     $_SESSION['user_shifts']['rooms'] = array(
-        0
+        0 
     );
-
+  
   $SQL = "SELECT DISTINCT `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs'
   FROM `Shifts`
   INNER JOIN `Room` USING (`RID`)
@@ -447,14 +443,14 @@ function view_user_shifts() {
   LEFT JOIN (SELECT se.`SID`, se.`TID`, COUNT(*) as count FROM `ShiftEntry` AS se GROUP BY se.`SID`, se.`TID`) AS entries ON entries.`SID` = `Shifts`.`SID` AND entries.`TID` = nat.`angel_type_id`
   WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ")
   AND `start` BETWEEN " . $starttime . " AND " . $endtime;
-
+  
   if (count($_SESSION['user_shifts']['filled']) == 1) {
     if ($_SESSION['user_shifts']['filled'][0] == 0)
       $SQL .= "
-      AND (nat.`count` > entries.`count` OR entries.`count` IS NULL OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " .sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))";
+      AND (nat.`count` > entries.`count` OR entries.`count` IS NULL OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " . sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))";
     elseif ($_SESSION['user_shifts']['filled'][0] == 1)
       $SQL .= "
-    AND (nat.`count` <= entries.`count`  OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " .sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))";
+    AND (nat.`count` <= entries.`count`  OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = " . sql_escape($user['UID']) . " AND `ShiftEntry`.`SID` = `Shifts`.`SID`))";
   }
   $SQL .= "
   ORDER BY `start`";
@@ -470,7 +466,7 @@ function view_user_shifts() {
   foreach ($ownshifts_source as $ownshift)
     $ownshifts[$ownshift['SID']] = $ownshift;
   unset($ownshifts_source);
-
+  
   $shifts_table = "";
   // qqqq
   /*
@@ -482,7 +478,7 @@ function view_user_shifts() {
     $block = array();
     $todo = array();
     $myrooms = $rooms;
-
+    
     // delete un-selected rooms from array
     foreach ($myrooms as $k => $v) {
       if (array_search($v["id"], $_SESSION['user_shifts']['rooms']) === FALSE)
@@ -490,7 +486,7 @@ function view_user_shifts() {
         // initialize $block array
       $block[$v["id"]] = array_fill(0, $maxshow, 0);
     }
-
+    
     // calculate number of parallel shifts in each timeslot for each room
     foreach ($shifts as $k => $shift) {
       $rid = $shift["RID"];
@@ -500,7 +496,7 @@ function view_user_shifts() {
         $block[$rid][$i] ++;
       $shifts[$k]['own'] = in_array($shift['SID'], array_keys($ownshifts));
     }
-
+    
     $shifts_table = '<div class="shifts-table"><table id="shifts" class="table scrollable"><thead><tr><th>-</th>';
     foreach ($myrooms as $key => $room) {
       $rid = $room["id"];
@@ -517,15 +513,14 @@ function view_user_shifts() {
       $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n";
     }
     unset($block, $blocks, $firstblock, $colspan, $key, $room);
-
+    
     $shifts_table .= "</tr></thead><tbody>";
     for ($i = 0; $i < $maxshow; $i ++) {
       $thistime = $first + ($i * 15 * 60);
       if ($thistime % (24 * 60 * 60) == 23 * 60 * 60 && $endtime - $starttime > 24 * 60 * 60) {
         $shifts_table .= "<tr class=\"row-day\"><th class=\"row-header\">";
         $shifts_table .= date('y-m-d<b\r />H:i', $thistime);
-      }
-      elseif ($thistime % (60 * 60) == 0) {
+      } elseif ($thistime % (60 * 60) == 0) {
         $shifts_table .= "<tr class=\"row-hour\"><th>";
         $shifts_table .= date("H:i", $thistime);
       } else {
@@ -540,26 +535,23 @@ function view_user_shifts() {
               $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
               if ($blocks < 1)
                 $blocks = 1;
-
+              
               $collides = in_array($shift['SID'], array_keys($ownshifts));
               if (! $collides)
                 foreach ($ownshifts as $ownshift) {
-                  if ($ownshift['start'] >= $shift['start'] && $ownshift['start'] < $shift['end'] ||
-                        $ownshift['end'] > $shift['start'] && $ownshift['end'] <= $shift['end'] ||
-                        $ownshift['start'] < $shift['start'] && $ownshift['end'] > $shift['end'])
-                  {
+                  if ($ownshift['start'] >= $shift['start'] && $ownshift['start'] < $shift['end'] || $ownshift['end'] > $shift['start'] && $ownshift['end'] <= $shift['end'] || $ownshift['start'] < $shift['start'] && $ownshift['end'] > $shift['end']) {
                     $collides = true;
                     break;
                   }
                 }
-
+                
                 // qqqqqq
               $is_free = false;
-              $shifts_row = $shift['name'];
+              $shifts_row = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
               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'),
-                    button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs')
+                    button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') 
                 ));
               $shifts_row .= '<br />';
               $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id`
@@ -577,7 +569,7 @@ function view_user_shifts() {
                 $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
               $query .= " ORDER BY `AngelTypes`.`name`";
               $angeltypes = sql_select($query);
-
+              
               if (count($angeltypes) > 0) {
                 foreach ($angeltypes as $angeltype) {
                   $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`");
@@ -594,7 +586,7 @@ function view_user_shifts() {
                     }
                     if (in_array('user_shifts_admin', $privileges))
                       $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . table_buttons(array(
-                          button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs')
+                          button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') 
                       )) . '</span>';
                     else
                       $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . "</span>";
@@ -603,20 +595,20 @@ function view_user_shifts() {
                     $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries));
                     // is the shift still running or alternatively is the user shift admin?
                     $user_may_join_shift = true;
-
+                    
                     // you cannot join if user alread joined a parallel or this shift
                     $user_may_join_shift &= ! $collides;
-
+                    
                     // you cannot join if user is not of this angel type
                     $user_may_join_shift &= isset($angeltype['user_id']);
-
+                    
                     // you cannot join if you are not confirmed
                     if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
                       $user_may_join_shift &= isset($angeltype['confirm_user_id']);
-
+                      
                       // you can only join if the shift is in future or running
                     $user_may_join_shift &= time() < $shift['start'];
-
+                    
                     // User shift admins may join anybody in every shift
                     $user_may_join_shift |= in_array('user_shifts_admin', $privileges);
                     if ($user_may_join_shift)
@@ -631,11 +623,11 @@ function view_user_shifts() {
                       else
                         $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>';
                     }
-
+                    
                     unset($inner_text);
                     $is_free = true;
                   }
-
+                  
                   $shifts_row .= '<b>' . $angeltype['name'] . ':</b> ';
                   $shifts_row .= join(", ", $entry_list);
                   $shifts_row .= '<br />';
@@ -678,16 +670,16 @@ function view_user_shifts() {
       $info[] = date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']);
       if (count($_SESSION['user_shifts']['rooms']) > 1)
         $info[] = $shift['room_name'];
-
+      
       $shift_row = array(
           'info' => join('<br />', $info),
-          'entries' => $shift['name']
+          'entries' => $shift['name'] 
       );
-
+      
       if (in_array('admin_shifts', $privileges))
         $shift_row['info'] .= ' ' . table_buttons(array(
             button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'),
-            button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs')
+            button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') 
         ));
       $shift_row['entries'] .= '<br />';
       $is_free = false;
@@ -708,7 +700,7 @@ function view_user_shifts() {
       $angeltypes = sql_select($query);
       if (count($angeltypes) > 0) {
         $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']) . " AND `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0;
-
+        
         foreach ($angeltypes as &$angeltype) {
           $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`");
           $entry_list = array();
@@ -716,7 +708,7 @@ function view_user_shifts() {
           foreach ($entries as $entry) {
             if (in_array('user_shifts_admin', $privileges))
               $member = User_Nick_render($entry) . ' ' . table_buttons(array(
-                  button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs')
+                  button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') 
               ));
             else
               $member = User_Nick_render($entry);
@@ -732,20 +724,20 @@ function view_user_shifts() {
             $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries) + $freeloader), $angeltype['count'] - count($entries) + $freeloader);
             // is the shift still running or alternatively is the user shift admin?
             $user_may_join_shift = true;
-
+            
             /* you cannot join if user already joined this shift */
             $user_may_join_shift &= ! $my_shift;
-
+            
             // you cannot join if user is not of this angel type
             $user_may_join_shift &= isset($angeltype['user_id']);
-
+            
             // you cannot join if you are not confirmed
             if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
               $user_may_join_shift &= isset($angeltype['confirm_user_id']);
-
+              
               // you can only join if the shift is in future or running
             $user_may_join_shift &= time() < $shift['start'];
-
+            
             // User shift admins may join anybody in every shift
             $user_may_join_shift |= in_array('user_shifts_admin', $privileges);
             if ($user_may_join_shift)
@@ -759,11 +751,11 @@ function view_user_shifts() {
                 $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>';
               }
             }
-
+            
             unset($inner_text);
             $is_free = true;
           }
-
+          
           $shift_row['entries'] .= '<b>' . $angeltype['name'] . ':</b> ';
           $shift_row['entries'] .= join(", ", $entry_list);
           $shift_row['entries'] .= '<br />';
@@ -778,13 +770,13 @@ function view_user_shifts() {
     }
     $shifts_table = table(array(
         'info' => _("Time") . "/" . _("Room"),
-        'entries' => _("Entries")
+        'entries' => _("Entries") 
     ), $shifts_table);
   }
-
+  
   if ($user['api_key'] == "")
     User_reset_api_key($user, false);
-
+  
   return page(array(
       '<div class="col-md-12">',
       msg(),
@@ -801,9 +793,9 @@ function view_user_shifts() {
           'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>',
           'shifts_table' => msg() . $shifts_table,
           'ical_text' => '<h2>' . _("iCal export") . '</h2><p>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset') . '</p>',
-          'filter' => _("Filter")
+          'filter' => _("Filter") 
       )),
-      '</div>'
+      '</div>' 
   ));
 }
 
@@ -829,14 +821,14 @@ function make_select($items, $selected, $name, $title = null) {
   $html_items = array();
   if (isset($title))
     $html_items[] = '<h4>' . $title . '</h4>' . "\n";
-
+  
   foreach ($items as $i)
     $html_items[] = '<div class="checkbox"><label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '"' . (in_array($i['id'], $selected) ? ' checked="checked"' : '') . '> ' . $i['name'] . '</label>' . (! isset($i['enabled']) || $i['enabled'] ? '' : glyph("lock")) . '</div><br />';
   $html = '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
   $html .= implode("\n", $html_items);
   $html .= buttons(array(
       button("javascript: check_all('selection_" . $name . "')", _("All"), ""),
-      button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "")
+      button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "") 
   ));
   $html .= '</div>' . "\n";
   return $html;
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 75c7c3db..c5cded11 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -14,7 +14,7 @@ function page_link_to_absolute($page) {
  * Renders the header toolbar containing search, login/logout, user and settings links.
  */
 function header_toolbar() {
-  global $p, $privileges, $user, $enable_tshirt_size;
+  global $p, $privileges, $user, $enable_tshirt_size, $max_freeloadable_shifts;
   
   $toolbar_items = array();
   
diff --git a/includes/sys_template.php b/includes/sys_template.php
index b9ae39de..56751e16 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -9,6 +9,10 @@ $themes = array(
     "2" => "Engelsystem 31c3" 
 );
 
+function progress_bar($valuemin, $valuemax, $valuenow, $class = '', $content = '') {
+  return '<div class="progress"><div class="progress-bar ' . $class . '" role="progressbar" aria-valuenow="' . $valuenow . '" aria-valuemin="' . $valuemin . '" aria-valuemax="' . $valuemax . '" style="width: ' . (($valuenow - $valuemin) * 100 / ($valuemax - $valuemin)) . '%">' . $content . '</div></div>';
+}
+
 /**
  * Render glyphicon
  *
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index d0e7d809..47f83a9f 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -1,7 +1,94 @@
 <?php
+
+function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source, $user_shift_admin) {
+  $parsedown = new Parsedown();
+  
+  $angeltypes = [];
+  foreach ($angeltypes_source as $angeltype)
+    $angeltypes[$angeltype['id']] = $angeltype;
+  
+  $needed_angels = '';
+  foreach ($shift['NeedAngels'] as $needed_angeltype) {
+    $class = 'progress-bar-warning';
+    if ($needed_angeltype['taken'] == 0)
+      $class = 'progress-bar-danger';
+    if ($needed_angeltype['taken'] >= $needed_angeltype['count'])
+      $class = 'progress-bar-success';
+    $needed_angels .= '<div class="list-group-item">';
+    $needed_angels .= '<div class="pull-right">' . button(page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $needed_angeltype['TID'], _('Sign up')) . '</div>';
+    $needed_angels .= '<h3>' . $angeltypes[$needed_angeltype['TID']]['name'] . '</h3>';
+    $needed_angels .= progress_bar(0, $needed_angeltype['count'], $needed_angeltype['taken'], $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']);
+    
+    $angels = [];
+    foreach ($shift['ShiftEntry'] as $shift_entry) {
+      if ($shift_entry['TID'] == $needed_angeltype['TID']) {
+        $entry = User_Nick_render(User($shift_entry['UID']));
+        if ($shift_entry['freeloaded'])
+          $entry = '<strike>' . $entry . '</strike>';
+        if ($user_shift_admin) {
+          $entry .= ' <div class="btn-group">';
+          $entry .= button_glyph(page_link_to('user_myshifts') . '&edit=' . $shift['SID'] . '&id=' . $shift_entry['UID'], 'pencil', 'btn-xs');
+          $entry .= button_glyph(page_link_to('user_shifts') . '&entry_id=' . $shift_entry['id'], 'trash', 'btn-xs');
+          $entry .= '</div>';
+        }
+        $angels[] = $entry;
+      }
+    }
+    
+    $needed_angels .= join(', ', $angels);
+    
+    $needed_angels .= '</div>';
+  }
+  
+  return page_with_title($shift['name'] . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>', [
+      msg(),
+      $shift_admin ? buttons([
+          button(shift_edit_link($shift), glyph('pencil') . _('edit')),
+          button(shift_delete_link($shift), glyph('trash') . _('delete')) 
+      ]) : '',
+      div('row', [
+          div('col-sm-3', [
+              '<h4>' . _('Start') . '</h4>',
+              '<p class="lead">',
+              date('y-m-d', $shift['start']),
+              '<br />',
+              date('H:i', $shift['start']),
+              '</p>' 
+          ]),
+          div('col-sm-3', [
+              '<h4>' . _('End') . '</h4>',
+              '<p class="lead">',
+              date('y-m-d', $shift['end']),
+              '<br />',
+              date('H:i', $shift['end']),
+              '</p>' 
+          ]),
+          div('col-sm-3', [
+              '<h4>' . _('Location') . '</h4>',
+              '<p class="lead">' . $room['Name'] . '</p>' 
+          ]),
+          div('col-sm-3', [
+              '<h4>' . _('More info') . '</h4>',
+              $shift['URL'] != '' ? '<a href="' . $shift['URL'] . '">' . $shift['URL'] . '</a>' : '' 
+          ]) 
+      ]),
+      div('row', [
+          div('col-sm-6', [
+              '<h2>' . _('Needed angels') . '</h2>',
+              '<div class="list-group">' . $needed_angels . '</div>' 
+          ]),
+          div('col-sm-6', [
+              '<h2>' . _('Description') . '</h2>',
+              $parsedown->parse($shifttype['description']) 
+          ]) 
+      ]) 
+  ]);
+}
+
 /**
  * Calc shift length in format 12:23h.
- * @param Shift $shift
+ *
+ * @param Shift $shift          
  */
 function shift_length($shift) {
   $length = floor(($shift['end'] - $shift['start']) / (60 * 60)) . ":";
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 99ca3eeb..59456946 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -16,7 +16,7 @@ $tshirt_sizes = array(
     'S-G' => "S Girl",
     'M-G' => "M Girl",
     'L-G' => "L Girl",
-    'XL-G' => "XL Girl"
+    'XL-G' => "XL Girl" 
 );
 
 function Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count) {
@@ -28,7 +28,7 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
     $user['Tshirt'] = glyph_bool($user['Tshirt']);
     $user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']);
     $user['actions'] = table_buttons(array(
-        button_glyph(page_link_to('admin_user') . '&id=' . $user['UID'], 'edit', 'btn-xs')
+        button_glyph(page_link_to('admin_user') . '&id=' . $user['UID'], 'edit', 'btn-xs') 
     ));
   }
   $users[] = array(
@@ -38,13 +38,13 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
       'force_active' => $force_active_count,
       'freeloads' => $freeloads_count,
       'Tshirt' => $tshirts_count,
-      'actions' => '<strong>' . count($users) . '</strong>'
+      'actions' => '<strong>' . count($users) . '</strong>' 
   );
-
+  
   return page_with_title(_('All users'), array(
       msg(),
       buttons(array(
-          button(page_link_to('register'), glyph('plus') . _('New user'))
+          button(page_link_to('register'), glyph('plus') . _('New user')) 
       )),
       table(array(
           'Nick' => Users_table_header_link('Nick', _('Nick'), $order_by),
@@ -58,8 +58,8 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act
           'Tshirt' => Users_table_header_link('Tshirt', _('T-Shirt'), $order_by),
           'Size' => Users_table_header_link('Size', _('Size'), $order_by),
           'lastLogIn' => Users_table_header_link('lastLogIn', _('Last login'), $order_by),
-          'actions' => ''
-      ), $users)
+          'actions' => '' 
+      ), $users) 
   ));
 }
 
@@ -71,18 +71,18 @@ function User_shift_state_render($user) {
   $upcoming_shifts = ShiftEntries_upcoming_for_user($user);
   if ($upcoming_shifts === false)
     return false;
-
+  
   if (count($upcoming_shifts) == 0)
     return '<span class="text-success">' . _("Free") . '</span>';
-
+  
   if ($upcoming_shifts[0]['start'] > time())
     if ($upcoming_shifts[0]['start'] - time() > 3600)
       return '<span class="text-success moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>';
     else
       return '<span class="text-warning moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>';
-
+  
   $halfway = ($upcoming_shifts[0]['start'] + $upcoming_shifts[0]['end']) / 2;
-
+  
   if (time() < $halfway)
     return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift starts %c") . '</span>';
   else
@@ -91,17 +91,17 @@ function User_shift_state_render($user) {
 
 function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) {
   global $LETZTES_AUSTRAGEN, $privileges;
-
+  
   $user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']);
-
+  
   $myshifts_table = array();
   $html = "";
   $timesum = 0;
   foreach ($shifts as $shift) {
-    $shift_info = $shift['name'];
+    $shift_info = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
     foreach ($shift['needed_angeltypes'] as $needed_angel_type) {
       $shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';
-
+      
       $shift_entries = array();
       foreach ($needed_angel_type['users'] as $user_shift) {
         if ($its_me)
@@ -110,34 +110,36 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
           $member = User_Nick_render($user_shift);
         if ($user_shift['freeloaded'])
           $member = '<strike>' . $member . '</strike>';
-
+        
         $shift_entries[] = $member;
       }
       $shift_info .= join(", ", $shift_entries);
     }
-
+    
     $myshift = array(
         'date' => date("Y-m-d", $shift['start']),
         'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']),
         'room' => $shift['Name'],
         'shift_info' => $shift_info,
-        'comment' => $shift['Comment']
+        'comment' => $shift['Comment'] 
     );
-
+    
     if ($shift['freeloaded']) {
       if (in_array("user_shifts_admin", $privileges))
         $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '</p>';
       else
         $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . '</p>';
     }
-
-    $myshift['actions'] = array();
+    
+    $myshift['actions'] = [
+        button(shift_link($shift), glyph('eye-open') . _('view'), 'btn-xs') 
+    ];
     if ($its_me || in_array('user_shifts_admin', $privileges))
       $myshift['actions'][] = button(page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '&id=' . $user_source['UID'], glyph('edit') . _('edit'), 'btn-xs');
     if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges))
       $myshift['actions'][] = button(page_link_to('user_myshifts') . ((! $its_me) ? '&id=' . $user_source['UID'] : '') . '&cancel=' . $shift['id'], glyph('trash') . _('sign off'), 'btn-xs');
     $myshift['actions'] = table_buttons($myshift['actions']);
-
+    
     if ($shift['freeloaded'])
       $timesum += - 2 * ($shift['end'] - $shift['start']);
     else
@@ -151,9 +153,9 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
         'room' => "",
         'shift_info' => "",
         'comment' => "",
-        'actions' => ""
+        'actions' => "" 
     );
-
+  
   return page_with_title('<span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . ' <small>' . $user_name . '</small>', array(
       msg(),
       div('row', array(
@@ -161,7 +163,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
               '<h1>',
               '<span class="glyphicon glyphicon-phone"></span>',
               $user_source['DECT'],
-              '</h1>'
+              '</h1>' 
           )),
           div('col-md-3', array(
               '<h4>' . _("User state") . '</h4>',
@@ -169,28 +171,28 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
               $user_source['Gekommen'] ? User_shift_state_render($user_source) . '<br />' : '',
               ($user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . _("Arrived") . '</span>' : '<span class="text-danger">' . _("Not arrived") . '</span>'),
               ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Aktiv']) ? ' <span class="text-success">' . _("Active") . '</span>' : '',
-              ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _("T-Shirt") . '</span>' : ''
+              ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _("T-Shirt") . '</span>' : '' 
           )),
           div('col-md-3', array(
               '<h4>' . _("Angeltypes") . '</h4>',
-              User_angeltypes_render($user_angeltypes)
+              User_angeltypes_render($user_angeltypes) 
           )),
           div('col-md-3', array(
               '<h4>' . _("Rights") . '</h4>',
-              User_groups_render($user_groups)
-          ))
+              User_groups_render($user_groups) 
+          )) 
       )),
       div('row space-top', array(
           div('col-md-12', array(
               buttons(array(
                   $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], glyph("edit") . _("edit")) : '',
-                  ($admin_user_privilege && !$user_source['Gekommen']) ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
+                  ($admin_user_privilege && ! $user_source['Gekommen']) ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
                   $its_me ? button(page_link_to('user_settings'), glyph('list-alt') . _("Settings")) : '',
                   $its_me ? button(page_link_to('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '',
                   $its_me ? button(page_link_to('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '',
-                  $its_me ? button(page_link_to('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : ''
-              ))
-          ))
+                  $its_me ? button(page_link_to('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : '' 
+              )) 
+          )) 
       )),
       ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '',
       ($its_me || $admin_user_privilege) ? table(array(
@@ -199,9 +201,9 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
           'room' => _("Location"),
           'shift_info' => _("Name &amp; workmates"),
           'comment' => _("Comment"),
-          'actions' => _("Action")
+          'actions' => _("Action") 
       ), $myshifts_table) : '',
-      $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : ''
+      $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '' 
   ));
 }
 
@@ -214,8 +216,8 @@ function User_password_recovery_view() {
       _("We will send you an e-mail with a password recovery link. Please use the email address you used for registration."),
       form(array(
           form_text('email', _("E-Mail"), ""),
-          form_submit('submit', _("Recover"))
-      ))
+          form_submit('submit', _("Recover")) 
+      )) 
   ));
 }
 
@@ -229,8 +231,8 @@ function User_password_set_view() {
       form(array(
           form_password('password', _("Password")),
           form_password('password2', _("Confirm password")),
-          form_submit('submit', _("Save"))
-      ))
+          form_submit('submit', _("Save")) 
+      )) 
   ));
 }
 
@@ -261,7 +263,7 @@ function User_groups_render($user_groups) {
 /**
  * Render a users avatar.
  *
- * @param User $user
+ * @param User $user          
  * @return string
  */
 function User_Avatar_render($user) {
@@ -271,7 +273,7 @@ function User_Avatar_render($user) {
 /**
  * Render a user nickname.
  *
- * @param User $user_source
+ * @param User $user_source          
  * @return string
  */
 function User_Nick_render($user_source) {