Merge branch 'feature/20725-road-trip-page' into stage

Author: andrej-griniuk

src/Controller/ContactsController.php

@@ -41,7 +41,7 @@ public function roadTrip()
         if ($this->Contacts->save($contact)) {
             $this->sendEmail($contact);
 
-            $this->Flash->success(__('Thank you!'), ['key' => 'contact']);
+            $this->Flash->success(__('Thank you, we are adding your city to the list if others and will let you know if we choose yours to visit.'), ['key' => 'contact']);
         }
 
         return $this->redirect('/roadtrip');

src/Template/Pages/road_trip.ctp

@@ -8,6 +8,7 @@ $this->assign('title', __('CakePHP is coming to your town!'));
 <section class="clearfix">
     <div class="container-fluid">
         <div class="row roadtrip-hero">
+            <?= $this->Flash->render('contact') ?>
             <?= $this->Html->image('roadtrip-hero.svg') ?>
         </div>
     </div>
@@ -27,20 +28,16 @@ $this->assign('title', __('CakePHP is coming to your town!'));
                 <p><?= __('If you have a PHP or CakePHP meetup group and are excited to have us come visit, let us know soon! We will go to as many places as we can fit into our Cake Road Trip. And will be asking the community to vote for the top places to visit!') ?></p>
             </div>
         </div>
-        <?php if (!$flash = $this->Flash->render('contact')): ?>
-            <div class="row">
-                <div class="col-md-6 col-md-offset-3">
-                    <?= $this->Form->create(null, ['url' => ['controller' => 'Contacts', 'action' => 'roadTrip'], 'class' => 'road-form']) ?>
-                        <?= $this->Form->input('name', ['label' => __('Name {0}', $this->Html->tag('span', __('(Required)'))), 'escape' => false, 'class' => 'form-control']) ?>
-                        <?= $this->Form->input('email', ['label' => __('Email {0}', $this->Html->tag('span', __('(Required)'))), 'escape' => false, 'class' => 'form-control']) ?>
-                        <?= $this->Form->input('where', ['label' => __('Tell us where would you’d like us to go next {0}', $this->Html->tag('span', __('(Required)'))), 'escape' => false, 'class' => 'form-control']) ?>
-                        <?= $this->Form->button(__('Notify me!')) ?>
-                    <?= $this->Form->end() ?>
-                </div>
+        <div class="row">
+            <div class="col-md-6 col-md-offset-3">
+                <?= $this->Form->create(null, ['url' => ['controller' => 'Contacts', 'action' => 'roadTrip'], 'class' => 'road-form']) ?>
+                    <?= $this->Form->input('name', ['label' => __('Name {0}', $this->Html->tag('span', __('(Required)'))), 'escape' => false, 'class' => 'form-control', 'required' => true]) ?>
+                    <?= $this->Form->input('email', ['label' => __('Email {0}', $this->Html->tag('span', __('(Required)'))), 'escape' => false, 'class' => 'form-control', 'required' => true]) ?>
+                    <?= $this->Form->input('where', ['label' => __('Tell us where would you’d like us to go next {0}', $this->Html->tag('span', __('(Required)'))), 'escape' => false, 'class' => 'form-control', 'required' => true]) ?>
+                    <?= $this->Form->button(__('Notify me!')) ?>
+                <?= $this->Form->end() ?>
             </div>
-        <?php else: ?>
-            <?= $flash ?>
-        <?php endif; ?>
+        </div>
     </div>
     <div class="roadtrip-bottom">
         <?= $this->Html->image('roadtrip-footer-img.svg') ?>

webroot/css/style.css

@@ -10333,7 +10333,10 @@ code {
 	width: 100%;
 }
 
-
+.roadtrip-hero .alert {
+	margin-top: 90px;
+	margin-bottom: -60px;
+}
 
 .roadtrip-body {
 	padding-top: 40px;
@@ -10426,6 +10429,9 @@ code {
 		max-width: inherit !important;
 		margin-left: -25%;
 	}
+	.roadtrip-hero .alert {
+		margin-top: 70px;
+	}
 	.road-cloud1, .road-cloud2 {
 		display: none;
 	}