Merge branch 'main' into issue-3911issue-3911

6 files changed, 20 insertions, 13 deletions

diff --git a/app/views/calendar/calendar/export.php b/app/views/calendar/calendar/export.php
index 3fa302e..b4171fe 100644
--- a/app/views/calendar/calendar/export.php
+++ b/app/views/calendar/calendar/export.php
@@ -7,8 +7,8 @@
  * @var DateTimeImmutable $end
  */
 ?>
-<form class="default" method="post"
-      action="<?= $controller->link_for('calendar/calendar/export/' . $user_id) ?>">
+<form class="default" method="post" data-dialog="size=auto"
+      action="<?= $controller->link_for('calendar/calendar/export', $user_id ?? null) ?>">
     <?= CSRFProtection::tokenTag() ?>
     <fieldset>
         <legend><?= _('Termine exportieren') ?></legend>
diff --git a/app/views/calendar/contentbox/_termin.php b/app/views/calendar/contentbox/_termin.php
index ded7d0b..3daf699 100644
--- a/app/views/calendar/contentbox/_termin.php
+++ b/app/views/calendar/contentbox/_termin.php
@@ -13,19 +13,19 @@
             </span>
             <? if ($admin && $isProfile && $termin->getObjectClass() === 'CalendarDateAssignment') : ?>
                 <a href="<?= URLHelper::getLink('dispatch.php/calendar/calendar') ?>"
-                   title="<?= _('Zum Kalender') ?>">
+                   title="<?= _('Zum Kalender') ?>" aria-label="<?= _('Zum Kalender') ?>">
                     <?= Icon::create('schedule')->asImg(['class' => 'text-bottom']) ?>
                 </a>
                 <? if ($termin->calendar_date->isWritable($GLOBALS['user']->id)) : ?>
                     <a href="<?= URLHelper::getLink('dispatch.php/calendar/date/edit/' . $termin->getPrimaryObjectId()) ?>"
-                       title="<?= _('Termin bearbeiten') ?>"
+                       title="<?= _('Termin bearbeiten') ?>" aria-label="<?= _('Termin bearbeiten') ?>"
                        data-dialog>
                         <?= Icon::create('edit')->asImg(['class' => 'text-bottom']) ?>
                     </a>
                 <? endif ?>
             <? elseif (!$course_range && in_array($termin->getObjectClass(), ['CourseDate', 'CourseExDate'])) : ?>
                 <a href="<?= URLHelper::getLink('dispatch.php/course/dates', ['cid' => $termin->getPrimaryObjectId()]) ?>"
-                   title="<?= _('Zur Veranstaltung') ?>">
+                   title="<?= _('Zur Veranstaltung') ?>" aria-label="<?= _('Zur Veranstaltung') ?>">
                     <?= Icon::create('seminar')->asImg(['class'=> 'text-bottom']) ?>
                 </a>
             <? endif ?>
diff --git a/app/views/calendar/contentbox/display.php b/app/views/calendar/contentbox/display.php
index c0387fd..bd7b266 100644
--- a/app/views/calendar/contentbox/display.php
+++ b/app/views/calendar/contentbox/display.php
@@ -10,12 +10,12 @@
                     <? if ($isProfile) : ?>
                         <a href="<?= URLHelper::getLink('dispatch.php/calendar/date/add') ?>"
                            data-dialog="reload-on-close"
-                           title="<?= _('Neuen Termin anlegen') ?>">
+                           title="<?= _('Neuen Termin anlegen') ?>" aria-label="<?= _('Neuen Termin anlegen') ?>">
                             <?= Icon::create('add', 'clickable')->asImg(['class' => 'text-bottom']) ?>
                         </a>
                     <? else: ?>
                         <a href="<?= URLHelper::getLink("dispatch.php/course/timesrooms", ['cid' => $range_id]) ?>"
-                           title="<?= _('Neuen Termin anlegen') ?>">
+                           title="<?= _('Neuen Termin anlegen') ?>" aria-label="<?= _('Neuen Termin anlegen') ?>">
                             <?= Icon::create('admin', 'clickable')->asImg(['class' => 'text-bottom']) ?>
                         </a>
                     <? endif ?>
diff --git a/app/views/calendar/schedule/_colorpicker.php b/app/views/calendar/schedule/_colorpicker.php
index 310c93a..20ef1a8 100644
--- a/app/views/calendar/schedule/_colorpicker.php
+++ b/app/views/calendar/schedule/_colorpicker.php
@@ -4,8 +4,11 @@
     <? for ($index = 1; $index <= 18; $index++): ?>
         <span>
             <input type="radio" name="entry_color" value="<?= $index ?>" id="color-<?= $index ?>"
-                   <? if ($index == $selected) echo 'checked'; ?>>
-            <label class="undecorated schedule-category<?= $index ?>" for="color-<?= $index ?>"></label>
+                   <?= $index === $selected ? 'checked' : '' ?>>
+            <label class="undecorated schedule-category<?= $index ?> enter-accessible"
+                   for="color-<?= $index ?>"
+                   aria-label="<?= sprintf(_('Farbe %u zuordnen'), $index) ?>"
+                   title="<?= sprintf(_('Farbe %u zuordnen'), $index) ?>"></label>
         </span>
     <? endfor; ?>
     </div>
diff --git a/app/views/calendar/schedule/_semester_chooser.php b/app/views/calendar/schedule/_semester_chooser.php
index 3af4018..a8a783e 100644
--- a/app/views/calendar/schedule/_semester_chooser.php
+++ b/app/views/calendar/schedule/_semester_chooser.php
@@ -1,7 +1,8 @@
 <form method="post" class="default" action="<?= $controller->link_for(
     isset($inst_mode) && $inst_mode == true ? 'calendar/instschedule/index' : 'calendar/schedule/index'
 ) ?>">
-    <select name="semester_id" class="submit-upon-select">
+    <label for="semester_id" class="sr-only"><?= _('Angezeigtes Semester') ?></label>
+    <select name="semester_id" class="submit-upon-select" id="semester_id">
         <? foreach ($semesters as $semester) : ?>
             <? if ($semester['ende'] > time() - strtotime('1year 1day')) : ?>
                 <option
diff --git a/app/views/calendar/schedule/settings.php b/app/views/calendar/schedule/settings.php
index a9f24b2..0e2674e 100644
--- a/app/views/calendar/schedule/settings.php
+++ b/app/views/calendar/schedule/settings.php
@@ -2,10 +2,9 @@
     <?= CSRFProtection::tokenTag() ?>
     <fieldset>
         <legend>
-            <?= _('Darstellung des Stundenplans ändern') ?>
+            <?= _('Angezeigter Zeitraum') ?>
         </legend>
         <section>
-            <?= _('Angezeigter Zeitraum') ?>
             <section class="hgroup">
                 <label>
                     <?= _('von') ?>
@@ -22,8 +21,12 @@
                 <?= _('Uhr') ?><br>
             </section>
         </section>
-        <section class='settings'>
+    </fieldset>
+    <fieldset>
+        <legend>
             <?= _('Angezeigte Wochentage') ?>
+        </legend>
+        <section class='settings'>
             <? foreach ([1, 2, 3, 4, 5, 6, 0] as $day) : ?>
                 <label>
                     <input type="checkbox" name="days[]" value="<?= $day ?>"