From 3e2dfdacfd9673177d8c3643a585c4d894e19078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Fri, 17 May 2024 13:42:01 +0000
Subject: [PATCH] Resolve "Listenelemente sind nicht syntaktisch korrekt
ausgezeichnet"
Closes #4088
Merge request studip/studip!2929
---
app/views/profile/seminare.php | 18 +++++++-----
resources/assets/stylesheets/scss/lists.scss | 13 +++++++++
templates/start/quickselection.php | 29 +++++++++++---------
3 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/app/views/profile/seminare.php b/app/views/profile/seminare.php
index acb67140306..1c60e431507 100644
--- a/app/views/profile/seminare.php
+++ b/app/views/profile/seminare.php
@@ -9,14 +9,18 @@
<? foreach ($seminare as $semester => $seminar) :?>
<b><?= htmlReady($semester) ?></b><br>
+ <ul class="clean">
<? foreach ($seminar as $one) :?>
- <a href="<?= URLHelper::getScriptLink('dispatch.php/course/details', ['sem_id' => $one->id])?>">
- <?= htmlReady($one->getFullname('number-name')) ?>
- <? if ($one->start_semester !== $one->end_semester) : ?>
- (<?= htmlReady($one->getFullname('sem-duration-name')) ?>)
- <? endif ?>
- </a><br>
+ <li>
+ <a href="<?= URLHelper::getScriptLink('dispatch.php/course/details', ['sem_id' => $one->id])?>">
+ <?= htmlReady($one->getFullname('number-name')) ?>
+ <? if ($one->start_semester !== $one->end_semester) : ?>
+ (<?= htmlReady($one->getFullname('sem-duration-name')) ?>)
+ <? endif ?>
+ </a>
+ </li>
<?endforeach?>
+ </ul>
<?endforeach?>
</section>
-</article>
\ No newline at end of file
+</article>
diff --git a/resources/assets/stylesheets/scss/lists.scss b/resources/assets/stylesheets/scss/lists.scss
index 6de20041502..80796b72a6f 100644
--- a/resources/assets/stylesheets/scss/lists.scss
+++ b/resources/assets/stylesheets/scss/lists.scss
@@ -66,6 +66,19 @@ ol {
}
}
+.list-slash-separated-small {
+ @extend .list-csv;
+
+ > li {
+ padding-right: 0;
+ font-size: small;
+
+ &::after {
+ content: "/";
+ }
+ }
+}
+
dl {
dt {
font-weight: bold;
diff --git a/templates/start/quickselection.php b/templates/start/quickselection.php
index e465d8d0dbd..bcf3fb383a1 100644
--- a/templates/start/quickselection.php
+++ b/templates/start/quickselection.php
@@ -1,28 +1,31 @@
<div id="quickSelectionWrap" style="padding: 1ex;">
<? foreach ($navigation as $nav) : ?>
<? if ($nav->isVisible()) : ?>
- <div class="mainmenu">
+ <ul class="mainmenu list-unstyled">
<? if (is_internal_url($url = $nav->getURL())) : ?>
- <a href="<?= URLHelper::getLink($url) ?>">
+ <li><a href="<?= URLHelper::getLink($url) ?>">
<? else : ?>
- <a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
+ <li><a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
<? endif ?>
- <?= htmlReady($nav->getTitle()) ?></a>
- <? $pos = 0 ?>
+ <?= htmlReady($nav->getTitle()) ?></a></li>
+
+ <li>
+ <ul class="list-slash-separated-small">
<? foreach ($nav as $subnav) : ?>
<? if ($subnav->isVisible()) : ?>
- <font size="-1">
- <?= $pos++ ? ' / ' : '<br>' ?>
+ <li>
<? if (is_internal_url($url = $subnav->getURL())) : ?>
- <a href="<?= URLHelper::getLink($url) ?>">
- <? else : ?>
+ <a href="<?= URLHelper::getLink($url) ?>">
+ <? else : ?>
<a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
- <? endif ?>
- <?= htmlReady($subnav->getTitle()) ?></a>
- </font>
+ <? endif ?>
+ <?= htmlReady($subnav->getTitle()) ?></a>
+ </li>
<? endif ?>
<? endforeach ?>
- </div>
+ </ul>
+ </li>
+ </ul>
<? endif ?>
<? endforeach ?>
</div>
--
GitLab