diff --git a/trunk/app/Resources/TwigBundle/views/Exception/error.html.twig b/trunk/app/Resources/TwigBundle/views/Exception/error.html.twig new file mode 100644 index 00000000..11218964 --- /dev/null +++ b/trunk/app/Resources/TwigBundle/views/Exception/error.html.twig @@ -0,0 +1,7 @@ +{% extends get_base_template() %} + +{% block body %} +

Fehler

+ +
Es ist ein Fehler aufgetreten. Ihre Anfrage konnte nicht verarbeitet werden
+{% endblock %} \ No newline at end of file diff --git a/trunk/app/Resources/TwigBundle/views/Exception/error404.html.twig b/trunk/app/Resources/TwigBundle/views/Exception/error404.html.twig new file mode 100644 index 00000000..634f213f --- /dev/null +++ b/trunk/app/Resources/TwigBundle/views/Exception/error404.html.twig @@ -0,0 +1,19 @@ +{% extends get_base_template() %} + +{% block body %} +

Fehler 404

+

Leider konnte die von Ihnen angeforderte Seite nicht gefunden werden.

+

+ Bitte überprüfen Sie: +

+ + + +

+ Versuchen Sie ggf. die gewünschte Seite über unsere Homepage zu finden. +

+{% endblock body %} \ No newline at end of file diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 7abd0b40..8566c684 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -1,4 +1,8 @@ +{% if app.debug -%} + +{%- endif %} + @@ -15,10 +19,19 @@ + {% block meta_description -%} + {%- if page is defined and page.description is not empty -%} + + {%- elseif app.debug -%} + + {%- endif -%} + {%- endblock %} + {% block meta_robots %} + + {% if app.debug %}{% endif %} + {% endblock %} {% endblock %} - STERNTOURS - @@ -26,18 +39,22 @@ {% 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 %}{% endif %} + {% else %} + {% set canonical_url = get_base_url() ~ page.urlPath %} + {% if app.debug %}{% endif %} {% endif %} - {% endblock %} + {% elseif app.debug and canonical_url is defined %} + + {% endif %} {% if canonical_url is defined %} + {% elseif app.debug %} + {% endif %} {% endblock %} diff --git a/trunk/app/Resources/views/default/components/footer.html.twig b/trunk/app/Resources/views/default/components/footer.html.twig index c19572aa..f474ac29 100644 --- a/trunk/app/Resources/views/default/components/footer.html.twig +++ b/trunk/app/Resources/views/default/components/footer.html.twig @@ -15,9 +15,9 @@
- - - + + +
@@ -119,6 +119,7 @@
Impressum | AGB | + AGB | Datenschutz | Bildnachweise | Sitemap diff --git a/trunk/app/Resources/views/default/components/header.html.twig b/trunk/app/Resources/views/default/components/header.html.twig index 9709453d..6f33f6f3 100644 --- a/trunk/app/Resources/views/default/components/header.html.twig +++ b/trunk/app/Resources/views/default/components/header.html.twig @@ -15,7 +15,7 @@
  • - + Über uns
    • @@ -71,12 +71,12 @@
  • -
  • -
    • diff --git a/trunk/app/Resources/views/default/components/home/slider.html.twig b/trunk/app/Resources/views/default/components/home/slider.html.twig index b18e232b..ca810afe 100644 --- a/trunk/app/Resources/views/default/components/home/slider.html.twig +++ b/trunk/app/Resources/views/default/components/home/slider.html.twig @@ -55,12 +55,11 @@
    -
    +
    {{ form_field_pho(search_form.c) }}
    diff --git a/trunk/app/Resources/views/default/components/sidebar.html.twig b/trunk/app/Resources/views/default/components/sidebar.html.twig index e0d3634a..09f3c70d 100644 --- a/trunk/app/Resources/views/default/components/sidebar.html.twig +++ b/trunk/app/Resources/views/default/components/sidebar.html.twig @@ -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 %} diff --git a/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig b/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig index 61e28b2a..f07081f8 100644 --- a/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig +++ b/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig @@ -4,7 +4,7 @@ Kulturreisen suchen
    - +
    {{ form_field_pho(search_form.c, 'Reiseziel') }}
    diff --git a/trunk/app/Resources/views/default/components/sidebar/ttSearchSidebarWidget.html.twig b/trunk/app/Resources/views/default/components/sidebar/ttSearchSidebarWidget.html.twig index c8502d27..d51ab9dc 100644 --- a/trunk/app/Resources/views/default/components/sidebar/ttSearchSidebarWidget.html.twig +++ b/trunk/app/Resources/views/default/components/sidebar/ttSearchSidebarWidget.html.twig @@ -1,6 +1,6 @@ {% form_theme tt_search_form 'default/form/theme.html.twig' %}
    - +
    {{ form_field_pho(tt_search_form.termin, 'Früheste Anreise') }}
    {{ form_field_pho(tt_search_form.ruecktermin, 'Späteste Abreise') }}
    {{ form_field_pho(tt_search_form.dauer) }}
    diff --git a/trunk/app/Resources/views/default/components/ttBodySearchForm.html.twig b/trunk/app/Resources/views/default/components/ttBodySearchForm.html.twig index 4fdd7665..84f155ed 100644 --- a/trunk/app/Resources/views/default/components/ttBodySearchForm.html.twig +++ b/trunk/app/Resources/views/default/components/ttBodySearchForm.html.twig @@ -1,6 +1,6 @@ {% form_theme tt_search_form 'default/form/theme.html.twig' %} - +
    {{ form_field_pho(tt_search_form.termin, 'Früheste Anreise') }}
    {{ form_field_pho(tt_search_form.ruecktermin, 'Späteste Abreise') }}
    diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig index 89ff6997..dace8974 100644 --- a/trunk/app/Resources/views/default/pages/booking.html.twig +++ b/trunk/app/Resources/views/default/pages/booking.html.twig @@ -1,11 +1,11 @@ {% extends 'base.html.twig' %} {% form_theme form 'default/form/theme.html.twig' %} -{% block metatags %} - {{ parent() }} +{% block meta_robots %} + {% if app.debug %}{% endif %} {% endblock %} -{% block canonical_tag %}{% endblock %} +{% block canonical_tag %}{% if app.debug %}{% endif %}{% endblock %} {% block stylesheets %} {{ parent() }} diff --git a/trunk/app/Resources/views/default/pages/cms/offers.html.twig b/trunk/app/Resources/views/default/pages/cms/offers.html.twig index d183a935..269d850f 100644 --- a/trunk/app/Resources/views/default/pages/cms/offers.html.twig +++ b/trunk/app/Resources/views/default/pages/cms/offers.html.twig @@ -9,6 +9,8 @@
    +

    Unsere beliebtesten Kulturreisen

    + {{ render(controller('AppBundle:Component:offersCarousel', {country: page.effectiveCountry})) }}
    {% endblock %} \ No newline at end of file diff --git a/trunk/app/Resources/views/default/pages/ttSearch.html.twig b/trunk/app/Resources/views/default/pages/ttSearch.html.twig index 6d1316b7..6d8d09a0 100644 --- a/trunk/app/Resources/views/default/pages/ttSearch.html.twig +++ b/trunk/app/Resources/views/default/pages/ttSearch.html.twig @@ -1,15 +1,20 @@ {% extends get_base_template() %} -{% block metatags %} - {{ parent() }} +{% block meta_robots %} + {% if app.debug %}{% endif %} {% endblock %} +{% block canonical_tag %}{% if app.debug %}{% 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 %}