fixes #912

Closes #912

Merge request studip/studip!2367

app/controllers/course/overview.php

@@ -75,7 +75,7 @@ class Course_OverviewController extends AuthenticatedController
             $show_link         = $GLOBALS["perm"]->have_studip_perm('autor', $this->course_id) && $this->course->isToolActive('schedule');
             $this->times_rooms = $this->sem->getDatesTemplate('dates/seminar_html', ['link_to_dates' => $show_link, 'show_room' => true]);
 
-            // Fettch teachers
+            // Fetch teachers
             $dozenten      = $this->sem->getMembers('dozent');
             $this->num_dozenten  = count($dozenten);
             $show_dozenten = [];

app/views/news/display.php

@@ -25,35 +25,41 @@
         </nav>
     </header>
     <? foreach ($news as $new): ?>
-    <? $is_new = ($new['chdate'] >= object_get_visit($new->id, 'news', false, false))
+        <? $is_new = ($new['chdate'] >= object_get_visit($new->id, 'news', false, false))
             && ($new['user_id'] != $GLOBALS['user']->id); ?>
-    <article class="studip toggle <?= ContentBoxHelper::classes($new->id, $is_new) ?>" id="<?= $new->id ?>" data-visiturl="<?=URLHelper::getScriptLink('dispatch.php/news/visit')?>">
-        <header>
-            <h1>
-                <a href="<?= ContentBoxHelper::href($new->id, ['contentbox_type' => 'news']) ?>">
-                    <?= Icon::create('news') ?>
-                    <?= htmlReady($new['topic']); ?>
-                </a>
-            </h1>
-            <nav>
-                <?= $this->render_partial('news/_actions.php', ['new' => $new, 'range' => $range]) ?>
-            </nav>
-        </header>
-        <section>
-            <article>
-                <?= formatReady($new['body']) ?>
-            </article>
-        </section>
-        <?= $this->render_partial('news/_comments.php', ['new' => $new, 'range' => $range]) ?>
-    </article>
+        <? if ($is_new && Request::get('unread_news') === 'yes') : ?>
+        <? object_add_view($new->id);
+            object_set_visit($new->id, 'news');?>
+        <? endif ?>
+        <article class="studip toggle <?= ContentBoxHelper::classes($new->id, $is_new) ?>"
+                 id="<?= $new->id ?>"
+                 data-visiturl="<?=URLHelper::getScriptLink('dispatch.php/news/visit')?>">
+            <header>
+                <h1>
+                    <a href="<?= ContentBoxHelper::href($new->id, ['contentbox_type' => 'news']) ?>">
+                        <?= Icon::create('news') ?>
+                        <?= htmlReady($new['topic']); ?>
+                    </a>
+                </h1>
+                <nav>
+                    <?= $this->render_partial('news/_actions.php', ['new' => $new, 'range' => $range]) ?>
+                </nav>
+            </header>
+            <section>
+                <article>
+                    <?= formatReady($new['body']) ?>
+                </article>
+            </section>
+            <?= $this->render_partial('news/_comments.php', ['new' => $new, 'range' => $range]) ?>
+        </article>
     <? endforeach; ?>
     <? if (!$news): ?>
-    <section>
-        <?= _('Es sind keine aktuellen Ankündigungen vorhanden. Um neue Ankündigungen zu erstellen, klicken Sie rechts auf das Plus-Zeichen.') ?>
-    </section>
+        <section>
+            <?= _('Es sind keine aktuellen Ankündigungen vorhanden. Um neue Ankündigungen zu erstellen, klicken Sie rechts auf das Plus-Zeichen.') ?>
+        </section>
         <? if ($perm && $count_all_news) : ?>
             <footer>
-            <a href="<?=URLHelper::getLink('?nshow_all=1')?>"><?=sprintf(_("Abgelaufene und unveröffentlichte Ankündigungen anzeigen (%s)"), $count_all_news)?></a>
+                <a href="<?=URLHelper::getLink('?nshow_all=1')?>"><?=sprintf(_("Abgelaufene und unveröffentlichte Ankündigungen anzeigen (%s)"), $count_all_news)?></a>
             </footer>
         <? endif; ?>
     <? elseif ($perm) : ?>

lib/classes/ContentBoxHelper.php

@@ -37,6 +37,7 @@ class ContentBoxHelper {
         // Check if new
         if ($is_new) {
             $classes[] = 'new';
+            $classes[] = 'open';
         }
 
         // Return classes

lib/modules/CoreOverview.class.php

@@ -41,9 +41,8 @@ class CoreOverview extends CorePlugin implements StudipModule
         }
 
         $nav = new Navigation(_('Ankündigungen'), '');
-        $url_params = ['redirect_to' => 'dispatch.php/course/overview'];
         if ($result['neue']) {
-            $url_params['new_news'] = true;
+            $url_params = ['unread_news' => 'yes'];
             $nav->setImage(Icon::create('news', Icon::ROLE_ATTENTION), [
                 'title' => sprintf(
                     ngettext(
@@ -68,7 +67,8 @@ class CoreOverview extends CorePlugin implements StudipModule
                 )
             ]);
         }
-        $nav->setURL(URLHelper::getURL('', $url_params));
+        $nav->setURL('dispatch.php/course/overview', $url_params);
+
         return $nav;
     }