Skip to content
Snippets Groups Projects
Commit b66896cd authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

icons on course overview should no longer have the new extra, fixes #777

parent 690e4a6d
No related branches found
No related tags found
No related merge requests found
Showing
with 16 additions and 16 deletions
...@@ -125,7 +125,7 @@ class MyRealmModel ...@@ -125,7 +125,7 @@ class MyRealmModel
if ($neue || $count > 0) { if ($neue || $count > 0) {
$nav = new Navigation('vote', '#vote'); $nav = new Navigation('vote', '#vote');
if ($neue) { if ($neue) {
$nav->setImage(Icon::create('vote+new', Icon::ROLE_ATTENTION, [ $nav->setImage(Icon::create('vote', Icon::ROLE_ATTENTION, [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
'%1$u Fragebogen, %2$u neuer', '%1$u Fragebogen, %2$u neuer',
...@@ -138,7 +138,7 @@ class MyRealmModel ...@@ -138,7 +138,7 @@ class MyRealmModel
])); ]));
$nav->setBadgeNumber($neue); $nav->setBadgeNumber($neue);
} else if ($count) { } else if ($count) {
$nav->setImage(Icon::create('vote', Icon::ROLE_INACTIVE, [ $nav->setImage(Icon::create('vote', Icon::ROLE_CLICKABLE, [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
'%u Fragebogen', '%u Fragebogen',
......
...@@ -114,7 +114,7 @@ class CoreDocuments extends CorePlugin implements StudipModule, OERModule ...@@ -114,7 +114,7 @@ class CoreDocuments extends CorePlugin implements StudipModule, OERModule
foreach ($file_refs as $fileref) { foreach ($file_refs as $fileref) {
$foldertype = $fileref->folder->getTypedFolder(); $foldertype = $fileref->folder->getTypedFolder();
if ($foldertype->isFileDownloadable($fileref->getId(), $user_id)) { 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.'), 'title' => _('Es gibt neue Dateien.'),
]); ]);
$navigation->setURL("dispatch.php/{$range_type}/files/flat", ['select' => 'new']); $navigation->setURL("dispatch.php/{$range_type}/files/flat", ['select' => 'new']);
......
...@@ -41,7 +41,7 @@ class CoreElearningInterface extends CorePlugin implements StudipModule ...@@ -41,7 +41,7 @@ class CoreElearningInterface extends CorePlugin implements StudipModule
if (!empty($result)) { if (!empty($result)) {
$nav = new Navigation(_('Lernmodule'), 'dispatch.php/course/elearning/show'); $nav = new Navigation(_('Lernmodule'), 'dispatch.php/course/elearning/show');
if ($result['neue']) { if ($result['neue']) {
$nav->setImage(Icon::create('learnmodule+new', Icon::ROLE_ATTENTION), [ $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
'%1$d Lernmodul, %2$d neues', '%1$d Lernmodul, %2$d neues',
......
...@@ -43,7 +43,7 @@ class CoreOverview extends CorePlugin implements StudipModule ...@@ -43,7 +43,7 @@ class CoreOverview extends CorePlugin implements StudipModule
$nav = new Navigation(_('Ankündigungen'), ''); $nav = new Navigation(_('Ankündigungen'), '');
if ($result['neue']) { if ($result['neue']) {
$nav->setURL('?new_news=true'); $nav->setURL('?new_news=true');
$nav->setImage(Icon::create('news+new', Icon::ROLE_ATTENTION), [ $nav->setImage(Icon::create('news', Icon::ROLE_ATTENTION), [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
'%1$d Ankündigung, %2$d neue', '%1$d Ankündigung, %2$d neue',
......
...@@ -89,7 +89,7 @@ class CoreParticipants extends CorePlugin implements StudipModule ...@@ -89,7 +89,7 @@ class CoreParticipants extends CorePlugin implements StudipModule
$result = $statement->fetch(PDO::FETCH_ASSOC); $result = $statement->fetch(PDO::FETCH_ASSOC);
if ($result['neue']) { if ($result['neue']) {
$navigation->setImage(Icon::create('persons+new', Icon::ROLE_ATTENTION), [ $navigation->setImage(Icon::create('persons', Icon::ROLE_ATTENTION), [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
'%1$d Teilnehmende/r, %2$d neue/r', '%1$d Teilnehmende/r, %2$d neue/r',
......
...@@ -47,7 +47,7 @@ class CoreSchedule extends CorePlugin implements StudipModule ...@@ -47,7 +47,7 @@ class CoreSchedule extends CorePlugin implements StudipModule
$nav = new Navigation(_('Ablaufplan'), 'dispatch.php/course/dates'); $nav = new Navigation(_('Ablaufplan'), 'dispatch.php/course/dates');
if ($result['neue']) { if ($result['neue']) {
$nav->setImage(Icon::create('schedule+new', Icon::ROLE_ATTENTION), [ $nav->setImage(Icon::create('schedule', Icon::ROLE_ATTENTION), [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
'%1$d Termin, %2$d neuer', '%1$d Termin, %2$d neuer',
......
...@@ -49,7 +49,7 @@ class CoreScm extends CorePlugin implements StudipModule ...@@ -49,7 +49,7 @@ class CoreScm extends CorePlugin implements StudipModule
if ($result['count']) { if ($result['count']) {
if ($result['neue']) { if ($result['neue']) {
$image = Icon::create('infopage+new', Icon::ROLE_NEW); $image = Icon::create('infopage', Icon::ROLE_NEW);
$nav->setBadgeNumber($result['neue']); $nav->setBadgeNumber($result['neue']);
if ($result['count'] == 1) { if ($result['count'] == 1) {
$title = $scm->tab_name . _(' (geändert)'); $title = $scm->tab_name . _(' (geändert)');
......
...@@ -19,7 +19,7 @@ class CoreStudygroupParticipants extends CorePlugin implements StudipModule ...@@ -19,7 +19,7 @@ class CoreStudygroupParticipants extends CorePlugin implements StudipModule
$navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/{$course_id}"); $navigation = new Navigation(_('Teilnehmende'), "dispatch.php/course/studygroup/members/{$course_id}");
$navigation->setImage(Icon::create('persons', Icon::ROLE_CLICKABLE)); $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) { 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; return $navigation;
} }
......
...@@ -59,7 +59,7 @@ class CoreWiki extends CorePlugin implements StudipModule ...@@ -59,7 +59,7 @@ class CoreWiki extends CorePlugin implements StudipModule
$nav = new Navigation(_('Wiki')); $nav = new Navigation(_('Wiki'));
if ($result['neue']) { if ($result['neue']) {
$nav->setURL('wiki.php', ['view' => 'listnew']); $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( 'title' => sprintf(
ngettext( ngettext(
'%1$d Wiki-Seite, %2$d Änderung(en)', '%1$d Wiki-Seite, %2$d Änderung(en)',
......
...@@ -61,7 +61,7 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule ...@@ -61,7 +61,7 @@ class GradebookModule extends CorePlugin implements SystemPlugin, StudipModule
} }
$icon = $changed $icon = $changed
? Icon::create('assessment+new', Icon::ROLE_NEW) ? Icon::create('assessment', Icon::ROLE_NEW)
: Icon::create('assessment', Icon::ROLE_CLICKABLE); : Icon::create('assessment', Icon::ROLE_CLICKABLE);
$navigation = new Navigation($title, 'dispatch.php/course/gradebook/overview'); $navigation = new Navigation($title, 'dispatch.php/course/gradebook/overview');
......
...@@ -70,7 +70,7 @@ class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlu ...@@ -70,7 +70,7 @@ class IliasInterfaceModule extends CorePlugin implements StudipModule, SystemPlu
$title = CourseConfig::get($course_id)->getValue('ILIAS_INTERFACE_MODULETITLE'); $title = CourseConfig::get($course_id)->getValue('ILIAS_INTERFACE_MODULETITLE');
$nav = new Navigation($title, 'dispatch.php/course/ilias_interface/index'); $nav = new Navigation($title, 'dispatch.php/course/ilias_interface/index');
if ($result['neue']) { if ($result['neue']) {
$nav->setImage(Icon::create('learnmodule+new', Icon::ROLE_ATTENTION), [ $nav->setImage(Icon::create('learnmodule', Icon::ROLE_ATTENTION), [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
'%1$d Lernobjekt, %2$d neues', '%1$d Lernobjekt, %2$d neues',
......
...@@ -41,7 +41,7 @@ class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, Pr ...@@ -41,7 +41,7 @@ class LtiToolModule extends CorePlugin implements StudipModule, SystemPlugin, Pr
$changed = LtiData::countBySQL('course_id = ? AND chdate > ?', [$course_id, $last_visit]); $changed = LtiData::countBySQL('course_id = ? AND chdate > ?', [$course_id, $last_visit]);
$icon = $changed $icon = $changed
? Icon::create('link-extern+new', Icon::ROLE_NEW) ? Icon::create('link-extern', Icon::ROLE_NEW)
: Icon::create('link-extern', Icon::ROLE_CLICKABLE); : Icon::create('link-extern', Icon::ROLE_CLICKABLE);
$navigation = new Navigation($title, 'dispatch.php/course/lti'); $navigation = new Navigation($title, 'dispatch.php/course/lti');
......
...@@ -60,7 +60,7 @@ class Blubber extends StudIPPlugin implements StandardPlugin ...@@ -60,7 +60,7 @@ class Blubber extends StudIPPlugin implements StandardPlugin
]); ]);
foreach ($comments as $comment) { foreach ($comments as $comment) {
if ($comment->thread->isVisibleInStream() && $comment->thread->isReadable() && ($comment->thread->getLatestActivity() > UserConfig::get($user_id)->getValue("BLUBBERTHREAD_VISITED_".$comment['thread_id']))) { 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->setTitle(_('Es gibt neue Blubber'));
$icon->setBadgeNumber(count($comments)); $icon->setBadgeNumber(count($comments));
$icon->setURL(PluginEngine::getURL($this, ['thread' => 'new'], 'messenger/course')); $icon->setURL(PluginEngine::getURL($this, ['thread' => 'new'], 'messenger/course'));
...@@ -84,7 +84,7 @@ class Blubber extends StudIPPlugin implements StandardPlugin ...@@ -84,7 +84,7 @@ class Blubber extends StudIPPlugin implements StandardPlugin
]); ]);
foreach ($threads as $thread) { foreach ($threads as $thread) {
if ($thread->isVisibleInStream() && $thread->isReadable() && ($thread['mkdate'] > UserConfig::get($user_id)->getValue("BLUBBERTHREAD_VISITED_".$thread->getId()))) { 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')); $icon->setTitle(_('Es gibt neue Blubber'));
break; break;
} }
......
...@@ -82,7 +82,7 @@ class CoreForum extends StudipPlugin implements ForumModule ...@@ -82,7 +82,7 @@ class CoreForum extends StudipPlugin implements ForumModule
$navigation->setBadgeNumber($num_entries); $navigation->setBadgeNumber($num_entries);
if ($num_entries > 0) { 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 { } else {
$navigation->setImage(Icon::create('forum', Icon::ROLE_CLICKABLE, ['title' => $text])); $navigation->setImage(Icon::create('forum', Icon::ROLE_CLICKABLE, ['title' => $text]));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment