Skip to content
Snippets Groups Projects
Commit 2f31dd04 authored by Michaela Brückner's avatar Michaela Brückner :unicorn:
Browse files

Revert "fixes #912"

This reverts commit 6237f9aa.
parent eeb13cde
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,7 @@ class Course_OverviewController extends AuthenticatedController ...@@ -75,7 +75,7 @@ class Course_OverviewController extends AuthenticatedController
$show_link = $GLOBALS["perm"]->have_studip_perm('autor', $this->course_id) && $this->course->isToolActive('schedule'); $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]); $this->times_rooms = $this->sem->getDatesTemplate('dates/seminar_html', ['link_to_dates' => $show_link, 'show_room' => true]);
// Fetch teachers // Fettch teachers
$dozenten = $this->sem->getMembers('dozent'); $dozenten = $this->sem->getMembers('dozent');
$this->num_dozenten = count($dozenten); $this->num_dozenten = count($dozenten);
$show_dozenten = []; $show_dozenten = [];
......
...@@ -25,41 +25,35 @@ ...@@ -25,41 +25,35 @@
</nav> </nav>
</header> </header>
<? foreach ($news as $new): ?> <? 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); ?> && ($new['user_id'] != $GLOBALS['user']->id); ?>
<? if ($is_new && Request::get('unread_news') === 'yes') : ?> <article class="studip toggle <?= ContentBoxHelper::classes($new->id, $is_new) ?>" id="<?= $new->id ?>" data-visiturl="<?=URLHelper::getScriptLink('dispatch.php/news/visit')?>">
<? object_add_view($new->id); <header>
object_set_visit($new->id, 'news');?> <h1>
<? endif ?> <a href="<?= ContentBoxHelper::href($new->id, ['contentbox_type' => 'news']) ?>">
<article class="studip toggle <?= ContentBoxHelper::classes($new->id, $is_new) ?>" <?= Icon::create('news') ?>
id="<?= $new->id ?>" <?= htmlReady($new['topic']); ?>
data-visiturl="<?=URLHelper::getScriptLink('dispatch.php/news/visit')?>"> </a>
<header> </h1>
<h1> <nav>
<a href="<?= ContentBoxHelper::href($new->id, ['contentbox_type' => 'news']) ?>"> <?= $this->render_partial('news/_actions.php', ['new' => $new, 'range' => $range]) ?>
<?= Icon::create('news') ?> </nav>
<?= htmlReady($new['topic']); ?> </header>
</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> <section>
<?= _('Es sind keine aktuellen Ankündigungen vorhanden. Um neue Ankündigungen zu erstellen, klicken Sie rechts auf das Plus-Zeichen.') ?> <article>
<?= formatReady($new['body']) ?>
</article>
</section> </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>
<? if ($perm && $count_all_news) : ?> <? if ($perm && $count_all_news) : ?>
<footer> <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> </footer>
<? endif; ?> <? endif; ?>
<? elseif ($perm) : ?> <? elseif ($perm) : ?>
......
...@@ -37,7 +37,6 @@ class ContentBoxHelper { ...@@ -37,7 +37,6 @@ class ContentBoxHelper {
// Check if new // Check if new
if ($is_new) { if ($is_new) {
$classes[] = 'new'; $classes[] = 'new';
$classes[] = 'open';
} }
// Return classes // Return classes
......
...@@ -41,8 +41,9 @@ class CoreOverview extends CorePlugin implements StudipModule ...@@ -41,8 +41,9 @@ class CoreOverview extends CorePlugin implements StudipModule
} }
$nav = new Navigation(_('Ankündigungen'), ''); $nav = new Navigation(_('Ankündigungen'), '');
$url_params = ['redirect_to' => 'dispatch.php/course/overview'];
if ($result['neue']) { if ($result['neue']) {
$url_params = ['unread_news' => 'yes']; $url_params['new_news'] = true;
$nav->setImage(Icon::create('news', Icon::ROLE_ATTENTION), [ $nav->setImage(Icon::create('news', Icon::ROLE_ATTENTION), [
'title' => sprintf( 'title' => sprintf(
ngettext( ngettext(
...@@ -67,8 +68,7 @@ class CoreOverview extends CorePlugin implements StudipModule ...@@ -67,8 +68,7 @@ class CoreOverview extends CorePlugin implements StudipModule
) )
]); ]);
} }
$nav->setURL('dispatch.php/course/overview', $url_params); $nav->setURL(URLHelper::getURL('', $url_params));
return $nav; return $nav;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment