From 3f28e8ed509af09e4ca5a03434ffdb29f5391848 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 19 Dec 2024 11:26:29 +0000
Subject: added fixes for third GUI review of TIC 4421, re #4421

Merge request studip/studip!3780
---
 app/controllers/calendar/schedule.php           | 2 +-
 app/views/calendar/schedule/course_info.php     | 5 ++++-
 config/config.inc.php.dist                      | 6 ------
 resources/assets/stylesheets/scss/schedule.scss | 1 +
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/controllers/calendar/schedule.php b/app/controllers/calendar/schedule.php
index abde33a..aa7aaff 100644
--- a/app/controllers/calendar/schedule.php
+++ b/app/controllers/calendar/schedule.php
@@ -244,7 +244,7 @@ class Calendar_ScheduleController extends AuthenticatedController
                     $event_title = studip_interpolate(
                         '%{course_name} (%{lecturer_names})',
                         [
-                            'course_name'    => $cycle_date->course->getFullName('number-name'),
+                            'course_name'    => $cycle_date->course->getFullName(),
                             'lecturer_names' => implode(', ', $lecturer_names)
                         ]
                     );
diff --git a/app/views/calendar/schedule/course_info.php b/app/views/calendar/schedule/course_info.php
index dd664ec..d339934 100644
--- a/app/views/calendar/schedule/course_info.php
+++ b/app/views/calendar/schedule/course_info.php
@@ -33,6 +33,8 @@
                     <h3><?= _('Veranstaltungsnummer') ?></h3>
                     <p><?= htmlReady($course->veranstaltungsnummer) ?></p>
                 <? endif ?>
+                <h3><?= _('Name') ?></h3>
+                <p><?= htmlReady($course->getFullName('type-name')) ?></p>
                 <h3><?= _('Lehrende') ?></h3>
                 <ul class="default">
                     <?
@@ -67,7 +69,7 @@
             </section>
         </fieldset>
         <div data-dialog-button>
-            <?= \Studip\Button::create(
+            <?= \Studip\Button::createAccept(
                 _('Speichern'),
                 'save',
                 ['formaction' => $controller->url_for('calendar/schedule/save_course_info/' . $course->id)]
@@ -85,6 +87,7 @@
                     ['formaction' => $controller->url_for('calendar/schedule/hide_course/' . $course->id)]
                 ) ?>
             <? endif ?>
+            <?= \Studip\Button::createCancel(_('Abbrechen')) ?>
         </div>
     </form>
 <? endif ?>
diff --git a/config/config.inc.php.dist b/config/config.inc.php.dist
index aaed66b..879ee20 100644
--- a/config/config.inc.php.dist
+++ b/config/config.inc.php.dist
@@ -301,12 +301,6 @@ $PERS_TERMIN_KAT = [
         'border_color' => '#8bbd40',
         'bgcolor'      => '#8bbd40',
         'fgcolor'      => '#000000'
-    ],
-    '255' => [
-        'name'         => _('Sonstige'),
-        'border_color' => '#A7ABAF',
-        'bgcolor'      => '#A7ABAF',
-        'fgcolor'      => '#000000'
     ]
     //More categories can be added here.
 ];
diff --git a/resources/assets/stylesheets/scss/schedule.scss b/resources/assets/stylesheets/scss/schedule.scss
index d12faf8..c632e51 100644
--- a/resources/assets/stylesheets/scss/schedule.scss
+++ b/resources/assets/stylesheets/scss/schedule.scss
@@ -11,6 +11,7 @@ form.default.schedule-entry {
 
             .studip-icon {
                 height: 1.5em;
+                filter: drop-shadow(0 0 2px var(--white))
             }
         }
     }
-- 
cgit v1.0