From: vincent@cubedesigners.com Date: Wed, 31 Aug 2016 09:55:19 +0000 (+0000) Subject: wip #581 @0:45 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0ef4e3cff5648a225a9ba07a05d41976e4ff4edf;p=fluidbook-v3.git wip #581 @0:45 --- diff --git a/framework/application/forms/CMS/Sub/Home/Block.php b/framework/application/forms/CMS/Sub/Home/Block.php index eac06f5..6526c21 100644 --- a/framework/application/forms/CMS/Sub/Home/Block.php +++ b/framework/application/forms/CMS/Sub/Home/Block.php @@ -5,11 +5,15 @@ class Fluidbook_Form_CMS_Sub_Home_Block extends CubeIT_Form_SubForm { parent::init(); $title = new CubeIT_Form_Element_Textarea('title'); - $title->setAttrib('rows', 2); + $title->setAttrib('rows', 2); $title->setLabel('Titre'); $title->setOrder(10); $this->addElement($title); + $puce = new CubeIT_Form_Element_Text('puce'); + $puce->setLabel('Titre de la puce'); + $this->addElement($puce); + $text = new CubeIT_Form_Element_Markitup('content'); $text->setLabel('Texte'); $text->setAttrib('rows', 8); diff --git a/framework/application/views/helpers/ContactFooter.php b/framework/application/views/helpers/ContactFooter.php index b657e27..43315da 100644 --- a/framework/application/views/helpers/ContactFooter.php +++ b/framework/application/views/helpers/ContactFooter.php @@ -28,6 +28,6 @@ class Fluidbook_View_Helper_ContactFooter extends CubeIT_View_Helper_Abstract { return $this->htmlElement($res, 'section', array( 'class' => 'contactFooter section', 'data-themecolor' => '#8aab41', // Todo: possibly set this via the admin? - 'data-section-name' => 'contact')); + 'data-section-name' => 'contact', 'data-puce' => __('Contact'))); } } \ No newline at end of file diff --git a/framework/application/views/helpers/HomeLayer.php b/framework/application/views/helpers/HomeLayer.php index c72a972..723e2ee 100644 --- a/framework/application/views/helpers/HomeLayer.php +++ b/framework/application/views/helpers/HomeLayer.php @@ -5,14 +5,14 @@ class Fluidbook_View_Helper_HomeLayer extends CubeIT_View_Helper_Abstract { protected function _layer($content, $class, $attributes = array(), $outerContent = '') { - $section = $class; + $section = $class; $class .= ' section ' . $this->data['headerstyle']; $defaultAttributes = array('class' => $class, - 'data-headerstyle' => $this->data['headerstyle'], - 'data-themecolor' => $this->data['themecolor'], - 'data-section-name' => $section); + 'data-headerstyle' => $this->data['headerstyle'], + 'data-themecolor' => $this->data['themecolor'], + 'data-section-name' => $section, 'data-puce' => $this->data['puce']); $attributes = $this->_mergeAttributes($attributes, $defaultAttributes); $content = $this->htmlElement($content, 'div', array('class' => 'content-inner')); diff --git a/js/210-home.js b/js/210-home.js index affb760..01d47c2 100644 --- a/js/210-home.js +++ b/js/210-home.js @@ -30,10 +30,10 @@ function load_home() { // Disable scrollify when popups are open because it // interferes with internal popup scrolling - $(window).on('cubeitopenpopup', function() { + $(window).on('cubeitopenpopup', function () { disableScrollify(); }); - $(window).on('cubeitpopupremoved', function() { + $(window).on('cubeitpopupremoved', function () { resizeHome(); // Update layout and re-enable scrollify if space requirements are met }); } @@ -173,11 +173,16 @@ function initScrollify() { var pagination = '"; diff --git a/less/210-home.less b/less/210-home.less index 85f87e4..1e9dfff 100644 --- a/less/210-home.less +++ b/less/210-home.less @@ -5,37 +5,37 @@ position: relative; background-position: bottom right; - @media @m900 { - background-size: 180%; - } + @media @m900 { + background-size: 180%; + } } .content-inner { - position: absolute; - padding: 0 5%; - top: 50%; - left: 0; - width: 100%; - transform: translateY(-50%); - - @media @m900 { - position: static; - transform: none; - padding-top: 5%; - padding-bottom: 80%; - text-align: center; - } + position: absolute; + padding: 0 5%; + top: 50%; + left: 0; + width: 100%; + transform: translateY(-50%); + + @media @m900 { + position: static; + transform: none; + padding-top: 5%; + padding-bottom: 80%; + text-align: center; + } } .btn { .button(); .longarrow-button(20px, 40px, 18px); - color: #fff; - margin-top: 30px; + color: #fff; + margin-top: 30px; } section { - overflow: hidden; + overflow: hidden; &.light { color: #fff; @@ -49,43 +49,73 @@ } } - .dotclear { - max-width: 500px; + .dotclear { + max-width: 500px; - @media @m900 { - max-width: none; + @media @m900 { + max-width: none; - ul { - display: inline-block; - text-align: left; - } - } - } + ul { + display: inline-block; + text-align: left; + } + } + } } } .pagination { - color: rgba(128,128,128,0.5); - position: fixed; - top: 50%; - left: 15px; - transform: translateY(-50%); - font-size: 30px; - line-height: 1; - transition: opacity 0.3s; - cursor: pointer; - z-index: 10; - display: none; // Displayed only when in pagination mode - - .fullpages & { - display: block; - } - - //li:hover span { - // display: inline-block; - //} - - span { - display: none; - } + position: fixed; + top: 50%; + left: 15px; + transform: translateY(-50%); + font-size: 30px; + line-height: 1; + transition: opacity 0.3s; + cursor: pointer; + z-index: 10; + display: none; // Displayed only when in pagination mode + list-style: none; + + .fullpages & { + display: block; + } + + li { + //margin: 10px 0; + height: 22px; + position: relative; + padding: 0 10px 0 25px; + &:before { + content: ""; + background-color: #e1e2e3; + display: block; + width: 10px; + height: 10px; + border-radius: 5px; + position: absolute; + left: 6px; + top: 6px; + } + &:hover { + &:before { + background-color: #fff !important; + } + border-radius: 10px; + span { + position: relative; + display: inline-block; + color: #fff; + top: -10px; + } + } + span { + font-size: 14px; + line-height: 22px; + } + } + + span { + display: none; + } } \ No newline at end of file