kontakt
/
engelsystem
3
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

minor css class changes

Browse Source
main
msquare 3 years ago
parent 2833be24c0
commit c3045e07ce
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
includes/pages/user_shifts.php
Unescape Escape View File

@ -365,7 +365,7 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons
. '<label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '" ' . '<label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '" '
. (in_array($i['id'], $selected) ? ' checked="checked"' : '') . (in_array($i['id'], $selected) ? ' checked="checked"' : '')
. ' > ' . $i['name'] . '</label>' . ' > ' . $i['name'] . '</label>'
. (!isset($i['enabled']) || $i['enabled'] ? '' : icon('lock')) . (!isset($i['enabled']) || $i['enabled'] ? '' : icon('book'))
. '</div>'; . '</div>';
} }
$html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n"; $html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";

4
includes/sys_template.php
Unescape Escape View File

@ -222,8 +222,8 @@ function toolbar_dropdown_item_divider(): string
function toolbar_dropdown($icon, $label, $submenu, $class = ''): string function toolbar_dropdown($icon, $label, $submenu, $class = ''): string
{ {
$template =<<<EOT $template =<<<EOT
<li class="nav-item dropdown {class}"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false"> <a class="nav-link dropdown-toggle {class}" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
{icon} {label} {icon} {label}
</a> </a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown"> <ul class="dropdown-menu" aria-labelledby="navbarDropdown">

2
includes/view/Rooms_view.php
Unescape Escape View File

@ -53,7 +53,6 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
return page_with_title(icon('geo-alt') . $room->name, [ return page_with_title(icon('geo-alt') . $room->name, [
$assignNotice, $assignNotice,
$description,
auth()->can('admin_rooms') ? buttons([ auth()->can('admin_rooms') ? buttons([
button( button(
page_link_to('admin_rooms', ['show' => 'edit', 'id' => $room->id]), page_link_to('admin_rooms', ['show' => 'edit', 'id' => $room->id]),
@ -66,6 +65,7 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
'btn' 'btn'
) )
]) : '', ]) : '',
$description,
tabs($tabs, $selected_tab), tabs($tabs, $selected_tab),
], true); ], true);
} }

8
includes/view/ShiftCalendarShiftRenderer.php
Unescape Escape View File

@ -82,7 +82,7 @@ class ShiftCalendarShiftRenderer
case ShiftSignupState::NOT_ARRIVED: case ShiftSignupState::NOT_ARRIVED:
case ShiftSignupState::NOT_YET: case ShiftSignupState::NOT_YET:
case ShiftSignupState::SHIFT_ENDED: case ShiftSignupState::SHIFT_ENDED:
return 'light'; return 'secondary';
case ShiftSignupState::ANGELTYPE: case ShiftSignupState::ANGELTYPE:
case ShiftSignupState::COLLIDES: case ShiftSignupState::COLLIDES:
@ -91,7 +91,7 @@ class ShiftCalendarShiftRenderer
case ShiftSignupState::FREE: case ShiftSignupState::FREE:
return 'danger'; return 'danger';
default: default:
return 'secondary'; return 'light';
} }
} }
@ -282,12 +282,12 @@ class ShiftCalendarShiftRenderer
button( button(
page_link_to('user_shifts', ['edit_shift' => $shift['SID']]), page_link_to('user_shifts', ['edit_shift' => $shift['SID']]),
icon('pencil'), icon('pencil'),
"btn-$class btn-sm border-light" "btn-$class btn-sm border-light text-white"
), ),
button( button(
page_link_to('user_shifts', ['delete_shift' => $shift['SID']]), page_link_to('user_shifts', ['delete_shift' => $shift['SID']]),
icon('trash'), icon('trash'),
"btn-$class btn-sm border-light" "btn-$class btn-sm border-light text-white"
) )
]) . '</div>'; ]) . '</div>';
} }

2
includes/view/UserDriverLicenses_view.php
Unescape Escape View File

@ -69,5 +69,5 @@ function UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver
}); });
</script> </script>
' '
]); ], true);
} }

2
includes/view/User_view.php
Unescape Escape View File

