gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New Header / Slider / Infos from API

Browse source
This commit is contained in:
Kevin Adametz 2019-12-28 20:12:23 +01:00
parent 645ea5da7d
commit ee89626864
49 changed files with 6213 additions and 965 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/app/Resources/views/base.html.twig
View file

@ -166,7 +166,9 @@
</div><!-- end container -->
</section><!-- end section -->
{% include 'default/components/footer.html.twig' %}
{{ render(controller('AppBundle:Component:footer')) }}
<a class="js-go-to u-go-to-v1 animated" href="#!" data-type="fixed" data-offset-top="400" data-show-effect="zoomIn" data-hide-effect="zoomOut" data-position='{"bottom": 15, "right": 15 }'>
<i class="icon-up-open-big"></i>
</a>

1451
trunk/app/Resources/views/default/components/_bak/_bak_header.html.twig Normal file
View file

File diff suppressed because it is too large Load diff

4
trunk/app/Resources/views/default/components/_header.bak.html.twig → trunk/app/Resources/views/default/components/_bak/_header.bak.html.twig
View file

@ -117,11 +117,9 @@
<li class="dropdown">
<a class="dropdown-toggle" href="{{ nav_page.urlPath }}"
title="{{ nav_page.title }}">
{{ nav_page.title|replace({'Reisen': ''}) }}<span
class="hidden-md hidden-sm">Reisen</span>
{{ nav_page.title|replace({'Reisen': ''}) }} Reisen
</a>
<ul class="dropdown-menu">
<li class="first" role="menuitem" itemprop="name">
<a itemprop="url" href="{{ nav_page.urlPath }}"
title="{{ nav_page.title }}">

0
trunk/app/Resources/views/default/components/_header.html.twig → trunk/app/Resources/views/default/components/_bak/_header.html.twig
View file

1286
trunk/app/Resources/views/default/components/_bak/_header_bak1.html.twig Normal file
View file

File diff suppressed because it is too large Load diff

1470
trunk/app/Resources/views/default/components/_bak/_header_bak2.html.twig Normal file
View file

File diff suppressed because it is too large Load diff

147
trunk/app/Resources/views/default/components/footer.html.twig
View file

