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

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2022-06-29 11:21:44 +02:00
parent 7e7d58d026 7997fb7140
commit d8fe880da9
13 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Address.vue
+1 -1
View File
@@ -51,7 +51,7 @@
</form-group> </form-group>
</div> </div>
<div class="col-span-1 md:col-span2"> <div class="col-span-1 md:col-span2">
<button type="submit" class="button" :disabled="loading"> <button type="submit" class="button bg-button" :disabled="loading">
Speichern Speichern
</button> </button>
</div> </div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/BookingEdit.vue
+4 -4
View File
@@ -48,10 +48,10 @@
</div> </div>
</div> </div>
<div class="py-4 lg:flex lg:justify-between space-y-1 lg:space-y-0" v-show="!loading"> <div class="py-4 lg:flex lg:justify-between space-y-1 lg:space-y-0" v-show="!loading">
<button class="button" :disabled="!dirty" @click.prevent="storeBookingData()" v-if="initialized"> <button class="button bg-button" :disabled="!dirty" @click.prevent="storeBookingData()" v-if="initialized">
Buchung aktualisieren Buchung aktualisieren
</button> </button>
<router-link :to="{ name: 'events' }" class="button"> <router-link :to="{ name: 'events' }" class="button bg-button">
zur Übersicht zur Übersicht
</router-link> </router-link>
</div> </div>
@@ -141,10 +141,10 @@
</collapsible-panel> </collapsible-panel>
</div> </div>
<div class="py-4 lg:flex lg:justify-between space-y-1 lg:space-y-0" v-show="!loading"> <div class="py-4 lg:flex lg:justify-between space-y-1 lg:space-y-0" v-show="!loading">
<button class="button" :disabled="!dirty" @click.prevent="storeBookingData()" v-if="initialized"> <button class="button bg-button" :disabled="!dirty" @click.prevent="storeBookingData()" v-if="initialized">
Buchung aktualisieren Buchung aktualisieren
</button> </button>
<router-link :to="{ name: 'events' }" class="button"> <router-link :to="{ name: 'events' }" class="button bg-button">
zur Übersicht zur Übersicht
</router-link> </router-link>
</div> </div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/CrmData.vue
+1 -1
View File
@@ -42,7 +42,7 @@
</div> </div>
</div> </div>
</div> </div>
<button type="submit" class="button" :disabled="loading"> <button type="submit" class="button bg-button" :disabled="loading">
Speichern Speichern
</button> </button>
</form> </form>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Events.vue
+3 -3
View File
@@ -56,13 +56,13 @@
</td> </td>
<td class="px-2 py-1 border border-gray-200"> <td class="px-2 py-1 border border-gray-200">
<div class="grid grid-cols-1 xl:grid-cols-3 gap-2 w-32 xl:w-auto"> <div class="grid grid-cols-1 xl:grid-cols-3 gap-2 w-32 xl:w-auto">
<a :href="getDownloadUrl(event, 'confirmation')" target="_blank" class="button button--action button--small"> <a :href="getDownloadUrl(event, 'confirmation')" target="_blank" class="button bg-button button--small">
Bestätigung Bestätigung
</a> </a>
<router-link :to="{ name: 'bookingEdit', params: { id: event.id } }" v-if="event.editable" class="button button--small"> <router-link :to="{ name: 'bookingEdit', params: { id: event.id } }" v-if="event.editable" class="button bg-button button--small">
bearbeiten bearbeiten
</router-link> </router-link>
<a :href="getDownloadUrl(event, 'documents')" target="_blank" class="button button--secondary button--small" v-if="event.documents"> <a :href="getDownloadUrl(event, 'documents')" target="_blank" class="button bg-button--secondary button--small" v-if="event.documents">
Reiseinfos Reiseinfos
</a> </a>
</div> </div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Login.vue
+3 -3
View File
@@ -13,13 +13,13 @@
<input type="password" v-model="password" class="border-gray-400 focus:border-gray-800 ring-0 focus:ring-0 mt-1 w-full"> <input type="password" v-model="password" class="border-gray-400 focus:border-gray-800 ring-0 focus:ring-0 mt-1 w-full">
</form-group> </form-group>
<div class="flex flex-col lg:flex-row space-y-2 lg:space-y-0 lg:space-x-2 mt-4"> <div class="flex flex-col lg:flex-row space-y-2 lg:space-y-0 lg:space-x-2 mt-4">
<button type="submit" class="button" :disabled="loading"> <button type="submit" class="button bg-button" :disabled="loading">
{{ loginMode ? 'Login' : 'Passwort erneuern' }} {{ loginMode ? 'Login' : 'Passwort erneuern' }}
</button> </button>
<button class="button button--secondary" @click.prevent="toggleMode()"> <button class="button bg-button--secondary" @click.prevent="toggleMode()">
{{ loginMode ? 'Passwort vergessen?' : 'Zum Login' }} {{ loginMode ? 'Passwort vergessen?' : 'Zum Login' }}
</button> </button>
<router-link to="register" class="button button--secondary">Registrieren</router-link> <router-link to="register" class="button bg-button--secondary">Registrieren</router-link>
</div> </div>
</div> </div>
<div> <div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Newsletter.vue
+1 -1
View File
@@ -4,7 +4,7 @@
Newsletter Newsletter
</h1> </h1>
<p class="mb-8" v-html="statusMessage"></p> <p class="mb-8" v-html="statusMessage"></p>
<button type="submit" class="button" :disabled="loading" @click.prevent="toggleReqistration()"> <button type="submit" class="button bg-button" :disabled="loading" @click.prevent="toggleReqistration()">
{{ userData.newsletter ? 'Abmelden' : 'Anmelden' }} {{ userData.newsletter ? 'Abmelden' : 'Anmelden' }}
</button> </button>
</div> </div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Registration.vue
+2 -2
View File
@@ -23,10 +23,10 @@
</form-group> </form-group>
</div> </div>
<div class="flex flex-col lg:flex-row space-y-2 lg:space-y-0 lg:space-x-2"> <div class="flex flex-col lg:flex-row space-y-2 lg:space-y-0 lg:space-x-2">
<button type="submit" class="button" :disabled="loading"> <button type="submit" class="button bg-button" :disabled="loading">
Registrieren Registrieren
</button> </button>
<router-link to="login" class="button button--secondary"> <router-link to="login" class="button bg-button--secondary">
Zum Login Zum Login
</router-link> </router-link>
</div> </div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Teamer.vue
+1 -1
View File
@@ -72,7 +72,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<button type="submit" class="button" :disabled="loading"> <button type="submit" class="button bg-button" :disabled="loading">
Speichern Speichern
</button> </button>
</div> </div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/AccommodationSelect.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="relative" v-if="mutable && selectableAccommodations.length > 0"> <div class="relative" v-if="mutable && selectableAccommodations.length > 0">
<button class="button button--primary button--small w-full" <button class="button bg-button button--small w-full"
type="button" type="button"
@click.prevent="visible = !visible"> @click.prevent="visible = !visible">
<span> <span>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ParticipantAddressForm.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="relative"> <div class="relative">
<button class="button button--primary button--small w-full" <button class="button bg-button button--small w-full"
type="button" type="button"
@click.prevent="visible = !visible"> @click.prevent="visible = !visible">
<span> <span>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ParticipantSizesForm.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="relative" v-if="hasSelectedRentals"> <div class="relative" v-if="hasSelectedRentals">
<button class="button button--primary button--small" @click.prevent="visible = !visible"> <button class="button bg-button button--small" @click.prevent="visible = !visible">
<span> <span>
Größen Größen
</span> </span>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/PickupSelect.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="relative"> <div class="relative">
<button class="button button--primary button--small" @click.prevent="visible = !visible"> <button class="button bg-button button--small" @click.prevent="visible = !visible">
<span> <span>
Zustieg Zustieg
</span> </span>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/ServiceSelect.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="relative" v-if="hasServices"> <div class="relative" v-if="hasServices">
<button class="button button--primary button--small" type="button" @click.prevent="visible = !visible"> <button class="button bg-button button--small" type="button" @click.prevent="visible = !visible">
<span> <span>
{{ subType.label }} {{ subType.label }}
</span> </span>