From b66896cdee96bb2d700383d6b38bbf3c81a9691c Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 15 Mar 2022 10:25:09 +0000
Subject: [PATCH] icons on course overview should no longer have the new extra,
fixes #777
---
lib/classes/MyRealmModel.php | 4 ++--
lib/modules/CoreDocuments.class.php | 2 +-
lib/modules/CoreElearningInterface.class.php | 2 +-
lib/modules/CoreOverview.class.php | 2 +-
lib/modules/CoreParticipants.class.php | 2 +-
lib/modules/CoreSchedule.class.php | 2 +-
lib/modules/CoreScm.class.php | 2 +-
lib/modules/CoreStudygroupParticipants.class.php | 2 +-
lib/modules/CoreWiki.class.php | 2 +-
lib/modules/GradebookModule.class.php | 2 +-
lib/modules/IliasInterfaceModule.class.php | 2 +-
lib/modules/LtiToolModule.class.php | 2 +-
public/plugins_packages/core/Blubber/Blubber.class.php | 4 ++--
public/plugins_packages/core/Forum/CoreForum.class.php | 2 +-
14 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 7421058bfdd..570338926f3 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -125,7 +125,7 @@ class MyRealmModel
if ($neue || $count > 0) {
$nav = new Navigation('vote', '#vote');
if ($neue) {
- $nav->setImage(Icon::create('vote+new', Icon::ROLE_ATTENTION, [
+ $nav->setImage(Icon::create('vote', Icon::ROLE_ATTENTION, [
'title' => sprintf(
ngettext(
'%1$u Fragebogen, %2$u neuer',
@@ -138,7 +138,7 @@ class MyRealmModel
]));
$nav->setBadgeNumber($neue);
} else if ($count) {
- $nav->setImage(Icon::create('vote', Icon::ROLE_INACTIVE, [
+ $nav->setImage(Icon::create('vote', Icon::ROLE_CLICKABLE, [
'title' => sprintf(
ngettext(
'%u Fragebogen',
diff --git a/lib/modules/CoreDocuments.class.php b/lib/modules/CoreDocuments.class.php
index 6588bc888ab..28fcae5cce7 100644
--- a/lib/modules/CoreDocuments.class.php
+++ b/lib/modules/CoreDocuments.class.php
@@ -114,7 +114,7 @@ class CoreDocuments extends CorePlugin implements StudipModule, OERModule
foreach ($file_refs as $fileref) {
$foldertype = $fileref->folder->getTypedFolder();
if ($foldertype->isFileDownloadable($fileref->getId(), $user_id)) {
- $navigation->setImage(Icon::create('files+new', Icon::ROLE_ATTENTION), [
+ $navigation->setImage(Icon::create('files', Icon::ROLE_ATTENTION), [
'title' => _('Es gibt neue Dateien.'),
]);
$navigation->setURL("dispatch.php/{$range_type}/files/flat", ['select' => 'new']);
diff --git a/lib/modules/CoreElearningInterface.class.php b/lib/modules/CoreElearningInterface.class.php
index 2a8a183037b..ca3d3be1b6d 100644
--- a/lib/modules/CoreElearningInterface.class.php
+++ b/lib/modules/CoreElearningInterface.class.php
@@ -41,7 +41,7 @@ class CoreElearningInterface extends CorePlugin implements StudipModule
if (!empty($result)) {
$nav = new Navigation(_('Lernmodule'), 'dispatch.php/course/elearning/show');
if ($result['neue']) {
- $nav->setImage(Icon::create('learnmodule+new', Icon::ROLE_ATTENTION), [
+ $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
'title' => sprintf(
ngettext(
'%1$d Lernmodul, %2$d neues',
diff --git a/lib/modules/CoreOverview.class.php b/lib/modules/CoreOverview.class.php
index b0de37a460f..39145aea83b 100644
--- a/lib/modules/CoreOverview.class.php
+++ b/lib/modules/CoreOverview.class.php
@@ -43,7 +43,7 @@ class CoreOverview extends CorePlugin implements StudipModule
$nav = new Navigation(_('Ankündigungen'), '');
if ($result['neue']) {
$nav->setURL('?new_news=true');
- $nav->setImage(Icon::create('news+new', Icon::ROLE_ATTENTION), [
+ $nav->setImage(Icon::create('news', Icon::ROLE_ATTENTION), [
'title' => sprintf(
ngettext(
'%1$d Ankündigung, %2$d neue',
diff --git a/lib/modules/CoreParticipants.class.php b/lib/modules/CoreParticipants.class.php
index 65997d9999b..a9fac5c2a42 100644
--- a/lib/modules/CoreParticipants.class.php
+++ b/lib/modules/CoreParticipants.class.php
@@ -89,7 +89,7 @@ class CoreParticipants extends CorePlugin implements StudipModule
$result = $statement->fetch(PDO::FETCH_ASSOC);
if ($result['neue']) {
- $navigation->setImage(Icon::create('persons+new', Icon::ROLE_ATTENTION), [
+ $navigation->setImage(Icon::create('persons', Icon::ROLE_ATTENTION), [
'title' => sprintf(
ngettext(
'%1$d Teilnehmende/r, %2$d neue/r',
diff --git a/lib/modules/CoreSchedule.class.php b/lib/modules/CoreSchedule.class.php
index 950193038b5..e8f7781e851 100644
--- a/lib/modules/CoreSchedule.class.php
+++ b/lib/modules/CoreSchedule.class.php
@@ -47,7 +47,7 @@ class CoreSchedule extends CorePlugin implements StudipModule
$nav = new Navigation(_('Ablaufplan'), 'dispatch.php/course/dates');
if ($result['neue']) {
- $nav->setImage(Icon::create('schedule+new', Icon::ROLE_ATTENTION), [
+ $nav->setImage(Icon::create('schedule', Icon::ROLE_ATTENTION), [
'title' => sprintf(
ngettext(
'%1$d Termin, %2$d neuer',
diff --git a/lib/modules/CoreScm.class.php b/lib/modules/CoreScm.class.php
index f403589e07c..595c219cf6a 100644
--- a/lib/modules/CoreScm.class.php
+++ b/lib/modules/CoreScm.class.php
@@ -49,7 +49,7 @@ class CoreScm extends CorePlugin implements StudipModule
if ($result['count']) {
if ($result['neue']) {
- $image = Icon::create('infopage+new', Icon::ROLE_NEW);
+ $image = Icon::create('infopage', Icon::ROLE_NEW);
$nav->setBadgeNumber($result['neue']);
if ($result['count'] == 1) {
$title = $scm->tab_name . _(' (geändert)');
diff --git a/lib/modules/CoreStudygroupParticipants.class.php b/lib/modules/CoreStudygroupParticipants.class.php
index 70663528048..334f84ab6d8 100644
--- a/lib/modules/CoreStudygroupParticipants.class.php
+++ b/lib/modules/CoreStudygroupParticipants.class.php
@@ -19,7 +19,7 @@ class CoreStudygroupParticipants extends CorePlugin implements StudipModule
$navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/{$course_id}");
$navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE));
if ($last_visit && CourseMember::countBySQL("seminar_id = :course_id AND mkdate >= :last_visit", ['last_visit' => $last_visit, 'course_id' => $course_id]) > 0) {
- $navigation->setImage(Icon::create('persons+new', Icon::ROLE_ATTENTION));
+ $navigation->setImage(Icon::create('persons', Icon::ROLE_ATTENTION));
}
return $navigation;
}
diff --git a/lib/modules/CoreWiki.class.php b/lib/modules/CoreWiki.class.php
index 7921e4ce963..0034098eef4 100644
--- a/lib/modules/CoreWiki.class.php
+++ b/lib/modules/CoreWiki.class.php
@@ -59,7 +59,7 @@ class CoreWiki extends CorePlugin implements StudipModule
$nav = new Navigation(_('Wiki'));
if ($result['neue']) {
$nav->setURL('wiki.php', ['view' => 'listnew']);
- $nav->setImage(Icon::create('wiki+new', Icon::ROLE_ATTENTION, [
+ $nav->setImage(Icon::create('wiki', Icon::ROLE_ATTENTION, [
'title' => sprintf(
ngettext(
'%1$d Wiki-Seite, %2$d Änderung(en)',
diff --git a/lib/modules/GradebookModule.class.php b/lib/modules/GradebookModule.class.php
index 14b21e7c1dc..4cde852ea1d 100644
--- a/lib/modules/GradebookModule.class.php
+++ b/lib/modules/GradebookModule.class.php
@@ -61,7 +61,7 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule
}
$icon = $changed
- ? Icon::create('assessment+new', Icon::ROLE_NEW)
+ ? Icon::create('assessment', Icon::ROLE_NEW)
: Icon::create('assessment', Icon::ROLE_CLICKABLE);
$navigation = new Navigation($title, 'dispatch.php/course/gradebook/overview');
diff --git a/lib/modules/IliasInterfaceModule.class.php b/lib/modules/IliasInterfaceModule.class.php
index 45b33989711..f5bc83f855d 100644
--- a/lib/modules/IliasInterfaceModule.class.php
+++ b/lib/modules/IliasInterfaceModule.class.php
@@ -70,7 +70,7 @@ class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlu
$title = CourseConfig::get($course_id)->getValue('ILIAS_INTERFACE_MODULETITLE');
$nav = new Navigation($title, 'dispatch.php/course/ilias_interface/index');
if ($result['neue']) {
- $nav->setImage(Icon::create('learnmodule+new', Icon::ROLE_ATTENTION), [
+ $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
'title' => sprintf(
ngettext(
'%1$d Lernobjekt, %2$d neues',
diff --git a/lib/modules/LtiToolModule.class.php b/lib/modules/LtiToolModule.class.php
index c342a9e1dcc..3093615aa29 100644
--- a/lib/modules/LtiToolModule.class.php
+++ b/lib/modules/LtiToolModule.class.php
@@ -41,7 +41,7 @@ class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, Pr
$changed = LtiData::countBySQL('course_id = ? AND chdate > ?', [$course_id, $last_visit]);
$icon = $changed
- ? Icon::create('link-extern+new', Icon::ROLE_NEW)
+ ? Icon::create('link-extern', Icon::ROLE_NEW)
: Icon::create('link-extern', Icon::ROLE_CLICKABLE);
$navigation = new Navigation($title, 'dispatch.php/course/lti');
diff --git a/public/plugins_packages/core/Blubber/Blubber.class.php b/public/plugins_packages/core/Blubber/Blubber.class.php
index e33b763a54e..a6f0443de35 100644
--- a/public/plugins_packages/core/Blubber/Blubber.class.php
+++ b/public/plugins_packages/core/Blubber/Blubber.class.php
@@ -60,7 +60,7 @@ class Blubber extends StudIPPlugin implements StandardPlugin
]);
foreach ($comments as $comment) {
if ($comment->thread->isVisibleInStream() && $comment->thread->isReadable() && ($comment->thread->getLatestActivity() > UserConfig::get($user_id)->getValue("BLUBBERTHREAD_VISITED_".$comment['thread_id']))) {
- $icon->setImage(Icon::create('blubber+new', Icon::ROLE_NEW, ['title' => _('Es gibt neue Blubber')]));
+ $icon->setImage(Icon::create('blubber', Icon::ROLE_NEW, ['title' => _('Es gibt neue Blubber')]));
$icon->setTitle(_('Es gibt neue Blubber'));
$icon->setBadgeNumber(count($comments));
$icon->setURL(PluginEngine::getURL($this, ['thread' => 'new'], 'messenger/course'));
@@ -84,7 +84,7 @@ class Blubber extends StudIPPlugin implements StandardPlugin
]);
foreach ($threads as $thread) {
if ($thread->isVisibleInStream() && $thread->isReadable() && ($thread['mkdate'] > UserConfig::get($user_id)->getValue("BLUBBERTHREAD_VISITED_".$thread->getId()))) {
- $icon->setImage(Icon::create('blubber+new', Icon::ROLE_ATTENTION, ['title' => _('Es gibt neue Blubber')]));
+ $icon->setImage(Icon::create('blubber', Icon::ROLE_ATTENTION, ['title' => _('Es gibt neue Blubber')]));
$icon->setTitle(_('Es gibt neue Blubber'));
break;
}
diff --git a/public/plugins_packages/core/Forum/CoreForum.class.php b/public/plugins_packages/core/Forum/CoreForum.class.php
index bb4d16c6d1d..520da03d9df 100644
--- a/public/plugins_packages/core/Forum/CoreForum.class.php
+++ b/public/plugins_packages/core/Forum/CoreForum.class.php
@@ -82,7 +82,7 @@ class CoreForum extends StudipPlugin implements ForumModule
$navigation->setBadgeNumber($num_entries);
if ($num_entries > 0) {
- $navigation->setImage(Icon::create('forum+new', Icon::ROLE_ATTENTION, ['title' => $text]));
+ $navigation->setImage(Icon::create('forum', Icon::ROLE_ATTENTION, ['title' => $text]));
} else {
$navigation->setImage(Icon::create('forum', Icon::ROLE_CLICKABLE, ['title' => $text]));
}
--
GitLab