@ -615,7 +615,7 @@ function User_view(
. (config('enable_user_name') ? ' <small>' . $user_name . '</small>' : ''), . (config('enable_user_name') ? ' <small>' . $user_name . '</small>' : ''),
[ [
msg(), msg(),
div('row m-3', [ div('row', [
div('col-md-12', [ div('col-md-12', [
buttons([ buttons([
$admin_user_privilege ? button( $admin_user_privilege ? button(

4
resources/views/admin/schedule/index.twig
Unescape Escape View File

@ -40,12 +40,12 @@
<div class="btn-group"> <div class="btn-group">
<a <a
href="{{ url('/admin/schedule/load/' ~ schedule.id) }}" href="{{ url('/admin/schedule/load/' ~ schedule.id) }}"
class="btn btn-sm btn-primary"> class="btn btn-sm btn-secondary">
{{ __('form.import') }} {{ __('form.import') }}
</a> </a>
<a <a
href="{{ url('/admin/schedule/edit/' ~ schedule.id) }}" href="{{ url('/admin/schedule/edit/' ~ schedule.id) }}"
class="btn btn-sm btn-primary"> class="btn btn-sm btn-secondary">
{{ __('form.edit') }} {{ __('form.edit') }}
</a> </a>
</div> </div>

2
resources/views/macros/form.twig
Unescape Escape View File

@ -68,7 +68,7 @@
{% macro button(label, opt) %} {% macro button(label, opt) %}
<button <button
class="btn btn-{{ opt.btn_type|default('secondary') }} class="btn btn-{{ opt.btn_type|default('secondary') }}
{%- if 'btn_size' in opt %} btn-{{ opt.btn_size }}{% endif %}" {%- if opt.size is defined %} btn-{{ opt.size }}{% endif %}"
{%- if opt.type is defined %} type="{{ opt.type }}"{% endif %} {%- if opt.type is defined %} type="{{ opt.type }}"{% endif %}
{%- if opt.name is defined %} name="{{ opt.name }}"{% endif %} {%- if opt.name is defined %} name="{{ opt.name }}"{% endif %}
{%- if opt.title is defined %} title="{{ opt.title }}"{% endif %} {%- if opt.title is defined %} title="{{ opt.title }}"{% endif %}

4
resources/views/pages/news/news.twig
Unescape Escape View File

@ -25,12 +25,12 @@
{{ m.user(comment.user) }} {{ m.user(comment.user) }}
{% if comment.user.id == user.id or has_permission_to('admin_news') or has_permission_to('comment.delete') %} {% if comment.user.id == user.id or has_permission_to('admin_news') or has_permission_to('comment.delete') %}
<div class="pull-right"> <div class="ms-auto">
<form <form
action="{{ url('/news/comment/' ~ comment.id) }}" enctype="multipart/form-data" action="{{ url('/news/comment/' ~ comment.id) }}" enctype="multipart/form-data"
method="post"> method="post">
{{ csrf() }} {{ csrf() }}
{{ f.submit(m.glyphicon('trash'), {'name': 'delete', 'btn_type': 'danger', 'btn_size': 'xs', 'title': __('form.delete')}) }} {{ f.submit(m.icon('trash'), {'name': 'delete', 'btn_type': 'danger', 'size': 'sm', 'title': __('form.delete')}) }}
</form> </form>
</div> </div>
{% endif %} {% endif %}

2
resources/views/pages/questions/overview.twig
Unescape Escape View File

@ -51,7 +51,7 @@
> >
{{ csrf() }} {{ csrf() }}
{{ f.hidden('id', question.id) }} {{ f.hidden('id', question.id) }}
{{ f.submit(m.icon('trash'), {'name': 'delete', 'btn_type': 'danger', 'btn_size': 'sm', 'title': __('form.delete')}) }} {{ f.submit(m.icon('trash'), {'name': 'delete', 'btn_type': 'danger', 'size': 'sm', 'title': __('form.delete')}) }}
</form> </form>
{% endif %} {% endif %}

4
resources/views/pages/settings/oauth.twig
Unescape Escape View File

@ -35,13 +35,13 @@
<form method="POST" action="{{ url('/oauth/' ~ name ~ '/connect') }}"> <form method="POST" action="{{ url('/oauth/' ~ name ~ '/connect') }}">
{{ csrf() }} {{ csrf() }}
{{ f.submit(__('form.connect'), {'btn_size' : 'sm'}) }} {{ f.submit(__('form.connect'), {'size' : 'sm'}) }}
</form> </form>
{% else %} {% else %}
<form method="POST" action="{{ url('/oauth/' ~ name ~ '/disconnect') }}"> <form method="POST" action="{{ url('/oauth/' ~ name ~ '/disconnect') }}">
{{ csrf() }} {{ csrf() }}
{{ f.submit(__('form.disconnect'), {'btn_type': 'danger', 'btn_size' : 'sm'}) }} {{ f.submit(__('form.disconnect'), {'btn_type': 'danger', 'size' : 'sm'}) }}
</form> </form>
{% endif %} {% endif %}
</td> </td>

Write Preview
Loading…
Cancel
Save