diff --git a/app/controllers/calendar/schedule.php b/app/controllers/calendar/schedule.php index abde33ae135f809fb4c52bd27a2e2decdc7b0acb..aa7aaff2b2ce67dd7a5f4e0f9659f0943ccad3ee 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 dd664ec4b48a39a4ff6a7de70faef66fccefdf94..d339934b03d7a9155278db3892e9c5e3877ccc2a 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 aaed66b3f8e06e3d8504b6226487eac063c5909d..879ee203cdbb5add27e89b4da6061f34734014ad 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 d12faf82d1083679d92e89645d75f5ff79033c27..c632e51d04c70fd7dba64e91f663d102673ac267 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)) } } }