minor css class changes
This commit is contained in:
msquare
parent
2833be24c0
commit
c3045e07ce
|
|
@ -365,7 +365,7 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons
|
|||
. '<label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '" '
|
||||
. (in_array($i['id'], $selected) ? ' checked="checked"' : '')
|
||||
. ' > ' . $i['name'] . '</label>'
|
||||
. (!isset($i['enabled']) || $i['enabled'] ? '' : icon('lock'))
|
||||
. (!isset($i['enabled']) || $i['enabled'] ? '' : icon('book'))
|
||||
. '</div>';
|
||||
}
|
||||
$html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
|
||||
|
|
|
|||
|
|
@ -222,8 +222,8 @@ function toolbar_dropdown_item_divider(): string
|
|||
function toolbar_dropdown($icon, $label, $submenu, $class = ''): string
|
||||
{
|
||||
$template =<<<EOT
|
||||
<li class="nav-item dropdown {class}">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle {class}" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{icon} {label}
|
||||
</a>
|
||||
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
|
|||
|
||||
return page_with_title(icon('geo-alt') . $room->name, [
|
||||
$assignNotice,
|
||||
$description,
|
||||
auth()->can('admin_rooms') ? buttons([
|
||||
button(
|
||||
page_link_to('admin_rooms', ['show' => 'edit', 'id' => $room->id]),
|
||||
|
|
@ -66,6 +65,7 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
|
|||
'btn'
|
||||
)
|
||||
]) : '',
|
||||
$description,
|
||||
tabs($tabs, $selected_tab),
|
||||
], true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ class ShiftCalendarShiftRenderer
|
|||
case ShiftSignupState::NOT_ARRIVED:
|
||||
case ShiftSignupState::NOT_YET:
|
||||
case ShiftSignupState::SHIFT_ENDED:
|
||||
return 'light';
|
||||
return 'secondary';
|
||||
|
||||
case ShiftSignupState::ANGELTYPE:
|
||||
case ShiftSignupState::COLLIDES:
|
||||
|
|
@ -91,7 +91,7 @@ class ShiftCalendarShiftRenderer
|
|||
case ShiftSignupState::FREE:
|
||||
return 'danger';
|
||||
default:
|
||||
return 'secondary';
|
||||
return 'light';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -282,12 +282,12 @@ class ShiftCalendarShiftRenderer
|
|||
button(
|
||||
page_link_to('user_shifts', ['edit_shift' => $shift['SID']]),
|
||||
icon('pencil'),
|
||||
"btn-$class btn-sm border-light"
|
||||
"btn-$class btn-sm border-light text-white"
|
||||
),
|
||||
button(
|
||||
page_link_to('user_shifts', ['delete_shift' => $shift['SID']]),
|
||||
icon('trash'),
|
||||
"btn-$class btn-sm border-light"
|
||||
"btn-$class btn-sm border-light text-white"
|
||||
)
|
||||
]) . '</div>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,5 +69,5 @@ function UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver
|
|||
});
|
||||
</script>
|
||||
'
|
||||
]);
|
||||
], true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -615,7 +615,7 @@ function User_view(
|
|||
. (config('enable_user_name') ? ' <small>' . $user_name . '</small>' : ''),
|
||||
[
|
||||
msg(),
|
||||
div('row m-3', [
|
||||
div('row', [
|
||||
div('col-md-12', [
|
||||
buttons([
|
||||
$admin_user_privilege ? button(
|
||||
|
|
|
|||
|
|
@ -40,12 +40,12 @@
|
|||
<div class="btn-group">
|
||||
<a
|
||||
href="{{ url('/admin/schedule/load/' ~ schedule.id) }}"
|
||||
class="btn btn-sm btn-primary">
|
||||
class="btn btn-sm btn-secondary">
|
||||
{{ __('form.import') }}
|
||||
</a>
|
||||
<a
|
||||
href="{{ url('/admin/schedule/edit/' ~ schedule.id) }}"
|
||||
class="btn btn-sm btn-primary">
|
||||
class="btn btn-sm btn-secondary">
|
||||
{{ __('form.edit') }}
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
{% macro button(label, opt) %}
|
||||
<button
|
||||
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.name is defined %} name="{{ opt.name }}"{% endif %}
|
||||
{%- if opt.title is defined %} title="{{ opt.title }}"{% endif %}
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@
|
|||
{{ m.user(comment.user) }}
|
||||
|
||||
{% 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
|
||||
action="{{ url('/news/comment/' ~ comment.id) }}" enctype="multipart/form-data"
|
||||
method="post">
|
||||
{{ 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>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
>
|
||||
{{ csrf() }}
|
||||
{{ 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>
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,13 +35,13 @@
|
|||
<form method="POST" action="{{ url('/oauth/' ~ name ~ '/connect') }}">
|
||||
{{ csrf() }}
|
||||
|
||||
{{ f.submit(__('form.connect'), {'btn_size' : 'sm'}) }}
|
||||
{{ f.submit(__('form.connect'), {'size' : 'sm'}) }}
|
||||
</form>
|
||||
{% else %}
|
||||
<form method="POST" action="{{ url('/oauth/' ~ name ~ '/disconnect') }}">
|
||||
{{ csrf() }}
|
||||
|
||||
{{ f.submit(__('form.disconnect'), {'btn_type': 'danger', 'btn_size' : 'sm'}) }}
|
||||
{{ f.submit(__('form.disconnect'), {'btn_type': 'danger', 'size' : 'sm'}) }}
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue