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

fix shift view bars

This commit is contained in:
msquare 2016-11-25 13:03:25 +01:00
parent d865abb8b9
commit 4f6db20ae4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/view/Shifts_view.php
View File

@ -81,7 +81,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt
]), ]),
div('col-sm-3 col-xs-6', [ div('col-sm-3 col-xs-6', [
'<h4>' . _('Location') . '</h4>', '<h4>' . _('Location') . '</h4>',
'<p class="lead">' . glyph('map-marker') . $room['Name'] . '</p>' '<p class="lead">' . Room_name_render($room) . '</p>'
]) ])
]), ]),
div('row', [ div('row', [
@ -113,7 +113,9 @@ function Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shi
$needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>'; $needed_angels .= '<div class="pull-right">' . Shift_signup_button_render($shift, $angeltypes[$needed_angeltype['TID']]) . '</div>';
$needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>'; $needed_angels .= '<h3>' . AngelType_name_render($angeltypes[$needed_angeltype['TID']]) . '</h3>';
$needed_angels .= progress_bar(0, $needed_angeltype['count'], min($needed_angeltype['taken'], $needed_angeltype['count']), $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']); $bar_max = max($needed_angeltype['count']*10, $needed_angeltype['taken']*10, 10);
$bar_value = max(1, $needed_angeltype['taken'] * 10);
$needed_angels .= progress_bar(0, $bar_max, $bar_value, $class, $needed_angeltype['taken'] . ' / ' . $needed_angeltype['count']);
$angels = []; $angels = [];
foreach ($shift['ShiftEntry'] as $shift_entry) { foreach ($shift['ShiftEntry'] as $shift_entry) {

4
public/css/theme4.css
View File

@ -7027,6 +7027,8 @@ a.thumbnail.active {
color: #fff; color: #fff;
} }
.label-warning, .label-warning,
.label-success { .label-success,
.progress-bar-warning,
.progress-bar-success {
color: #222222; color: #222222;
} }

2
themes/theme4.less
View File

@ -1046,6 +1046,6 @@ a.thumbnail.active {
} }
} }
.label-warning, .label-success { .label-warning, .label-success, .progress-bar-warning, .progress-bar-success {
color: @gray-darker; color: @gray-darker;
} }