* Behoben: Doppelter title, fehlender description-Tag, meta Tag für canonical-URL funktioniert nicht immer; fehlender robots-meta-tag
* Im Entwickler-Modus werden jetzt im Quellcode Hinweise angezeigt: Ganz oben, die Seiten-ID und z.B. bei den meta-Tags, wie sie entstehen oder warum sie fehlen * Neue Links verwenden für Reiseführer und Reisemagazin und "Über uns"; Social-Media-Link-URLs (Google, Facebook); ARBs im Footer verlinken * "Jugendreisen"-Tab im Header entfernt * Behoben: Traveltainment-Suchmaske fehlt auf der Traveltainment-Suchergebnisseite (/tt-suche) * End-Datum in Suchmasken automatisch 14 Tage setzen, falls der Nutzer das Start-Datum später als das Enddatum setzt * Überschrift über Angebotsboxen im Body (Betrifft das CMS-Template "offers") * In der Traveltainment-Suchmaske automatisch nur noch für das Land der Seite passende Destinationen im Dropdown vorschlagen * Statt Text-"Slider" den "Slider" mit Bildern für Reisemagzin und Reiseführer in der Sidebar verwenden * Sidebar-"Slider": Automatisches Blättern alle 5 Sekunden deaktiviert git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3308 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli
parent
fc8e9a9113
commit
6f51f420e0
18 changed files with 201 additions and 57 deletions
|
|
@ -1,4 +1,8 @@
|
|||
<!DOCTYPE html>
|
||||
{% if app.debug -%}
|
||||
<!-- {% if page is defined %}page-Eintrag mit ID {{ page.id }}{% else %}Für diese Seite existiert kein page-Eintrag, sondern ein Twig-Seitetemplate in app/Resources/views/default/pages{% endif %} -->
|
||||
{%- endif %}
|
||||
|
||||
<!--[if lt IE 7 ]><html class="ie ie6" lang="de"> <![endif]-->
|
||||
<!--[if IE 7 ]><html class="ie ie7" lang="de"> <![endif]-->
|
||||
<!--[if IE 8 ]><html class="ie ie8" lang="de"> <![endif]-->
|
||||
|
|
@ -15,10 +19,19 @@
|
|||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||
{% block meta_description -%}
|
||||
{%- if page is defined and page.description is not empty -%}
|
||||
<meta name="description" content="{{ page.description }}" >
|
||||
{%- elseif app.debug -%}
|
||||
<!-- <meta name="description" > {% if page is not defined %} muss im Twig-Seitentemplate im Block meta_description festgelegt werden.{% else %} fehlt, da das Feld "description" im page Eintrag mit der ID {{ page.id }} fehlt.{% endif %} -->
|
||||
{%- endif -%}
|
||||
{%- endblock %}
|
||||
{% block meta_robots %}
|
||||
<meta name="robots" content="follow,index" />
|
||||
{% if app.debug %}<!-- Falls der meta-robots-Tag für diese Seite falsch ist, kann der Block "meta_robots" im Twig-Template überschrieben werden -->{% endif %}
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
||||
<title>STERNTOURS</title>
|
||||
|
||||
<!-- Favicons -->
|
||||
<link rel="shortcut icon" href="/bundles/app/images/favicon.ico" type="image/x-icon" />
|
||||
<link rel="apple-touch-icon" href="/bundles/app/images/apple-icon.png" />
|
||||
|
|
@ -26,18 +39,22 @@
|
|||
<link rel="apple-touch-icon" sizes="114x114" href="/bundles/app/images/apple-icon-114x114.png" />
|
||||
|
||||
{% block canonical_tag %}
|
||||
{% block canonical_url %}
|
||||
{% if canonical_url is not defined and page is defined %}
|
||||
{% if page.canonicalUrl is not empty %}
|
||||
{% set canonical_url = (page.canonicalUrl starts with '/' ? get_base_url()) ~ page.canonicalUrl %}
|
||||
{% else %}
|
||||
{% set canonical_url = get_base_url() ~ page.urlPath %}
|
||||
{% endif %}
|
||||
{% if canonical_url is not defined and page is defined %}
|
||||
{% if page.canonicalUrl is not empty %}
|
||||
{% set canonical_url = (page.canonicalUrl starts with '/' ? get_base_url()) ~ page.canonicalUrl %}
|
||||
{% if app.debug %}<!-- Die canonical URL wurde über das Feld "canonical_url" des page-Eintrags ermittelt -->{% endif %}
|
||||
{% else %}
|
||||
{% set canonical_url = get_base_url() ~ page.urlPath %}
|
||||
{% if app.debug %}<!-- Die canonical URL wurde über den URL-Pfad des page-Eintrags berechnet, also entweder über das Feld "real_url_path" oder den "slug"-Werten der Seitenhierarchie -->{% endif %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% elseif app.debug and canonical_url is defined %}
|
||||
<!-- Die canonical_url wurde im Controller festgelegt -->
|
||||
{% endif %}
|
||||
{% if canonical_url is defined %}
|
||||
<link rel="canonical" href="{{ canonical_url }}" />
|
||||
<link rel="alternate" hreflang="de-de" href="{{ canonical_url }}" />
|
||||
{% elseif app.debug %}
|
||||
<!-- Die canonical_url konnte nicht automatisch ermittelt werden und muss daher entweder durch den Controller festgelegt werden, oder der Block "canonical_tag" im Seiten-Template überschrieben werden -->
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
</div>
|
||||
<div class="col-md-3 col-sm-12 col-xs-12">
|
||||
<div class="social-footer text-right">
|
||||
<a href="/docs/ueber-uns.html" title="Über uns"><i class="fa fa-users"></i></a>
|
||||
<a href="#" title="Facebook"><i class="fa fa-facebook"></i></a>
|
||||
<a href="#" title="Google"><i class="fa fa-google-plus"></i></a>
|
||||
<a href="/ueber-uns" title="Über uns"><i class="fa fa-users"></i></a>
|
||||
<a href="https://de-de.facebook.com/sterntours/" title="Facebook"><i class="fa fa-facebook"></i></a>
|
||||
<a href="https://plus.google.com/+sterntours" title="Google"><i class="fa fa-google-plus"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -119,6 +119,7 @@
|
|||
<div class="link-footer">
|
||||
<a href="/impressum" title="Impressum">Impressum</a> |
|
||||
<a href="/agb" title="AGB">AGB</a> |
|
||||
<a href="/arb" title="AGB">AGB</a> |
|
||||
<a href="/datenschutz" title="Datenschutz">Datenschutz</a> |
|
||||
<a href="/bildnachweis" title="Bildnachweise">Bildnachweise</a> |
|
||||
<a href="/sitemap" title="Sitemap">Sitemap</a>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/docs/ueber-uns.html" title="Über uns">
|
||||
<a href="/ueber-uns" title="Über uns">
|
||||
<i class="fa fa-users"></i> Über uns
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -71,12 +71,12 @@
|
|||
</a>
|
||||
</li>
|
||||
<li itemprop="name">
|
||||
<a itemprop="url" href="/docs/urlaubsinfos.html" title="Reiseführer">
|
||||
<a itemprop="url" href="/reisefuehrer" title="Reiseführer">
|
||||
Reiseführer
|
||||
</a>
|
||||
</li>
|
||||
<li itemprop="name">
|
||||
<a itemprop="url" href="/docs/reisemagazin.html" title="Reisemagazin">
|
||||
<a itemprop="url" href="/reisemagazin" title="Reisemagazin">
|
||||
Reisemagazin
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -55,12 +55,11 @@
|
|||
<ul class="nav nav-tabs nav-justified" role="tablist">
|
||||
<li class="active"><a href="#tab_01" aria-controls="tab_01" role="tab" data-toggle="tab">Kulturreisen</a></li>
|
||||
<li><a href="#tab_02" aria-controls="tab_02" role="tab" data-toggle="tab">Pauschalreisen weltweit</a></li>
|
||||
<li><a href="/docs/jugendreisen.html" aria-controls="tab_03" role="tab" data-toggle="tab">Jugendreisen</a></li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content">
|
||||
<div role="tabpanel" class="tab-pane active" id="tab_01">
|
||||
<form class="bookform form-inline row" action="/suche" method="get">
|
||||
<form class="bookform form-inline row st-search-form" action="/suche" method="get">
|
||||
<div class="form-group col-md-3 col-sm-6 col-xs-12">
|
||||
{{ form_field_pho(search_form.c) }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,12 @@
|
|||
{% if search_sidebar_widget_block is null %}
|
||||
{% if search_form is defined %}
|
||||
{{ include('default/components/sidebar/searchSidebarWidget.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 %}
|
||||
{{ include('default/components/sidebar/ttSearchSidebarWidget.html.twig') }}
|
||||
{# END WORKAROUND #}
|
||||
|
||||
{% elseif page is defined %}
|
||||
{{ render(controller('AppBundle:Component:searchSidebarWidget', {page: page})) }}
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<a class="collapse-widget" href="#search-widget" data-toggle="collapse">Kulturreisen suchen</a>
|
||||
</div><!-- end title -->
|
||||
<div class="searchwidget collapse in" id="search-widget">
|
||||
<form action="/suche" method="get" class="searchform row">
|
||||
<form action="/suche" method="get" class="searchform row st-search-form">
|
||||
<div class="form-group col-md-12">
|
||||
{{ form_field_pho(search_form.c, 'Reiseziel') }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% form_theme tt_search_form 'default/form/theme.html.twig' %}
|
||||
<div class="widget clearfix">
|
||||
<form action="/tt-suche" method="get" class="searchwidget searchform row">
|
||||
<form action="/tt-suche" method="get" class="searchwidget searchform row st-tt-search-form">
|
||||
<div class="form-group col-md-12">{{ form_field_pho(tt_search_form.termin, 'Früheste Anreise') }}</div>
|
||||
<div class="form-group col-md-12">{{ form_field_pho(tt_search_form.ruecktermin, 'Späteste Abreise') }}</div>
|
||||
<div class="form-group col-md-12">{{ form_field_pho(tt_search_form.dauer) }}</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% form_theme tt_search_form 'default/form/theme.html.twig' %}
|
||||
|
||||
<form action="/tt-suche" method="get" class="bookform form-inline">
|
||||
<form action="/tt-suche" method="get" class="bookform form-inline st-tt-search-form">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-3 col-sm-6 col-xs-12">{{ form_field_pho(tt_search_form.termin, 'Früheste Anreise') }}</div>
|
||||
<div class="col-md-3 col-sm-6 col-xs-12">{{ form_field_pho(tt_search_form.ruecktermin, 'Späteste Abreise') }}</div>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{% extends 'base.html.twig' %}
|
||||
{% form_theme form 'default/form/theme.html.twig' %}
|
||||
|
||||
{% block metatags %}
|
||||
{{ parent() }}
|
||||
{% block meta_robots %}
|
||||
<meta name="robots" content="noindex,nofollow" />
|
||||
{% if app.debug %}<!-- meta-robots wurde durch das Twig-Seitentemplate festgelegt -->{% endif %}
|
||||
{% endblock %}
|
||||
{% block canonical_tag %}{% endblock %}
|
||||
{% block canonical_tag %}{% if app.debug %}<!-- Die canonical URL wird für diese Seite bewusst nicht definiert, da sie vom Suchindex ausgeschlossen wurde (Siehe meta robots) -->{% endif %}{% endblock %}
|
||||
|
||||
{% block stylesheets %}
|
||||
{{ parent() }}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
</section>
|
||||
|
||||
<section class="clearfix">
|
||||
<h3>Unsere beliebtesten Kulturreisen</h3>
|
||||
|
||||
{{ render(controller('AppBundle:Component:offersCarousel', {country: page.effectiveCountry})) }}
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
|
@ -1,15 +1,20 @@
|
|||
{% extends get_base_template() %}
|
||||
|
||||
{% block metatags %}
|
||||
{{ parent() }}
|
||||
{% block meta_robots %}
|
||||
<meta name="robots" content="noindex,nofollow" />
|
||||
{% if app.debug %}<!-- meta-robots wurde durch das Twig-Seitentemplate festgelegt -->{% endif %}
|
||||
{% endblock %}
|
||||
{% block canonical_tag %}{% if app.debug %}<!-- Die canonical URL wird für diese Seite bewusst nicht definiert, da sie vom Suchindex ausgeschlossen wurde (Siehe meta robots) -->{% endif %}{% endblock %}
|
||||
|
||||
{#
|
||||
TODO: This doesn't work. Form labels are rendered, but widgets themselves not. Symfony / Twig bug?
|
||||
{% block search_sidebar_widget %}
|
||||
{{ include('default/components/sidebar/ttSearchSidebarWidget.html.twig') }}
|
||||
{% include 'default/components/sidebar/ttSearchSidebarWidget.html.twig' %}
|
||||
{% endblock %}
|
||||
#}
|
||||
|
||||
{% block body %}
|
||||
{% include 'default/components/sidebar/ttSearchSidebarWidget.html.twig' %}
|
||||
{% if tt_url is defined %}
|
||||
<iframe src="{{ tt_url }}" scrolling="no" width="100%" height="13500"
|
||||
onload="window.parent.parent.scrollTo(0,0);"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue