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

Optimierung Darstellungen, kleine Bugs,

Browse source 
SS-Sudan twig im Content
This commit is contained in:
Kevin Adametz 2019-07-09 14:29:58 +02:00
parent e741dddfc1
commit 54fc46ace4
29 changed files with 377 additions and 18095 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,6 @@
</script> </script>
{% block stylesheets %} {% block stylesheets %}
{% endblock stylesheets %} {% endblock stylesheets %}
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js" async></script> <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js" async></script>
@ -139,15 +138,22 @@
{% endblock %} {% endblock %}
<!-- START CONTENT --> <!-- START CONTENT -->
<div class="row" id="order_row"> <div class="row" id="order_row">
<div id="show_sterntours_video_full" class="col-md-12" style="display: none;">
</div>
<div id="content" class="col-xs-12 col-sm-12 col-md-9 col-md-push-3 order_sec"> <div id="content" class="col-xs-12 col-sm-12 col-md-9 col-md-push-3 order_sec">
{% block body %}{% endblock %} {% block body %}{% endblock %}
</div> </div>
<div id="sidebar" class="col-xs-12 col-sm-12 col-md-3 col-md-pull-9 order_first"> <div id="sidebar" class="col-xs-12 col-sm-12 col-md-3 col-md-pull-9 order_first">
{% if site_loading is defined and page is defined %} {% if site_loading is defined and page is defined %}
{{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': page})) }} {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': page})) }}
{% else %}
{% if site_loading is defined %}
{{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': null, 'search_form': search_form})) }}
{% else %} {% else %}
{{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': 'default'})) }} {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': 'default'})) }}
{% endif %} {% endif %}
{% endif %}
</div> </div>
</div><!-- end row --> </div><!-- end row -->

6
trunk/app/Resources/views/default/components/departuresModal.html.twig
View file

@ -3,12 +3,12 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true"><i class="fa fa-times"></i></span>
</button> </button>
<h4 class="modal-title">Abflugorte / Zuschläge</h4> <h4 class="modal-title text-left">Abflugorte / Zuschläge</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<table class="table"> <table class="table table-modal">
<thead> <thead>
<tr> <tr>
<th style="text-align: left; width: 80%">Ort</th> <th style="text-align: left; width: 80%">Ort</th>

2
trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig
View file

