From 54268ba70604998a05d838992bf684c77e6c7f5f Mon Sep 17 00:00:00 2001
From: uli <uli@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Mon, 3 Apr 2017 10:54:00 +0000
Subject: [PATCH] =?UTF-8?q?*=20Behoben:=20/buchen-Seiten=20funktionieren?=
 =?UTF-8?q?=20nicht=20mehr,=20wenn=20neue=20URL-Struktur=20(ohne=20real=5F?=
 =?UTF-8?q?url=5Fpath)=20verwendet=20wird=20*=20target=3D"=5Fblank"=20f?=
 =?UTF-8?q?=C3=BCr=20AGB-Links=20im=20Buchungsformular=20*=20CSS=20files?=
 =?UTF-8?q?=20nicht=20durch=20assetic=20zusammenf=C3=BCgen,=20da=20sonst?=
 =?UTF-8?q?=20@import-Statements=20unerlaubterweisen=20mitten=20in=20der?=
 =?UTF-8?q?=20resultierenden=20CSS-Datei=20stehen=20*=20Google-Maps=20und?=
 =?UTF-8?q?=20Railway-Schriftart=20per=20https://=20einbinden,=20sonst=20S?=
 =?UTF-8?q?icherheitswarnungen=20in=20Chrome=20*=20Sidebar-Widget=20f?=
 =?UTF-8?q?=C3=BCr=20Google-Bewertung=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3327 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 trunk/app/Resources/views/base.html.twig                   | 7 ++++++-
 .../Resources/views/default/components/sidebar.html.twig   | 4 ++--
 trunk/app/Resources/views/default/pages/booking.html.twig  | 4 ++--
 trunk/src/AppBundle/Listener/KernelControllerListener.php  | 2 +-
 trunk/src/AppBundle/Resources/public/css/custom.css        | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig
index 77a715d4..474a062e 100644
--- a/trunk/app/Resources/views/base.html.twig
+++ b/trunk/app/Resources/views/base.html.twig
@@ -68,6 +68,11 @@
     {% block stylesheets %}
         {% stylesheets
             'bundles/app/css/bootstrap-3.3.7.css'
+            filter='cssrewrite'
+        %}
+            <link rel="stylesheet" href="{{ asset_url }}"/>
+        {% endstylesheets %}
+        {% stylesheets
             'bundles/app/css/custom.css'
             filter='cssrewrite'
         %}
@@ -158,7 +163,7 @@
 {% embed 'default/components/embed/modal.html.twig' with {id: 'default'} %}{% endembed %}
 
 {% block javascripts %}
-    <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+    <script src="https://maps.google.com/maps/api/js?sensor=false"></script>
     {% javascripts
         '@AppBundle/Resources/public/js/jquery-3.1.1.js'
         '@AppBundle/Resources/public/js/jquery-ui-1.12.1.js'
diff --git a/trunk/app/Resources/views/default/components/sidebar.html.twig b/trunk/app/Resources/views/default/components/sidebar.html.twig
index a07ef13d..3137cfc7 100644
--- a/trunk/app/Resources/views/default/components/sidebar.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar.html.twig
@@ -42,7 +42,7 @@
             <!-- Ausgezeichnet.org-Siegel: Ende -->
         </div><!-- end boxwidget -->
 
-        <div class="boxwidget">
+        {#<div class="boxwidget">
             <div itemscope itemtype="https://data-vocabulary.org/Review-aggregate">
                 <span itemprop="itemreviewed">STERN TOURS Online-Shop</span><br>
                 <span itemprop="rating" itemscope itemtype="https://data-vocabulary.org/Rating">
@@ -50,7 +50,7 @@
                 </span>
                 bei <span itemprop="count">78</span> Bewertungen
             </div>
-        </div>
+        </div>#}
 
     </div><!-- end widget -->
 
diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig
index dace8974..a24258fb 100644
--- a/trunk/app/Resources/views/default/pages/booking.html.twig
+++ b/trunk/app/Resources/views/default/pages/booking.html.twig
@@ -341,12 +341,12 @@
                                     {{ form_widget(form.acceptTerms) }}
                                     <label for="{{ form.acceptTerms.vars.id }}">
                                         Ich habe alle Daten und Angaben auf Richtigkeit überprüft. Ich habe die
-                                        <a href="/uploads/{{ travel_program.organizer.fileName }}">
+                                        <a href="/uploads/{{ travel_program.organizer.fileName }}" target="_blank">
                                             Allgemeinen Geschäftsbedingungen des Reiseveranstalters
                                         </a> {{ travel_program.organizer.name }}
                                         {% if travel_program.isMediated %}
                                             sowie die
-                                            <a href="/uploads/{{ mediator_terms_filename }}">
+                                            <a href="/uploads/{{ mediator_terms_filename }}" target="_blank">
                                                 Allgemeinen Geschäftsbedingungen des Reisevermittlers
                                             </a>
                                         {% endif %}
diff --git a/trunk/src/AppBundle/Listener/KernelControllerListener.php b/trunk/src/AppBundle/Listener/KernelControllerListener.php
index 93d094b3..ec176cc2 100644
--- a/trunk/src/AppBundle/Listener/KernelControllerListener.php
+++ b/trunk/src/AppBundle/Listener/KernelControllerListener.php
@@ -65,8 +65,8 @@ class KernelControllerListener
                 $i = 0;
                 while (!empty($pathArray))
                 {
-                    $slug = array_shift($pathArray);
                     $restOfPath = '/'. implode('/', $pathArray);
+                    $slug = array_shift($pathArray);
 
                     $qb = $repo->createQueryBuilder('p');
                     $qb->where($qb->expr()->eq('p.lvl', $i));
diff --git a/trunk/src/AppBundle/Resources/public/css/custom.css b/trunk/src/AppBundle/Resources/public/css/custom.css
index e57fed97..43067448 100644
--- a/trunk/src/AppBundle/Resources/public/css/custom.css
+++ b/trunk/src/AppBundle/Resources/public/css/custom.css
@@ -15,7 +15,7 @@ A customized "theme_custom_bootstrap.css" is also loaded by the theme in a preco
 /* ==================================================================
   FONTS
 ================================================================== */
-@import url(http://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,600,700,800,900);
+@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://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css);
 @import url(../../app/css/font-awesome-4.7.0.css);