From 97c837850a0caa2b22f0c4a5be51ec833f2bd365 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 5 Aug 2022 13:18:08 +0000
Subject: [PATCH] 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 04c44b770db..47b65c418a7 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 d4cdbdbf8ce81ac7ea658e96805f39b8f5e196dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005%Nkl<ZI8S4E
zs30EvN<-t(OKpSy$oQ3({^e^58W#Wm|7XC58QvHeeEnG%`2XL&RVespzW-m4L4*up
z04e&a&3xpMG|&GlLPGyRG?4%Qn}f{%pXsgy4Pkh$t^fbIrQqdLVq*WNC57073;`Jc
z#x~;re<V2l1*ySh2*XoNJ+R^f8WR5lA_D(EljlMh0K{Lc#Qy&XHv02a(+H~}3=h?H
z{(sSC`TuP7jQ^R<C1C#}8vw?p{Qtjus{aA0MK^@umXh}WZ-!j|pK7uGkI75K)C|MM
zy#K%3OaHm2hUy)LW$sQ*rzI8tzct{-ZvZG@^*R23vlRIYvJ_?rLv(hUWqD%se~=-d
zFaUW6uOYf@|G$~={Q(;AA8bHKQXD@>;}&CsY!Ln3g!lhPRp$SnwXhrTPMHa;=8~K`
z!~hWC8yT7l(!AbCKmV+>GRTJiZ&gqY0kPl7G5!B$%=7=8jLQFevJ!r91CTLD0^}W#
zA+Kba{=Wg*_y$P76leVZ1*rKXP!6UUs{t@Wj*H8KqYtDJgg*mg0VIa38N&b|U<YCz
zAm*PTERcLeOz!^=3n4H*EGqkdny^45P)-wwC4g7}h&i#RZ-}JK1Yv=+10pj2L3oj<
lP$p1J1tboV$Lj@BFaZ6uLuZ1~7oPwC002ovPDHLkV1l{}0RI30
diff --git a/resources/assets/stylesheets/less/schedule.less b/resources/assets/stylesheets/less/schedule.less
index 4364390b29d..9eb01e82f46 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 {
--
GitLab