Merge branch 'spidev' into 'master'

Kalender

See merge request fronk/thetool!752
This commit is contained in:
Daniel Spitzer
2024-11-19 14:31:33 +00:00
5 changed files with 238 additions and 138 deletions
+18 -16
View File
@@ -248,22 +248,24 @@ endforeach;
</div>
</h5>
<div class="calendar-side-borders-sub-inner data-origin-2">
<div class="form-check text-left ml-2" data-origin="2">
<input data-calendar_id="999" class="form-check-input calendar-check"
name="form-check-input"
type="checkbox" value="">
<input data-calendar_id="999" type="color"
class="form-control-color color-input"
value="<?= ($Calendar_colors[999]['bgcolor']) ?: $specialCalendarColors[999] ?>"
title="Hintergrundfarbe">
<input data-calendar_id="999" type="color"
class="form-control-color color-text-input"
value="<?= ($Calendar_colors[999]['txtcolor']) ? $Calendar_colors[999]['txtcolor'] : '#ffffff' ?>"
title="Textfarbe">
<label class="calendar-side-label" for="" style="margin-top:2px;">
Abwesenheiten
</label>
</div>
<!-- <div style="display:none">-->
<!-- <div class="form-check text-left ml-2" data-origin="2">-->
<!-- <input data-calendar_id="999" class="form-check-input calendar-check"-->
<!-- name="form-check-input"-->
<!-- type="checkbox" value="">-->
<!-- <input data-calendar_id="999" type="color"-->
<!-- class="form-control-color color-input"-->
<!-- value="--><?php //= ($Calendar_colors[999]['bgcolor']) ?: $specialCalendarColors[999] ?><!--"-->
<!-- title="Hintergrundfarbe">-->
<!-- <input data-calendar_id="999" type="color"-->
<!-- class="form-control-color color-text-input"-->
<!-- value="--><?php //= ($Calendar_colors[999]['txtcolor']) ? $Calendar_colors[999]['txtcolor'] : '#ffffff' ?><!--"-->
<!-- title="Textfarbe">-->
<!-- <label class="calendar-side-label" for="" style="margin-top:2px;">-->
<!-- Abwesenheiten-->
<!-- </label>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-check text-left ml-2" data-origin="2">
<input data-calendar_id="998" class="form-check-input calendar-check"
name="form-check-input"