From 97c837850a0caa2b22f0c4a5be51ec833f2bd365 Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Fri, 5 Aug 2022 13:18:08 +0000 Subject: replace old icon, closes #1369 Closes #1369 Merge request studip/studip!863 --- lib/classes/calendar/CalendarScheduleModel.php | 10 +++++----- public/assets/images/virtual.png | Bin 547 -> 0 bytes resources/assets/stylesheets/less/schedule.less | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 public/assets/images/virtual.png diff --git a/lib/classes/calendar/CalendarScheduleModel.php b/lib/classes/calendar/CalendarScheduleModel.php index 04c44b7..47b65c4 100644 --- a/lib/classes/calendar/CalendarScheduleModel.php +++ b/lib/classes/calendar/CalendarScheduleModel.php @@ -220,10 +220,10 @@ class CalendarScheduleModel $stmt->execute([$sem->getId(), $user_id, $cycle->getMetaDateId()]); $details = $stmt->fetch(); - if ($entry['type'] == 'virtual') { - $entry['color'] = $details['color'] ? $details['color'] : DEFAULT_COLOR_VIRTUAL; + if ($entry['type'] === 'virtual') { + $entry['color'] = $details['color'] ?: DEFAULT_COLOR_VIRTUAL; $entry['icons'][] = [ - 'image' => 'virtual.png', + 'image' => Icon::create('tag', Icon::ROLE_INFO_ALT)->asImagePath(), 'title' => _("Dies ist eine vorgemerkte Veranstaltung") ]; } else { @@ -240,7 +240,7 @@ class CalendarScheduleModel $entry['icons'][] = [ 'url' => $bind_url, - 'image' => Icon::create('visibility-invisible', 'info_alt')->asImagePath(16), + 'image' => Icon::create('visibility-invisible', Icon::ROLE_INFO_ALT)->asImagePath(), 'onClick' => "function(id) { window.location = '". $bind_url ."'; }", 'title' => _("Diesen Eintrag wieder einblenden"), ]; @@ -252,7 +252,7 @@ class CalendarScheduleModel . $seminar_id . '/' . $cycle->getMetaDateId()); $entry['icons'][] = [ 'url' => $unbind_url, - 'image' => Icon::create('visibility-visible', 'info_alt')->asImagePath(16), + 'image' => Icon::create('visibility-visible', Icon::ROLE_INFO_ALT)->asImagePath(), 'onClick' => "function(id) { window.location = '". $unbind_url ."'; }", 'title' => _("Diesen Eintrag ausblenden"), ]; diff --git a/public/assets/images/virtual.png b/public/assets/images/virtual.png deleted file mode 100644 index d4cdbdb..0000000 Binary files a/public/assets/images/virtual.png and /dev/null differ diff --git a/resources/assets/stylesheets/less/schedule.less b/resources/assets/stylesheets/less/schedule.less index 4364390..9eb01e8 100644 --- a/resources/assets/stylesheets/less/schedule.less +++ b/resources/assets/stylesheets/less/schedule.less @@ -139,6 +139,10 @@ div.schedule_edit_entry > form { position: absolute; right: 0; top: 0; + + img { + .square(16px); + } } div.invisible_entry { -- cgit v1.0