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

Replaced info and calendar icons

This commit is contained in:
Igor Scheller 2021-07-24 21:08:04 +02:00 committed by Michael Weimann
parent 7917e32f3e
commit 191a3a7d48
No known key found for this signature in database
GPG Key ID: 34F0524D4DA694A1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/sys_form.php
View File

@ -214,7 +214,7 @@ function form_radio($name, $label, $selected, $value)
function form_info($label, $text = '') function form_info($label, $text = '')
{ {
if ($label == '') { if ($label == '') {
return '<span class="help-block">' . icon('info-lg') . $text . '</span>'; return '<span class="help-block">' . icon('info-circle') . $text . '</span>';
} }
if ($text == '') { if ($text == '') {
return '<h4>' . $label . '</h4>'; return '<h4>' . $label . '</h4>';

4
includes/view/Shifts_view.php
View File

@ -26,7 +26,7 @@ function Shift_view_header($shift, Room $room)
div('col-sm-3 col-xs-6', [ div('col-sm-3 col-xs-6', [
'<h4>' . __('Start') . '</h4>', '<h4>' . __('Start') . '</h4>',
'<p class="lead' . (time() >= $shift['start'] ? ' text-success' : '') . '">', '<p class="lead' . (time() >= $shift['start'] ? ' text-success' : '') . '">',
icon('calendar') . date(__('Y-m-d'), $shift['start']), icon('calendar3') . date(__('Y-m-d'), $shift['start']),
'<br />', '<br />',
icon('clock') . date('H:i', $shift['start']), icon('clock') . date('H:i', $shift['start']),
'</p>' '</p>'
@ -34,7 +34,7 @@ function Shift_view_header($shift, Room $room)
div('col-sm-3 col-xs-6', [ div('col-sm-3 col-xs-6', [
'<h4>' . __('End') . '</h4>', '<h4>' . __('End') . '</h4>',
'<p class="lead' . (time() >= $shift['end'] ? ' text-success' : '') . '">', '<p class="lead' . (time() >= $shift['end'] ? ' text-success' : '') . '">',
icon('calendar') . date(__('Y-m-d'), $shift['end']), icon('calendar3') . date(__('Y-m-d'), $shift['end']),
'<br />', '<br />',
icon('clock') . date('H:i', $shift['end']), icon('clock') . date('H:i', $shift['end']),
'</p>' '</p>'

8
includes/view/User_view.php
View File

@ -390,7 +390,7 @@ function User_view_myshift($shift, $user_source, $its_me)
} }
$myshift = [ $myshift = [
'date' => icon('calendar') 'date' => icon('calendar3')
. date('Y-m-d', $shift['start']) . '<br>' . date('Y-m-d', $shift['start']) . '<br>'
. icon('clock') . date('H:i', $shift['start']) . icon('clock') . date('H:i', $shift['start'])
. ' - ' . ' - '
@ -530,7 +530,7 @@ function User_view_worklog(Worklog $worklog, $admin_user_worklog_privilege)
} }
return [ return [
'date' => icon('calendar') . date('Y-m-d', $worklog->worked_at->timestamp), 'date' => icon('calendar3') . date('Y-m-d', $worklog->worked_at->timestamp),
'duration' => sprintf('%.2f', $worklog->hours) . ' h', 'duration' => sprintf('%.2f', $worklog->hours) . ' h',
'room' => '', 'room' => '',
'shift_info' => __('Work log entry'), 'shift_info' => __('Work log entry'),
@ -649,7 +649,7 @@ function User_view(
) : '', ) : '',
($its_me && $auth->can('ical')) ? button( ($its_me && $auth->can('ical')) ? button(
page_link_to('ical', ['key' => $user_source->api_key]), page_link_to('ical', ['key' => $user_source->api_key]),
icon('calendar') . __('iCal Export') icon('calendar3') . __('iCal Export')
) : '', ) : '',
($its_me && $auth->can('shifts_json_export')) ? button( ($its_me && $auth->can('shifts_json_export')) ? button(
page_link_to('shifts_json_export', ['key' => $user_source->api_key]), page_link_to('shifts_json_export', ['key' => $user_source->api_key]),
@ -681,7 +681,7 @@ function User_view(
($its_me || $admin_user_privilege) ? '<h2>' . __('Shifts') . '</h2>' : '', ($its_me || $admin_user_privilege) ? '<h2>' . __('Shifts') . '</h2>' : '',
$myshifts_table, $myshifts_table,
($its_me && $nightShiftsConfig['enabled']) ? info( ($its_me && $nightShiftsConfig['enabled']) ? info(
icon('info-lg') . sprintf( icon('info-circle') . sprintf(
__('Your night shifts between %d and %d am count twice.'), __('Your night shifts between %d and %d am count twice.'),
$nightShiftsConfig['start'], $nightShiftsConfig['start'],
$nightShiftsConfig['end'] $nightShiftsConfig['end']

2
resources/views/macros/base.twig
View File

@ -25,7 +25,7 @@
{% endmacro %} {% endmacro %}
{% macro info(text) %} {% macro info(text) %}
<span class="help-block">{{ _self.icon('info-lg') }}{{ text }}</span> <span class="help-block">{{ _self.icon('info-circle') }}{{ text }}</span>
{%- endmacro %} {%- endmacro %}
{% macro type_bg_class() -%} {% macro type_bg_class() -%}

2
resources/views/pages/login.twig
View File

@ -114,7 +114,7 @@
</div> </div>
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
{{ m.icon('info-lg') }} {{ __('Please note: You have to activate cookies!') }} {{ m.icon('info-circle') }} {{ __('Please note: You have to activate cookies!') }}
</div> </div>
</div> </div>
</div> </div>