@ -1,4 +1,4 @@
<footer class="clearfix">
<!--<footer class="clearfix">
<div class="container">
<div class="row">
<div class="col-md-5 col-sm-12 col-xs-12">
@ -20,7 +20,131 @@
</div>
</div>
</div>
</footer>
</footer>-->
<style>
/* Info Bar */
.info-bar {
margin:0;
border:0;
padding:10px 0;
display: block;
background-color: rgba(80, 80, 80, 0.1);
border-top: rgba(0,0,0,0.05) 1px solid;
color: #777;
}
.info-bar div.row>div {
padding-top:20px;
padding-bottom:20px;
margin:0 !important;
border-right:rgba(0,0,0,0.1) 1px solid;
}
.info-bar div.row>div:last-child {
border:0;
}
.info-bar div.row>div i {
font-size:34px;
line-height: 1.2;
margin-right:10px;
float:left;
}
.info-bar h1,
.info-bar h2,
.info-bar h3,
.info-bar h4,
.info-bar h5,
.info-bar h6,
.info-bar p {
font-size:18px;
line-height:1.5;
font-weight: 600;
margin:0;
padding:0;
border-bottom: none;
}
.info-bar p {
font-size: 12px;
line-height:1;
}
.info-bar.info-bar-color div.row>div {
border-right-color:rgba(0,0,0,0.1);
}
/* bordered */
.info-bar.info-bar-bordered {
margin:30px 0;
border: rgba(0,0,0,0.1) 1px solid;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.info-bar.info-bar-bordered div.row>div {
padding-top:15px;
padding-bottom:15px;
}
.footer p.hl4 {
text-transform: none;
}
.footer p {
font-size: 90%;
line-height: 1.3em;
}
.footer .left-img {
max-width: 180px;
}
.footer .c4 li {
margin: 10px 15px;
font-size: 15px;
}
.text-success {
color:#648859;
}
</style>
<section class="info-bar">
<div class="container">
<div class="row">
<div class="col-md-3 col-sm-6">
<i class="fa fa-phone-square text-success"></i>
<h3><a href="tel:030 - 700 94 100">030 - 700 94 100</a></h3>
<p>{% if(content.available.phone.active) %}
<span class="text-success">erreichbar</span>
{% else %}
erreichbar
{% endif %}
{{ content.available.phone.content }}</p>
</div>
<div class="col-md-3 col-sm-6">
<i class="fa fa-envelope text-success"></i>
<h3><a href="mailto:stern@sterntours.de">stern@sterntours.de</a></h3>
<p>schreiben Sie uns jederzeit</p>
</div>
<div class="col-md-3 col-sm-6">
<i class="fa fa-envelope-open text-success"></i>
<h3><a href="/kontakt">Kontaktformular</a></h3>
<p>oder nutzen Sie einfach unser:</p>
</div>
<div class="col-md-3 col-sm-6">
<i class="fa fa-users text-success"></i>
<h3><a href="/ueber-uns" title="Über uns">Über uns</a></h3>
<p>Erfahren Sie mehr über unser Reisebüro.</p>
</div>
</div>
</div>
</section>
<footer class="footer clearfix">
<div class="container">
<div class="row">
@ -29,7 +153,7 @@
<p>Unsere Produktauswahl ist vielfältig. Neben dem Pauschaltourismus und Jugendreisen sind wir auf individuelle Kulturreisen spezialisiert.</p>
<img class="left-img lozad" src="{{ asset('/images/dummy.png') }}" data-src="{{ asset('/images/stern-tours_20.png') }}" alt="Stern Tours 20 Jahre">
<img class="left-img lozad" src="{{ asset('/images/dummy.png') }}" data-src="{{ asset('/images/STERN_22-Jahre.png') }}" alt="Stern Tours 20 Jahre">
<ul class="c4">
<li>Spezialist seit 1998</li>
<li>Top Service</li>
@ -39,20 +163,21 @@
</div><!-- end col -->
<div class="col-md-6 col-sm-6 col-xs-12">
<p class="hl4">ANGESCHLOSSEN AN PROFIS DER REISEBRANCHE:</p>
<p class="hl4">Angeschlossen an Profis der Reisebranche:</p>
<div class="row text-center">
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="col-md-4 col-sm-6 col-xs-6">
<br>
{% image '@AppBundle/Resources/public/images/logos/iata.png' %}
<img class="img-responsive lozad" src="{{ asset('/images/dummy.png') }}" data-src="{{ asset_url }}" alt="IATA">
{% endimage %}
</div>
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="col-md-4 col-sm-6 col-xs-6">
{% image '@AppBundle/Resources/public/images/logos/rundv.png' %}
<img class="img-responsive lozad" src="{{ asset('/images/dummy.png') }}" data-src="{{ asset_url }}" alt="R + V">
{% endimage %}
</div>
<div class="clearfix padding-bottom"></div>
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="col-md-4 col-sm-6 col-xs-6">
<br>
{% image '@AppBundle/Resources/public/images/logos/DB.png' %}
<img class="img-responsive lozad" src="{{ asset('/images/dummy.png') }}" data-src="{{ asset_url }}" alt="DB Bahn">
{% endimage %}
@ -65,7 +190,7 @@
<div class="clearfix padding-bottom"></div>
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-12">
<p class="hl4">Sicherheit &amp; starke Marken:</p>
<p class="hl4">Sicherheit</p>
<div class="row text-center">
<div class="col-md-12">
{% image '@AppBundle/Resources/public/images/logos/ssl.png' %}
@ -88,11 +213,11 @@
<div class="copyrights clearfix" style="padding-bottom:270px;">
<div class="container">
<div class="row">
<div class="col-md-6 text-left">
<div class="col-md-4 text-left">
<p>STERN TOURS © {{ 'now'|date('Y') }}</p>
</div><!-- end col -->
<div class="col-md-6 text-right">
<div class="col-md-8 text-right">
<div class="link-footer">
<a href="/impressum" title="Impressum">Impressum</a> |
<a href="/arb" title="ARB">ARB</a> |

1072
trunk/app/Resources/views/default/components/header.html.twig
View file

File diff suppressed because it is too large Load diff

130
trunk/app/Resources/views/default/components/home/_back_slider.html.twig Normal file
View file

@ -0,0 +1,130 @@
{% form_theme search_form 'default/form/theme.html.twig' %}
<section class="section fullscreen background start-slider">
<div class="absolute-section">
<div class="container-fluid">
<div class="row">
<div class="col-md-12 col-xs-12">
<div class="home-message text-center">
<div class="home-info-box">
<div id="eKomiSeal_default" class="eKomi-header" style="padding-top: 5px;padding-left: 2px;">
<img class="lozad" border="0" src="{{ asset('images/dummy.png') }}" data-src="/bundles/app/images/logo-qualitaet.png" alt="Top Kundenservice" height="78">
</div>
<ul class="c4">
<li>Spezialist für Kulturreisen </li>
<li>Reiseexperte seit 1998</li>
<li>Beratung für individuelle Reisen</li>
</ul>
</div>
</div><!-- end homemessage -->
</div><!-- end col -->
</div><!-- end row -->
</div><!-- end container -->
</div>
<div id="myCarousel" class="carousel slide">
<!-- Indicators -->
<!-- Wrapper for Slides -->
<div class="carousel-inner">
<div class="item active">
<!-- Set the first background image using inline CSS below. -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image="{{ image('bundles/app/images/travel/slider_aegypten.jpg').cropResize(1024).guess(70) }}"></div>
<noscript>
<div class="fill" style="background-image:url({{ image('bundles/app/images/travel/slider_aegypten.jpg').cropResize(1024).guess(70) }})"></div>
</noscript>
</div>
<div class="item">
<!-- Set the second background image using inline CSS below. -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image=" {{ image('bundles/app/images/travel/slider_felsendom.jpg').cropResize(1024).guess(70) }}"></div>
<noscript>
<div class="fill" style="background-image:url({{ image('bundles/app/images/travel/slider_felsendom.jpg').cropResize(1024).guess(70) }})"></div>
</noscript>
</div>
<div class="item">
<!-- Set the third background image using inline CSS below. -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image="{{ image('bundles/app/images/travel/slider_petra.jpg').cropResize(1024).guess(70) }}"></div>
<noscript>
<div class="fill" style="background-image:url({{ image('bundles/app/images/travel/slider_petra.jpg').cropResize(1024).guess(70) }})"></div>
</noscript>
</div>
</div>
</div>
</section><!-- end section -->
<section class="nopadding">
<div class="container-full absolute">
<div class="container-fluid container-form">
<div class="home-form">
<!-- Nav tabs
Hier bitte die Tabs über Parameter Steuer, wenn JS aus.
Paramter an URL hängen und dann den jeweiligen Tab auf active setzen.
-->
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="tab_01">
<form class="bookform form-inline row st-search-form" style="margin-right: -5px; margin-left: -5px;" action="/suche" method="get">
<div class="form-group col-lg-2 col-md-12 col-sm-12 col-xs-12" style="padding-right: 5px;padding-left: 5px;">
<div class="head_tap">KULTURREISEN</div>
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.b, 'Anreise') }}
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.e, 'Abreise') }}
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.c) }}
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
<label class="sr-only" for="departure">Abfahrtsort</label>
<div class="dropdown form-bottom">
<select id="departure" class="selectpicker" data-style="btn-white" data-dropup-auto="false">
<option>Abfahrtsort beliebig</option>
<option>Basel</option>
<option>Berlin</option>
<option>Berlin Schönefeld</option>
<option>Berlin Tegel</option>
<option>Bonn</option>
<option>Bremen</option>
<option>Dresden</option>
<option>Düsseldorf</option>
<option>Eigenanreise</option>
<option>Erfurt</option>
<option>Frankfurt</option>
<option>Friedrichshafen</option>
<option>Genf</option>
<option>Graz</option>
<option>Hamburg</option>
<option>Hannover</option>
<option>Köln</option>
<option>Leipzig</option>
<option>Linz</option>
<option>München</option>
<option>Nürnberg</option>
<option>Saarbrücken</option>
<option>Salzburg</option>
<option>Stuttgart</option>
<option>Wien</option>
<option>Zürich</option>
</select>
</div>
</div>
<div class="form-group col-lg-2 col-md-12 col-sm-12 col-xs-12" style="padding-right: 5px;padding-left: 5px;">
<button type="submit" class="btn btn-primary btn-block text-center">suchen</button>
</div>
</form>
</div><!-- end tab-pane -->
</div><!-- end tab-content -->
</div><!-- end homeform -->
</div>
</div><!-- end container -->
</section><!-- end section -->

