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

* Behoben: /buchen-Seiten funktionieren nicht mehr, wenn neue URL-Struktur (ohne real_url_path) verwendet wird

Browse source 
* target="_blank" für AGB-Links im Buchungsformular
* CSS files nicht durch assetic zusammenfügen, da sonst @import-Statements unerlaubterweisen mitten in der resultierenden CSS-Datei stehen
* Google-Maps und Railway-Schriftart per https:// einbinden, sonst Sicherheitswarnungen in Chrome
* Sidebar-Widget für Google-Bewertung entfernt

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3327 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2017-04-03 10:54:00 +00:00
parent b742bf7cbc
commit 54268ba706
5 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,11 @@
{% block stylesheets %} {% block stylesheets %}
{% stylesheets {% stylesheets
'bundles/app/css/bootstrap-3.3.7.css' 'bundles/app/css/bootstrap-3.3.7.css'
filter='cssrewrite'
%}
<link rel="stylesheet" href="{{ asset_url }}"/>
{% endstylesheets %}
{% stylesheets
'bundles/app/css/custom.css' 'bundles/app/css/custom.css'
filter='cssrewrite' filter='cssrewrite'
%} %}
@ -158,7 +163,7 @@
{% embed 'default/components/embed/modal.html.twig' with {id: 'default'} %}{% endembed %} {% embed 'default/components/embed/modal.html.twig' with {id: 'default'} %}{% endembed %}
{% block javascripts %} {% 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 {% javascripts
'@AppBundle/Resources/public/js/jquery-3.1.1.js' '@AppBundle/Resources/public/js/jquery-3.1.1.js'
'@AppBundle/Resources/public/js/jquery-ui-1.12.1.js' '@AppBundle/Resources/public/js/jquery-ui-1.12.1.js'

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

@ -42,7 +42,7 @@
<!-- Ausgezeichnet.org-Siegel: Ende --> <!-- Ausgezeichnet.org-Siegel: Ende -->
</div><!-- end boxwidget --> </div><!-- end boxwidget -->
<div class="boxwidget"> {#<div class="boxwidget">
<div itemscope itemtype="https://data-vocabulary.org/Review-aggregate"> <div itemscope itemtype="https://data-vocabulary.org/Review-aggregate">
<span itemprop="itemreviewed">STERN TOURS Online-Shop</span><br> <span itemprop="itemreviewed">STERN TOURS Online-Shop</span><br>
<span itemprop="rating" itemscope itemtype="https://data-vocabulary.org/Rating"> <span itemprop="rating" itemscope itemtype="https://data-vocabulary.org/Rating">
@ -50,7 +50,7 @@
</span> </span>
bei <span itemprop="count">78</span> Bewertungen bei <span itemprop="count">78</span> Bewertungen
</div> </div>
</div> </div>#}
</div><!-- end widget --> </div><!-- end widget -->

4
trunk/app/Resources/views/default/pages/booking.html.twig
View file

@ -341,12 +341,12 @@
{{ form_widget(form.acceptTerms) }} {{ form_widget(form.acceptTerms) }}
<label for="{{ form.acceptTerms.vars.id }}"> <label for="{{ form.acceptTerms.vars.id }}">
Ich habe alle Daten und Angaben auf Richtigkeit überprüft. Ich habe die 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 Allgemeinen Geschäftsbedingungen des Reiseveranstalters
</a> {{ travel_program.organizer.name }} </a> {{ travel_program.organizer.name }}
{% if travel_program.isMediated %} {% if travel_program.isMediated %}
sowie die sowie die
<a href="/uploads/{{ mediator_terms_filename }}"> <a href="/uploads/{{ mediator_terms_filename }}" target="_blank">
Allgemeinen Geschäftsbedingungen des Reisevermittlers Allgemeinen Geschäftsbedingungen des Reisevermittlers
</a> </a>
{% endif %} {% endif %}

2
trunk/src/AppBundle/Listener/KernelControllerListener.php
View file

@ -65,8 +65,8 @@ class KernelControllerListener
$i = 0; $i = 0;
while (!empty($pathArray)) while (!empty($pathArray))
{ {
$slug = array_shift($pathArray);
$restOfPath = '/'. implode('/', $pathArray); $restOfPath = '/'. implode('/', $pathArray);
$slug = array_shift($pathArray);
$qb = $repo->createQueryBuilder('p'); $qb = $repo->createQueryBuilder('p');
$qb->where($qb->expr()->eq('p.lvl', $i)); $qb->where($qb->expr()->eq('p.lvl', $i));

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

@ -15,7 +15,7 @@ A customized "theme_custom_bootstrap.css" is also loaded by the theme in a preco
/* ================================================================== /* ==================================================================
FONTS 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://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(https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css);
@import url(../../app/css/font-awesome-4.7.0.css); @import url(../../app/css/font-awesome-4.7.0.css);