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

Merge branch 'feature/tailwind-3' into feature/sass-remove

Browse Source
This commit is contained in:
Björn Fromme
2022-08-31 16:24:07 +02:00
parent 61d26591ca b1eba8e684
commit 915ad47034
26 changed files with 161 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/osm_controller.js
+3 -9
View File
@@ -36,15 +36,9 @@ export default class extends Controller {
for (let item of this.markersValue) {
const position = L.latLng(item.lat, item.lng)
const marker = L.marker(position)
if (item.externalLink) {
marker.on('click', () => {
window.open(item.externalLink, '_blank')
})
} else {
const popupContent = '<div data-rte-content=""><strong>' + item.name + '</strong><br>' + item.teaser +
'<br><a href="' + item.uri + '">zu den Details</a></div>'
marker.bindPopup(popupContent)
}
const popupContent = '<div data-rte-content=""><strong>' + item.name + '</strong><br>' + item.teaser +
'<br><a href="' + item.uri + '">zu den Details</a></div>'
marker.bindPopup(popupContent)
marker.addTo(this.map)
bounds.extend(position)
}
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
+1 -1
View File
@@ -470,7 +470,7 @@
}
},
computed: {
...mapState(['config', 'loading']),
...mapState(['config', 'loading', 'countries']),
...mapGetters(['isGroupManager']),
availableContingents () {
let filteredContingents = {};
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/AccommodationSelect.vue
+1 -3
View File
@@ -6,9 +6,7 @@
<span>
Zimmer
</span>
<svg class="w-4 h-4 transform" :class="{ 'rotate-180': visible }">
<use href="#icon-chevron-down"></use>
</svg>
<svg class="w-4 h-4" fill="none" :class="{ 'rotate-180': visible }" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>
</button>
<ul class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs divide-y" v-show="visible">
<li v-for="accommodation in selectableAccommodations" :key="accommodation.id" class="py-1">
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/CollapsiblePanel.vue
+1 -3
View File
@@ -5,9 +5,7 @@
<a role="button" href="#" class="flex items-center justify-between"
@click.prevent="expanded = !expanded">
<span>{{ title }}</span>
<svg class="w-6 h-6 transform" :class="{ 'rotate-180': expanded }">
<use href="#icon-chevron-down"></use>
</svg>
<svg class="w-6 h-6" fill="none" :class="{ 'rotate-180': expanded }" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>
</a>
</h3>
</div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ParticipantAddressForm.vue
+1 -3
View File
@@ -6,9 +6,7 @@
<span>
Telefon
</span>
<svg class="w-4 h-4 transform" :class="{ 'rotate-180': visible }">
<use href="#icon-chevron-down"></use>
</svg>
<svg class="w-4 h-4" fill="none" :class="{ 'rotate-180': visible }" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>
</button>
<div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs space-y-2" v-show="visible">
<input class="border-zinc-400 focus:border-zinc-800 ring-0 focus:ring-0 mt-1 w-full" type="text" placeholder="Mobil"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ParticipantSizesForm.vue
+1 -3
View File
@@ -4,9 +4,7 @@
<span>
Größen
</span>
<svg class="w-4 h-4 transform" :class="{ 'rotate-180': visible }">
<use href="#icon-chevron-down"></use>
</svg>
<svg class="w-4 h-4" fill="none" :class="{ 'rotate-180': visible }" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>
</button>
<div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs space-y-2" v-show="visible">
<input class="form-input w-full" type="text" placeholder="Körpergröße"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/PickupSelect.vue
+1 -3
View File
@@ -4,9 +4,7 @@
<span>
Zustieg
</span>
<svg class="w-4 h-4 transform" :class="{ 'rotate-180': visible }">
<use href="#icon-chevron-down"></use>
</svg>
<svg class="w-4 h-4" fill="none" :class="{ 'rotate-180': visible }" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>
</button>
<div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs" v-show="visible">
<div class="py-1" v-for="pickup in pickups" :key="pickup.id">
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServiceSelect.vue
+7 -4
View File
@@ -4,11 +4,14 @@
<span>
{{ subType.label }}
</span>
<svg class="w-4 h-4 transform" :class="{ 'rotate-180': visible }">
<use href="#icon-chevron-down"></use>
</svg>
<svg class="w-4 h-4" fill="none" :class="{ 'rotate-180': visible }" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path></svg>
</button>
<div class="absolute top-100 left-0 z-50 mt-4 border shadow-md p-4 bg-white w-screen max-w-xs" v-show="visible">
<div class="absolute top-100 left-0 z-50 mt-1 border shadow-md p-4 bg-white w-screen max-w-xs" v-show="visible">
<div class="text-right">
<button type="button" @click="visible = false">
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path></svg>
</button>
</div>
<div class="py-1" v-for="service in availableServices" :key="service.id">
<label class="inline-flex items-center text-sm">
<input type="checkbox"
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html
+1 -1
View File
@@ -8,7 +8,7 @@
<h2 class="text-base font-bold mb-1">
<f:if condition="{title}">
<f:then>
Skiurlaub {title} Facts
{title}
</f:then>
<f:else>
Facts
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Details.html
+8 -6
View File
@@ -15,12 +15,14 @@
</f:else>
</f:if>
{hotel.description -> f:format.html()}
<f:if condition="{hotel.groupsPriceConfigs}">
<f:else>
<f:link.typolink class="button bg-button" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}">
<f:translate key="tx_eptheme.label.to_inquiry_form" extensionName="ep_theme"/>
</f:link.typolink>
</f:else>
<f:if condition="{showInquiryForm}">
<f:if condition="{hotel.groupsPriceConfigs}">
<f:else>
<f:link.typolink class="button bg-button" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}">
<f:translate key="tx_eptheme.label.to_inquiry_form" extensionName="ep_theme"/>
</f:link.typolink>
</f:else>
</f:if>
</f:if>
</div>
<f:if condition="{teasers}">
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html
+1 -1
View File
@@ -37,7 +37,7 @@
{hotel.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
<f:if condition="{hotel.available} != -1">
<span class="teaserbox__price">
<strong>{f:if(condition: '{hotel.available} > 0', then: 'ab {hotel.minPrice} €', else: 'bald buchbar')}</strong>
<strong>{f:if(condition: '{hotel.available} > 0', then: 'ab {hotel.minPrice} €', else: 'aktuell nicht buchbar')}</strong>
</span>
</f:if>
</div>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
+9 -9
View File
@@ -52,6 +52,12 @@
<svg class="product-teaser__watchlist-icon" data-watchlist-toggle-target="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"></path></svg>
</button>
</div>
<f:if condition="{concept.code} == 'evt'">
<div class="absolute bottom-0 left-0 inset-x-0 flex justify-between text-white {f:if(condition: landscape, else: 'text-sm')} bg-concept-evt/70 px-2 py-1">
<span>{hotel.name}</span>
<span class="uppercase">{hotel.category}</span>
</div>
</f:if>
</div>
</f:section>
@@ -71,24 +77,18 @@
<ul class="product-teaser__list-included flex-1 list-none m-0 text-zinc-800 divide-y divide-zinc-400">
<li class="flex items-center space-x-1 py-1">
{ep:icon(class: 'w-6 h-6 text-ep-primary-light', icon: 'check')}
<span class="block flex-1 leading-none">
{f:if(condition: '{season} == "s"', then: 'Bergbahnticket', else: 'Skipass')}
</span>
<span class="block flex-1 leading-none">{f:if(condition: '{season} == "s"', then: 'Bergbahnticket', else: 'Skipass')}</span>
</li>
<f:if condition="{product.feature}">
<li class="flex items-center space-x-1 py-1">
{ep:icon(class: 'w-6 h-6 text-ep-primary-light', icon: 'check')}
<span class="block flex-1 leading-tight">
{product.feature}
</span>
<span class="block flex-1 leading-tight">{product.feature}</span>
</li>
</f:if>
<f:if condition="{board}">
<li class="flex items-center space-x-1 py-1">
{ep:icon(class: 'w-6 h-6 text-ep-primary-light', icon: 'check')}
<span class="block flex-1 leading-tight">
{board}
</span>
<span class="block flex-1 leading-tight">Verpflegung</span>
</li>
</f:if>
</ul>
public/typo3conf/ext/ep_theme/Resources/Private/Templates/City/Detail.html
+6 -1
View File
@@ -75,7 +75,7 @@
</div>
<f:if condition="{settings.hideMoreLink}">
<f:else>
<f:link.typolink class="button bg-button"
<f:link.typolink class="button bg-button ml-4"
parameter="{settings.defaultSearchPageUid}"
additionalParams="f={filterSettings -> ep:filterSettingsEncoder()}"
additionalAttributes="{rel: 'nofollow'}">
@@ -84,6 +84,11 @@
</f:else>
</f:if>
</f:if>
<f:if condition="{city.descriptionExtended}">
<div class="p-4 mt-4" data-rte-content>
{city.descriptionExtended -> f:format.html()}
</div>
</f:if>
</div>
<div class="col-span-3 lg:col-span-1">
<f:if condition="{teasers}">
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+2 -1
View File
@@ -170,10 +170,11 @@
</f:section>
<f:section name="Hotel">
<div class="mb-4{f:if(condition: settings.hotelOnTop, else: ' hidden')}"
data-tabs-target="tab"
data-tab="hotel">
<f:render partial="Hotel/Details" arguments="{hotel: hotel, bars: 1, showNonBookableHint: 0, currentPageUid: currentPageUid}"/>
<f:render partial="Hotel/Details" arguments="{hotel: hotel, bars: 1, showNonBookableHint: 0, currentPageUid: currentPageUid, showInquiryForm: isProductWithGroupInquiryForm}"/>
</div>
</f:section>
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
+1 -1
View File
@@ -32,7 +32,7 @@
<f:if condition="{teasers}">
<p class="hidden lg:block">
<button type="button"
class="button bg-button w-full mb-8"
class="button bg-button w-full mb-8 ml-4"
data-controller="scroll-to"
data-scroll-to-target-value="teasers"
data-action="scroll-to#scroll">