From 19241c84f557187f8b309dbe1953674bae490526 Mon Sep 17 00:00:00 2001 From: Elmar Ludwig Date: Wed, 23 Jul 2025 15:06:19 +0200 Subject: finalize vips icon names, fixes #5163 Closes #5163 Merge request studip/studip!4380 --- lib/models/vips/VipsAssignment.php | 6 +++--- lib/modules/VipsModule.php | 12 ++++++------ public/assets/images/icons/black/assignment-exam.svg | 1 + public/assets/images/icons/black/assignment-practice.svg | 1 + public/assets/images/icons/black/assignment-quiz.svg | 1 + public/assets/images/icons/black/tasks.svg | 1 + public/assets/images/icons/black/vips.svg | 1 - public/assets/images/icons/blue/assignment-exam.svg | 1 + public/assets/images/icons/blue/assignment-practice.svg | 1 + public/assets/images/icons/blue/assignment-quiz.svg | 1 + public/assets/images/icons/blue/tasks.svg | 1 + public/assets/images/icons/blue/vips.svg | 1 - public/assets/images/icons/green/assignment-exam.svg | 1 + public/assets/images/icons/green/assignment-practice.svg | 1 + public/assets/images/icons/green/assignment-quiz.svg | 1 + public/assets/images/icons/green/tasks.svg | 1 + public/assets/images/icons/green/vips.svg | 1 - public/assets/images/icons/grey/assignment-exam.svg | 1 + public/assets/images/icons/grey/assignment-practice.svg | 1 + public/assets/images/icons/grey/assignment-quiz.svg | 1 + public/assets/images/icons/grey/tasks.svg | 1 + public/assets/images/icons/grey/vips.svg | 1 - public/assets/images/icons/red/assignment-exam.svg | 1 + public/assets/images/icons/red/assignment-practice.svg | 1 + public/assets/images/icons/red/assignment-quiz.svg | 1 + public/assets/images/icons/red/tasks.svg | 1 + public/assets/images/icons/red/vips.svg | 1 - public/assets/images/icons/white/assignment-exam.svg | 1 + public/assets/images/icons/white/assignment-practice.svg | 1 + public/assets/images/icons/white/assignment-quiz.svg | 1 + public/assets/images/icons/white/tasks.svg | 1 + public/assets/images/icons/white/vips.svg | 1 - public/assets/images/icons/yellow/assignment-exam.svg | 1 + public/assets/images/icons/yellow/assignment-practice.svg | 1 + public/assets/images/icons/yellow/assignment-quiz.svg | 1 + public/assets/images/icons/yellow/tasks.svg | 1 + public/assets/images/icons/yellow/vips.svg | 1 - resources/assets/stylesheets/scss/courseware/variables.scss | 2 +- resources/assets/stylesheets/scss/vips.scss | 2 +- 39 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 public/assets/images/icons/black/assignment-exam.svg create mode 100644 public/assets/images/icons/black/assignment-practice.svg create mode 100644 public/assets/images/icons/black/assignment-quiz.svg create mode 100644 public/assets/images/icons/black/tasks.svg delete mode 100644 public/assets/images/icons/black/vips.svg create mode 100644 public/assets/images/icons/blue/assignment-exam.svg create mode 100644 public/assets/images/icons/blue/assignment-practice.svg create mode 100644 public/assets/images/icons/blue/assignment-quiz.svg create mode 100644 public/assets/images/icons/blue/tasks.svg delete mode 100644 public/assets/images/icons/blue/vips.svg create mode 100644 public/assets/images/icons/green/assignment-exam.svg create mode 100644 public/assets/images/icons/green/assignment-practice.svg create mode 100644 public/assets/images/icons/green/assignment-quiz.svg create mode 100644 public/assets/images/icons/green/tasks.svg delete mode 100644 public/assets/images/icons/green/vips.svg create mode 100644 public/assets/images/icons/grey/assignment-exam.svg create mode 100644 public/assets/images/icons/grey/assignment-practice.svg create mode 100644 public/assets/images/icons/grey/assignment-quiz.svg create mode 100644 public/assets/images/icons/grey/tasks.svg delete mode 100644 public/assets/images/icons/grey/vips.svg create mode 100644 public/assets/images/icons/red/assignment-exam.svg create mode 100644 public/assets/images/icons/red/assignment-practice.svg create mode 100644 public/assets/images/icons/red/assignment-quiz.svg create mode 100644 public/assets/images/icons/red/tasks.svg delete mode 100644 public/assets/images/icons/red/vips.svg create mode 100644 public/assets/images/icons/white/assignment-exam.svg create mode 100644 public/assets/images/icons/white/assignment-practice.svg create mode 100644 public/assets/images/icons/white/assignment-quiz.svg create mode 100644 public/assets/images/icons/white/tasks.svg delete mode 100644 public/assets/images/icons/white/vips.svg create mode 100644 public/assets/images/icons/yellow/assignment-exam.svg create mode 100644 public/assets/images/icons/yellow/assignment-practice.svg create mode 100644 public/assets/images/icons/yellow/assignment-quiz.svg create mode 100644 public/assets/images/icons/yellow/tasks.svg delete mode 100644 public/assets/images/icons/yellow/vips.svg diff --git a/lib/models/vips/VipsAssignment.php b/lib/models/vips/VipsAssignment.php index 7810019..0c84106 100644 --- a/lib/models/vips/VipsAssignment.php +++ b/lib/models/vips/VipsAssignment.php @@ -397,9 +397,9 @@ class VipsAssignment extends SimpleORMap public static function getAssignmentTypes(): array { return [ - 'practice' => ['name' => _('Übung'), 'icon' => 'file'], - 'selftest' => ['name' => _('Selbsttest'), 'icon' => 'check-circle'], - 'exam' => ['name' => _('Klausur'), 'icon' => 'doctoral_cap'] + 'practice' => ['name' => _('Übung'), 'icon' => 'assignment-practice'], + 'selftest' => ['name' => _('Selbsttest'), 'icon' => 'assignment-quiz'], + 'exam' => ['name' => _('Klausur'), 'icon' => 'assignment-exam'] ]; } diff --git a/lib/modules/VipsModule.php b/lib/modules/VipsModule.php index a049ec7..6aff4b8 100644 --- a/lib/modules/VipsModule.php +++ b/lib/modules/VipsModule.php @@ -52,7 +52,7 @@ class VipsModule extends CorePlugin implements StudipModule, SystemPlugin, Priva if (Navigation::hasItem('/contents')) { $nav_item = new Navigation(_('Aufgaben')); - $nav_item->setImage(Icon::create('vips')); + $nav_item->setImage(Icon::create('tasks')); $nav_item->setDescription(_('Erstellen und Verwalten von Aufgabenblättern')); Navigation::addItem('/contents/vips', $nav_item); @@ -246,7 +246,7 @@ class VipsModule extends CorePlugin implements StudipModule, SystemPlugin, Priva $navigation->addSubNavigation('course', $course); $vips = new Navigation($this->getPluginName()); - $vips->setImage(Icon::create('vips')); + $vips->setImage(Icon::create('tasks')); $course->addSubNavigation('vips', $vips); $nav_item = new Navigation(_('Aufgabenblätter'), 'dispatch.php/vips/sheets'); @@ -307,11 +307,11 @@ class VipsModule extends CorePlugin implements StudipModule, SystemPlugin, Priva } $overview_message = $this->getPluginName(); - $icon = Icon::create('vips'); + $icon = Icon::create('tasks'); if ($new_items > 0) { $overview_message = sprintf($message, $new_items); - $icon = Icon::create('vips', Icon::ROLE_NEW); + $icon = Icon::create('tasks', Icon::ROLE_NEW); } $icon_navigation = new Navigation($this->getPluginName(), 'dispatch.php/vips/sheets'); @@ -328,7 +328,7 @@ class VipsModule extends CorePlugin implements StudipModule, SystemPlugin, Priva public function getTabNavigation($course_id) { $navigation = new Navigation($this->getPluginName()); - $navigation->setImage(Icon::create('vips')); + $navigation->setImage(Icon::create('tasks')); $nav_item = new Navigation(_('Aufgabenblätter'), 'dispatch.php/vips/sheets'); $navigation->addSubNavigation('sheets', $nav_item); @@ -357,7 +357,7 @@ class VipsModule extends CorePlugin implements StudipModule, SystemPlugin, Priva _('Einsatz bei Hausaufgaben und Präsenzprüfungen; Reduzierter Arbeitsaufwand bei der Auswertung; ' . 'Sortierte Übersicht der eingereichten Ergebnisse; Single-, Multiple-Choice- und Textaufgaben, ' . 'Lückentexte und Zuordnungen; Notwendige Korrekturen und erzielte Punktzahlen auf einen Blick'); - $metadata['icon'] = Icon::create('vips'); + $metadata['icon'] = Icon::create('tasks'); $metadata['screenshots'] = [ 'path' => 'assets/images/plus/screenshots/Vips', 'pictures' => [ diff --git a/public/assets/images/icons/black/assignment-exam.svg b/public/assets/images/icons/black/assignment-exam.svg new file mode 100644 index 0000000..b465e8b --- /dev/null +++ b/public/assets/images/icons/black/assignment-exam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/black/assignment-practice.svg b/public/assets/images/icons/black/assignment-practice.svg new file mode 100644 index 0000000..403cf15 --- /dev/null +++ b/public/assets/images/icons/black/assignment-practice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/black/assignment-quiz.svg b/public/assets/images/icons/black/assignment-quiz.svg new file mode 100644 index 0000000..cc4551e --- /dev/null +++ b/public/assets/images/icons/black/assignment-quiz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/black/tasks.svg b/public/assets/images/icons/black/tasks.svg new file mode 100644 index 0000000..2458c1c --- /dev/null +++ b/public/assets/images/icons/black/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/black/vips.svg b/public/assets/images/icons/black/vips.svg deleted file mode 100644 index 2458c1c..0000000 --- a/public/assets/images/icons/black/vips.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/blue/assignment-exam.svg b/public/assets/images/icons/blue/assignment-exam.svg new file mode 100644 index 0000000..759183e --- /dev/null +++ b/public/assets/images/icons/blue/assignment-exam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/assignment-practice.svg b/public/assets/images/icons/blue/assignment-practice.svg new file mode 100644 index 0000000..3e164bd --- /dev/null +++ b/public/assets/images/icons/blue/assignment-practice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/assignment-quiz.svg b/public/assets/images/icons/blue/assignment-quiz.svg new file mode 100644 index 0000000..c834668 --- /dev/null +++ b/public/assets/images/icons/blue/assignment-quiz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/tasks.svg b/public/assets/images/icons/blue/tasks.svg new file mode 100644 index 0000000..ae407a4 --- /dev/null +++ b/public/assets/images/icons/blue/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/blue/vips.svg b/public/assets/images/icons/blue/vips.svg deleted file mode 100644 index ae407a4..0000000 --- a/public/assets/images/icons/blue/vips.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/green/assignment-exam.svg b/public/assets/images/icons/green/assignment-exam.svg new file mode 100644 index 0000000..6d8988c --- /dev/null +++ b/public/assets/images/icons/green/assignment-exam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/green/assignment-practice.svg b/public/assets/images/icons/green/assignment-practice.svg new file mode 100644 index 0000000..5a6e6a4 --- /dev/null +++ b/public/assets/images/icons/green/assignment-practice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/green/assignment-quiz.svg b/public/assets/images/icons/green/assignment-quiz.svg new file mode 100644 index 0000000..6295f5a --- /dev/null +++ b/public/assets/images/icons/green/assignment-quiz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/green/tasks.svg b/public/assets/images/icons/green/tasks.svg new file mode 100644 index 0000000..8af9a21 --- /dev/null +++ b/public/assets/images/icons/green/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/green/vips.svg b/public/assets/images/icons/green/vips.svg deleted file mode 100644 index 8af9a21..0000000 --- a/public/assets/images/icons/green/vips.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/grey/assignment-exam.svg b/public/assets/images/icons/grey/assignment-exam.svg new file mode 100644 index 0000000..7833fa3 --- /dev/null +++ b/public/assets/images/icons/grey/assignment-exam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/grey/assignment-practice.svg b/public/assets/images/icons/grey/assignment-practice.svg new file mode 100644 index 0000000..abf3424 --- /dev/null +++ b/public/assets/images/icons/grey/assignment-practice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/grey/assignment-quiz.svg b/public/assets/images/icons/grey/assignment-quiz.svg new file mode 100644 index 0000000..a48dbb9 --- /dev/null +++ b/public/assets/images/icons/grey/assignment-quiz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/grey/tasks.svg b/public/assets/images/icons/grey/tasks.svg new file mode 100644 index 0000000..1bdd757 --- /dev/null +++ b/public/assets/images/icons/grey/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/grey/vips.svg b/public/assets/images/icons/grey/vips.svg deleted file mode 100644 index 1bdd757..0000000 --- a/public/assets/images/icons/grey/vips.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/red/assignment-exam.svg b/public/assets/images/icons/red/assignment-exam.svg new file mode 100644 index 0000000..f412235 --- /dev/null +++ b/public/assets/images/icons/red/assignment-exam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/red/assignment-practice.svg b/public/assets/images/icons/red/assignment-practice.svg new file mode 100644 index 0000000..f632e79 --- /dev/null +++ b/public/assets/images/icons/red/assignment-practice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/red/assignment-quiz.svg b/public/assets/images/icons/red/assignment-quiz.svg new file mode 100644 index 0000000..bc36274 --- /dev/null +++ b/public/assets/images/icons/red/assignment-quiz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/red/tasks.svg b/public/assets/images/icons/red/tasks.svg new file mode 100644 index 0000000..6b4de6b --- /dev/null +++ b/public/assets/images/icons/red/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/red/vips.svg b/public/assets/images/icons/red/vips.svg deleted file mode 100644 index 6b4de6b..0000000 --- a/public/assets/images/icons/red/vips.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/white/assignment-exam.svg b/public/assets/images/icons/white/assignment-exam.svg new file mode 100644 index 0000000..9bf6ff3 --- /dev/null +++ b/public/assets/images/icons/white/assignment-exam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/white/assignment-practice.svg b/public/assets/images/icons/white/assignment-practice.svg new file mode 100644 index 0000000..ae715e1 --- /dev/null +++ b/public/assets/images/icons/white/assignment-practice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/white/assignment-quiz.svg b/public/assets/images/icons/white/assignment-quiz.svg new file mode 100644 index 0000000..25e6a74 --- /dev/null +++ b/public/assets/images/icons/white/assignment-quiz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/white/tasks.svg b/public/assets/images/icons/white/tasks.svg new file mode 100644 index 0000000..10d71a2 --- /dev/null +++ b/public/assets/images/icons/white/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/white/vips.svg b/public/assets/images/icons/white/vips.svg deleted file mode 100644 index 10d71a2..0000000 --- a/public/assets/images/icons/white/vips.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/images/icons/yellow/assignment-exam.svg b/public/assets/images/icons/yellow/assignment-exam.svg new file mode 100644 index 0000000..e5f7dcd --- /dev/null +++ b/public/assets/images/icons/yellow/assignment-exam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/yellow/assignment-practice.svg b/public/assets/images/icons/yellow/assignment-practice.svg new file mode 100644 index 0000000..429f96b --- /dev/null +++ b/public/assets/images/icons/yellow/assignment-practice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/yellow/assignment-quiz.svg b/public/assets/images/icons/yellow/assignment-quiz.svg new file mode 100644 index 0000000..098d589 --- /dev/null +++ b/public/assets/images/icons/yellow/assignment-quiz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/yellow/tasks.svg b/public/assets/images/icons/yellow/tasks.svg new file mode 100644 index 0000000..5b817a0 --- /dev/null +++ b/public/assets/images/icons/yellow/tasks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/images/icons/yellow/vips.svg b/public/assets/images/icons/yellow/vips.svg deleted file mode 100644 index 5b817a0..0000000 --- a/public/assets/images/icons/yellow/vips.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/assets/stylesheets/scss/courseware/variables.scss b/resources/assets/stylesheets/scss/courseware/variables.scss index 248e300..47dcb96 100644 --- a/resources/assets/stylesheets/scss/courseware/variables.scss +++ b/resources/assets/stylesheets/scss/courseware/variables.scss @@ -74,7 +74,7 @@ $blockadder-items: ( key-point: exclaim-circle, link: link-extern, table-of-contents: table-of-contents, - test: vips, + test: tasks, text: edit, timeline: date-cycle, typewriter: block-typewriter, diff --git a/resources/assets/stylesheets/scss/vips.scss b/resources/assets/stylesheets/scss/vips.scss index f11afda..4419ba4 100644 --- a/resources/assets/stylesheets/scss/vips.scss +++ b/resources/assets/stylesheets/scss/vips.scss @@ -68,7 +68,7 @@ progress.assignment { .vips-teaser { background-color: var(--content-color-20); - background-image: url(../images/icons/blue/vips.svg); + background-image: url(../images/icons/blue/tasks.svg); background-position: 64px 50%; background-repeat: no-repeat; background-size: 120px; -- cgit v1.0