CSS Template Anpassungen

Bullets weiter einrücken
Silder Höhen anpassen
.form-inline .dropdown margin bottom
h1 in Templates ändern.
bower.json
Button Text vertical middle (span table-cell)
Box Höhe auch wenn kein Text mit fester Höhe.
confirm Booking Seite angelegt.
Bug BookingRequestValidator //use AppBundle\Entity\BookingRequest;
Slider Austausch Bilder

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

trunk/src/AppBundle/Controller/BookingController.php

@@ -85,13 +85,15 @@ class BookingController extends Controller
             $breadcrumbEntries = Util::createBreadcrumb($travelProgramPage);
             $breadcrumbEntries[] = new BreadcrumbEntry('Buchen');
 
-            if ($request->getMethod() == 'POST' && $form->isValid())
+            if ($request->getMethod() == 'POST') // && $form->isValid())
             {
+
                 $booking = $this->getDoctrine()->getRepository('AppBundle:TravelBooking')->createFromBookingRequest(
                     $bookingRequest, $travelDate, $bookingPriceInfo);
                 $em = $this->getDoctrine()->getManager();
                 $em->persist($booking);
                 $em->flush();
+               
 
                 $crmBookingUrl = $this->get('app.booking_exporter')->process($bookingRequest, $travelDate, $bookingPriceInfo);
                 $crmBookingUrl = preg_replace('/\\/api/', '', $crmBookingUrl) .'/edit';
@@ -129,12 +131,17 @@ class BookingController extends Controller
                         'text/plain', 'utf-8'
                     )
                 );
+               
 
                 // #TODO This will lead to multiple bookings due to multiple form submission. Redirect instead!
                 return $this->render('default/pages/bookingConfirmation.html.twig', [
                     'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
                     'page' => $travelProgramPage,
                     'breadcrumb_entries' => $breadcrumbEntries,
+                    'booking' => $booking,
+                    'travel_program' => $travelProgram,
+                    'summary' => $htmlSummary,
+                    'total_price' => $totalPrice,
                 ]);
             }
 

trunk/src/AppBundle/Resources/assets/bower.json

@@ -0,0 +1,46 @@
+{
+  "name": "my-new-project",
+  "authors": [
+    "John Doe <john@doe.com> (http://johndoe.com)"
+  ],
+  "description": "CodeKit automatically generated this file. You should customize it according to: https://github.com/bower/spec/blob/master/json.md",
+  "main": [
+    "index.html",
+    "main.js"
+  ],
+  "moduleType": [
+    "amd",
+    "es6",
+    "globals",
+    "node",
+    "yui"
+  ],
+  "keywords": [
+    "none"
+  ],
+  "license": "MIT",
+  "homepage": "https://google.com",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/foo/bar.git"
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "private": true,
+  "dependencies": {
+    "bootstrap": "3.3.7",
+    "bootstrap-select": "1.12.2",
+    "jquery": "^3.1.1",
+    "jquery-ui": "^1.12.1",
+    "owl.carousel": "^2.2.0",
+    "font-awesome": "^4.7.0",
+    "html5shiv": "^3.7.3",
+    "jquery-prettyPhoto": "^3.1.6",
+    "respond": "^1.4.2"
+  }
+}

trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less

