Skip to content

Commit c24fe18

Browse files
chfsxAmstutz
authored andcommitted
[FIX] 0043696: Failed test: HTML des Mediacasts ist valide (KS System MessagError: Element p not allowed as child of element span...) (#9754)
(cherry picked from commit 5ac52d1)
1 parent dfb2df3 commit c24fe18

File tree

4 files changed

+23
-14
lines changed

4 files changed

+23
-14
lines changed

components/ILIAS/UI/src/templates/default/MainControls/tpl.system_info.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div id="{ID}" class="container-fluid il-system-info il-system-info-{DENOTATION}" data-close-uri="{CLOSE_URI}" {ROLE} {LIVE} aria-labelledby="{ID}_headline" aria-describedby="{ID}_description">
22
<div class="il-system-info-content-wrapper">
33
<div class="il-system-info-content">
4-
<span id="{ID}_headline" class="il-system-info-headline">{HEADLINE}</span>
5-
<span id="{ID}_description" class="il-system-info-body">{BODY}</span>
4+
<div id="{ID}_headline" class="il-system-info-headline">{HEADLINE}</div>
5+
<div id="{ID}_description" class="il-system-info-body">{BODY}</div>
66
</div>
77
</div>
88
<div class="il-system-info-actions">

components/ILIAS/UI/tests/Component/MainControls/SystemInfoTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public function testRenderingDefault(): void
5454
<div id="id" class="container-fluid il-system-info il-system-info-neutral" data-close-uri="" aria-live="polite" aria-labelledby="id_headline" aria-describedby="id_description">
5555
<div class="il-system-info-content-wrapper">
5656
<div class="il-system-info-content">
57-
<span id="id_headline" class="il-system-info-headline">$headline</span>
58-
<span id="id_description" class="il-system-info-body">$information</span>
57+
<div id="id_headline" class="il-system-info-headline">$headline</div>
58+
<div id="id_description" class="il-system-info-body">$information</div>
5959
</div>
6060
</div>
6161
<div class="il-system-info-actions">
@@ -87,8 +87,8 @@ public function testRenderingNeutral(): void
8787
<div id="id" class="container-fluid il-system-info il-system-info-neutral" data-close-uri="" aria-live="polite" aria-labelledby="id_headline" aria-describedby="id_description">
8888
<div class="il-system-info-content-wrapper">
8989
<div class="il-system-info-content">
90-
<span id="id_headline" class="il-system-info-headline">$headline</span>
91-
<span id="id_description" class="il-system-info-body">$information</span>
90+
<div id="id_headline" class="il-system-info-headline">$headline</div>
91+
<div id="id_description" class="il-system-info-body">$information</div>
9292
</div>
9393
</div>
9494
<div class="il-system-info-actions">
@@ -120,8 +120,8 @@ public function testRenderingImportant(): void
120120
<div id="id" class="container-fluid il-system-info il-system-info-important" data-close-uri="" aria-live="polite" aria-labelledby="id_headline" aria-describedby="id_description">
121121
<div class="il-system-info-content-wrapper">
122122
<div class="il-system-info-content">
123-
<span id="id_headline" class="il-system-info-headline">$headline</span>
124-
<span id="id_description" class="il-system-info-body">$information</span>
123+
<div id="id_headline" class="il-system-info-headline">$headline</div>
124+
<div id="id_description" class="il-system-info-body">$information</div>
125125
</div>
126126
</div>
127127
<div class="il-system-info-actions">
@@ -152,8 +152,8 @@ public function testRenderingBreaking(): void
152152
<div id="id" class="container-fluid il-system-info il-system-info-breaking" data-close-uri="" role="alert" aria-labelledby="id_headline" aria-describedby="id_description">
153153
<div class="il-system-info-content-wrapper">
154154
<div class="il-system-info-content">
155-
<span id="id_headline" class="il-system-info-headline">$headline</span>
156-
<span id="id_description" class="il-system-info-body">$information</span>
155+
<div id="id_headline" class="il-system-info-headline">$headline</div>
156+
<div id="id_description" class="il-system-info-body">$information</div>
157157
</div>
158158
</div>
159159
<div class="il-system-info-actions">
@@ -187,8 +187,8 @@ public function testRenderingCloseAction(): void
187187
<div id="id" class="container-fluid il-system-info il-system-info-neutral" data-close-uri="$uri_string" aria-live="polite" aria-labelledby="id_headline" aria-describedby="id_description">
188188
<div class="il-system-info-content-wrapper">
189189
<div class="il-system-info-content">
190-
<span id="id_headline" class="il-system-info-headline">$headline</span>
191-
<span id="id_description" class="il-system-info-body">$information</span>
190+
<div id="id_headline" class="il-system-info-headline">$headline</div>
191+
<div id="id_description" class="il-system-info-body">$information</div>
192192
</div>
193193
</div>
194194
<div class="il-system-info-actions">

templates/default/070-components/UI-framework/MainControls/_ui-component_system_info.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,13 @@ $il-standard-page-system-info-color-variant-breaking: darken($il-danger-color, 1
9393
flex-basis: auto;
9494
overflow: hidden;
9595

96-
span.il-system-info-headline {
96+
// System Info Content may contain HTML, so we need to use divs instead of spans. with this, we display the content
97+
// inline as it was using spans.
98+
div.il-system-info-headline, div.il-system-info-body {
99+
display: inline;
100+
}
101+
102+
div.il-system-info-headline {
97103
text-transform: $il-standard-page-system-info-headline-transform;
98104
font-weight: $il-standard-page-system-info-headline-font-weight;
99105
margin-right: $il-margin-base-horizontal;

templates/default/delos.css

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)