From 82ebe57080ff6ac83f77a45f6938d5e85fb37cde Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 9 Mar 2017 14:56:53 +0000 Subject: [PATCH] done #1204 @0.75 --- .../views/helpers/SimeoxDocuments.php | 3 +++ .../views/helpers/SimeoxVideos.php | 15 +++++++---- .../views/scripts/home/simeox.phtml | 2 +- less/simeox.less | 27 ++++++++----------- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/framework/application/views/helpers/SimeoxDocuments.php b/framework/application/views/helpers/SimeoxDocuments.php index 050b9dc..1b237cb 100644 --- a/framework/application/views/helpers/SimeoxDocuments.php +++ b/framework/application/views/helpers/SimeoxDocuments.php @@ -13,6 +13,9 @@ class Simeox_View_Helper_SimeoxDocuments extends CubeIT_View_Helper_Abstract { } protected function _document($doc) { + if ($doc['title'] == '-') { + return $this->clear(array(), "li"); + } $res = $this->imageProcess($doc['thumbnail'], '', 101, 100000, array(), 'R', 'C', 'M'); $res .= $this->htmlElement($doc['title'], 'h4'); diff --git a/framework/application/views/helpers/SimeoxVideos.php b/framework/application/views/helpers/SimeoxVideos.php index c3190ee..0e8eb10 100644 --- a/framework/application/views/helpers/SimeoxVideos.php +++ b/framework/application/views/helpers/SimeoxVideos.php @@ -4,19 +4,24 @@ class Simeox_View_Helper_SimeoxVideos extends CubeIT_View_Helper_Abstract { /** * @return string */ - public function simeoxVideos($videos) { + public function simeoxVideos($bigvideo, $videos) { $this->headScript()->addFeatherlight(); - $res = array(); + $small = array(); + $res = $this->videoWeb($bigvideo,925); foreach ($videos as $video) { - $res[] = $this->_video($video); + $small[] = $this->_video($video); } - return $this->listUnordered($res, array('class' => 'videos')); + $res .= $this->listUnordered($small, array('class' => 'videos')); + return $res; } protected function _video($v) { + if ($v['title'] == '-') { + return $this->clear(array(), 'li'); + } $res = $this->imageProcess($v['thumbnail'], '', 165, 96, array(), 'C', 'C', 'M'); $res .= $this->htmlElement($v['title'], 'h4'); - return $this->link($res, CubeIT_Util_WebVideo::getIframeUrl($v['url'], null, array('autoplay' => 1, 'modestbranding' => 1, 'rel' => 0, 'cc_load_policy' => 0,''))); + return $this->link($res, CubeIT_Util_WebVideo::getIframeUrl($v['url'], null, array('autoplay' => 1, 'modestbranding' => 1, 'rel' => 0, 'cc_load_policy' => 0, ''))); } } \ No newline at end of file diff --git a/framework/application/views/scripts/home/simeox.phtml b/framework/application/views/scripts/home/simeox.phtml index c3ec321..deaa9bc 100644 --- a/framework/application/views/scripts/home/simeox.phtml +++ b/framework/application/views/scripts/home/simeox.phtml @@ -22,7 +22,7 @@ $this->headScript()->addScriptAndStyle('simeox');

markupDotclear($o['content']); - $c = str_replace('$videos', $this->simeoxVideos($o['videos']), $c); + $c = str_replace('$videos', $this->simeoxVideos($o['video'], $o['videos']), $c); $c = str_replace('$documents', $this->simeoxDocuments($o['documents']), $c); echo $c; ?> diff --git a/less/simeox.less b/less/simeox.less index 504209b..32c298a 100644 --- a/less/simeox.less +++ b/less/simeox.less @@ -71,20 +71,9 @@ padding-bottom: 80px; .dotclear { - max-width: 425px; + max-width: 925px; margin-top: 50px; } - - .video { - width: 582px; - margin-top: 55px; - margin-bottom: 30px; - box-shadow: 15px 10px 15px rgba(0, 0, 0, 0.2); - - iframe { - display: block; // gets rid of odd space at the bottom of the video - } - } } .benefits { @@ -139,12 +128,19 @@ position: relative; margin-right: 19px; + &.clear { + display: block; + &:before, &:after { + display: none !important; + } + } + h4 { color: #3c3c3b; font-size: 16px; font-weight: 300; line-height: 24px; - margin-top: 15px; + margin-top: 5px; height: 48px; overflow: hidden; } @@ -152,9 +148,9 @@ } } - ul.documents{ + ul.documents { width: 960px; - li{ + li { width: 101px; } } @@ -165,7 +161,6 @@ margin-bottom: 26px; width: 165px; - &:before { content: "a"; display: block; -- 2.39.5