Color-Themes-System, fixes #5361

Closes #5361

Merge request studip/studip!4038

4 files changed, 6 insertions, 7 deletions

diff --git a/app/controllers/course/contentmodules.php b/app/controllers/course/contentmodules.php
index bbda1b3..66fa2c5 100644
--- a/app/controllers/course/contentmodules.php
+++ b/app/controllers/course/contentmodules.php
@@ -300,7 +300,6 @@ class Course_ContentmodulesController extends AuthenticatedController
             $visibility = $tool ? $tool->getVisibilityPermission() : 'nobody';
 
             $metadata = $plugin->getMetadata();
-            $icon = $this->getIconFromMetadata($metadata, $plugin);
             $list[$plugin_id] = [
                 'id'             => $plugin_id,
                 'moduleclass'    => get_class($plugin),
@@ -309,7 +308,7 @@ class Course_ContentmodulesController extends AuthenticatedController
                 'displayname'    => $displayname,
                 'visibility'     => $visibility,
                 'active'         => (bool) $tool,
-                'icon'           => $icon ? $icon->asImagePath() : null,
+                'icon'           => $this->getIconFromMetadata($metadata, $plugin),
                 'summary'        => $metadata['summary'] ?? null,
                 'mandatory'      => $this->sem_class->isModuleMandatory(get_class($plugin)),
                 'highlighted'    => (bool) $plugin->isHighlighted(),
diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php
index 22c6b1e..adeb4a8 100644
--- a/app/controllers/course/members.php
+++ b/app/controllers/course/members.php
@@ -205,7 +205,7 @@ class Course_MembersController extends AuthenticatedController
         $results = SimpleCollection::createFromArray($members)->pluck('email');
 
         if (!empty($results)) {
-            return sprintf('<a href="mailto:%s">%s</a>', htmlReady(join(',', $results)), Icon::create('mail', attributes: ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asImg());
+            return sprintf('<a href="mailto:%s">%s</a>', htmlReady(join(',', $results)), Icon::create('mail', attributes: ['title' => sprintf('E-Mail an alle %s versenden',$textStatus)])->asSvg());
         } else {
             return null;
         }
diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php
index df21a2a..85d7a70 100644
--- a/app/controllers/course/room_requests.php
+++ b/app/controllers/course/room_requests.php
@@ -625,7 +625,7 @@ class Course_RoomRequestsController extends AuthenticatedController
             }
             if ($request_dates_booked === 0) {
                 $this->available_room_icons[$room->id] =
-                    Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asImg(
+                    Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asSvg(
                         [
                             'class' => 'text-bottom',
                             'title' => _('freier Raum')
@@ -633,7 +633,7 @@ class Course_RoomRequestsController extends AuthenticatedController
                     );
                 $available_rooms[] = $room;
             } elseif ($request_dates_booked < $request_time_intervals) {
-                $this->available_room_icons[$room->id] = Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asImg([
+                $this->available_room_icons[$room->id] = Icon::create('exclaim-circle', Icon::ROLE_STATUS_YELLOW)->asSvg([
                     'class' => 'text-bottom',
                     'title' => _('teilweise belegter Raum')
                 ]);
diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php
index 81d933e..1dad1d0 100644
--- a/app/controllers/course/wiki.php
+++ b/app/controllers/course/wiki.php
@@ -59,8 +59,8 @@ class Course_WikiController extends AuthenticatedController
                     '<a href="%s">%s</a>',
                     URLHelper::getLink('dispatch.php/course/wiki/edit_toc'),
                     $toc_content_empty
-                        ? Icon::create('add')->asImg(['title' => _('Erstellen')])
-                        : Icon::create('edit')->asImg(['title' => _('Bearbeiten')])
+                        ? Icon::create('add')->asSvg(['title' => _('Erstellen')])
+                        : Icon::create('edit')->asSvg(['title' => _('Bearbeiten')])
                 );
                 $widget->setExtra($extra);
             }