From f89a7da691ecf74f34a2044047b398e522c68789 Mon Sep 17 00:00:00 2001 From: "stephen@cubedesigners.com" Date: Wed, 22 Jun 2016 14:47:54 +0000 Subject: [PATCH] General setup and footer development. WIP #481 @4 --- framework/application/configs/application.ini | 10 +++++--- .../forms/CMS/Sub/Social/Network.php | 22 ++++++++++++++++++ .../forms/CMS/Sub/Social/Networks.php | 14 +++++++++++ framework/application/forms/Settings.php | 8 +++++++ .../application/layouts/scripts/layout.phtml | 5 ++++ .../views/scripts/common/footer.phtml | 22 ++++++++++++++---- index.php | 4 ++-- less/000-imports.less | 2 +- less/001-variables.less | 16 +++++++++++++ less/002-common.less | 6 +++-- less/003-mixins.less | 12 ++++++++++ less/footer.less | 23 +++++++++++++++++++ 12 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 framework/application/forms/CMS/Sub/Social/Network.php create mode 100644 framework/application/forms/CMS/Sub/Social/Networks.php create mode 100644 less/footer.less diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index 3acee9b..02b88f1 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -60,6 +60,10 @@ compat_ie = 9 [testing : production] dev = true +firephp = true + +minify.js = false +minify.css = false seo.universalAnalytics = @@ -70,7 +74,7 @@ httpauth.ip_whitelist[] = 82.216.164.184 robots = false -webhost = dev.fluidbook.com +webhost = fluidbookwebv3.dev.cubedesigners.com -locales.fr = dev.fluidbook.com -locales.en = en.dev.fluidbook.com \ No newline at end of file +locales.fr = fluidbookwebv3.dev.cubedesigners.com +locales.en = en.fluidbookwebv3.dev.cubedesigners.com \ No newline at end of file diff --git a/framework/application/forms/CMS/Sub/Social/Network.php b/framework/application/forms/CMS/Sub/Social/Network.php new file mode 100644 index 0000000..b7bbf56 --- /dev/null +++ b/framework/application/forms/CMS/Sub/Social/Network.php @@ -0,0 +1,22 @@ +setLabel('Titre du réseau social'); + $this->addElement($title); + + $url = new CubeIT_Form_Element_Url('url'); + $url->setLabel('URL'); + $this->addElement($url); + + $icon = new CubeIT_Form_Element_File_Image('icon'); + $icon->setLabel('Pictogramme'); + $icon->setMaxItems(1); + $this->addElement($icon); + } + +} \ No newline at end of file diff --git a/framework/application/forms/CMS/Sub/Social/Networks.php b/framework/application/forms/CMS/Sub/Social/Networks.php new file mode 100644 index 0000000..2825442 --- /dev/null +++ b/framework/application/forms/CMS/Sub/Social/Networks.php @@ -0,0 +1,14 @@ +setBaseSubForm($network); + $this->setBaseLegend('Edition du réseau social « $title »'); + $this->setNewLegend('Nouveau réseau social'); + } + +} \ No newline at end of file diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php index 1718b54..fc72ab4 100644 --- a/framework/application/forms/Settings.php +++ b/framework/application/forms/Settings.php @@ -7,6 +7,10 @@ class Fluidbook_Form_Settings extends CubeIT_Form_Settings { $this->setTitle('Edition des paramètres du site'); + $logo = new CubeIT_Form_Element_File_Image('logo'); + $logo->setLabel('Logo'); + $this->addElement($logo); + $longTitle = new Zend_Form_Element_Text('longTitle'); $longTitle->setLabel('Titre long par défaut'); $this->addElementLocalized($longTitle); @@ -29,6 +33,10 @@ class Fluidbook_Form_Settings extends CubeIT_Form_Settings { $workshop->fileEnabled(false); $workshop->pageEnabled(false); $this->addSubFormLocalized($workshop, 'workshop'); + + $social = new Fluidbook_Form_CMS_Sub_Social_Networks(); + $social->setLegend('Réseaux Sociaux'); + $this->addSubFormLocalized($social, 'social_networks'); } } \ No newline at end of file diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml index fc4531b..99c8114 100644 --- a/framework/application/layouts/scripts/layout.phtml +++ b/framework/application/layouts/scripts/layout.phtml @@ -17,6 +17,11 @@ $this->headLink()->appendStylesheet('/less/002-common.less', 'all'); * $this->headScript()->addWebFont($fonts); * */ + +// Google Font +$fonts = array('google' => array('families' => array('Open+Sans|Playfair+Display'))); +$this->headScript()->addWebFont($fonts); + profile(__FILE__, __LINE__, 'Before rendering body'); $res = $this->htmlPage($this->render('common/body.phtml')); profile(__FILE__, __LINE__, 'Body rendered'); diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml index f5f4b28..f92e427 100644 --- a/framework/application/views/scripts/common/footer.phtml +++ b/framework/application/views/scripts/common/footer.phtml @@ -1,5 +1,10 @@ '; + +$this->headScript()->addScriptAndStyle('footer'); + +$res = ''; +$res .= ''; // footer.legal + echo $res; \ No newline at end of file diff --git a/index.php b/index.php index bf7569b..a3411bb 100644 --- a/index.php +++ b/index.php @@ -4,9 +4,9 @@ $start = microtime(true); ini_set('log_errors', '1'); ini_set('error_log', dirname(__FILE__) . '/log/php_error.log'); -if ($_SERVER['HTTP_HOST'] == 'dev.fluidbook.com') { +if (strpos($_SERVER['HTTP_HOST'], 'dev.') !== false) { define('APPLICATION_ENV', 'testing'); -} else if ($_SERVER['HTTP_HOST'] == 'www.') { +} else { define('APPLICATION_ENV', 'production'); } diff --git a/less/000-imports.less b/less/000-imports.less index 786ced1..683c8a9 100644 --- a/less/000-imports.less +++ b/less/000-imports.less @@ -1,2 +1,2 @@ -@import "001-variables"; +@import "001-variables"; @import "003-mixins"; \ No newline at end of file diff --git a/less/001-variables.less b/less/001-variables.less index e69de29..339d97a 100644 --- a/less/001-variables.less +++ b/less/001-variables.less @@ -0,0 +1,16 @@ +//-- Fonts +@opensans: 'Open Sans', sans-serif; +@playfair: 'Playfair Display', serif; +@montserrat: 'Montserrat', sans-serif; + +//-- General Fonts +@heading-font: @playfair; +@sub-heading-font: @montserrat; +@body-font: @opensans; + +//-- Colours +@color-footer-bg-primary: #263340; +@color-footer-bg-secondary: #161e26; + +//-- Content and breakpoints +@mobile-breakpoint: 1024px; \ No newline at end of file diff --git a/less/002-common.less b/less/002-common.less index 3626b59..856b756 100644 --- a/less/002-common.less +++ b/less/002-common.less @@ -1,3 +1,5 @@ -body{ - background: #f00; +@import "000-imports"; + +body { + font-family: @body-font; } \ No newline at end of file diff --git a/less/003-mixins.less b/less/003-mixins.less index e69de29..adacd16 100644 --- a/less/003-mixins.less +++ b/less/003-mixins.less @@ -0,0 +1,12 @@ +// Special mixin to be used when fonts render too bold +// See: https://maximilianhoffmann.com/posts/better-font-rendering-on-osx +// also: http://usabilitypost.com/2012/11/05/stop-fixing-font-smoothing/ +.font-thinning() { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.font-thinning-off() { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; +} \ No newline at end of file diff --git a/less/footer.less b/less/footer.less new file mode 100644 index 0000000..947c828 --- /dev/null +++ b/less/footer.less @@ -0,0 +1,23 @@ +@import "000-imports"; + +footer { + .font-thinning(); + + a { + color: #fff; + text-decoration: none; + } +} + +footer.site { + color: #fff; + background-color: @color-footer-bg-primary; + padding: 75px 85px 75px 42px; +} + +// Copyright and legal bar +footer.legal { + background-color: @color-footer-bg-secondary; + color: #5c6268; + padding: 40px 85px; +} \ No newline at end of file -- 2.39.5