iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

display shifts with title

This commit is contained in:
Philip Häusler 2014-12-22 18:06:58 +01:00
parent 6a05c3d9de
commit c12e5336fb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/pages/user_shifts.php
View File

@ -551,9 +551,9 @@ function view_user_shifts() {
$shifts_row .= " – "; $shifts_row .= " – ";
$shifts_row .= date('H:i', $shift['end']); $shifts_row .= date('H:i', $shift['end']);
$shifts_row .= "<br /><b>"; $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 .= "</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 />"; $shifts_row .= "<br />";
if (in_array('admin_shifts', $privileges)) if (in_array('admin_shifts', $privileges))
$shifts_row .= ' ' . table_buttons(array( $shifts_row .= ' ' . table_buttons(array(

8
includes/view/Shifts_view.php
View File

@ -47,6 +47,10 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source,
button(shift_delete_link($shift), glyph('trash') . _('delete')) button(shift_delete_link($shift), glyph('trash') . _('delete'))
]) : '', ]) : '',
div('row', [ 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', [ div('col-sm-3 col-xs-6', [
'<h4>' . _('Start') . '</h4>', '<h4>' . _('Start') . '</h4>',
'<p class="lead">', '<p class="lead">',
@ -66,10 +70,6 @@ function Shift_view($shift, $shifttype, $room, $shift_admin, $angeltypes_source,
div('col-sm-3 col-xs-6', [ div('col-sm-3 col-xs-6', [
'<h4>' . _('Location') . '</h4>', '<h4>' . _('Location') . '</h4>',
'<p class="lead">' . $room['Name'] . '</p>' '<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', [ div('row', [