aboutsummaryrefslogtreecommitdiff
path: root/app/views/news
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/news')
-rw-r--r--app/views/news/_actions.php9
-rw-r--r--app/views/news/admin_news.php84
-rw-r--r--app/views/news/display.php14
3 files changed, 69 insertions, 38 deletions
diff --git a/app/views/news/_actions.php b/app/views/news/_actions.php
index 343cd10..d67de26 100644
--- a/app/views/news/_actions.php
+++ b/app/views/news/_actions.php
@@ -37,16 +37,19 @@ if ($new['allow_comments']) :
<? if ($new->havePermission('edit')): ?>
- <a href="<?= URLHelper::getLink('dispatch.php/news/edit_news/' . $new->id) ?>" data-dialog>
+ <a href="<?= URLHelper::getLink('dispatch.php/news/edit_news/' . $new->id) ?>" data-dialog
+ title="<?= _('Bearbeiten') ?>" aria-label="<?= _('Bearbeiten') ?>">
<?= Icon::create('edit') ?>
</a>
<? if ($new->havePermission('unassign', $range)): ?>
- <a href=" <?= URLHelper::getLink('', ['remove_news' => $new->id, 'news_range' => $range]) ?>" >
+ <a href=" <?= URLHelper::getLink('', ['remove_news' => $new->id, 'news_range' => $range]) ?>"
+ title="<?= _('Nicht mehr abonnieren') ?>" aria-label="<?= _('Nicht mehr abonnieren') ?>">
<?= Icon::create('remove') ?>
</a>
<? endif; ?>
<? if ($new->havePermission('delete')): ?>
- <a href=" <?= URLHelper::getLink('', ['delete_news' => $new->id]) ?>" >
+ <a href=" <?= URLHelper::getLink('', ['delete_news' => $new->id]) ?>"
+ title="<?= _('Löschen') ?>" aria-label="<?= _('Löschen') ?>">
<?= Icon::create('trash') ?>
</a>
<? endif; ?>
diff --git a/app/views/news/admin_news.php b/app/views/news/admin_news.php
index 0376083..e12047a 100644
--- a/app/views/news/admin_news.php
+++ b/app/views/news/admin_news.php
@@ -1,24 +1,36 @@
-<? use Studip\Button, Studip\LinkButton; ?>
+<?php
+/**
+ * @var NewsController $controller
+ * @var string $area_type
+ * @var Trails\Flash $flash
+ * @var string $news_searchterm
+ * @var string $news_startdate
+ * @var string $news_enddate
+ * @var string|null $filter_text
+ * @var array<string, array<string, array{title: string, object: StudipNews}>> $news_items
+ * @var array $area_structure
+ */
+?>
<? if (!empty($flash['question_text'])) : ?>
-<?= QuestionBox::create(
- htmlReady($flash['question_text']),
- $controller->url_for('news/admin_news/' . $area_type, array_merge(
- $flash['question_param'],
- [
+ <?= QuestionBox::create(
+ htmlReady($flash['question_text']),
+ $controller->url_for('news/admin_news/' . $area_type, array_merge(
+ $flash['question_param'],
+ [
+ 'news_filter_term' => htmlReady($news_searchterm),
+ 'news_filter_start' => $news_startdate,
+ 'news_filter_end' => $news_enddate,
+ 'news_filter' => 'set'
+ ]
+ )),
+ $controller->url_for('news/admin_news/' . $area_type, [
'news_filter_term' => htmlReady($news_searchterm),
'news_filter_start' => $news_startdate,
'news_filter_end' => $news_enddate,
'news_filter' => 'set'
- ]
- )),
- $controller->url_for('news/admin_news/' . $area_type, [
- 'news_filter_term' => htmlReady($news_searchterm),
- 'news_filter_start' => $news_startdate,
- 'news_filter_end' => $news_enddate,
- 'news_filter' => 'set'
- ])
- );
-?>
+ ])
+ );
+ ?>
<? endif ?>
<form action="<?= $controller->link_for('news/admin_news/' . $area_type) ?>" id="admin_news_form" class="default" method="post">
@@ -52,9 +64,9 @@
</label>
</fieldset>
<footer>
- <?= Button::create(_('Filter anwenden'), 'apply_news_filter', ['aria-label' => _('Liste mit Suchbegriff und/oder Zeitraum filtern')]) ?>
+ <?= Studip\Button::create(_('Filter anwenden'), 'apply_news_filter', ['aria-label' => _('Liste mit Suchbegriff und/oder Zeitraum filtern')]) ?>
<? if ($filter_text) : ?>
- <?= Button::create(_('Filter zurücksetzen'), 'reset_filter') ?>
+ <?= Studip\Button::create(_('Filter zurücksetzen'), 'reset_filter') ?>
<? endif ?>
</footer>
<br>
@@ -74,12 +86,13 @@
</caption>
<? endif ?>
<colgroup>
- <col width="20">
+ <col style="width: 20px">
<col>
- <col width="25%">
- <col width="10%">
- <col width="10%">
- <col width="80">
+ <col style="width: 25%">
+ <col style="width: 10%">
+ <col style="width: 10%">
+ <col style="width: 5%">
+ <col style="width: 80px">
</colgroup>
<thead>
<tr>
@@ -88,6 +101,7 @@
<th><?= _('Autor') ?></th>
<th><?= _('Einstelldatum') ?></th>
<th><?= _('Ablaufdatum') ?></th>
+ <th><?= _('Aufrufe') ?></th>
<th class="actions"><?= _('Aktion') ?></th>
</tr>
</thead>
@@ -99,18 +113,18 @@
<tr>
<th>
<input type="checkbox"
- data-proxyfor=".news_<?= $news['range_id'] ?>"
+ data-proxyfor=".news_<?= htmlReady($news['range_id']) ?>"
aria-labelledby="<?= _('Alle auswählen') ?>">
</th>
- <th colspan="5"><?= mila(htmlReady($news['title'] ?? '')) . ' ' . htmlReady($news['semester'] ?? '') ?></th>
+ <th colspan="6"><?= mila(htmlReady($news['title'] ?? '')) . ' ' . htmlReady($news['semester'] ?? '') ?></th>
</tr>
<? endif ?>
<? $last_title = $title ?>
<? endif ?>
<tr>
<td>
- <input type="checkbox" class="news_<?= $news['range_id'] ?>" name="mark_news[]"
- value="<?= $news['object']->news_id . '_' . $news['range_id'] ?>"
+ <input type="checkbox" class="news_<?= htmlReady($news['range_id']) ?>" name="mark_news[]"
+ value="<?= htmlReady($news['object']->news_id . '_' . $news['range_id']) ?>"
aria-label="<?= _('Diese Ankündigung zum Entfernen vormerken') ?>" <?= tooltip(_("Diese Ankündigung zum Entfernen vormerken"), false) ?>>
</td>
<td><?= htmlReady($news['object']->topic) ?></td>
@@ -119,9 +133,19 @@
$body = $parts[0];
$admin_msg = $parts[1] ?? ';'
?>
- <td><?= htmlReady($news['object']->author) ?></td>
+ <td>
+ <? if ($news['object']->owner): ?>
+ <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => $news['object']->owner->username]) ?>">
+ <?= Avatar::getAvatar($news['object']->user_id)->getImageTag(Avatar::SMALL) ?>
+ <?= htmlReady($news['object']->owner->getFullName()) ?>
+ </a>
+ <? else: ?>
+ <?= htmlReady($news['object']->author) ?>
+ <? endif; ?>
+ </td>
<td><?= strftime("%d.%m.%y", $news['object']->date) ?></td>
<td><?= strftime("%d.%m.%y", $news['object']->date + $news['object']->expire) ?></td>
+ <td><?= $news['object']->views ?></td>
<td class="actions">
<?
$menu = ActionMenu::get()->setContext($news['object']->topic);
@@ -158,8 +182,8 @@
</tbody>
<tfoot>
<tr>
- <td colspan="6">
- <?= Button::create(_('Alle markierten Ankündigungen entfernen'), 'remove_marked_news') ?>
+ <td colspan="7">
+ <?= Studip\Button::create(_('Alle markierten Ankündigungen entfernen'), 'remove_marked_news') ?>
</td>
</tr>
</tfoot>
diff --git a/app/views/news/display.php b/app/views/news/display.php
index 356ec1f..5f62443 100644
--- a/app/views/news/display.php
+++ b/app/views/news/display.php
@@ -8,18 +8,22 @@
</h1>
<nav>
<? if ($perm): ?>
- <a href="<?= $controller->link_for('news/edit_news/new/' . $range); ?>" data-dialog>
+ <a href="<?= $controller->link_for('news/edit_news/new/' . $range); ?>" data-dialog
+ title="<?= _('Hinzufügen') ?>" aria-label="<?= _('Hinzufügen') ?>">
<?= Icon::create('add') ?>
</a>
<? endif; ?>
<? if ($perm && Config::get()->NEWS_RSS_EXPORT_ENABLE): ?>
- <a data-dialog="size=auto;reload-on-close" title="<?=_('RSS-Feed konfigurieren') ?>" href="<?= $controller->link_for('news/rss_config/' . $range); ?>">
+ <a data-dialog="size=auto;reload-on-close" title="<?=_('RSS-Feed konfigurieren') ?>"
+ aria-label="<?=_('RSS-Feed konfigurieren') ?>"
+ href="<?= $controller->link_for('news/rss_config/' . $range); ?>">
<?= Icon::create('admin') ?>
</a>
<? endif; ?>
<? if ($rss_id): ?>
- <a href="<?= URLHelper::getLink('rss.php', ['id' => $rss_id]) ?>">
- <?= Icon::create('rss')->asImg(['title' => _('RSS-Feed')]) ?>
+ <a href="<?= URLHelper::getLink('rss.php', ['id' => $rss_id]) ?>"
+ title="<?= _('RSS-Feed') ?>" aria-label="<?= _('RSS-Feed') ?>">
+ <?= Icon::create('rss') ?>
</a>
<? endif; ?>
</nav>
@@ -49,7 +53,7 @@
<? endforeach; ?>
<? if (!$news): ?>
<section>
- <?= _('Es sind keine aktuellen Ankündigungen vorhanden. Um neue Ankündigungen zu erstellen, klicken Sie rechts auf das Plus-Zeichen.') ?>
+ <?= _('Es sind aktuell keine Ankündigungen vorhanden. Nutzen Sie die Funktion „Hinzufügen“, um eine neue Ankündigung zu erstellen.') ?>
</section>
<? if ($perm && $count_all_news) : ?>
<footer>
generated by cgit v1.0 at 2026-05-29 17:54:41 +0000