@ -1,6 +1,6 @@
{% if search_form is defined %} {% if search_form is defined %}
{{ include('default/components/sidebar/searchSidebarWidget.html.twig') }} {{ include('default/components/sidebar/searchSidebarWidgetInner.html.twig') }}
{# #WORKAROUND Overriding this block doesn't work, probably due to a Symfony bug, see ttSearch.html.twig #} {# #WORKAROUND Overriding this block doesn't work, probably due to a Symfony bug, see ttSearch.html.twig #}
{% elseif tt_search_form is defined %} {% elseif tt_search_form is defined %}

10
trunk/app/Resources/views/default/components/sidebar/searchSidebarWidgetInner.html.twig
View file

@ -1,32 +1,24 @@
{% form_theme search_form 'default/form/theme.html.twig' %} {% form_theme search_form 'default/form/theme.html.twig' %}
<div class="widget clearfix"> <div class="widget clearfix">
<div class="widget-title"> <div class="widget-title">
<a class="collapse-widget" href="#search-widget" data-toggle="collapse">{{ slider_title }}</a> <a class="collapse-widget" href="#search-widget" data-toggle="collapse">Suche</a>
</div><!-- end title --> </div><!-- end title -->
<div class="searchwidget collapse in" id="search-widget"> <div class="searchwidget collapse in" id="search-widget">
<form action="/suche" method="get" class="searchform row st-search-form"> <form action="/suche" method="get" class="searchform row st-search-form">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
{{ form_field_pho(search_form.c, 'Reiseziel') }} {{ form_field_pho(search_form.c, 'Reiseziel') }}
</div> </div>
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label for="b" style="display: none"></label> <label for="b" style="display: none"></label>
{{ form_field_pho(search_form.b, 'Anreise') }} {{ form_field_pho(search_form.b, 'Anreise') }}
</div> </div>
<div class="form-group col-md-12 form-bottom"> <div class="form-group col-md-12 form-bottom">
<label for="e" style="display: none"></label> <label for="e" style="display: none"></label>
{{ form_field_pho(search_form.e, 'Abreise') }} {{ form_field_pho(search_form.e, 'Abreise') }}
</div> </div>
<div class="form-group col-md-12 col-sm-12 col-xs-12 text-center form-bottom"> <div class="form-group col-md-12 col-sm-12 col-xs-12 text-center form-bottom">
<button type="submit" class="btn btn-primary btn-block">Angebote suchen</button> <button type="submit" class="btn btn-primary btn-block">Angebote suchen</button>
</div> </div>
</form> </form>
</div><!-- end boxwidget --> </div><!-- end boxwidget -->
</div> </div>

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

@ -29,7 +29,7 @@
<td class="{{ dayState.getCssClass }} {% if dayState.isBookable %}active{% endif %}"> <td class="{{ dayState.getCssClass }} {% if dayState.isBookable %}active{% endif %}">
{% if dayState.isBookable %} {% if dayState.isBookable %}
{% if dayState.isPastDate %} {% if dayState.isPastDate %}
<div style="padding: 8px"><del style="color:#989898;">{{ dayState.day }}</del></div> <div><del style="color:#989898;">{{ dayState.day }}</del></div>
{% else %} {% else %}
<a href="{{ page.urlPath }}/buchen?pnr={{ dayState.price.id }}&fd={{ dayState.day < 10 ? '0':'' }}{{dayState.day}}{{ calendar_month['monthNumber'] < 10 ? '0':'' }}{{calendar_month['monthNumber']}}{{calendar_month['year']}}" <a href="{{ page.urlPath }}/buchen?pnr={{ dayState.price.id }}&fd={{ dayState.day < 10 ? '0':'' }}{{dayState.day}}{{ calendar_month['monthNumber'] < 10 ? '0':'' }}{{calendar_month['monthNumber']}}{{calendar_month['year']}}"
rel="nofollow" class="table-link" rel="nofollow" class="table-link"
@ -41,9 +41,9 @@
&nbsp; &nbsp;
{% else %} {% else %}
{% if dayState.isPastDate %} {% if dayState.isPastDate %}
<div style="padding: 8px"><del style="color:#989898;">{{ dayState.day }}</del></div> <div><del style="color:#989898;">{{ dayState.day }}</del></div>
{% else %} {% else %}
<div style="padding: 8px">{{ dayState.day }}</div> <div>{{ dayState.day }}</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
</td> </td>

52
trunk/app/Resources/views/default/pages/cms/components/ssSudan.html.twig
View file

@ -338,7 +338,7 @@
<g id="Sonnendeck"> <g id="Sonnendeck">
<g id="sonnendeck-1_"> <g id="sonnendeck-1_">
<a xlink:href="/aegypten_reisen_catalog/sonnendeck-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/sonnendeck-nilschiff-ss-sudan"
xlink:alt="Sonnendeck" xlink:title="Sonnendeck" class="{% if(tour_id == 32) %} active {% endif %}"> xlink:alt="Sonnendeck" xlink:title="Sonnendeck" class="{% if(tour_id == 32) %} active {% endif %}">
<rect id="sonnendeck-1_1_" x="350" y="70" class="st2" width="300" height="120"/> <rect id="sonnendeck-1_1_" x="350" y="70" class="st2" width="300" height="120"/>
<rect x="360" y="110" class="st3" width="280" height="40"/> <rect x="360" y="110" class="st3" width="280" height="40"/>
@ -346,7 +346,7 @@
</a> </a>
</g> </g>
<g id="bruecke-1_"> <g id="bruecke-1_">
<a xlink:href="/aegypten_reisen_catalog/bruecke-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/bruecke-nilschiff-ss-sudan"
xlink:alt="Brücke" xlink:title="Brücke" class="{% if(tour_id == 31) %} active {% endif %}"> xlink:alt="Brücke" xlink:title="Brücke" class="{% if(tour_id == 31) %} active {% endif %}">
<rect id="bruecke-1_1_" x="140" y="70" class="st2" width="210" height="120"/> <rect id="bruecke-1_1_" x="140" y="70" class="st2" width="210" height="120"/>
<rect x="150" y="110" class="st3" width="190" height="40"/> <rect x="150" y="110" class="st3" width="190" height="40"/>
@ -569,7 +569,7 @@
<g id="Oberdeck"> <g id="Oberdeck">
<g id="cabin-1"> <g id="cabin-1">
<a xlink:href="/aegypten_reisen_catalog/agatha-christie-suite-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/agatha-christie-suite-nilschiff-ss-sudan"
xlink:alt="Suite 1 Agatha Christie" xlink:title="Suite 1 Agatha Christie" class="{% if(tour_id == 1) %} active {% endif %}"> xlink:alt="Suite 1 Agatha Christie" xlink:title="Suite 1 Agatha Christie" class="{% if(tour_id == 1) %} active {% endif %}">
<polygon id="cabin-1_1_" onclick="test" class="st2" <polygon id="cabin-1_1_" onclick="test" class="st2"
points="140,60 140,130 210,130 210,40"/> points="140,60 140,130 210,130 210,40"/>
@ -578,7 +578,7 @@
</a> </a>
</g> </g>
<g id="cabin-2"> <g id="cabin-2">
<a xlink:href="/aegypten_reisen_catalog/lady-duff-gordon-suite-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/lady-duff-gordon-suite-nilschiff-ss-sudan"
xlink:alt="Suite 2 Lady Duff Gordon" xlink:title="Suite 2 Lady Duff Gordon" class="{% if(tour_id == 2) %} active {% endif %}"> xlink:alt="Suite 2 Lady Duff Gordon" xlink:title="Suite 2 Lady Duff Gordon" class="{% if(tour_id == 2) %} active {% endif %}">
<polygon id="cabin-2_1_" class="st2" points="140,130 140,200 210,220 210,130"/> <polygon id="cabin-2_1_" class="st2" points="140,130 140,200 210,220 210,130"/>
<rect x="160" y="150" class="st3" width="30" height="40"/> <rect x="160" y="150" class="st3" width="30" height="40"/>
@ -586,7 +586,7 @@
</a> </a>
</g> </g>
<g id="cabin-3"> <g id="cabin-3">
<a xlink:href="/aegypten_reisen_catalog/hercule-poirot-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/hercule-poirot-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 3 Hercule Poirot" xlink:title="Kabine 3 Hercule Poirot" class="{% if(tour_id == 3) %} active {% endif %}"> xlink:alt="Kabine 3 Hercule Poirot" xlink:title="Kabine 3 Hercule Poirot" class="{% if(tour_id == 3) %} active {% endif %}">
<rect id="cabin-3_1_" x="210" y="70" class="st2" width="70" height="60"/> <rect id="cabin-3_1_" x="210" y="70" class="st2" width="70" height="60"/>
<rect x="230" y="80" class="st3" width="30" height="40"/> <rect x="230" y="80" class="st3" width="30" height="40"/>
@ -594,7 +594,7 @@
</a> </a>
</g> </g>
<g id="cabin-4"> <g id="cabin-4">
<a xlink:href="/aegypten_reisen_catalog/gustave-flaubert-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/gustave-flaubert-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 4 Gustave Flaubert" xlink:title="Kabine 4 Gustave Flaubert" class="{% if(tour_id == 4) %} active {% endif %}"> xlink:alt="Kabine 4 Gustave Flaubert" xlink:title="Kabine 4 Gustave Flaubert" class="{% if(tour_id == 4) %} active {% endif %}">
<rect id="cabin-4_1_" x="210" y="130" class="st2" width="70" height="60"/> <rect id="cabin-4_1_" x="210" y="130" class="st2" width="70" height="60"/>
<rect x="230" y="140" class="st3" width="30" height="40"/> <rect x="230" y="140" class="st3" width="30" height="40"/>
@ -602,7 +602,7 @@
</a> </a>
</g> </g>
<g id="cabin-5"> <g id="cabin-5">
<a xlink:href="/aegypten_reisen_catalog/herodote-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/herodote-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 5 Herodote" xlink:title="Kabine 5 Herodote" class="{% if(tour_id == 5) %} active {% endif %}"> xlink:alt="Kabine 5 Herodote" xlink:title="Kabine 5 Herodote" class="{% if(tour_id == 5) %} active {% endif %}">
<rect id="cabin-5_1_" x="280" y="70" class="st2" width="70" height="60"/> <rect id="cabin-5_1_" x="280" y="70" class="st2" width="70" height="60"/>
<rect x="300" y="80" class="st3" width="30" height="40"/> <rect x="300" y="80" class="st3" width="30" height="40"/>
@ -610,7 +610,7 @@
</a> </a>
</g> </g>
<g id="cabin-6"> <g id="cabin-6">
<a xlink:href="/aegypten_reisen_catalog/vivant-denon-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/vivant-denon-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 6 Vivant Denon" xlink:title="Kabine 6 Vivant Denon" class="{% if(tour_id == 6) %} active {% endif %}"> xlink:alt="Kabine 6 Vivant Denon" xlink:title="Kabine 6 Vivant Denon" class="{% if(tour_id == 6) %} active {% endif %}">
<rect id="cabin-6_1_" x="280" y="130" class="st2" width="70" height="60"/> <rect id="cabin-6_1_" x="280" y="130" class="st2" width="70" height="60"/>
<rect x="300" y="140" class="st3" width="30" height="40"/> <rect x="300" y="140" class="st3" width="30" height="40"/>
@ -618,7 +618,7 @@
</a> </a>
</g> </g>
<g id="cabin-7"> <g id="cabin-7">
<a xlink:href="/aegypten_reisen_catalog/yacoubian-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/yacoubian-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 7 Yacoubian" xlink:title="Kabine 7 Yacoubian" class="{% if(tour_id == 7) %} active {% endif %}"> xlink:alt="Kabine 7 Yacoubian" xlink:title="Kabine 7 Yacoubian" class="{% if(tour_id == 7) %} active {% endif %}">
<rect id="cabin-7_1_" x="350" y="70" class="st2" width="70" height="60"/> <rect id="cabin-7_1_" x="350" y="70" class="st2" width="70" height="60"/>
<rect x="370" y="80" class="st3" width="30" height="40"/> <rect x="370" y="80" class="st3" width="30" height="40"/>
@ -626,7 +626,7 @@
</a> </a>
</g> </g>
<g id="cabin-8"> <g id="cabin-8">
<a xlink:href="/aegypten_reisen_catalog/le-roi-farouk-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/le-roi-farouk-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 8 Le roi Farouk" xlink:title="Kabine 8 Le roi Farouk" class="{% if(tour_id == 8) %} active {% endif %}"> xlink:alt="Kabine 8 Le roi Farouk" xlink:title="Kabine 8 Le roi Farouk" class="{% if(tour_id == 8) %} active {% endif %}">
<rect id="cabin-8_1_" x="350" y="130" class="st2" width="70" height="60"/> <rect id="cabin-8_1_" x="350" y="130" class="st2" width="70" height="60"/>
<rect x="370" y="140" class="st3" width="30" height="40"/> <rect x="370" y="140" class="st3" width="30" height="40"/>
@ -634,7 +634,7 @@
</a> </a>
</g> </g>
<g id="cabin-9"> <g id="cabin-9">
<a xlink:href="/aegypten_reisen_catalog/mariette-auguste-pacha-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/mariette-auguste-pacha-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 9 Mariette Auguste Pacha" xlink:title="Kabine 9 Mariette Auguste Pacha" class="{% if(tour_id == 9) %} active {% endif %}"> xlink:alt="Kabine 9 Mariette Auguste Pacha" xlink:title="Kabine 9 Mariette Auguste Pacha" class="{% if(tour_id == 9) %} active {% endif %}">
<rect id="cabin-9_1_" x="420" y="70" class="st2" width="70" height="60"/> <rect id="cabin-9_1_" x="420" y="70" class="st2" width="70" height="60"/>
<rect x="440" y="80" class="st3" width="30" height="40"/> <rect x="440" y="80" class="st3" width="30" height="40"/>
@ -642,7 +642,7 @@
</a> </a>
</g> </g>
<g id="cabin-10"> <g id="cabin-10">
<a xlink:href="/aegypten_reisen_catalog/gerard-de-nerval-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/gerard-de-nerval-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 10 Gerard de Nerval" xlink:title="Kabine 10 Gerard de Nerval" class="{% if(tour_id == 10) %} active {% endif %}"> xlink:alt="Kabine 10 Gerard de Nerval" xlink:title="Kabine 10 Gerard de Nerval" class="{% if(tour_id == 10) %} active {% endif %}">
<rect id="cabin-10_1_" x="420" y="130" class="st2" width="70" height="60"/> <rect id="cabin-10_1_" x="420" y="130" class="st2" width="70" height="60"/>
<rect x="430" y="140" class="st3" width="50" height="40"/> <rect x="430" y="140" class="st3" width="50" height="40"/>
@ -650,7 +650,7 @@
</a> </a>
</g> </g>
<g id="cabin-11"> <g id="cabin-11">
<a xlink:href="/aegypten_reisen_catalog/ferdinand-de-lesseps-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/ferdinand-de-lesseps-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 11 Ferdinand de Lesseps" xlink:title="Kabine 11 Ferdinand de Lesseps" class="{% if(tour_id == 11) %} active {% endif %}"> xlink:alt="Kabine 11 Ferdinand de Lesseps" xlink:title="Kabine 11 Ferdinand de Lesseps" class="{% if(tour_id == 11) %} active {% endif %}">
<rect id="cabin-11_1_" x="510" y="70" class="st2" width="70" height="60"/> <rect id="cabin-11_1_" x="510" y="70" class="st2" width="70" height="60"/>
<rect x="520" y="80" class="st3" width="50" height="40"/> <rect x="520" y="80" class="st3" width="50" height="40"/>
@ -658,7 +658,7 @@
</a> </a>
</g> </g>
<g id="cabin-12"> <g id="cabin-12">
<a xlink:href="/aegypten_reisen_catalog/david-roberts-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/david-roberts-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 12 David Roberts" xlink:title="Kabine 12 David Roberts" class="{% if(tour_id == 12) %} active {% endif %}"> xlink:alt="Kabine 12 David Roberts" xlink:title="Kabine 12 David Roberts" class="{% if(tour_id == 12) %} active {% endif %}">
<rect id="cabin-12_1_" x="510" y="130" class="st2" width="70" height="60"/> <rect id="cabin-12_1_" x="510" y="130" class="st2" width="70" height="60"/>
<rect x="520" y="140" class="st3" width="50" height="40"/> <rect x="520" y="140" class="st3" width="50" height="40"/>
@ -674,7 +674,7 @@
</a> </a>
</g> </g>
<g id="cabin-14"> <g id="cabin-14">
<a xlink:href="/aegypten_reisen_catalog/alexandre-le-grand-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/alexandre-le-grand-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 14 Alexandre le Grand" xlink:title="Kabine 14 Alexandre le Grand" class="{% if(tour_id == 14) %} active {% endif %}"> xlink:alt="Kabine 14 Alexandre le Grand" xlink:title="Kabine 14 Alexandre le Grand" class="{% if(tour_id == 14) %} active {% endif %}">
<rect id="cabin-14_1_" x="580" y="130" class="st2" width="70" height="60"/> <rect id="cabin-14_1_" x="580" y="130" class="st2" width="70" height="60"/>
<rect x="590" y="140" class="st3" width="50" height="40"/> <rect x="590" y="140" class="st3" width="50" height="40"/>
@ -682,7 +682,7 @@
</a> </a>
</g> </g>
<g id="cabin-17"> <g id="cabin-17">
<a xlink:href="/aegypten_reisen_catalog/le-venitien-inconnu-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/le-venitien-inconnu-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 17 Le vènitien inconnu" xlink:title="Kabine 17 Le vènitien inconnu" class="{% if(tour_id == 17) %} active {% endif %}"> xlink:alt="Kabine 17 Le vènitien inconnu" xlink:title="Kabine 17 Le vènitien inconnu" class="{% if(tour_id == 17) %} active {% endif %}">
<rect id="cabin-17_1_" x="650" y="70" class="st2" width="70" height="60"/> <rect id="cabin-17_1_" x="650" y="70" class="st2" width="70" height="60"/>
<rect x="660" y="80" class="st3" width="50" height="40"/> <rect x="660" y="80" class="st3" width="50" height="40"/>
@ -690,7 +690,7 @@
</a> </a>
</g> </g>
<g id="cabin-16"> <g id="cabin-16">
<a xlink:href="/aegypten_reisen_catalog/howard-carter-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/howard-carter-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 16 Howard Carter" xlink:title="Kabine 16 Howard Carter" class="{% if(tour_id == 16) %} active {% endif %}"> xlink:alt="Kabine 16 Howard Carter" xlink:title="Kabine 16 Howard Carter" class="{% if(tour_id == 16) %} active {% endif %}">
<rect id="cabin-16_1_" x="650" y="130" class="st2" width="70" height="60"/> <rect id="cabin-16_1_" x="650" y="130" class="st2" width="70" height="60"/>
<rect x="660" y="140" class="st3" width="50" height="40"/> <rect x="660" y="140" class="st3" width="50" height="40"/>
@ -698,7 +698,7 @@
</a> </a>
</g> </g>
<g id="cabin-19"> <g id="cabin-19">
<a xlink: href="/aegypten_reisen_catalog/reine-victoria-suite-nilschiff-ss-sudan.html" <a xlink: href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/reine-victoria-suite-nilschiff-ss-sudan"
xlink:alt="Suite 19 Suite Reine Victoria" xlink:title="Suite 19 Suite Reine Victoria" class="{% if(tour_id == 19) %} active {% endif %}"> xlink:alt="Suite 19 Suite Reine Victoria" xlink:title="Suite 19 Suite Reine Victoria" class="{% if(tour_id == 19) %} active {% endif %}">
<polygon id="cabin-19_1_" class="st2" points="720,70 720,130 790,130 780,70"/> <polygon id="cabin-19_1_" class="st2" points="720,70 720,130 790,130 780,70"/>
<rect x="730" y="80" class="st3" width="50" height="40"/> <rect x="730" y="80" class="st3" width="50" height="40"/>
@ -706,7 +706,7 @@
</a> </a>
</g> </g>
<g id="cabin-18"> <g id="cabin-18">
<a xlink:href="/aegypten_reisen_catalog/suite-18-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/suite-18-nilschiff-ss-sudan"
xlink:alt="Suite 18 Suite Aida" xlink:title="Suite 18 Suite Aida" class="{% if(tour_id == 18) %} active {% endif %}"> xlink:alt="Suite 18 Suite Aida" xlink:title="Suite 18 Suite Aida" class="{% if(tour_id == 18) %} active {% endif %}">
<polygon id="cabin-18_1_" class="st2" points="720,130 720,190 780,190 790,130"/> <polygon id="cabin-18_1_" class="st2" points="720,130 720,190 780,190 790,130"/>
<rect x="730" y="140" class="st3" width="50" height="40"/> <rect x="730" y="140" class="st3" width="50" height="40"/>
@ -929,7 +929,7 @@
<g id="Hauptdeck"> <g id="Hauptdeck">
<g id="restaurant-1"> <g id="restaurant-1">
<a xlink:href="/aegypten_reisen_catalog/restaurant-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/restaurant-nilschiff-ss-sudan"
xlink:alt="Restaurant" xlink:title="Restaurant" class="{% if(tour_id == 34) %} active {% endif %}"> xlink:alt="Restaurant" xlink:title="Restaurant" class="{% if(tour_id == 34) %} active {% endif %}">
<rect id="restaurant-1_1_" x="500" y="70" class="st2" width="250" height="120"/> <rect id="restaurant-1_1_" x="500" y="70" class="st2" width="250" height="120"/>
<rect x="510" y="110" class="st3" width="230" height="40"/> <rect x="510" y="110" class="st3" width="230" height="40"/>
@ -937,7 +937,7 @@
</a> </a>
</g> </g>
<g id="bar-1"> <g id="bar-1">
<a xlink:href="/aegypten_reisen_catalog/bar-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/bar-nilschiff-ss-sudan"
xlink:alt="Bar" xlink:title="Bar" class="{% if(tour_id == 33) %} active {% endif %}"> xlink:alt="Bar" xlink:title="Bar" class="{% if(tour_id == 33) %} active {% endif %}">
<rect id="bar-1_1_" x="390" y="70" class="st2" width="110" height="120"/> <rect id="bar-1_1_" x="390" y="70" class="st2" width="110" height="120"/>
<rect x="400" y="110" class="st3" width="90" height="40"/> <rect x="400" y="110" class="st3" width="90" height="40"/>
@ -953,7 +953,7 @@
</a> </a>
</g> </g>
<g id="cabin-23"> <g id="cabin-23">
<a xlink:href="/aegypten_reisen_catalog/jean-francois-champollion-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/jean-francois-champollion-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 23 Jean-Francois Champollion" xlink:title="Kabine 23 Jean-Francois Champollion" class="{% if(tour_id == 23) %} active {% endif %}"> xlink:alt="Kabine 23 Jean-Francois Champollion" xlink:title="Kabine 23 Jean-Francois Champollion" class="{% if(tour_id == 23) %} active {% endif %}">
<rect id="cabin-23_1_" x="210" y="70" class="st2" width="70" height="60"/> <rect id="cabin-23_1_" x="210" y="70" class="st2" width="70" height="60"/>
<rect x="220" y="80" class="st3" width="50" height="40"/> <rect x="220" y="80" class="st3" width="50" height="40"/>
@ -969,7 +969,7 @@
</a> </a>
</g> </g>
<g id="cabin-24"> <g id="cabin-24">
<a xlink:href="/aegypten_reisen_catalog/samuel-shepheard-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/samuel-shepheard-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 24 Samuel Shepheard" xlink:title="Kabine 24 Samuel Shepheard" class="{% if(tour_id == 24) %} active {% endif %}"> xlink:alt="Kabine 24 Samuel Shepheard" xlink:title="Kabine 24 Samuel Shepheard" class="{% if(tour_id == 24) %} active {% endif %}">
<rect id="cabin-24_1_" x="280" y="70" class="st2" width="70" height="60"/> <rect id="cabin-24_1_" x="280" y="70" class="st2" width="70" height="60"/>
<rect x="290" y="80" class="st3" width="50" height="40"/> <rect x="290" y="80" class="st3" width="50" height="40"/>
@ -977,7 +977,7 @@
</a> </a>
</g> </g>
<g id="cabin-22"> <g id="cabin-22">
<a xlink:href="/aegypten_reisen_catalog/geoffroy-st-hilaire-kabine-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/geoffroy-st-hilaire-kabine-nilschiff-ss-sudan"
xlink:alt="Kabine 22 Geoffroy St Hilaire" xlink:title="Kabine 22 Geoffroy St Hilaire" class="{% if(tour_id == 22) %} active {% endif %}"> xlink:alt="Kabine 22 Geoffroy St Hilaire" xlink:title="Kabine 22 Geoffroy St Hilaire" class="{% if(tour_id == 22) %} active {% endif %}">
<rect id="cabin-22_1_" x="280" y="130" class="st2" width="70" height="60"/> <rect id="cabin-22_1_" x="280" y="130" class="st2" width="70" height="60"/>
<rect x="290" y="140" class="st3" width="50" height="40"/> <rect x="290" y="140" class="st3" width="50" height="40"/>
@ -1201,7 +1201,7 @@
<g id="Unterdeck"> <g id="Unterdeck">
<g id="kueche-1"> <g id="kueche-1">
<a xlink:href="/aegypten_reisen_catalog/kueche-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/kueche-ss-sudan"
xlink:alt="Küche" xlink:title="Küche" class="{% if(tour_id == 36) %} active {% endif %}"> xlink:alt="Küche" xlink:title="Küche" class="{% if(tour_id == 36) %} active {% endif %}">
<rect id="kueche-1_1_" x="500" y="70" class="st2" width="250" height="120"/> <rect id="kueche-1_1_" x="500" y="70" class="st2" width="250" height="120"/>
<rect x="510" y="110" class="st3" width="230" height="40"/> <rect x="510" y="110" class="st3" width="230" height="40"/>
@ -1209,7 +1209,7 @@
</a> </a>
</g> </g>
<g id="maschinenraum-1"> <g id="maschinenraum-1">
<a xlink:href="/aegypten_reisen_catalog/maschinenraum-nilschiff-ss-sudan.html" <a xlink:href="/aegypten-reisen/nilkreuzfahrt/nilschiff-ss-sudan/maschinenraum-nilschiff-ss-sudan"
xlink:alt="Maschinenraum" xlink:title="Maschinenraum" class="{% if(tour_id == 35) %} active {% endif %}"> xlink:alt="Maschinenraum" xlink:title="Maschinenraum" class="{% if(tour_id == 35) %} active {% endif %}">
<rect id="maschinenraum-1_1_" x="170" y="70" class="st2" width="310" height="120"/> <rect id="maschinenraum-1_1_" x="170" y="70" class="st2" width="310" height="120"/>
<rect x="180" y="110" class="st3" width="290" height="40"/> <rect x="180" y="110" class="st3" width="290" height="40"/>

41
trunk/app/Resources/views/default/pages/cms/travelGuide.html.twig
View file

@ -2,7 +2,48 @@
{% block body %} {% block body %}
<section class="clearfix"> <section class="clearfix">
{% if(page.travelGuideContentId) %}
<div class="wrapper-nav-tabs">
<ul class="nav nav-tabs nav-justified list-nav-tabs">
<li class="active">
<a href="#travel_guide_short_content" aria-controls="travel_guide_short_content" role="tab" data-toggle="tab">
Kurzer Inhalt
</a>
</li>
<li>
<a href="#travel_guide_long_content" aria-controls="travel_guide_long_content" role="tab" data-toggle="tab">
Langer Inhalt
</a>
</li>
</ul>
</div>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="travel_guide_short_content">
{{ page.content|raw|keywords|lozad }} {{ page.content|raw|keywords|lozad }}
</div>
<div role="tabpanel" class="tab-pane" id="travel_guide_long_content">
{{ travel_guide_content.fullText|raw|keywords|lozad }}
</div>
</div>
<div class="wrapper-nav-tabs">
<ul class="nav nav-tabs nav-justified list-nav-tabs">
<li class="active">
<a href="#travel_guide_short_content" aria-controls="travel_guide_short_content" role="tab" data-toggle="tab">
Kurzer Inhalt
</a>
</li>
<li>
<a href="#travel_guide_long_content" aria-controls="travel_guide_long_content" role="tab" data-toggle="tab">
Langer Inhalt
</a>
</li>
</ul>
</div>
{% else %}
{{ page.content|raw|keywords|lozad }}
{% endif %}
</section> </section>
<hr> <hr>
{% if( page.children is not empty) %} {% if( page.children is not empty) %}

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

@ -14,10 +14,9 @@
<div class="content-copy"> <div class="content-copy">
<h1>{{ travel_program.title|default(page.pagetitle)|default(page.title) }}</h1> <h1>{{ travel_program.title|default(page.pagetitle)|default(page.title) }}</h1>
{#
********* SLIDER *********
#}
<section class="section fullscreen background padding-0 margin-bottom-20">
<div class="in-section-holder">
{% if travel_program.lowestPrice > 0 %} {% if travel_program.lowestPrice > 0 %}
<div class="price-over-slider"> <div class="price-over-slider">
<div class="cprice">ab {{ travel_program.lowestPrice|number_format }} € p.P.</div> <div class="cprice">ab {{ travel_program.lowestPrice|number_format }} € p.P.</div>
@ -45,7 +44,8 @@
<i class="fa fa-print" style="margin-top: -3px;"></i> Katalogseite zum Drucken <i class="fa fa-print" style="margin-top: -3px;"></i> Katalogseite zum Drucken
</a> </a>
</div> </div>
<section class="section fullscreen background padding-0 margin-bottom-20"> </div>
<div id="myCarousel" class="carousel slide"> <div id="myCarousel" class="carousel slide">
<!-- Indicators --> <!-- Indicators -->
<ol class="carousel-indicators"> <ol class="carousel-indicators">

11
trunk/src/AppBundle/Controller/CmsController.php
View file

@ -53,13 +53,20 @@ class CmsController extends Controller
public function travelGuideAction(Page $page, $template = 'default') public function travelGuideAction(Page $page, $template = 'default')
{ {
if(!empty($page->getTemplate())){ if(!empty($page->getTemplate())) {
$template = $page->getTemplate(); $template = $page->getTemplate();
} }
$travel_guide_content = false;
if($page->getTravelGuideContentId() > 0){
$repo = $this->getEntityManager()->getRepository('AppBundle:TravelGuides');
$travel_guide_content = $repo->findByID($page->getTravelGuideContentId());
}
return $this->render('default/pages/cms/'. $template .'.html.twig', [ return $this->render('default/pages/cms/'. $template .'.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
'site_loading' => 'default', 'site_loading' => 'default',
'travel_guide_content' => $travel_guide_content,
'page' => $page, 'page' => $page,
]); ]);
} }
@ -128,7 +135,7 @@ class CmsController extends Controller
'page' => $page, 'page' => $page,
'box_childs' => $box_childs, 'box_childs' => $box_childs,
'tour_id' => 0, 'tour_id' => 0,
'tour_tap' => 1, 'tour_tap' => 2,
]); ]);
} }

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