34
trunk/app/Resources/views/default/components/home/slider.html.twig
View file

@ -8,7 +8,7 @@
<div class="home-message text-center">
<div class="home-info-box">
<div id="eKomiSeal_default" class="eKomi-header" style="padding-top: 5px;padding-left: 2px;">
<img class="lozad" border="0" src="{{ asset('images/dummy.png') }}" data-src="/bundles/app/images/logo-qualitaet.png" alt="Top Kundenservice" height="78">
<img class="lozad" border="0" src="{{ asset('images/dummy.png') }}" data-src="/bundles/app/images/logo-qualitaet-22.png" alt="Top Kundenservice" height="78">
</div>
<ul class="c4">
<li>Spezialist für Kulturreisen </li>
@ -27,8 +27,8 @@
<!-- Wrapper for Slides -->
<div class="carousel-inner">
<div class="item active">
<!-- Set the first background image using inline CSS below. -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image="{{ image('bundles/app/images/travel/slider_aegypten.jpg').cropResize(1024).guess(70) }}"></div>
<!-- Set the first background image using inline CSS below. .cropResize(1024).guess(70) -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image="{{ image('bundles/app/images/travel/slider_aegypten.jpg') }}"></div>
<noscript>
<div class="fill" style="background-image:url({{ image('bundles/app/images/travel/slider_aegypten.jpg').cropResize(1024).guess(70) }})"></div>
</noscript>
@ -36,15 +36,15 @@
<div class="item">
<!-- Set the second background image using inline CSS below. -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image=" {{ image('bundles/app/images/travel/slider_felsendom.jpg').cropResize(1024).guess(70) }}"></div>
<!-- Set the second background image using inline CSS below. .cropResize(1024).guess(70) -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image=" {{ image('bundles/app/images/travel/slider_felsendom.jpg') }}"></div>
<noscript>
<div class="fill" style="background-image:url({{ image('bundles/app/images/travel/slider_felsendom.jpg').cropResize(1024).guess(70) }})"></div>
</noscript>
</div>
<div class="item">
<!-- Set the third background image using inline CSS below. -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image="{{ image('bundles/app/images/travel/slider_petra.jpg').cropResize(1024).guess(70) }}"></div>
<!-- Set the third background image using inline CSS below. .cropResize(1024).guess(70) -->
<div class="fill lozad" style="background-image:url(images/placeholder-image.png)" data-background-image="{{ image('bundles/app/images/travel/slider_petra.jpg') }}"></div>
<noscript>
<div class="fill" style="background-image:url({{ image('bundles/app/images/travel/slider_petra.jpg').cropResize(1024).guess(70) }})"></div>
</noscript>
@ -66,22 +66,20 @@
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="tab_01">
<form class="bookform form-inline row st-search-form" style="margin-right: -5px; margin-left: -5px;" action="/suche" method="get">
<div class="form-group col-lg-2 col-md-12 col-sm-12 col-xs-12" style="padding-right: 5px;padding-left: 5px;">
<div class="head_tap">KULTURREISEN</div>
<div class="form-group col-lg-2 col-md-2 col-sm-3 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.b, 'Anreise am') }}
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.b, 'Anreise') }}
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.e, 'Abreise') }}
<div class="form-group col-lg-2 col-md-2 col-sm-3 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.e, 'Abreise am') }}
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
<div class="form-group col-lg-2 col-md-3 col-sm-3 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
{{ form_field_pho(search_form.c) }}
</div>
<div class="form-group col-lg-2 col-md-3 col-sm-6 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
<div class="form-group col-lg-2 col-md-3 col-sm-3 col-xs-6" style="padding-right: 5px;padding-left: 5px;">
<label class="sr-only" for="departure">Abfahrtsort</label>
<div class="dropdown form-bottom">
<select id="departure" class="selectpicker" data-style="btn-white" data-dropup-auto="false">
@ -116,8 +114,8 @@
</div>
</div>
<div class="form-group col-lg-2 col-md-12 col-sm-12 col-xs-12" style="padding-right: 5px;padding-left: 5px;">
<button type="submit" class="btn btn-primary btn-block text-center">suchen</button>
<div class="form-group col-lg-4 col-md-2 col-sm-12 col-xs-12" style="padding-right: 5px;padding-left: 5px;">
<button type="submit" class="btn btn-primary btn-block text-center"><i class="fa fa-search" style="font-size: 1.1em"></i> &nbsp;<span class="hidden-md">Kulturreisen</span> suchen</button>
</div>
</form>
</div><!-- end tab-pane -->

