Skip to content

[FIX] #47001 UI: Reimplements legacy presentation table important field listing #10993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matheuszych wants to merge 1 commit into
base: release_11
Choose a base branch
from
+32 −27
Open

[FIX] #47001 UI: Reimplements legacy presentation table important field listing #10993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions components/ILIAS/UI/src/examples/Table/Presentation/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function ($row, $record, $ui_factory, $environment) use ($modal) { //mapping-clo
array(
$record['begin_date'],
$record['location'],
'Available Slots: ' => $record['bookings_available']
'Available Slots' => $record['bookings_available']
)
)

Expand All @@ -90,11 +90,11 @@ function ($row, $record, $ui_factory, $environment) use ($modal) { //mapping-clo
->withFurtherFieldsHeadline('Detailed Information')
->withFurtherFields(
array(
'Location: ' => $record['location'],
'Location' => $record['location'],
$record['address'],
'Date: ' => $record['date'],
'Available Slots: ' => $record['bookings_available'],
'Fee: ' => $record['fee']
'Date' => $record['date'],
'Available Slots' => $record['bookings_available'],
'Fee' => $record['fee']
)
)
->withAction(
Expand Down
24 changes: 13 additions & 11 deletions components/ILIAS/UI/src/templates/default/Table/tpl.presentationrow.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,20 @@ <h4 class="il-table-presentation-row-header-headline" onClick="$(document).trigg
</h4>

<div class="il-table-presentation-row-header-fields">
<!-- BEGIN important_field -->
<div class="l-bar__space-keeper">
<div class="l-bar__group">
<!-- BEGIN important_field_label -->
<div class="il-table-presentation-row-header-fields-label l-bar__element">{IMPORTANT_FIELD_LABEL}</div>
<!-- END important_field_label -->
<!-- BEGIN important_field_value -->
<div class="il-table-presentation-row-header-fields-value l-bar__element">{IMPORTANT_FIELD_VALUE}</div>
<!-- END important_field_value -->
<dl>
<!-- BEGIN important_field -->
<div class="l-bar__space-keeper">
<div class="l-bar__group">
<!-- BEGIN important_field_label -->
<dt class="il-table-presentation-row-header-fields-label l-bar__element">{IMPORTANT_FIELD_LABEL}</dt>
<!-- END important_field_label -->
<!-- BEGIN important_field_value -->
<dd class="il-table-presentation-row-header-fields-value l-bar__element">{IMPORTANT_FIELD_VALUE}</dd>
<!-- END important_field_value -->
</div>
</div>
</div>
<!-- END important_field -->
<!-- END important_field -->
</dl>
{SHY_EXPANDER}
</div>
</div>
Expand Down
21 changes: 12 additions & 9 deletions components/ILIAS/UI/tests/Component/Table/PresentationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,18 @@ public function testFullRendering(): void
<h4 class="il-table-presentation-row-header-headline" onClick="$(document).trigger('il_signal...');">some title<br /><small>some type</small>
</h4>
<div class="il-table-presentation-row-header-fields">
<div class="l-bar__space-keeper">
<div class="l-bar__group">
<div class="il-table-presentation-row-header-fields-value l-bar__element">important-1</div>
<dl>
<div class="l-bar__space-keeper">
<div class="l-bar__group">
<dd class="il-table-presentation-row-header-fields-value l-bar__element">important-1</dd>
</div>
</div>
</div>
<div class="l-bar__space-keeper">
<div class="l-bar__group">
<div class="il-table-presentation-row-header-fields-value l-bar__element">important-2</div>
<div class="l-bar__space-keeper">
<div class="l-bar__group">
<dd class="il-table-presentation-row-header-fields-value l-bar__element">important-2</dd>
</div>
</div>
</div>
</dl>
<button class="btn btn-link" id="id_7">presentation_table_more</button>
</div>
</div>
Expand Down Expand Up @@ -281,7 +283,8 @@ public function testMinimalRendering(): void
<div class="row">
<div class="il-table-presentation-row-header col-lg col-sm-12">
<h4 class="il-table-presentation-row-header-headline" onClick="$(document).trigger('il_signal...');">some title</h4>
<div class="il-table-presentation-row-header-fields">
<div class="il-table-presentation-row-header-fields">
<dl></dl>
<button class="btn btn-link" id="id_7">presentation_table_more</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/default/070-components/UI-framework/Table/_ui-component_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ $il-table-presentation-details-viewcontrols-btn-bg: white;
// add : to both importantfields and desclist keys
.il-table-presentation-row-header-fields-label::after,
.il-table-presentation-desclist .il-listing-characteristic-value-label::after {
content: ":";
content: ":\00a0";
}

.il-table-presentation-row-expanded {
Expand Down
2 changes: 1 addition & 1 deletion templates/default/delos.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11914,7 +11914,7 @@ div.alert ul {
}
.il-table-presentation-row .il-table-presentation-row-header-fields-label::after,
.il-table-presentation-row .il-table-presentation-desclist .il-listing-characteristic-value-label::after {
content: ":";
content: ":\00a0";
}
.il-table-presentation-row .il-table-presentation-row-expanded {
margin-top: 6px;
Expand Down