@ -109,12 +109,10 @@ class ComponentController extends Controller
} }
else else
{ {
$destination = $page->getCountry(); $destination = $page->getCountry();
} }
return $this->render('default/components/sidebar/searchSidebarWidgetInner.html.twig', [ return $this->render('default/components/sidebar/searchSidebarWidgetInner.html.twig', [
'slider_title' => $title, 'slider_title' => "suche",
'search_form' => $this->createForm(SearchRequestType::class, [ 'search_form' => $this->createForm(SearchRequestType::class, [
'c' => $destination, 'c' => $destination,
'c2' => $combinedDestination, 'c2' => $combinedDestination,
@ -192,7 +190,7 @@ class ComponentController extends Controller
]); ]);
} }
public function makeSidebarWidgetAction($site_loading = 'default', Page $page = null){ public function makeSidebarWidgetAction($site_loading = 'default', Page $page = null, $search_form = null){
$show_seal_of_approval = false; $show_seal_of_approval = false;
//default //default
@ -226,13 +224,17 @@ class ComponentController extends Controller
} }
$sidebarRepo = $this->getEntityManager()->getRepository('AppBundle:SidebarWidget'); $sidebarRepo = $this->getEntityManager()->getRepository('AppBundle:SidebarWidget');
$widgets = $sidebarRepo->findWidgetsBy($site); $widgets = $sidebarRepo->findWidgetsBy($site);
return $this->render(':default/components/sidebar:sidebar.html.twig', [
'page' => $page, $vars = [ 'page' => $page,
'site_loading' => $site_loading, 'site_loading' => $site_loading,
'widgets' => $widgets, 'widgets' => $widgets,
'show_seal_of_approval' => $show_seal_of_approval, 'show_seal_of_approval' => $show_seal_of_approval,
'loop_half' => ceil(count($widgets) / 2), 'loop_half' => ceil(count($widgets) / 2)
]); ];
if($search_form != null){
$vars['search_form'] = $search_form;
}
return $this->render(':default/components/sidebar:sidebar.html.twig', $vars);
} }

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