2
trunk/app/Resources/views/default/email/components/bookingSummary.txt.twig
View file

@ -52,7 +52,7 @@ Adresse: {{ booking_request.streetAddress }}
PLZ: {{ booking_request.zipCode }}
Ort: {{ booking_request.city }}
Telefonnummer: {{ booking_request.phone }}
Fax: {{ booking_request.fax ?? 'keine Angabe' }}
Handynummer: {{ booking_request.mobile ?? 'keine Angabe' }}
E-Mail: {{ booking_request.email ?? 'keine Angabe' }}
=====================================================================================

2
trunk/app/Resources/views/default/email/components/fewoBookingSummary.txt.twig
View file

@ -28,7 +28,7 @@ Reiseanmelder: {% if fewo_booking_request.salutation == 2 %}in{% endif %}
* PLZ: {{ fewo_booking_request.zipCode }}
* Ort: {{ fewo_booking_request.city }}
* Telefon: {{ fewo_booking_request.phone }}
* Fax: {{ fewo_booking_request.fax ?? 'keine Angabe' }}
* Handynummer: {{ fewo_booking_request.mobile ?? 'keine Angabe' }}
* E-Mail: {{ fewo_booking_request.email ?? 'keine Angabe' }}
=======================================================

8
trunk/app/Resources/views/default/pages/booking.html.twig
View file

@ -537,7 +537,7 @@
</div>
<div class="col-md-6 col-sm-6 col-xs-12">
{{ form_field_pho(form.fax, 'Fax (optional)') }}
{{ form_field_pho(form.mobile, 'Handynummer (Bitte angeben)') }}
</div>
<div class="col-md-12 col-sm-12 col-xs-12">
@ -574,7 +574,7 @@
<div class="">
<div class="col-md-12 col-sm-12 col-xs-12">
<h5>Reiseteilnehmer</h5>
<p>{{ getContextBySlug('namen-reisepass') }}</p>
<p>{{ getContextBySlug('namen-reisepass') | raw }}</p>
</div>
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="hidden">
@ -657,7 +657,7 @@
<div class="col-md-5 col-sm-12 col-xs-12">
<div class="form-group">
<div class="">
{{ form_field_pho(traveler.birthDate, 'Geburtsdatum') }}
{{ form_field_pho(traveler.birthDate, 'Geburtsdatum (04.01.1964)') }}
</div>
<div class="help-block with-errors"></div>
</div>
@ -700,7 +700,7 @@
</div> <!-- st trav -->
<h2>Hinweis</h2>
<p>{{ getContextBySlug('hinweis-staatsbuergerschaft-1')|raw }}
<p>{{ getContextBySlug('hinweis-staatsbuergerschaft-1') | raw }}
{% for nationalitie in nationalities %}
{{ nationalitie.name }}{% if not loop.last %},{% endif %}
{% endfor %} {{ getContextBySlug('hinweis-staatsbuergerschaft-2')|raw }} </p>