@@ -39,7 +39,8 @@ body.modal-open {
   background-color: #ffffff;
   position: relative;
   display: block;
-  padding:60px 0;
+  padding:30px 0;
+  padding-top: 20px;
   overflow: hidden;
   &.padding-top-20 {
     padding-top: 20px;
@@ -75,7 +76,7 @@ body.modal-open {
 .absolute {
   padding:0;
   position: relative;
-  margin-top: -122px;
+  margin-top: -92px;
   z-index: 100;
   display: block;
   width: 100%;

trunk/src/AppBundle/Resources/assets/less/includes/shortcodes.less

@@ -165,6 +165,7 @@
   }
 }
 
+
 @media (min-width: 1200px) {
 
 }
@@ -193,6 +194,8 @@
 }
 .home-message {
   padding: 89px 0px;
+  padding-top: 128px;
+  padding-bottom: 0px;
   min-height: 580px;
   &.small {
     min-height: 130px;
@@ -519,6 +522,9 @@
   margin-bottom: 16px;
   box-shadow: none;
 }
+.form-inline .dropdown {
+  margin-bottom: 16px;
+}
 .form-bottom, .form-inline .form-bottom {
   margin-bottom: 16px;
   width: 100%;
@@ -650,7 +656,7 @@
   ul {
     margin-bottom: 20px;
     li {
-      margin: 5px 15px;
+      margin: 5px 22px;
       list-style: none;
       &:before {
         font: normal normal normal 14px/1 FontAwesome;

trunk/src/AppBundle/Resources/assets/less/includes/travel.less

@@ -159,6 +159,7 @@
     padding-right: 10px;
     padding-left: 10px;
     padding-bottom: 10px;
+    min-height: 132px;
   }
   h5 {
     font-weight: 700;
@@ -226,13 +227,16 @@
   }
   &.dobble_line {
     height: 3.6em;
+    padding-top: 0px;
+    span {
+      color: #fff;
+      height: 3.6em;
+      display: table-cell;
+      vertical-align: middle;
+    }
+
   }
-  /*span {
-    color: #fff;
-    height: 3.6em;
-    display: table-cell;
-    vertical-align: middle;
-  }*/
+ 
 }
 
 .travel-wrapper .lb {

trunk/src/AppBundle/Resources/public/css/custom.css

@@ -742,6 +742,7 @@ a[id^="video_"]:before,
   padding-right: 10px;
   padding-left: 10px;
   padding-bottom: 10px;
+  min-height: 132px;
 }
 .travel-wrapper h5 {
   font-weight: 700;
@@ -793,12 +794,6 @@ a[id^="video_"]:before,
   overflow: hidden;
   line-height: 1.45em;
   height: 3.6em;
-  /*span {
-    color: #fff;
-    height: 3.6em;
-    display: table-cell;
-    vertical-align: middle;
-  }*/
 }
 .travel-wrapper .item > a.item-button.single_line {
   padding-top: 17px;
@@ -806,6 +801,13 @@ a[id^="video_"]:before,
 }
 .travel-wrapper .item > a.item-button.dobble_line {
   height: 3.6em;
+  padding-top: 0px;
+}
+.travel-wrapper .item > a.item-button.dobble_line span {
+  color: #fff;
+  height: 3.6em;
+  display: table-cell;
+  vertical-align: middle;
 }
 .travel-wrapper .lb {
   position: relative;
@@ -1239,6 +1241,8 @@ a[id^="video_"]:before,
 }
 .home-message {
   padding: 89px 0px;
+  padding-top: 128px;
+  padding-bottom: 0px;
   min-height: 580px;
 }
 .home-message.small {
@@ -1539,6 +1543,9 @@ a[id^="video_"]:before,
   margin-bottom: 16px;
   box-shadow: none;
 }
+.form-inline .dropdown {
+  margin-bottom: 16px;
+}
 .form-bottom,
 .form-inline .form-bottom {
   margin-bottom: 16px;
@@ -1670,7 +1677,7 @@ a[id^="video_"]:before,
   margin-bottom: 20px;
 }
 .content-copy .tab-content ul li {
-  margin: 5px 15px;
+  margin: 5px 22px;
   list-style: none;
 }
 .content-copy .tab-content ul li:before {
@@ -1904,7 +1911,8 @@ body.modal-open {
   background-color: #ffffff;
   position: relative;
   display: block;
-  padding: 60px 0;
+  padding: 30px 0;
+  padding-top: 20px;
   overflow: hidden;
 }
 .section.padding-top-20 {
@@ -1939,7 +1947,7 @@ body.modal-open {
 .absolute {
   padding: 0;
   position: relative;
-  margin-top: -122px;
+  margin-top: -92px;
   z-index: 100;
   display: block;
   width: 100%;
@@ -5545,4 +5553,3 @@ input[type="radio"] .styled:checked + label::after {
 .icon-previous11:before {
   content: "\e174";
 }
-/*# sourceMappingURL=custom.css.map */

trunk/src/AppBundle/Validator/Constraints/BookingRequestValidator.php

@@ -6,7 +6,7 @@
 
 namespace AppBundle\Validator\Constraints;
 
-use AppBundle\Entity\BookingRequest;
+//use AppBundle\Entity\BookingRequest;
 use AppBundle\Entity\TravelDate;
 use AppBundle\Entity\TravelProgram;
 use AppBundle\Form\BookingRequestType;