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

* Update auf Twig 2 (notwendig, da block() bei Twig 1 '' statt null zurückgibt. Somit kann nicht unterschieden werden, ob ein Block nicht definiert wurde oder leer ist; das ist wiederum notwendig, damit Templates die Blöcke in sidebar.html.twig auch mit leerem Inhalt überschreiben können)

Browse source 
* Symfony-Update
* Behoben: Reisemagazin/-führer Slider zeigt deaktivierte Seiten an; Begrenzung auf 3 Einträge entfernt
* Behoben: Angebote werden nicht überall angezeigt
* Land einer Seite von übergeordneten Seiten erben (getEffectiveCountry())
* Seitentemplate "offers": Diese Seiten haben unten im Body ein Angebots-Karusell
* Templates ohne Controller action werden jetzt unterstützt. Falls keine Action existiert, wird einfach ein gleichnamiges twig-Template gerendert

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3303 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2017-02-22 12:03:49 +00:00
parent bf69f20a50
commit ce292748fb
14 changed files with 662 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,8 +106,11 @@
<div class="row">
{% include 'default/components/sidebar.html.twig' with {
nav_sidebar_widget_block: block('nav_sidebar_widget'),
search_sidebar_widget_block: block('search_sidebar_widget'),
nav_sidebar_widget_block: block('nav_sidebar_widget') ?? null,
search_sidebar_widget_block: block('search_sidebar_widget') ?? null,
travel_guide_sidebar_widget_block: block('travel_guide_sidebar_widget') ?? null,
travel_magazine_sidebar_widget_block: block('travel_magazine_sidebar_widget') ?? null,
offers_sidebar_widget_block: block('offers_sidebar_widget') ?? null,
} %}
<div id="content" class="col-md-9 col-sm-8 col-xs-12">

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

@ -75,11 +75,6 @@
Reiseführer
</a>
</li>
<li itemprop="name">
<a itemprop="url" href="/docs/urlaubsinfos.html" title="Reiseführer">
Reiseführer
</a>
</li>
<li itemprop="name">
<a itemprop="url" href="/docs/reisemagazin.html" title="Reisemagazin">
Reisemagazin

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

@ -1,7 +1,8 @@
{# @var page \AppBundle\Entity\Page #}
<div id="sidebar" class="col-md-3 col-sm-4 col-xs-12 hidden-xs">
{% if show_search_sidebar_widget ?? true %}
{% if search_sidebar_widget_block is empty %}
{% if search_sidebar_widget_block is null %}
{% if search_form is defined %}
{{ include('default/components/sidebar/searchSidebarWidget.html.twig') }}
{% elseif page is defined %}
@ -13,7 +14,7 @@
{% endif %}
{% if show_nav_sidebar_widget ?? true and page is defined %}
{% if nav_sidebar_widget_block is empty %}
{% if nav_sidebar_widget_block is null %}
{{ render(controller('AppBundle:Component:navSidebarWidget', {page: page})) }}
{% else %}
{{ nav_sidebar_widget_block|raw }}
@ -41,22 +42,34 @@
<span itemprop="rating" itemscope itemtype="https://data-vocabulary.org/Rating">
<span itemprop="average">4.90</span> / <span itemprop="best">5</span>
</span>
bei <span itemprop="count">66</span> Bewertungen
bei <span itemprop="count">78</span> Bewertungen
</div>
</div>
</div><!-- end widget -->
{% if (show_travel_guide_sidebar_widget ?? true) and page is defined and page.country is not empty %}
{{ render(controller('AppBundle:Component:travelGuideSidebarWidget', {country: page.country})) }}
{% if (show_travel_guide_sidebar_widget ?? true) and page is defined and page.effectiveCountry is not empty %}
{% if travel_guide_sidebar_widget_block is null %}
{{ render(controller('AppBundle:Component:travelGuideSidebarWidget', {country: page.effectiveCountry})) }}
{% else %}
{{ travel_guide_sidebar_widget_block|raw }}
{% endif %}
{% endif %}
{% if (show_travel_magazine_sidebar_widget ?? true) and page is defined and page.country is not empty %}
{{ render(controller('AppBundle:Component:travelMagazineSidebarWidget', {country: page.country})) }}
{% if (show_travel_magazine_sidebar_widget ?? true) and page is defined and page.effectiveCountry is not empty %}
{% if travel_magazine_sidebar_widget_block is null %}
{{ render(controller('AppBundle:Component:travelMagazineSidebarWidget', {country: page.effectiveCountry})) }}
{% else %}
{{ travel_magazine_sidebar_widget_block|raw }}
{% endif %}
{% endif %}
{% if (show_offers_sidebar_widget ?? true) and page is defined and page.country is not empty %}
{{ render(controller('AppBundle:Component:offersSidebarWidget', {country: page.country})) }}
{% if (show_offers_sidebar_widget ?? true) %}
{% if offers_sidebar_widget_block is null %}
{{ render(controller('AppBundle:Component:offersSidebarWidget', {country: page.effectiveCountry ?? null})) }}
{% else %}
{{ offers_sidebar_widget_block|raw }}
{% endif %}
{% endif %}
</div><!-- end col -->

14
trunk/app/Resources/views/default/pages/cms/offers.html.twig Normal file
View file

@ -0,0 +1,14 @@
{# @var page \AppBundle\Entity\Page #}
{% extends get_base_template() %}
{% block offers_sidebar_widget %}{% endblock %}
{% block body %}
<section class="clearfix">
{{ page.content|raw|keywords }}
</section>
<section class="clearfix">
{{ render(controller('AppBundle:Component:offersCarousel', {country: page.effectiveCountry})) }}
</section>
{% endblock %}

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

@ -19,7 +19,7 @@
<section class="clearfix">
<div class="hl2">Alle Reisekategorien auf einem Blick</div>
{% include 'default/components/multiPageBoxCarousel.html.twig' with {pages: country_pages} %}
{{ render(controller('AppBundle:Component:offersCarousel')) }}
</section><!-- end section -->
<section class="clearfix">