@ -59,7 +59,7 @@ class DefaultController extends Controller
} }
if (empty($request->query->get('e'))) if (empty($request->query->get('e')))
{ {
$request->query->set('e', (new \DateTime('+19 day'))->format('d.m.Y')); $request->query->set('e', (new \DateTime('+31 day'))->format('d.m.Y'));
} }
$form->handleRequest($request); $form->handleRequest($request);

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

@ -410,6 +410,7 @@ class FewoBookingController extends Controller
if($day && $day->getDate()) { if($day && $day->getDate()) {
if (in_array($day->getDate()->format("d.m.Y"), $check_days)) { if (in_array($day->getDate()->format("d.m.Y"), $check_days)) {
if(!empty($day->getPrice())){
$season = $day->getPrice()->getSeason()->getName(); $season = $day->getPrice()->getSeason()->getName();
if(!isset($result['season'][$season])){ if(!isset($result['season'][$season])){
$result['season'][$season]['fromDay'] = $day->getDate()->format("d.m.Y"); $result['season'][$season]['fromDay'] = $day->getDate()->format("d.m.Y");
@ -431,6 +432,7 @@ class FewoBookingController extends Controller
}else{ }else{
$frist_day = true; $frist_day = true;
} }
}
} }
} }

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

@ -62,6 +62,15 @@ class Page
*/ */
private $parent; private $parent;
/**
* @var integer
*
* @ORM\Column(name="travel_guide_content_id", type="integer", nullable=true)
*/
private $travelGuideContentId;
/** /**
* @ORM\OneToMany(targetEntity="AppBundle\Entity\Page", mappedBy="parent") * @ORM\OneToMany(targetEntity="AppBundle\Entity\Page", mappedBy="parent")
* @ORM\OrderBy({"order" = "ASC"}) * @ORM\OrderBy({"order" = "ASC"})
@ -314,6 +323,32 @@ class Page
return $this->owner; return $this->owner;
} }
/**
* Set travelGuideContentId
*
* @param integer $travelGuideContentId
*
* @return Page
*/
public function setTravelGuideContentId($travelGuideContentId)
{
$this->travelGuideContentId = $travelGuideContentId;
return $this;
}
/**
* Get travelGuideContentId
*
* @return integer
*/
public function getTravelGuideContentId()
{
return $this->travelGuideContentId;
}
/** /**
* Set model * Set model
* *

15
trunk/src/AppBundle/Entity/TravelGuideRepository.php
View file

@ -3,21 +3,20 @@
namespace AppBundle\Entity; namespace AppBundle\Entity;
/** /**
* CMSContentRepository * TravelGuideRepository
* *
* This class was generated by the Doctrine ORM. Add your own custom * This class was generated by the Doctrine ORM. Add your own custom
* repository methods below. * repository methods below.
*/ */
class CMSContentRepository extends \Doctrine\ORM\EntityRepository class TravelGuideRepository extends \Doctrine\ORM\EntityRepository
{ {
public function findByID($id)
public function findBySlug($slug)
{ {
$qb = $this->getEntityManager()->createQueryBuilder(); $qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('c'); $qb->select('tg');
$qb->from('AppBundle:CMSContent', 'c'); $qb->from('AppBundle:TravelGuides', 'tg');
$qb->where('c.slug = :slug'); $qb->where('tg.id = :id');
$qb->setParameter('slug', $slug); $qb->setParameter('id', $id);
$qb->setMaxResults(1); $qb->setMaxResults(1);
return $qb->getQuery()->getOneOrNullResult(); return $qb->getQuery()->getOneOrNullResult();

27
trunk/src/AppBundle/Entity/TravelGuides.php
View file

@ -45,10 +45,6 @@ class TravelGuides
private $fullText; private $fullText;
/**
* @ORM\OneToOne(targetEntity="AppBundle\Entity\Page", mappedBy="travelGuideContentId")
*/
private $page;
/** /**
* Get id * Get id
@ -133,29 +129,6 @@ class TravelGuides
return $this->fullText; return $this->fullText;
} }
/**
* Set page
*
* @param \AppBundle\Entity\Page $page
*
* @return TravelGuideContent
*/
public function setPage(\AppBundle\Entity\Page $page = null)
{
$this->page = $page;
return $this;
}
/**
* Get page
*
* @return \AppBundle\Entity\Page
*/
public function getPage()
{
return $this->page;
}
} }

3
trunk/src/AppBundle/Entity/TravelPeriodRepository.php
View file

@ -92,7 +92,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
$qb->having('COUNT(DISTINCT tc) = '. count($destinationIds)); $qb->having('COUNT(DISTINCT tc) = '. count($destinationIds));
} }
} }
$qb->groupBy('p.id, p_dep.id, d.id'); // TODO $qb->groupBy('p.id, p_dep.id, d.id');
// $qb->groupBy('p.id'); // $qb->groupBy('p.id');
// Travel class // Travel class
@ -116,6 +116,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
/** @var TravelProgram[]|array $travelPrograms */ /** @var TravelProgram[]|array $travelPrograms */
$travelPrograms = $qb->getQuery()->getResult(); $travelPrograms = $qb->getQuery()->getResult();
if (empty($travelPrograms)) if (empty($travelPrograms))
{ {
return $travelPrograms; return $travelPrograms;

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

@ -16187,12 +16187,12 @@
"ft": 1, "ft": 1,
"ie": 1, "ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 0,
"mS": 0, "mS": 0,
"oA": 0, "oA": 0,
"oAP": "/Users/kevinadametz/Websites/sterntours-3/trunk/web/css/my-custom.css", "oAP": "/Users/kevinadametz/Websites/sterntours-3/trunk/web/css/my-custom.css",
"oF": 6, "oF": 6,
"oS": 0, "oS": 1,
"rwU": 0, "rwU": 0,
"sI": 0, "sI": 0,
"sU": 0 "sU": 0
@ -16222,12 +16222,12 @@
"ft": 1, "ft": 1,
"ie": 1, "ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 0,
"mS": 0, "mS": 0,
"oA": 0, "oA": 0,
"oAP": "/public/css/my-fewo.css", "oAP": "/Users/kevinadametz/Websites/sterntours-3/trunk/web/css/my-fewo.css",
"oF": 0, "oF": 6,
"oS": 0, "oS": 1,
"rwU": 0, "rwU": 0,
"sI": 0, "sI": 0,
"sU": 0 "sU": 0
@ -17657,6 +17657,25 @@
"sC": 1, "sC": 1,
"tS": 0 "tS": 0
}, },
"/public/js/min/custom-min.js": {
"bF": 4,
"ft": 64,
"ma": 0,
"mi": 1,
"oA": 0,
"oAP": "/public/js/min/min/custom-min-min.js",
"oF": 0,
"sC": 1,
"tS": 0
},
"/public/js/min/custom-min.js.map": {
"cB": 0,
"ft": 8192,
"hM": 0,
"oA": 0,
"oAP": "/public/js/min/custom-min.js.map",
"oF": 0
},
"/public/js/min/fewoBooking-min.js": { "/public/js/min/fewoBooking-min.js": {
"bF": 4, "bF": 4,
"ft": 64, "ft": 64,

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

@ -1222,39 +1222,11 @@ a[id^="video_"]:before,
text-align: center; text-align: center;
width: 70px; width: 70px;
} }
.btn-over-slider {
position: absolute;
right: 25px;
top: 70px;
z-index: 1000;
}
.btn-over-slider .btn {
border: 1px solid #fff;
-webkit-box-shadow: 0px 0px 8px 5px rgba(255, 255, 255, 0.4);
-moz-box-shadow: 0px 0px 8px 5px rgba(255, 255, 255, 0.4);
box-shadow: 0px 0px 8px 5px rgba(255, 255, 255, 0.4);
}
.btn-over-slider-bottom {
top: 270px !important;
}
.btn-primary.btn-sm.st-slider-booking-btn-bottom { .btn-primary.btn-sm.st-slider-booking-btn-bottom {
text-transform: none; text-transform: none;
font-size: 15px!important; font-size: 15px!important;
} }
.price-over-slider {
position: absolute;
left: 15px;
top: 75px;
z-index: 1000;
}
.price-over-slider .cprice {
background-color: #648859;
color: #fff;
padding: 4px 6px 4px 12px;
font-weight: bold;
border: 1px solid #fff;
border-left: none;
}
.owl-item-container .quick-view { .owl-item-container .quick-view {
position: absolute; position: absolute;
left: 50%; left: 50%;
@ -4019,8 +3991,8 @@ a,
top: 52px; top: 52px;
} }
} }
@media (max-width: 991px) { @media (max-width: 991px) {
/* Force table to not be like tables anymore */
#no-more-tables table, #no-more-tables table,
#no-more-tables thead, #no-more-tables thead,
#no-more-tables tbody, #no-more-tables tbody,
@ -4029,7 +4001,6 @@ a,
#no-more-tables tr { #no-more-tables tr {
display: block; display: block;
} }
/* Hide table headers (but not display: none;, for accessibility) */
#no-more-tables thead tr { #no-more-tables thead tr {
position: absolute; position: absolute;
top: -9999px; top: -9999px;
@ -4039,7 +4010,6 @@ a,
border: 1px solid #ccc; border: 1px solid #ccc;
} }
#no-more-tables td { #no-more-tables td {
/* Behave like a "row" */
border: none; border: none;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
position: relative; position: relative;
@ -4048,9 +4018,7 @@ a,
text-align: right; text-align: right;
} }
#no-more-tables td:before { #no-more-tables td:before {
/* Now like a table header */
position: absolute; position: absolute;
/* Top/left values mimic padding */
top: 6px; top: 6px;
left: 6px; left: 6px;
width: 45%; width: 45%;
@ -4073,16 +4041,42 @@ a,
#no-more-tables tr:nth-child(2n+1) > td { #no-more-tables tr:nth-child(2n+1) > td {
background-color: #d8d8d8; background-color: #d8d8d8;
} }
/*
Label the data
*/
#no-more-tables td:before { #no-more-tables td:before {
content: attr(data-title); content: attr(data-title);
} }
#no-more-tables table.table-modal {
display: table;
}
#no-more-tables .table-modal thead {
display: table-header-group;
}
#no-more-tables .table-modal tbody {
display: table-row-group;
}
#no-more-tables .table-modal tr {
display: table-row;
}
#no-more-tables .table-modal th {
display: table-cell;
}
#no-more-tables .table-modal td {
display: table-cell;
}
#no-more-tables .table-modal td {
padding-left: 6px;
}
#no-more-tables .table-modal td h4 {
margin-bottom: 5px;
}
} }
@media (max-width: 991px) { @media (max-width: 991px) {
/* Force table to not be like tables anymore */ /* Force table to not be like tables anymore */
.no-more-tables table, .no-more-tables table ,
.no-more-tables thead, .no-more-tables thead,
.no-more-tables tbody, .no-more-tables tbody,
.no-more-tables th, .no-more-tables th,
@ -4142,6 +4136,9 @@ a,
content: attr(data-title); content: attr(data-title);
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.dropdown-menu li.first { .dropdown-menu li.first {
display: none; display: none;
@ -4167,18 +4164,7 @@ a,
.home-info-box { .home-info-box {
margin-right: -30px; margin-right: -30px;
} }
.btn-over-slider {
top: 80px;
}
.btn-over-slider-bottom {
top: 320px;
}
.st-slider-booking-btn-bottom {
}
.price-over-slider {
top: 85px;
}
#sidebar #side-navigation .side-menu { #sidebar #side-navigation .side-menu {
width: 100%; width: 100%;
} }
@ -6321,27 +6307,66 @@ hr.primary {
-webkit-animation-name: zoomOut; -webkit-animation-name: zoomOut;
animation-name: zoomOut; animation-name: zoomOut;
} }
.in-section-holder {
position: relative;
}
.price-over-slider {
position: absolute;
left: 0;
top: 10px;
z-index: 1000;
}
.price-over-slider .cprice {
background-color: #648859;
color: #fff;
padding: 4px 6px 4px 12px;
font-weight: bold;
border: 1px solid #fff;
border-left: none;
}
.price-over-slider.next-over { .price-over-slider.next-over {
left: 15px; left: 0;
border-left: 0; border-left: 0;
top: 125px; top: 50px;
} }
@media (min-width: 992px) { .btn-over-slider {
.price-over-slider.next-over { position: absolute;
left: 150px; right: 10px;
border-left: 1px solid #fff; top: 10px;
top: 75px; z-index: 1000;
}
} }
.btn-over-slider .btn {
border: 1px solid #fff;
-webkit-box-shadow: 0px 0px 8px 5px rgba(255, 255, 255, 0.4);
-moz-box-shadow: 0px 0px 8px 5px rgba(255, 255, 255, 0.4);
box-shadow: 0px 0px 8px 5px rgba(255, 255, 255, 0.4);
}
.btn-over-slider-bottom {
top: 200px;
}
@media (max-width: 768px) { @media (max-width: 768px) {
.btn-over-slider {
top: 70px;
left: 2px;
}
.btn-over-slider-bottom {
top: 200px;
left: 2px;
}
.price-over-slider {
top:0px;
}
.price-over-slider.next-over { .price-over-slider.next-over {
top: 135px; top: 35px;
left: 0;
} }
} }
.btn-booking-form { .btn-booking-form {
font-size: 15px; font-size: 15px;
border: 1px solid #fff; border: 1px solid #fff;
@ -6382,22 +6407,6 @@ hr.primary {
55% {opacity: 1; transform: translateX(0px) scale(1);} 55% {opacity: 1; transform: translateX(0px) scale(1);}
} }
@media (min-width: 992px) {
.price-over-slider.next-over {
left: 150px;
border-left: 1px solid #fff;
top: 75px;
}
}
@media (max-width: 768px) {
.price-over-slider.next-over {
top: 165px;
}
}
@-webkit-keyframes burst { @-webkit-keyframes burst {
0% { 0% {
opacity: 1 opacity: 1
@ -6646,3 +6655,29 @@ hr.primary {
opacity: 0; opacity: 0;
} }
/*scroll*/
/* Let's get this party started */
::-webkit-scrollbar {
width: 12px;
}
/* Track */
::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-webkit-border-radius: 3px;
border-radius: 3px;
}
/* Handle */
::-webkit-scrollbar-thumb {
-webkit-border-radius: 3px;
border-radius: 3px;
background: #e5aa30;
-webkit-box-shadow: inset 0 0 4px rgba(0,0,0,0.1);
}
::-webkit-scrollbar-thumb:window-inactive {
background: #cb9030;
}

4
trunk/src/AppBundle/Resources/public/css/fewo.css
View file

@ -96,6 +96,10 @@
background-color: #648859; background-color: #648859;
}
.table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th {
padding: 8px 4px;
} }
/* #wrapper, #content, #fullwidth, .container, .row, .content-copy, .tab-content, .tab-pane { /* #wrapper, #content, #fullwidth, .container, .row, .content-copy, .tab-content, .tab-pane {
position:relative; position:relative;

2
trunk/src/AppBundle/Resources/public/css/header-min.css vendored
View file

File diff suppressed because one or more lines are too long

4
trunk/src/AppBundle/Resources/public/css/my-fewo.css
View file

@ -610,6 +610,10 @@
background-color: #648859; background-color: #648859;
}
.table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th {
padding: 8px 4px;
} }
/* #wrapper, #content, #fullwidth, .container, .row, .content-copy, .tab-content, .tab-pane { /* #wrapper, #content, #fullwidth, .container, .row, .content-copy, .tab-content, .tab-pane {
position:relative; position:relative;

2
trunk/src/AppBundle/Resources/public/css/my-fewo.css.map
View file

@ -1 +1 @@
{"version":3,"sources":["daterangepicker.css","fewo.css"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACjgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"my-fewo.css"} {"version":3,"sources":["daterangepicker.css","fewo.css"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;ACjgBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"my-fewo.css"}

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

@ -13,7 +13,6 @@ var collapse_on_responsive = function() {
collapse_on_responsive(); collapse_on_responsive();
$(window).on('resize',function(e){ $(window).on('resize',function(e){
collapse_on_responsive(); collapse_on_responsive();
}); });

16
trunk/src/AppBundle/Twig/AppExtension.php
View file

@ -224,6 +224,22 @@ class AppExtension extends \Twig_Extension
} }
} }
//include per tag <include data-twig="link">
$includes = $dom->getElementsByTagName('include');
foreach ($includes as $include) {
if($include->getAttribute('data-twig')){
$template = $this->environment->loadTemplate('::'.$include->getAttribute('data-twig'));
$view = $template->render(['tour_tap' => 2, 'tour_id' => false]);
$pN = $include->parentNode;
$viewDom = new \DOMDocument('1.0', 'utf-8');
$viewDom->loadHTML('<?xml encoding="utf-8" ?>'.$view);
$pN->parentNode->insertBefore($dom->importNode($viewDom->documentElement, true), $pN->nextSibling);#
$pN->parentNode->removeChild($pN);
}
}
$html = $dom->saveHTML(); $html = $dom->saveHTML();
return $html; return $html;

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -27,3 +27,13 @@ $(document).ready(function() {
} }
}); });
}); });
var collapse_on_responsive = function() {
if (jQuery(document).width() < 992) {
//jQuery('.widget').find('.collapse-widget:not(.open)').addClass('collapsed');
//jQuery('.widget').find('.collapse:not(.open)').removeClass('in');
}else{
// jQuery('.widget').find('.collapse-widget').removeClass('collapsed');
// jQuery('.widget').find('.collapse').addClass('in');
}
};