From: stephen@cubedesigners.com Date: Thu, 23 Jun 2016 16:47:18 +0000 (+0000) Subject: Done #481 @4 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=60bdf4e9a587488ef40a9503881d66e99f637c10;p=fluidbook-v3.git Done #481 @4 --- diff --git a/framework/application/forms/CMS/Element/PagesTagList.php b/framework/application/forms/CMS/Element/PagesTagList.php index c8f715b..b199cc7 100644 --- a/framework/application/forms/CMS/Element/PagesTagList.php +++ b/framework/application/forms/CMS/Element/PagesTagList.php @@ -1,5 +1,8 @@ headScript()->addTagHandler(true); + class Fluidbook_Form_CMS_Element_PagesTagList extends CubeIT_Form_Element_TagList { public function init() { @@ -8,7 +11,6 @@ class Fluidbook_Form_CMS_Element_PagesTagList extends CubeIT_Form_Element_TagLis $this->setAttrib('minChars', 1); $this->setAttrib('tagsPosition', "after"); $this->setAttrib('searchAnywhere', 1); // Search anywhere in the word :) - //$this->setAttrib('manageurl', '/admin/ajaxpopup/openselectlist/Fluidbook_Form_CMS_Sub_Pages/' . $this->getName()); $this->setAttrib('displayListManagement', 0); $this->_setOptions(); } @@ -55,8 +57,6 @@ class Fluidbook_Form_CMS_Element_PagesTagList extends CubeIT_Form_Element_TagLis $options[$id] = "[$id] - $title"; } - fb($options, 'page options'); - $this->setMultiOptions($options); } diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php index 36fc211..57a6a78 100644 --- a/framework/application/forms/Settings.php +++ b/framework/application/forms/Settings.php @@ -25,9 +25,14 @@ class Fluidbook_Form_Settings extends CubeIT_Form_Settings { $footer_menu_main = new Fluidbook_Form_CMS_Element_PagesTagList('footer_menu_main'); $footer_menu_main->setLabel('Pages for menu "Plan du site"'); - $footer_menu_main->setAttrib('placeholder', 'Tapez une page'); + $footer_menu_main->setAttrib('placeholder', 'Tapez un titre de la page'); $this->addElement($footer_menu_main); + $footer_menu_contact = new Fluidbook_Form_CMS_Element_PagesTagList('footer_menu_contact'); + $footer_menu_contact->setLabel('Pages for menu "Contactez-nous"'); + $footer_menu_contact->setAttrib('placeholder', 'Tapez un titre de la page'); + $this->addElement($footer_menu_contact); + $footer = new CubeIT_Form_Element_Markitup('footer'); $footer->setLabel('Footer'); $footer->setAttrib('rows', 6); diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml index 99c8114..83f8186 100644 --- a/framework/application/layouts/scripts/layout.phtml +++ b/framework/application/layouts/scripts/layout.phtml @@ -7,6 +7,8 @@ $this->headScript()->addIEConditionnals(); $this->headScript()->appendFile('/js/002-common.js'); $this->headLink()->appendStylesheet('/less/002-common.less', 'all'); +$this->headScript()->addTagHandler(true); // Used by related articles selector in admin + /** * Exemples d'intégrations de webfonts * diff --git a/framework/application/views/helpers/FooterMenu.php b/framework/application/views/helpers/FooterMenu.php new file mode 100644 index 0000000..2de83df --- /dev/null +++ b/framework/application/views/helpers/FooterMenu.php @@ -0,0 +1,33 @@ +linkInternal(null, $pageID); + } + + $res = '
'; + + if ($title) { + $res .= ''. $title .''; + } + + $res .= $this->htmlList($links); + + $res .= '
'; // .footer-menu + + return $res; + } +} \ No newline at end of file diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml index 8c71cc8..93b1dac 100644 --- a/framework/application/views/scripts/common/footer.phtml +++ b/framework/application/views/scripts/common/footer.phtml @@ -4,15 +4,27 @@ $this->headScript()->addScriptAndStyle('102-footer'); $res = ''; $res .= ''; // footer.legal echo $res; \ No newline at end of file diff --git a/less/003-mixins.less b/less/003-mixins.less index e15e61d..cc39248 100644 --- a/less/003-mixins.less +++ b/less/003-mixins.less @@ -11,6 +11,14 @@ -moz-osx-font-smoothing: auto; } +.rounded-button() { + display: inline-block; + padding: 13px 29px 14px; + line-height: 9px; + border-radius: 19px; + border: 1px solid transparent; +} + .border-button(@base-color,@border-color) { transition: all 200ms; diff --git a/less/101-header.less b/less/101-header.less index f72c9a1..5876552 100644 --- a/less/101-header.less +++ b/less/101-header.less @@ -68,11 +68,7 @@ header { margin-left: 19px; } a { - display: inline-block; - padding: 13px 29px 14px; - line-height: 9px; - border-radius: 19px; - border: 1px solid transparent; + .rounded-button(); &.quoteLink { .background-button(@color-green); color: #fff; diff --git a/less/102-footer.less b/less/102-footer.less index 90aecf2..544e7b3 100644 --- a/less/102-footer.less +++ b/less/102-footer.less @@ -13,6 +13,84 @@ footer.site { color: #fff; background-color: @color-footer-bg-primary; padding: 75px 85px 75px 42px; + + // Flexbox setup + display: flex; + flex-direction: row; + justify-content: space-between; + flex-wrap: wrap; + + // Footer containers + &> div { + flex-grow: 1; + padding-right: 20px; // so elements don't get too close when layout shrinks + &:last-of-type { + padding-right: 0; + } + } + + .contact-details { + flex-grow: 4; // Increase space bias for this block + } + + address { + margin-top: 4px; + margin-left: 41px; + font-style: normal; + font-size: 14px; + line-height: 32/14; + } + + .footer-social { + text-align: center; + } + + .social-link { + margin-right: 20px; + + &:last-of-type { + margin-right: 0; + } + } + + .workshop { + text-align: right; + } + .workshop-link { + .rounded-button(); + .border-button(#fff, #fff); + padding: 19px 83px 22px 46px; + border-radius: 26px; + text-transform: uppercase; + font-size: 12px; + position: relative; + + &:after { + content: ''; + width: 20px; + height: 13px; + position: absolute; + top: 17px; + right: 45px; + background-image: url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOSAxMy45Ij48c3R5bGU+LnN0MHtmaWxsOiNGRkZGRkY7fTwvc3R5bGU+PHBhdGggY2xhc3M9InN0MCIgZD0iTTE4LjUgNy40Yy0uMSAwLS4zIDAtLjQtLjFMMTEuNy45Yy0uMi0uMi0uMi0uNSAwLS43LjItLjIuNS0uMi43IDBsNi40IDYuNGMuMi4yLjIuNSAwIC43IDAgLjEtLjIuMS0uMy4xeiIvPjxwYXRoIGNsYXNzPSJzdDAiIGQ9Ik0xOC41IDcuNEguNWMtLjMgMC0uNS0uMi0uNS0uNXMuMi0uNS41LS41aDE4Yy4zIDAgLjUuMi41LjVzLS4yLjUtLjUuNXoiLz48cGF0aCBjbGFzcz0ic3QwIiBkPSJNMTIuMSAxMy45Yy0uMSAwLS4zIDAtLjQtLjEtLjItLjItLjItLjUgMC0uN2w2LjQtNi40Yy4yLS4yLjUtLjIuNyAwIC4yLjIuMi41IDAgLjdsLTYuNCA2LjRjLS4xIDAtLjIuMS0uMy4xeiIvPjwvc3ZnPg=='); + background-size: 100%; + } + } +} + +.footer-menu { + line-height: 32/14; + flex-grow: 2; + + .menu-title { + text-transform: uppercase; + font-family: @montserrat; + font-weight: 600; + } + + ul { + list-style: none; + } } // Copyright and legal bar @@ -21,4 +99,34 @@ footer.legal { color: #5c6268; padding: 40px 85px; font-size: 14px; + position: relative; +} + +.locale-nav { + position: absolute; + top: 21px; + right: 85px; + + a { + display: inline-block; + width: 52px; + line-height: 52px; + margin-right: 20px; + text-align: center; + font-family: @montserrat; + font-size: 14px; + font-weight: 600; + text-transform: uppercase; + color: #fff; + border: 1px solid currentColor; + border-radius: 100%; + + &.active { + color: #8aaa43; + } + + &:last-of-type { + margin-right: 0; + } + } } \ No newline at end of file