Merge branch 'qa' into stage

Author: Pedro Fernandes Steimbruch

src/Template/Cell/HomePageHighlight/display.ctp

@@ -1,6 +1,6 @@
-<?php if ($highlight): ?>
+<?php if ($highlights): ?>
 	<?= $this->element('Showcase.Showcase/highlight_carousel', [
-		'givenHighlight' => $highlight,
+		'givenHighlight' => $highlights,
 		'imageVersion' => 'slider'
 	]) ?>
 <?php endif; ?>

src/Template/Plugin/Showcase/Element/Showcase/cases/case.ctp

@@ -1,13 +1,15 @@
-<div class="col-sm-12 showcase-cases ptb-30">
-	<div class="col-sm-4 <?= $index % 2 === 1 ? 'col-sm-push-8' : '' ?>">
-		<a href="#">
-			<?= $this->Showcase->image($project->screen_monitor_images[0], [
-			'class' => 'img-responsive'
-			], 'small'); ?>
-		</a>
+<?php if ($project->website): ?>
+	<div class="col-sm-12 showcase-cases ptb-30">
+		<div class="col-sm-4 <?= $index % 2 === 1 ? 'col-sm-push-8' : '' ?>">
+			<a href="<?= $this->App->externalLink($project->website); ?>" target="_blank">
+				<?= $this->Showcase->image($project->screen_monitor_images[0], [
+				'class' => 'img-responsive'
+				], 'small'); ?>
+			</a>
+		</div>
+		<div class="col-sm-8 <?= $index % 2 === 1 ? 'col-sm-pull-4' : '' ?>">
+			<h4><?= $project->title ?></h4>
+			<?= $project->description ?>
+		</div>
 	</div>
-	<div class="col-sm-8 <?= $index % 2 === 1 ? 'col-sm-pull-4' : '' ?>">
-		<h4><?= $project->title ?></h4>
-		<?= $project->description ?>
-	</div>
-</div>
+<?php endif; ?>

src/Template/Plugin/Showcase/Element/Showcase/highlight_carousel.ctp

@@ -1,13 +1,26 @@
+<?php if (is_array($givenHighlight)): ?>
+	<?php $images = collection($givenHighlight)
+		->filter(function ($p) {
+			return isset($p->screen_monitor_images[0]);
+		})
+		->map(function ($p) {
+			return $p->screen_monitor_images[0];
+		})
+		->toArray(); ?>
+<?php else: ?>
+	<?php $images = $givenHighlight->screen_monitor_images ?>
+<?php endif; ?>
+
 <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
 	<ol class="carousel-indicators">
-		<?php foreach ($givenHighlight->screen_monitor_images as $index => $image): ?>
+		<?php foreach ($images as $index => $image): ?>
 		<li data-target="#carousel-example-generic"
 			data-slide-to="<?= $index ?>"
 		class="<?= ($index === 0) ? 'active' : '' ?>"></li>
 		<?php endforeach ?>
 	</ol>
 	<div class="carousel-inner" role="listbox">
-		<?php foreach ($givenHighlight->screen_monitor_images as $index => $image): ?>
+		<?php foreach ($images as $index => $image): ?>
 		<div class="item <?= ($index === 0) ? 'active' : '' ?>">
 			<?= $this->Showcase->image(
 				$image,

src/View/Cell/HomePageHighlightCell.php

@@ -27,7 +27,6 @@ class HomePageHighlightCell extends Cell
     public function display()
     {
     	$highlights = $this->loadModel('Showcase.Projects')->getHighlights();
-    	$highlight = reset($highlights);
-    	$this->set('highlight', $highlight);
+    	$this->set('highlights', $highlights);
     }
 }

src/View/Helper/AppHelper.php

@@ -11,6 +11,22 @@ class AppHelper extends Helper
 {
     public $helpers = ['Html'];
 
+    /**
+     * Adds http to the begining if not there yet
+     *
+     * @param string $link
+     * @return string
+     */
+    public function externalLink($link)
+    {
+    	if (!preg_match('/^(http|https)/', $link)) {
+    		return 'http://'. $link;
+    	}
+
+    	return $link;
+    }
+
+
     /**
      * Outputs the footer menu items
      *

webroot/css/custom.css

@@ -244,4 +244,15 @@ i.icon-social {
 
 .row.col-p30 [class*="col-"].business-solution {
 	padding: 0 20px;
-}
+}
+input#mc-embedded-subscribe {
+	background: white;
+	color: #D33C44;
+	padding: 15px 30px;
+    border-radius: 8px;
+    width: auto;
+}
+
+input[type="radio"]:checked:before {
+	background: #505050;
+}