4
trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig
View file

@ -182,8 +182,8 @@
<td>{{ booking.phone }}</td>
</tr>
<tr>
<td>Fax (optional)</td>
<td>{{ booking.fax }}</td>
<td>Handynummer (Bitte angeben)</td>
<td>{{ booking.mobile }}</td>
</tr>
<tr>
<td>E-Mail-Adresse</td>

2
trunk/app/Resources/views/default/pages/fewoBooking.html.twig
View file

@ -195,7 +195,7 @@
</div>
<div class="col-md-6 col-sm-6 col-xs-12">
{{ form_field_pho(form.fax, 'Fax (optional)') }}
{{ form_field_pho(form.mobile, 'Handynummer (Bitte angeben)') }}
</div>
<div class="col-md-12 col-sm-12 col-xs-12">

4
trunk/app/Resources/views/default/pages/fewoBookingConfirmation.html.twig
View file

@ -107,8 +107,8 @@
<td>{{ fewo_booking_request.phone }}</td>
</tr>
<tr>
<td>Fax (optional)</td>
<td>{{ fewo_booking_request.fax }}</td>
<td>Handynummer (Bitte angeben)</td>
<td>{{ fewo_booking_request.mobile }}</td>
</tr>
<tr>
<td>E-Mail-Adresse</td>

6
trunk/app/Resources/views/default/pages/search.html.twig
View file

@ -19,9 +19,9 @@
<div class="result">
<div class="row">
<div class="image col-md-3">
<img src="/{{ travel_program.images.empty
? 'images/icons/no-picture.png'
: ('uploads/travel_program/' ~ travel_program.images.first.fileNameWithExtension)
<img src="{{ travel_program.images.empty
? '/images/icons/no-picture.png'
: ('https://v2.sterntours.de/uploads/travel_program/' ~ travel_program.images.first.fileNameWithExtension)
}}" class="img-responsive"
>
</div>

BIN
trunk/logo-qualitaet.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

2
trunk/src/AppBundle/Controller/BookingController.php
View file

