EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2019.09-07'

Browse Source
This commit is contained in:
Björn Fromme
2019-09-16 13:57:24 +02:00
parent 56407a2c5c 9fb363d9ca
commit 0529cdfc09
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/rte.scss
+1
View File
@@ -289,5 +289,6 @@ h3 {
border-radius: 8px; border-radius: 8px;
line-height: 16px; line-height: 16px;
font-size: 14px; font-size: 14px;
text-align: center;
} }
} }
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/EventPriceTable.vue
+2 -2
View File
@@ -44,8 +44,8 @@
required: true required: true
}, },
partnerIds: { partnerIds: {
type: Object, type: Array,
required: true default: []
}, },
label: { label: {
type: String, type: String,
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_tables.scss
+4
View File
@@ -28,6 +28,10 @@
} }
} }
& .pricetable__section td {
background-color: $color-grey-lighter;
line-height: 32px;
}
} }
.pricetable__room-label { .pricetable__room-label {
public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/EventPricetable.html
+5 -8
View File
@@ -8,16 +8,13 @@
<f:section name="Main"> <f:section name="Main">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped pricetable"> <table class="table table-striped pricetable">
<tr>
<th>Apartments</th>
<f:for each="{roomTypesLabels}" as="type">
<th>{type}</th>
</f:for>
</tr>
<f:for each="{categories}" as="category" key="categoryKey"> <f:for each="{categories}" as="category" key="categoryKey">
<f:if condition="{v:variable.get(name: 'pricetable.{categoryKey}', useRawKeys: 1) -> f:count()} > 0"> <f:if condition="{v:variable.get(name: 'pricetable.{categoryKey}', useRawKeys: 1) -> f:count()} > 0">
<tr> <tr class="pricetable__section">
<td colspan="{roomTypesPax -> f:count() -> v:math.sum(b: 1)}"><strong>{category}</strong></td> <td><strong>Apartments {category}</strong></td>
<f:for each="{roomTypesLabels}" as="type">
<td>{type}</td>
</f:for>
</tr> </tr>
<f:for each="{v:variable.get(name: 'pricetable.{categoryKey}', useRawKeys: 1)}" as="row"> <f:for each="{v:variable.get(name: 'pricetable.{categoryKey}', useRawKeys: 1)}" as="row">
<tr> <tr>