done #1204 @0.75

diff --git a/framework/application/views/helpers/SimeoxDocuments.php b/framework/application/views/helpers/SimeoxDocuments.php
index 050b9dc85f9be608839913945da7b0dba7edc795..1b237cbc926ac1abc7b7e212f7a90cca868bf80d 100644 (file)
--- 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 {
        }\r
 \r
        protected function _document($doc) {\r
+               if ($doc['title'] == '-') {\r
+                       return $this->clear(array(), "li");\r
+               }\r
                $res = $this->imageProcess($doc['thumbnail'], '', 101, 100000, array(), 'R', 'C', 'M');\r
                $res .= $this->htmlElement($doc['title'], 'h4');\r
 \r

diff --git a/framework/application/views/helpers/SimeoxVideos.php b/framework/application/views/helpers/SimeoxVideos.php
index c3190eeec04c475b914785ab8c96dd113316640e..0e8eb10ad39a6207c6d119df847eabfa7815637f 100644 (file)
--- 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 {
        /**\r
         * @return string\r
         */\r
-       public function simeoxVideos($videos) {\r
+       public function simeoxVideos($bigvideo, $videos) {\r
                $this->headScript()->addFeatherlight();\r
-               $res = array();\r
+               $small = array();\r
+               $res = $this->videoWeb($bigvideo,925);\r
                foreach ($videos as $video) {\r
-                       $res[] = $this->_video($video);\r
+                       $small[] = $this->_video($video);\r
                }\r
-               return $this->listUnordered($res, array('class' => 'videos'));\r
+               $res .= $this->listUnordered($small, array('class' => 'videos'));\r
+               return $res;\r
        }\r
 \r
        protected function _video($v) {\r
+               if ($v['title'] == '-') {\r
+                       return $this->clear(array(), 'li');\r
+               }\r
                $res = $this->imageProcess($v['thumbnail'], '', 165, 96, array(), 'C', 'C', 'M');\r
                $res .= $this->htmlElement($v['title'], 'h4');\r
 \r
-               return $this->link($res, CubeIT_Util_WebVideo::getIframeUrl($v['url'], null, array('autoplay' => 1, 'modestbranding' => 1, 'rel' => 0, 'cc_load_policy' => 0,'')));\r
+               return $this->link($res, CubeIT_Util_WebVideo::getIframeUrl($v['url'], null, array('autoplay' => 1, 'modestbranding' => 1, 'rel' => 0, 'cc_load_policy' => 0, '')));\r
        }\r
 }
\ 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 c3ec321d9e4ba5977dce23049404c8bc0b83d00e..deaa9bcdf127003f07ced753f74e7b03a17b1c35 100644 (file)
--- a/framework/application/views/scripts/home/simeox.phtml
+++ b/framework/application/views/scripts/home/simeox.phtml
@@ -22,7 +22,7 @@ $this->headScript()->addScriptAndStyle('simeox');
                        <h1><?php echo $o['heading'] ?></h1>
                        <h2><?php echo $o['subheading'] ?></h2>
                        <?php $c = $this->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 504209b9c13a73cc236ea87c47824b2bd8a2a7a9..32c298a6cefdfc0b64d9fb5014b5622ed8e5b024 100644 (file)
--- 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;