@ -199,7 +199,6 @@ class BookingController extends Controller
)
);
$this->get('mailer')->send(\Swift_Message::newInstance()
->setSubject('BUCHUNG: '. $travelProgram->getTitle() .'('. $travelDate->getName() .')')
->setFrom('stern@stern-tours.de', 'STERN TOURS')
@ -221,7 +220,6 @@ class BookingController extends Controller
)
);
// #TODO This will lead to multiple bookings due to multiple form submission. Redirect instead!
return $this->render('default/pages/bookingConfirmation.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,

39
trunk/src/AppBundle/Controller/ComponentController.php
View file

@ -16,6 +16,8 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
*/
class ComponentController extends Controller
{
private $headerContent;
/**
* @return EntityManager
*/
@ -24,15 +26,52 @@ class ComponentController extends Controller
return $this->getDoctrine()->getManager();
}
public function getHeaderContent(){
if(!$this->headerContent){
$this->headerContent = Util::loadFromApi('cms/header/info', ['url'=>""]);
}
return $this->headerContent;
}
public function headerAction()
{
$navPages = $this->getEntityManager()->getRepository('AppBundle:Page')->findTopCountryNavPages();
$content = $this->getHeaderContent();
$local = [];
foreach ($content->local as $key=>$value){
$local[$key] = $value;
}
$phone = [];
foreach ($content->phone as $key=>$value){
$phone[$key] = $value;
}
return $this->render('default/components/header.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
'nav_pages' => $navPages,
'content' => $content,
'local' => $local,
'phone' => $phone,
]);
}
public function footerAction()
{
$content = $this->getHeaderContent();
return $this->render('default/components/footer.html.twig', [
'content' => $content,
]);
}
public function breadcrumbAction(Page $page)
{
return $this->render('default/components/breadcrumb.html.twig', [

12
trunk/src/AppBundle/Entity/BookingRequest.php
View file

@ -88,7 +88,7 @@ class BookingRequest
*/
private $phone;
private $fax;
private $mobile;
/**
* @Assert\NotBlank()
@ -581,17 +581,17 @@ class BookingRequest
/**
* @return string
*/
public function getFax()
public function getMobile()
{
return $this->fax;
return $this->mobile;
}
/**
* @param string $fax
* @param string $mobile
*/
public function setFax($fax)
public function setMobile($mobile)
{
$this->fax = $fax;
$this->mobile = $mobile;
}
/**

12
trunk/src/AppBundle/Entity/FewoBookingRequest.php
View file

@ -70,7 +70,7 @@ class FewoBookingRequest
*/
private $phone;
private $fax;
private $mobile;
/**
* @Assert\NotBlank()
@ -272,17 +272,17 @@ class FewoBookingRequest
/**
* @return mixed
*/
public function getFax()
public function getMobile()
{
return $this->fax;
return $this->mobile;
}
/**
* @param mixed $fax
* @param mixed $mobile
*/
public function setFax($fax)
public function setMobile($mobile)
{
$this->fax = $fax;
$this->mobile = $mobile;
}
/**

62
trunk/src/AppBundle/Entity/Page.php
View file

@ -156,6 +156,20 @@ class Page
*/
private $title;
/**
* @var string
*
* @ORM\Column(name="title_short", type="string", length=255, nullable=true)
*/
private $titleShort;
/**
* @var string
*
* @ORM\Column(name="before_title", type="string", length=255, nullable=true)
*/
private $beforeTitle;
/**
* @var string
*
@ -565,6 +579,54 @@ class Page
return $this->title;
}
/**
* Set titleShort
*
* @param string $titleShort
*
* @return Page
*/
public function setTitleShort($titleShort)
{
$this->titleShort = $titleShort;
return $this;
}
/**
* Get titleShort
*
* @return string
*/
public function getTitleShort()
{
return $this->titleShort;
}
/**
* Set beforeTitle
*
* @param string $beforeTitle
*
* @return Page
*/
public function setBeforeTitle($beforeTitle)
{
$this->beforeTitle = $beforeTitle;
return $this;
}
/**
* Get beforeTitle
*
* @return string
*/
public function getBeforeTitle()
{
return $this->beforeTitle;
}
/**
* Set pagetitle
*

18
trunk/src/AppBundle/Entity/TravelBooking.php
View file

@ -127,9 +127,9 @@ class TravelBooking
/**
* @var string
*
* @ORM\Column(name="fax", type="string", length=255, nullable=true)
* @ORM\Column(name="mobile", type="string", length=255, nullable=true)
*/
private $fax;
private $mobile;
/**
* @var string
@ -681,27 +681,27 @@ class TravelBooking
}
/**
* Set fax
* Set mobile
*
* @param string $fax
* @param string $mobile
*
* @return TravelBooking
*/
public function setFax($fax)
public function setMobile($mobile)
{
$this->fax = $fax;
$this->mobile = $mobile;
return $this;
}
/**
* Get fax
* Get mobile
*
* @return string
*/
public function getFax()
public function getMobile()
{
return $this->fax;
return $this->mobile;
}
/**

2
trunk/src/AppBundle/Entity/TravelBookingRepository.php
View file

@ -28,7 +28,7 @@ class TravelBookingRepository extends \Doctrine\ORM\EntityRepository
$ret->setCountry($bookingRequest->getNation());
$ret->setMail($bookingRequest->getEmail());
$ret->setPhone($bookingRequest->getPhone());
$ret->setFax($bookingRequest->getFax());
$ret->setMobile($bookingRequest->getMobile());
$ret->setSelectedDeparture([
'name' => $bookingRequest->getDeparture()->getName(),
'extra_charge' => $bookingRequest->getDeparture()->getExtraCharge(),

2
trunk/src/AppBundle/Export/BookingSternToursCrmExporter.php
View file

@ -352,7 +352,7 @@ class BookingSternToursCrmExporter extends SternToursCrmExporter
'city' => $bookingRequest->getCity(),
'country_id' => $bookingRequest->getNation(),
'phone' => $bookingRequest->getPhone(),
'fax' => $bookingRequest->getFax(),
'phonemobile' => $bookingRequest->getMobile(),
'email' => $bookingRequest->getEmail()
],
'request_date' => (new \DateTime())->format('Y-m-d'),

2
trunk/src/AppBundle/Export/FewoBookingSternToursCrmExporter.php
View file

@ -75,7 +75,7 @@ class FewoBookingSternToursCrmExporter extends SternToursCrmExporter
'city' => $fewoBookingRequest->getCity(),
'travel_nationality_id' => $fewoBookingRequest->getNation(),
'phone' => $fewoBookingRequest->getPhone(),
'fax' => $fewoBookingRequest->getFax(),
'mobile' => $fewoBookingRequest->getMobile(),
'email' => $fewoBookingRequest->getEmail()
],
]

2
trunk/src/AppBundle/Form/BookingRequestType.php
View file

@ -164,7 +164,7 @@ class BookingRequestType extends AbstractType
]
])
->add('phone')
->add('fax')
->add('mobile')
->add('email',
EmailType::class, [
'constraints' =>[

2
trunk/src/AppBundle/Form/FewoBookingRequestType.php
View file

@ -184,7 +184,7 @@ class FewoBookingRequestType extends AbstractType
->add('zipCode')
->add('city')
->add('phone')
->add('fax')
->add('mobile')
->add('email',
EmailType::class, [
'constraints' =>[

2
trunk/src/AppBundle/Listener/KernelControllerListener.php
View file

@ -60,6 +60,8 @@ class KernelControllerListener
$restOfPath = '';
$curPath = $path;
$api = Util::loadFromApi('cms/search', ['url'=>$curPath]);
while (!empty($pathArray))
{
if(!$api){

88
trunk/src/AppBundle/Resources/config.codekit3
View file

@ -16119,6 +16119,26 @@
"sI": 0,
"sU": 0
},
"/public/css/new_header-min.css": {
"aP": 1,
"bl": 0,
"ft": 16,
"ma": 0,
"oA": 0,
"oAP": "/public/css/new_header-min-min.css",
"oF": 0,
"oS": 3
},
"/public/css/new_header.css": {
"aP": 1,
"bl": 0,
"ft": 16,
"ma": 0,
"oA": 1,
"oAP": "/public/css/new_header-min.css",
"oF": 0,
"oS": 3
},
"/public/css/owl-carousel.css": {
"aP": 1,
"bl": 0,
@ -16648,6 +16668,39 @@
"oT": 1,
"q": 100
},
"/public/images/logo-qualitaet-22.png": {
"ft": 32768,
"iS": 31398,
"oA": 0,
"oAP": "/public/images/logo-qualitaet-22.png",
"oF": 0,
"oIPL": 0,
"opt": 0,
"oT": 1,
"q": 100
},
"/public/images/logo-qualitaet-23.png": {
"ft": 32768,
"iS": 31472,
"oA": 0,
"oAP": "/public/images/logo-qualitaet-23.png",
"oF": 0,
"oIPL": 0,
"opt": 0,
"oT": 1,
"q": 100
},
"/public/images/logo-qualitaet-24.png": {
"ft": 32768,
"iS": 31330,
"oA": 0,
"oAP": "/public/images/logo-qualitaet-24.png",
"oF": 0,
"oIPL": 0,
"opt": 0,
"oT": 1,
"q": 100
},
"/public/images/logo-qualitaet.png": {
"ft": 32768,
"iS": 13382,
@ -17269,6 +17322,17 @@
"opt": 0,
"q": 100
},
"/public/images/travel/slider_aegypten Kopie.jpg": {
"ft": 16384,
"iS": 78927,
"jF": 0,
"oA": 0,
"oAP": "/public/images/travel/slider_aegypten Kopie.jpg",
"oF": 0,
"oIPL": 0,
"opt": 0,
"q": 100
},
"/public/images/travel/slider_aegypten.jpg": {
"ft": 16384,
"iS": 78927,
@ -17277,6 +17341,17 @@
"oAP": "/public/images/travel/slider_aegypten.jpg",
"oF": 0,
"oIPL": 0,
"opt": 1,
"q": 100
},
"/public/images/travel/slider_felsendom Kopie.jpg": {
"ft": 16384,
"iS": 83494,
"jF": 0,
"oA": 0,
"oAP": "/public/images/travel/slider_felsendom Kopie.jpg",
"oF": 0,
"oIPL": 0,
"opt": 0,
"q": 100
},
@ -17288,6 +17363,17 @@
"oAP": "/public/images/travel/slider_felsendom.jpg",
"oF": 0,
"oIPL": 0,
"opt": 1,
"q": 100
},
"/public/images/travel/slider_petra Kopie.jpg": {
"ft": 16384,
"iS": 110949,
"jF": 0,
"oA": 0,
"oAP": "/public/images/travel/slider_petra Kopie.jpg",
"oF": 0,
"oIPL": 0,
"opt": 0,
"q": 100
},
@ -17299,7 +17385,7 @@
"oAP": "/public/images/travel/slider_petra.jpg",
"oF": 0,
"oIPL": 0,
"opt": 0,
"opt": 1,
"q": 100
},
"/public/images/travel/slider_strandkorb.jpg": {

32
trunk/src/AppBundle/Resources/public/css/custom.css
View file

@ -1347,6 +1347,7 @@ a[id^="video_"]:before,
.home-info-box {
background: #ffc926;
float: right;
margin-top: 9px;
width: 340px;
height: 90px;
border-radius: 0 0 8px 8px;
@ -2091,7 +2092,7 @@ body.modal-open {
.fullscreen {
width: 100%;
min-height: 100%;
padding-top: 145px;
padding-top: 0px;
}
.section.padding-top-20 {
padding-top: 20px;
@ -2157,7 +2158,7 @@ body.modal-open {
.fill {
width: 100%;
height: 280px;
background-position: center;
background-position: center bottom;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
@ -2176,7 +2177,7 @@ body.modal-open {
bottom: 0px;
}
.start-slider {
padding-top: 148px;
/*padding-top: 148px;*/
}
.start-slider .home-message {
padding-top: 0px;
@ -2993,17 +2994,7 @@ nav hr {
.navbar .navbar-subnavi .subnavi {
margin-top: 0px;
}
.dropdown-menu {
background-color: #fff !important;
border-left: 1px solid #dddddd;
border-right: 1px solid #dddddd;
border-radius: 0;
box-shadow: none !important;
color: #ffffff;
min-width: 210px;
padding: 0px;
z-index: 9999;
}
.nav .open > a,
.nav .open > a:hover,
.nav .open > a:focus,
@ -3027,6 +3018,17 @@ nav hr {
/* The Fallback */
background: rgba(255, 255, 255, 0);
}
.dropdown-menu {
background-color: #fff !important;
border-left: 1px solid #dddddd;
border-right: 1px solid #dddddd;
border-radius: 0;
color: #ffffff;
min-width: 210px;
padding: 0px;
z-index: 9999;
}
.dropdown-menu li:last-child {
border-bottom: 1px solid transparents;
}
@ -4173,7 +4175,7 @@ a,
}
.fullscreen {
padding: 0;
padding-top: 110px;
padding-top: 0px;
}
.absolute-carousel {
top: 0px;

5
trunk/src/AppBundle/Resources/public/css/my-custom.less
View file

@ -1,6 +1,6 @@
@import url(https://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,600,700,800,900);
@import url(https://fonts.googleapis.com/css?family=Oswald:400,700);
@import url(https://fonts.googleapis.com/css?family=Oswald:400,500,600,700);
@import (inline) './bootstrap-3.3.7.css';
@import (inline) './jqueryUI.css';
@ -9,7 +9,8 @@
@import (inline) './owl-carousel.css';
@import (inline) './cookieconsent.min.css';
@import (inline) './custom.css';
//@import (inline) './header-min.css';
@import (inline) './booking.css';
@import (inline) './new_header.css';
//@import (inline) './daterangepicker.css';

1
trunk/src/AppBundle/Resources/public/css/new_header-min.css vendored Normal file
View file

File diff suppressed because one or more lines are too long

1197
trunk/src/AppBundle/Resources/public/css/new_header.css Normal file
View file

File diff suppressed because it is too large Load diff

BIN
trunk/src/AppBundle/Resources/public/images/logo-qualitaet-22.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
trunk/src/AppBundle/Resources/public/images/logo-qualitaet-23.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
trunk/src/AppBundle/Resources/public/images/logo-qualitaet-24.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
trunk/src/AppBundle/Resources/public/images/travel/slider_aegypten Kopie.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 77 KiB

BIN
trunk/src/AppBundle/Resources/public/images/travel/slider_aegypten.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 97 KiB

Before After
Before After

BIN
trunk/src/AppBundle/Resources/public/images/travel/slider_felsendom Kopie.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 82 KiB

BIN
trunk/src/AppBundle/Resources/public/images/travel/slider_felsendom.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 109 KiB

Before After
Before After

BIN
trunk/src/AppBundle/Resources/public/images/travel/slider_petra Kopie.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 108 KiB

BIN
trunk/src/AppBundle/Resources/public/images/travel/slider_petra.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 98 KiB

Before After
Before After

8
trunk/src/AppBundle/Resources/public/js/custom.js
View file

@ -138,26 +138,26 @@ jQuery("button.btn-mobile").bind("click", function(e) {
if(jQuery(this).hasClass('btn-mobile-active')) {
jQuery('body').append('<div id="menu-overlay"></div>');
if(!jQuery("#topMain").hasClass('nav-onepage') || window.width > 960) { /* onepage fix */
if(!jQuery(".topMain").hasClass('nav-onepage') || window.width > 960) { /* onepage fix */
jQuery('html').addClass('noscroll');
window.currentScroll = jQuery(window).scrollTop();
}
} else {
if(!jQuery("#topMain").hasClass('nav-onepage') || window.width > 960) { /* onepage fix */
if(!jQuery(".topMain").hasClass('nav-onepage') || window.width > 960) { /* onepage fix */
jQuery('html,body').animate({scrollTop: currentScroll}, 300, 'easeInOutExpo');
}
}
});
var addActiveClass = false;
jQuery("#topMain a.dropdown-toggle").bind("click", function(e) {
jQuery(".topMain a.dropdown-toggle").bind("click", function(e) {
if(jQuery("button.btn-mobile").hasClass('btn-mobile-active') || jQuery("html").hasClass('touch')){
e.preventDefault();
}
addActiveClass = jQuery(this).parent().hasClass("resp-active");
jQuery("#topMain").find(".resp-active").removeClass("resp-active");
jQuery(".topMain").find(".resp-active").removeClass("resp-active");
if(!addActiveClass) {
jQuery(this).parents("li").addClass("resp-active");

1
trunk/web/app.php
View file

@ -18,3 +18,4 @@ $request = Request::createFromGlobals();
$response = $kernel->handle($request);
$response->send();
$kernel->terminate($request, $response);

4
trunk/web/css/my-custom-blessed1.css
View file

File diff suppressed because one or more lines are too long

2
trunk/web/css/my-custom.css
View file

File diff suppressed because one or more lines are too long

17
trunk/web/js/custom-min.js vendored
View file

File diff suppressed because one or more lines are too long