diff options
| author | Michaela Brückner <brueckner@data-quest.de> | 2024-05-17 13:42:01 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-05-17 13:42:01 +0000 |
| commit | c19d75ac88d74ec9ff602cdf3344b861b49a3d75 (patch) | |
| tree | 19dd9e64215f1d3851f29b275d7942530cd6adb0 | |
| parent | 364005681b3ec2e6e9b50ce8762e3ca83ba5e601 (diff) | |
Resolve "Listenelemente sind nicht syntaktisch korrekt ausgezeichnet"
Closes #4088
Merge request studip/studip!2929
| -rw-r--r-- | app/views/profile/seminare.php | 25 | ||||
| -rw-r--r-- | resources/assets/stylesheets/scss/lists.scss | 13 | ||||
| -rw-r--r-- | resources/assets/stylesheets/studip.scss | 2 | ||||
| -rw-r--r-- | templates/start/quickselection.php | 29 |
4 files changed, 43 insertions, 26 deletions
diff --git a/app/views/profile/seminare.php b/app/views/profile/seminare.php index b218eca..1d1c7c7 100644 --- a/app/views/profile/seminare.php +++ b/app/views/profile/seminare.php @@ -6,17 +6,20 @@ </header> <section> - <? foreach ($seminare as $semester => $seminar) :?> - <b><?= htmlReady($semester) ?></b><br> - - <? 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> + <? foreach ($seminare as $semester => $seminar) : ?> + <b><?= htmlReady($semester) ?></b><br> + <ul class="clean"> + <? foreach ($seminar as $one) : ?> + <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 6de2004..80796b7 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/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss index 037aad4..0f329a4 100644 --- a/resources/assets/stylesheets/studip.scss +++ b/resources/assets/stylesheets/studip.scss @@ -243,8 +243,6 @@ ol.clean { padding: 5px; } - - .minor { color: var(--black); font-size: 0.75em; diff --git a/templates/start/quickselection.php b/templates/start/quickselection.php index e465d8d..bcf3fb3 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> |
