#1464 + #1441

Formatierungen Kalenderansicht
Sortierung FEWO

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3438 f459cee4-fb09-11de-96c3-f9c5f16c3c76

trunk/app/Resources/views/default/components/booking/insurance.html.twig

@@ -1,4 +1,11 @@
 {# @var insurance \AppBundle\Entity\TravelInsurance #}
+
+<style>
+    .c1.c1b li:before {
+        top:-20px;
+    }
+</style>
+
 <div class="radio">
     {{ form_widget(form) }}
 
@@ -7,13 +14,37 @@
         (<a href="#" data-toggle="modal" data-target="#st-insurance-{{ insurance.id }}-modal">Details</a>)
     </label>
 
+
+    <div class="accordion-toggle-2">
+        <div class="panel-group booking_insurance_toogle" id="accordion_in_{{ form.vars.id }}" style="margin-left: 5px;margin-top: 5px;">
+            <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#accordion_in_{{ form.vars.id }}" href="#collapse_in_{{ form.vars.id }}" aria-expanded="false">
+                <h5 style="font-size: 0.9em;font-weight: 600;"><span>Leistungen einblenden</span><i class="indicator pull-right icon-plus"></i></h5>
+            </a>
+            <div id="collapse_in_{{ form.vars.id }}" class="panel-collapse collapse" aria-expanded="false" style="height: 0px;">
+                <div class="panel-body">
+
+                        <p><strong>Versicherung:</strong>  {{ insurance.insuranceName }} </p>
+
+                    <ul class="c1 c1b">
+                        {% for textli in insurance.text|split('\n') %}
+                            <li>{{ textli|raw }}</li>
+                        {% endfor %}
+                    </ul>
+                    <br>
+                    <p><a href="/uploads/{{ insurance.insurancePdf }} " target="_blank"> Informationsblatt zur Versicherung <i class="fa fa-file-pdf-o"></i></a>  </p>
+
+                </div>
+            </div>
+        </div>
+    </div>
     {% embed 'default/components/embed/modal.html.twig' with {
         id: 'insurance-' ~ insurance.id,
         title: insurance.name
     } %}
         {% block body %}
             <h3>Leistungen & Preisliste</h3>
-            <ul>
+
+            <ul class="c1 c1b">
                 {% for item in insurance.included|split('\n') %}
                     <li>{{ item }}</li>
                 {% endfor %}
@@ -42,4 +73,6 @@
             </table>
         {% endblock %}
     {% endembed %}
-</div>
+</div>
+
+

trunk/app/Resources/views/default/components/booking/summary.html.twig

@@ -10,6 +10,8 @@
             </td>
         </tr>
     {% endfor %}
+
+
     <tr class="st-total-tr">
         <td class="st-position-price-col">
             <span class="st-total-price">= {{ total_price|number_format(2) }} €</span>

trunk/app/Resources/views/default/pages/booking.html.twig

@@ -158,7 +158,7 @@
                                         {% endif %}
                                     </td>
                                 </tr>
-                                <tr style="display:none">
+                                <tr style="display:">
                                     <td>Reiseversicherung</td>
                                     <td>
                                         <div class="radio">
@@ -178,9 +178,8 @@
 
                                         {{ form_errors(form.insurance) }}
                                     </td>
-                                </tr> 
-
-                                <tr>
+                                </tr>
+                                <tr style="display: none">
                                     <td>Reiseversicherung</td>
                                     <td>
                                      <p style="white-space: normal;">

trunk/app/Resources/views/default/pages/cms/calendarLodgingProgram.html.twig

@@ -28,11 +28,15 @@
                             {% set is_past_date = dayState.date is not empty and date(dayState.date) < date('now') %}
 
                             {# Set cell class #}
-                            {% if is_past_date or
-                                (dayState.isReserved and not dayState.isReservationBegin and not dayState.isReservationEnd) or
-                                not dayState.isInSeason
-                            %}
+
+                            {% if dayState.isReserved and (not dayState.isReservationBegin and not dayState.isReservationEnd)  %}
                                 {% set cell_class = 'calendar-day-disabled' %}
+                            {% elseif dayState.day == 0 %}
+                                {% set cell_class = 'calendar-day-non' %}
+                            {% elseif is_past_date %}
+                                {% set cell_class = 'calendar-day-past' %}
+                            {% elseif not dayState.isInSeason %}
+                                {% set cell_class = 'calendar-day-non' %}
                             {% elseif dayState.isReservationBegin %}
                                 {% set cell_class = 'calendar-day-reservation-begin' %}
                             {% elseif dayState.isReservationEnd %}
@@ -50,11 +54,15 @@
                                         {{ dayState.day }}
                                     </a>
                                 {% elseif dayState.day == 0 %}
-                                    -
+                                    &nbsp;
                                 {% elseif cell_class == '' %}
                                     {{ dayState.day }}
                                 {% else %}
-                                    <del>{{ dayState.day }}</del>
+                                    {% if is_past_date %}
+                                        <del style="color:#989898;">{{ dayState.day }}</del>
+                                    {% else %}
+                                        {{ dayState.day }}
+                                    {% endif %}
                                 {% endif %}
                             </td>
                         {% endfor %}

trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig

@@ -216,6 +216,14 @@
 
                     <p>Bitte klicken Sie einen Anreisetermin, um zur Buchungsmaske zu gelagen.</p>
 
+                    <style>
+                        .table > tbody > tr > td.calendar-day-non {
+                            background-color: transparent;
+                        }
+                        .table > tbody > tr > td.calendar-day-past {
+                            background-color: rgba(242, 242, 242, 0.5);
+                        }
+                    </style>
                     {% include 'default/pages/cms/calendarLodgingProgram.html.twig' %}
 
                 </div>  <!-- END tabpanel -->