Skip to content
Snippets Groups Projects
Commit bba69ab3 authored by Rasmus Fuhse's avatar Rasmus Fuhse
Browse files

Resolve "Gesetzte Information via ContentBar::setInfo() gehen verloren"

Closes #3565

Merge request studip/studip!2448
parent c1007032
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
background-color: var(--dark-gray-color-5); background-color: var(--dark-gray-color-5);
border: solid thin var(--dark-gray-color-30); border: solid thin var(--dark-gray-color-30);
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: nowrap;
height: auto; height: auto;
justify-content: flex-start; justify-content: flex-start;
margin-bottom: 15px; margin-bottom: 15px;
...@@ -70,10 +70,15 @@ ...@@ -70,10 +70,15 @@
} }
.contentbar-wrapper-right { .contentbar-wrapper-right {
align-items: center;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
position: relative; position: relative;
.contentbar-info {
flex: 0 1 auto;
}
.contentbar-button-wrapper { .contentbar-button-wrapper {
height: 24px; height: 24px;
margin: 0 7px; margin: 0 7px;
......
<?php
/**
* @var TOCItem $toc
* @var Icon $icon
* @var Flexi_Template $breadcrumbs
* @var string $info
* @var ActionMenu $actionMenu
* @var Flexi_Template $ttpl
*/
?>
<section> <section>
<header class="contentbar"> <header class="contentbar">
<nav class="contentbar-nav"></nav> <nav class="contentbar-nav"></nav>
<div class="contentbar-wrapper-left"> <div class="contentbar-wrapper-left">
<nav class="contentbar-breadcrumb"> <nav class="contentbar-breadcrumb">
<? if (!$toc->isActive()) : ?> <? if (!$toc->isActive()) : ?>
<a href="<?= $toc->getUrl() ?>" title="<?= htmlReady($toc->getTitle()) ?>" class="contentbar-icon"> <a href="<?= $toc->getUrl() ?>" title="<?= htmlReady($toc->getTitle()) ?>" class="contentbar-icon">
<? endif ?> <? endif ?>
<?= $icon->asImg(24, ['class' => 'text-bottom']) ?> <?= $icon->asImg(24, ['class' => 'text-bottom']) ?>
<? if (!$toc->isActive()) : ?> <? if (!$toc->isActive()) : ?>
</a> </a>
<? endif ?> <? endif ?>
<?= $breadcrumbs->render() ?> <?= $breadcrumbs->render() ?>
</nav> </nav>
</div> </div>
<div class="contentbar-wrapper-right"> <div class="contentbar-wrapper-right">
<? if (trim($info)): ?>
<div class="contentbar-info"><?= $info ?></div>
<? endif; ?>
<? if ($toc->hasChildren()) : ?> <? if ($toc->hasChildren()) : ?>
<div class="contentbar-button-wrapper contentbar-toc-wrapper"> <div class="contentbar-button-wrapper contentbar-toc-wrapper">
<input type="checkbox" id="cb-toc"> <input type="checkbox" id="cb-toc">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment