Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve rotation mode thumbnails #302

Merged
merged 2 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 55 additions & 11 deletions application/forms/RotationConfigForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,9 @@ protected function assembleModeSelection(): string
$value = $this->getPopulatedValue('mode');

$modes = [
'24-7' => $this->translate('24/7'),
'partial' => $this->translate('Partial Day'),
'multi' => $this->translate('Multi Day')
'multi' => $this->translate('Multi Day'),
'24-7' => $this->translate('24/7')
];

$modeList = new HtmlElement('ul');
Expand All @@ -602,22 +602,66 @@ protected function assembleModeSelection(): string
$value = $mode;
}

switch ($mode) {
case 'partial':
$labelDescription = [
new HtmlElement(
'span',
null,
Text::create($this->translate('Daily shifts with a daily handoff at a defined time.'))
),
new HtmlElement(
'span',
new Attributes(['class' => 'example']),
Text::create($this->translate('e.g. Working hours (Mon - Fri, 9AM - 5PM)'))
)
];

break;
case 'multi':
$labelDescription = [
new HtmlElement(
'span',
null,
Text::create($this->translate(
'Shifts start at a certain time on one day of the week and end on another.'
))
),
new HtmlElement(
'span',
new Attributes(['class' => 'example']),
Text::create($this->translate('e.g. Weekend shifts (Fri 5PM - Mon 9AM)'))
)
];

break;
case '24-7':
$labelDescription = [
new HtmlElement(
'span',
null,
Text::create($this->translate(
'24 h shifts starting at a certain time at the day on every day of the week.'
))
),
new HtmlElement(
'span',
new Attributes(['class' => 'example']),
Text::create($this->translate('e.g. Daily, 9AM - 5PM'))
)
];
}

$modeList->addHtml(new HtmlElement(
'li',
null,
new HtmlElement(
'label',
null,
$radio,
new HtmlElement('img', Attributes::create([
'src' => Url::fromPath(sprintf('img/notifications/pictogram/%s-gray.jpg', $mode)),
'class' => 'unchecked'
])),
new HtmlElement('img', Attributes::create([
'src' => Url::fromPath(sprintf('img/notifications/pictogram/%s-colored.jpg', $mode)),
'class' => 'checked'
])),
Text::create($label)
new HtmlElement('div', Attributes::create(['class' => ['mode-img', 'img-' . $mode]])),
Text::create($label),
...$labelDescription
)
));
}
Expand Down
81 changes: 68 additions & 13 deletions public/css/form.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.rotation-config {
.rotation-mode {
width: 50em;
padding: .5em;
padding: .5em 1em;
margin: 0 auto;

h2 {
Expand All @@ -39,22 +39,28 @@
margin: 0;
padding: 0;

li {
flex: 1 1 auto;
width: 0;

&:not(:last-child) {
margin-right: 1em;
}
}

label {
display: block;
width: 12em;
text-align: center;
display: flex;
flex-direction: column;
width: auto;

input {
display: none;
}

img {
width: 100%;
}

input:not(:checked) ~ img.checked,
input:checked ~ img.unchecked {
display: none;
.mode-img {
width: 8em;
margin-bottom: .5em;
outline: 3px solid @icinga-blue;
}
}
}
Expand All @@ -80,6 +86,20 @@

/* Style */

.rotation-mode {
--img-24-7: url('../img/notifications/pictogram/24-7-dark.jpg');
--img-partial: url("../img/notifications/pictogram/partial-dark.jpg");
--img-multi: url("../img/notifications/pictogram/multi-dark.jpg");
}

@light-mode: {
.rotation-mode {
--img-24-7: url("../img/notifications/pictogram/24-7-light.jpg");
--img-partial: url("../img/notifications/pictogram/partial-light.jpg");
--img-multi: url("../img/notifications/pictogram/multi-light.jpg");
}
};

.rotation-config {
label:not(:hover) {
&.contact input:not(:focus) ~ .icon::before {
Expand All @@ -99,8 +119,43 @@
background-color: @gray-lighter;
}

img {
.box-shadow();
label {
font-weight: bold;

* {
font-weight: normal;
}

.example {
font-style: italic;
color: @gray;
}
}

.mode-img {
background-position: center;
background-repeat: no-repeat;
background-size: contain;
aspect-ratio: 2;

.rounded-corners();

&.img-24-7 {
background-image: var(--img-24-7);
}

&.img-partial {
background-image: var(--img-partial);
}

&.img-multi {
background-image: var(--img-multi);
}
}

input:not(:checked) + .mode-img {
filter: grayscale(100%);
outline: 1px solid @gray-light;
}
}
}
Expand Down
Binary file removed public/img/pictogram/24-7-colored.jpg
Binary file not shown.
Binary file added public/img/pictogram/24-7-dark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/pictogram/24-7-gray.jpg
Binary file not shown.
Binary file added public/img/pictogram/24-7-light.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/pictogram/multi-colored.jpg
Binary file not shown.
Binary file added public/img/pictogram/multi-dark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/pictogram/multi-gray.jpg
Binary file not shown.
Binary file added public/img/pictogram/multi-light.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/pictogram/partial-colored.jpg
Binary file not shown.
Binary file added public/img/pictogram/partial-dark.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/img/pictogram/partial-gray.jpg
Binary file not shown.
Binary file added public/img/pictogram/partial-light.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading