From c12e5336fbe93c4596bd26c2bc4c9ee7390759fc Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Mon, 22 Dec 2014 18:06:58 +0100
Subject: display shifts with title

---
 includes/pages/user_shifts.php | 4 ++--
 includes/view/Shifts_view.php  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index c8633cc5..70a674fb 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -551,9 +551,9 @@ function view_user_shifts() {
               $shifts_row .= " &ndash; ";
               $shifts_row .= date('H:i', $shift['end']);
               $shifts_row .= "<br /><b>";
-              $shifts_row .= '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
+              $shifts_row .= '<a href="' . shift_link($shift) . '">' . ShiftType($shift['shifttype_id'])['name'] . '</a>';
               $shifts_row .= "</b><br />";
-              $shifts_row .= '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>';
+              $shifts_row .= '<a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>';
               $shifts_row .= "<br />";
               if (in_array('admin_shifts', $privileges))
                 $shifts_row .= ' ' . table_buttons(array(
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index c796b13e..91a553ec 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -47,6 +47,10 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source,
           button(shift_delete_link($shift), glyph('trash') . _('delete')) 
       ]) : '',
       div('row', [
+          div('col-sm-3 col-xs-6', [
+              '<h4>' . _('Title') . '</h4>',
+              '<p class="lead">' . ($shift['URL'] != '' ? '<a href="' . $shift['URL'] . '">' . $shift['title'] . '</a>' : $shift['title']) . '</p>' 
+          ]),
           div('col-sm-3 col-xs-6', [
               '<h4>' . _('Start') . '</h4>',
               '<p class="lead">',
@@ -66,10 +70,6 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source,
           div('col-sm-3 col-xs-6', [
               '<h4>' . _('Location') . '</h4>',
               '<p class="lead">' . $room['Name'] . '</p>' 
-          ]),
-          div('col-sm-3 col-xs-6', [
-              '<h4>' . _('More info') . '</h4>',
-              $shift['URL'] != '' ? '<a href="' . $shift['URL'] . '">' . $shift['URL'] . '</a>' : '' 
           ]) 
       ]),
       div('row', [
-- 
cgit v1.2.3-54-g00ecf