From befc381b9a35aa9ba1c0dcc441de99487ade94aa Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 29 Feb 2016 13:19:34 +0000 Subject: [PATCH] #simeox : Fixes team wrap Add legal mention page Remove translations in cms forms Update `CubeIT` library @2 --- framework/application/Bootstrap.php | 1 + framework/application/forms/CMS/Home.php | 19 +- framework/application/forms/CMS/Sub/About.php | 12 +- .../application/forms/CMS/Sub/Benefits.php | 18 +- .../application/forms/CMS/Sub/Carousel.php | 6 +- .../forms/CMS/Sub/Carousel/Item.php | 2 +- .../application/forms/CMS/Sub/Contact.php | 10 +- .../application/forms/CMS/Sub/ImageHeader.php | 8 +- .../application/forms/CMS/Sub/Interface.php | 6 +- .../application/forms/CMS/Sub/Operation.php | 10 +- .../application/forms/CMS/Sub/Partners.php | 8 +- .../forms/CMS/Sub/Partners/Partner.php | 6 +- .../forms/CMS/Sub/Partners/Partners.php | 2 +- .../application/forms/CMS/Sub/RDClinic.php | 14 +- .../application/forms/CMS/Sub/Section.php | 2 +- .../application/forms/CMS/Sub/Simeox.php | 8 +- framework/application/forms/CMS/Sub/Team.php | 8 +- .../application/forms/CMS/Sub/Team/Person.php | 8 +- .../application/forms/CMS/Sub/Team/Team.php | 2 +- framework/application/forms/CMS/Text.php | 17 ++ framework/application/forms/Settings.php | 9 + .../views/scripts/common/footer.phtml | 34 +-- .../views/scripts/common/header.phtml | 35 +-- .../views/scripts/templates/text.phtml | 5 + less/_utilities.less | 38 +-- less/about.less | 248 +++++++++-------- less/admin.less | 9 + less/common.less | 255 +++++++++--------- less/text.less | 5 + 29 files changed, 423 insertions(+), 382 deletions(-) create mode 100644 framework/application/forms/CMS/Text.php create mode 100644 framework/application/views/scripts/templates/text.phtml create mode 100644 less/text.less diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index e64d4ab..c8c9a6e 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -15,6 +15,7 @@ class Bootstrap extends CubeIT_Bootstrap { */ public function getCMSTemplates() { $templates = parent::getCMSTemplates(); + $templates['text'] = 'Page de texte'; return $templates; } diff --git a/framework/application/forms/CMS/Home.php b/framework/application/forms/CMS/Home.php index 851eae5..22cec30 100644 --- a/framework/application/forms/CMS/Home.php +++ b/framework/application/forms/CMS/Home.php @@ -5,37 +5,28 @@ class Simeox_Form_CMS_Home extends Simeox_Form_CMS { public function init() { parent::init(); - $logo = new CubeIT_Form_Element_File_Image('site_logo'); - $logo->setLabel(__('Logo principal')); - $this->addElement($logo); - $header = new Simeox_Form_CMS_Sub_ImageHeader(); - $header->setLegend(__('Header')); + $header->setLegend('Header'); $this->addSubForm($header, 'hero'); // Le Simeox section $simeox = new Simeox_Form_CMS_Sub_Simeox(); - $simeox->setLegend(__("Section 'Le Simeox'")); + $simeox->setLegend("Section 'Le Simeox'"); $this->addSubForm($simeox, 'simeox'); // R&D Clinic section $RDClinic = new Simeox_Form_CMS_Sub_RDClinic(); - $RDClinic->setLegend(__("Section 'R&D Clinique'")); + $RDClinic->setLegend("Section 'R&D Clinique'"); $this->addSubForm($RDClinic, 'clinic'); // About section $about = new Simeox_Form_CMS_Sub_About(); - $about->setLegend(__("Section 'A propos de PhysioAssist'")); + $about->setLegend("Section 'A propos de PhysioAssist'"); $this->addSubForm($about, 'about'); // Contact section $contact = new Simeox_Form_CMS_Sub_Contact(); - $contact->setLegend(__("Section 'Contact'")); + $contact->setLegend("Section 'Contact'"); $this->addSubForm($contact, 'contact'); - - // Footer text - $footer = new Simeox_Form_Element_Markitup('footer'); - $footer->setLabel(__('Footer')); - $this->addElement($footer); } } \ No newline at end of file diff --git a/framework/application/forms/CMS/Sub/About.php b/framework/application/forms/CMS/Sub/About.php index 52eb17a..98ea443 100644 --- a/framework/application/forms/CMS/Sub/About.php +++ b/framework/application/forms/CMS/Sub/About.php @@ -7,31 +7,31 @@ class Simeox_Form_CMS_Sub_About extends Simeox_Form_CMS_Sub_Section { $heading = new Zend_Form_Element_Textarea('heading'); $heading->setAttrib('rows', 2); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $subheading = new Zend_Form_Element_Textarea('subheading'); $subheading->setAttrib('rows', 2); - $subheading->setLabel(__('Sous-titre')); + $subheading->setLabel('Sous-titre'); $this->addElement($subheading); $content = new Simeox_Form_Element_Markitup('content'); - $content->setLabel(__('Contenus')); + $content->setLabel('Contenus'); $this->addElement($content); $bg_image = new CubeIT_Form_Element_File_Image('bg_image'); - $bg_image->setLabel(__("Image d'arrière-plan")); + $bg_image->setLabel("Image d'arrière-plan"); $bg_image->setMaxItems(1); $this->addElement($bg_image); // Team members $team = new Simeox_Form_CMS_Sub_Team(); - $team->setLegend(__("Bloc 'L'équipe'")); + $team->setLegend("Bloc 'L'équipe'"); $this->addSubForm($team, 'team'); // Partners $partners = new Simeox_Form_CMS_Sub_Partners(); - $partners->setLegend(__("Bloc 'Les Partenaires'")); + $partners->setLegend("Bloc 'Les Partenaires'"); $this->addSubForm($partners, 'partners'); } diff --git a/framework/application/forms/CMS/Sub/Benefits.php b/framework/application/forms/CMS/Sub/Benefits.php index 243203b..54dc6db 100644 --- a/framework/application/forms/CMS/Sub/Benefits.php +++ b/framework/application/forms/CMS/Sub/Benefits.php @@ -2,17 +2,17 @@ class Simeox_Form_CMS_Sub_Benefits extends CubeIT_Form_SubForm { - public function init() { - parent::init(); + public function init() { + parent::init(); - $content_left = new Simeox_Form_Element_Markitup('content_left'); - $content_left->setLabel(__('Colonne de gauche')); - $this->addElement($content_left); + $content_left = new Simeox_Form_Element_Markitup('content_left'); + $content_left->setLabel('Colonne de gauche'); + $this->addElement($content_left); - $content_right = new Simeox_Form_Element_Markitup('content_right'); - $content_right->setLabel(__('Colonne de droite')); - $this->addElement($content_right); - } + $content_right = new Simeox_Form_Element_Markitup('content_right'); + $content_right->setLabel('Colonne de droite'); + $this->addElement($content_right); + } } \ No newline at end of file diff --git a/framework/application/forms/CMS/Sub/Carousel.php b/framework/application/forms/CMS/Sub/Carousel.php index a308cb5..d57bbc0 100644 --- a/framework/application/forms/CMS/Sub/Carousel.php +++ b/framework/application/forms/CMS/Sub/Carousel.php @@ -6,16 +6,16 @@ class Simeox_Form_CMS_Sub_Carousel extends CubeIT_Form_SubForm { parent::init(); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $subheading = new Zend_Form_Element_Text('subheading'); $subheading->setAttrib('rows', 2); - $subheading->setLabel(__('Sous-titre')); + $subheading->setLabel('Sous-titre'); $this->addElement($subheading); $carousel = new Simeox_Form_CMS_Sub_Carousel_Carousel(); - $carousel->setLegend(__('Carrousel')); + $carousel->setLegend('Carrousel'); $this->addSubForm($carousel, 'image_carousel'); diff --git a/framework/application/forms/CMS/Sub/Carousel/Item.php b/framework/application/forms/CMS/Sub/Carousel/Item.php index 9a487e3..2a49d38 100644 --- a/framework/application/forms/CMS/Sub/Carousel/Item.php +++ b/framework/application/forms/CMS/Sub/Carousel/Item.php @@ -6,7 +6,7 @@ class Simeox_Form_CMS_Sub_Carousel_Item extends CubeIT_Form_SubForm { parent::init(); $title = new Zend_Form_Element_Text('title'); - $title->setLabel(__('Titre')); + $title->setLabel('Titre'); $this->addElement($title); $image = new CubeIT_Form_Element_File_Image('image'); diff --git a/framework/application/forms/CMS/Sub/Contact.php b/framework/application/forms/CMS/Sub/Contact.php index 264cdcf..43e7918 100644 --- a/framework/application/forms/CMS/Sub/Contact.php +++ b/framework/application/forms/CMS/Sub/Contact.php @@ -5,23 +5,23 @@ class Simeox_Form_CMS_Sub_Contact extends CubeIT_Form_Adresse { public function init() { $menu_title = new Zend_Form_Element_Text('menu_title'); - $menu_title->setLabel(__('Titre pour le menu')); + $menu_title->setLabel('Titre pour le menu'); $this->addElement($menu_title); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $company_name = new Zend_Form_Element_Text('company_name'); - $company_name->setLabel(__('Nom de société')); + $company_name->setLabel('Nom de société'); $this->addElement($company_name); $company_logo = new CubeIT_Form_Element_File_Image('company_logo'); - $company_logo->setLabel(__('Logo')); + $company_logo->setLabel('Logo'); $this->addElement($company_logo); $email = new CubeIT_Form_Element_Email('email'); - $email->setLabel(__('Adresse email')); + $email->setLabel('Adresse email'); $this->addElement($email); parent::init(); diff --git a/framework/application/forms/CMS/Sub/ImageHeader.php b/framework/application/forms/CMS/Sub/ImageHeader.php index ea5817a..a61351e 100644 --- a/framework/application/forms/CMS/Sub/ImageHeader.php +++ b/framework/application/forms/CMS/Sub/ImageHeader.php @@ -6,20 +6,20 @@ class Simeox_Form_CMS_Sub_ImageHeader extends CubeIT_Form_SubForm { parent::init(); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $subheading = new Zend_Form_Element_Text('subheading'); $subheading->setAttrib('rows', 2); - $subheading->setLabel(__('Sous-titre')); + $subheading->setLabel('Sous-titre'); $this->addElement($subheading); $bg_color = new CubeIT_Form_Element_Color('bg_color'); - $bg_color->setLabel(__('Couleur de fond')); + $bg_color->setLabel('Couleur de fond'); $this->addElement($bg_color); $image = new CubeIT_Form_Element_File_Image('image'); - $image->setLabel(__("Image de fond")); + $image->setLabel("Image de fond"); $image->setMaxItems(1); $this->addElement($image); } diff --git a/framework/application/forms/CMS/Sub/Interface.php b/framework/application/forms/CMS/Sub/Interface.php index 5be4b63..00d310d 100644 --- a/framework/application/forms/CMS/Sub/Interface.php +++ b/framework/application/forms/CMS/Sub/Interface.php @@ -6,15 +6,15 @@ class Simeox_Form_CMS_Sub_Interface extends CubeIT_Form_SubForm { parent::init(); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $content = new Simeox_Form_Element_Markitup('content'); - $content->setLabel(__('Contenus')); + $content->setLabel('Contenus'); $this->addElement($content); $image = new CubeIT_Form_Element_File_Image('image'); - $image->setLabel(__("Image")); + $image->setLabel("Image"); $image->setMaxItems(1); $this->addElement($image); } diff --git a/framework/application/forms/CMS/Sub/Operation.php b/framework/application/forms/CMS/Sub/Operation.php index 46849df..55cea2f 100644 --- a/framework/application/forms/CMS/Sub/Operation.php +++ b/framework/application/forms/CMS/Sub/Operation.php @@ -6,24 +6,24 @@ class Simeox_Form_CMS_Sub_Operation extends CubeIT_Form_SubForm { parent::init(); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $subheading = new Zend_Form_Element_Text('subheading'); $subheading->setAttrib('rows', 2); - $subheading->setLabel(__('Sous-titre')); + $subheading->setLabel('Sous-titre'); $this->addElement($subheading); $content = new Simeox_Form_Element_Markitup('content'); - $content->setLabel(__('Contenus')); + $content->setLabel('Contenus'); $this->addElement($content); $video = new CubeIT_Form_Element_WebVideo('video'); - $video->setLabel(__('Video')); + $video->setLabel('Video'); $this->addElement($video); $bg_image = new CubeIT_Form_Element_File_Image('bg_image'); - $bg_image->setLabel(__("Image de fond")); + $bg_image->setLabel("Image de fond"); $bg_image->setMaxItems(1); $this->addElement($bg_image); diff --git a/framework/application/forms/CMS/Sub/Partners.php b/framework/application/forms/CMS/Sub/Partners.php index fb0b425..d9f34c4 100644 --- a/framework/application/forms/CMS/Sub/Partners.php +++ b/framework/application/forms/CMS/Sub/Partners.php @@ -6,19 +6,19 @@ class Simeox_Form_CMS_Sub_Partners extends CubeIT_Form_SubForm { parent::init(); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $partners_medical = new Simeox_Form_CMS_Sub_Partners_Partners(); - $partners_medical->setLegend(__('Les partenaires médicaux')); + $partners_medical->setLegend('Les partenaires médicaux'); $this->addSubForm($partners_medical, 'partners_medical'); $partners_financial = new Simeox_Form_CMS_Sub_Partners_Partners(); - $partners_financial->setLegend(__('Les partenaires financiers')); + $partners_financial->setLegend('Les partenaires financiers'); $this->addSubForm($partners_financial, 'partners_financial'); $content = new Simeox_Form_Element_Markitup('content'); - $content->setLabel(__('Contenus')); + $content->setLabel('Contenus'); $this->addElement($content); } diff --git a/framework/application/forms/CMS/Sub/Partners/Partner.php b/framework/application/forms/CMS/Sub/Partners/Partner.php index 0ce2575..fef500e 100644 --- a/framework/application/forms/CMS/Sub/Partners/Partner.php +++ b/framework/application/forms/CMS/Sub/Partners/Partner.php @@ -6,15 +6,15 @@ class Simeox_Form_CMS_Sub_Partners_Partner extends CubeIT_Form_SubForm { parent::init(); $name = new Zend_Form_Element_Text('name'); - $name->setLabel(__('Nom du partenaire')); + $name->setLabel('Nom du partenaire'); $this->addElement($name); $description = new Zend_Form_Element_Text('description'); - $description->setLabel(__('Description')); + $description->setLabel('Description'); $this->addElement($description); $link = new CubeIT_Form_Element_Url('link'); - $link->setLabel(__('Lien')); + $link->setLabel('Lien'); $this->addElement($link); $logo = new CubeIT_Form_Element_File_Image('logo'); diff --git a/framework/application/forms/CMS/Sub/Partners/Partners.php b/framework/application/forms/CMS/Sub/Partners/Partners.php index 0cba183..ba016b9 100644 --- a/framework/application/forms/CMS/Sub/Partners/Partners.php +++ b/framework/application/forms/CMS/Sub/Partners/Partners.php @@ -6,7 +6,7 @@ class Simeox_Form_CMS_Sub_Partners_Partners extends CubeIT_Form_Multi_SubForm { parent::init(); $this->setBaseSubForm(new Simeox_Form_CMS_Sub_Partners_Partner()) ->setBaseLegend('Edition du partenaire « $name »') - ->setNewLegend(__("Nouveau partenaire")); + ->setNewLegend("Nouveau partenaire"); } } \ No newline at end of file diff --git a/framework/application/forms/CMS/Sub/RDClinic.php b/framework/application/forms/CMS/Sub/RDClinic.php index 7d6e3fd..fed2834 100644 --- a/framework/application/forms/CMS/Sub/RDClinic.php +++ b/framework/application/forms/CMS/Sub/RDClinic.php @@ -6,31 +6,31 @@ class Simeox_Form_CMS_Sub_RDClinic extends Simeox_Form_CMS_Sub_Section { parent::init(); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $intro = new Simeox_Form_Element_Markitup('introduction'); - $intro->setLabel(__('Introduction')); + $intro->setLabel('Introduction'); $this->addElement($intro); $bg_image = new CubeIT_Form_Element_File_Image('bg_image_1'); - $bg_image->setLabel(__("Image de fond #1")); + $bg_image->setLabel("Image de fond #1"); $bg_image->setMaxItems(1); $this->addElement($bg_image); $findings = new Simeox_Form_Element_Markitup('findings'); - $findings->setLabel(__('Conclusions cliniques')); + $findings->setLabel('Conclusions cliniques'); $this->addElement($findings); $bg_image_2 = new CubeIT_Form_Element_File_Image('bg_image_2'); - $bg_image_2->setLabel(__("Image de fond #2")); + $bg_image_2->setLabel("Image de fond #2"); $bg_image_2->setMaxItems(1); $this->addElement($bg_image_2); /* $download = new CubeIT_Form_Element_File_Image_Legend('download'); - $download->setLabel(__('PDF document')); - $download->setAttrib('data-textbutton', __('Cliquez pour choisir un document')); + $download->setLabel('PDF document'); + $download->setAttrib('data-textbutton', 'Cliquez pour choisir un document'); $this->addElement($download); */ diff --git a/framework/application/forms/CMS/Sub/Section.php b/framework/application/forms/CMS/Sub/Section.php index 2f1d108..2a9aedd 100644 --- a/framework/application/forms/CMS/Sub/Section.php +++ b/framework/application/forms/CMS/Sub/Section.php @@ -6,7 +6,7 @@ class Simeox_Form_CMS_Sub_Section extends CubeIT_Form_SubForm { parent::init(); $menu_title = new Zend_Form_Element_Text('menu_title'); - $menu_title->setLabel(__('Titre pour le menu')); + $menu_title->setLabel('Titre pour le menu'); $this->addElement($menu_title); } diff --git a/framework/application/forms/CMS/Sub/Simeox.php b/framework/application/forms/CMS/Sub/Simeox.php index bb5c9cb..785eae6 100644 --- a/framework/application/forms/CMS/Sub/Simeox.php +++ b/framework/application/forms/CMS/Sub/Simeox.php @@ -6,19 +6,19 @@ class Simeox_Form_CMS_Sub_Simeox extends Simeox_Form_CMS_Sub_Section { parent::init(); $carousel = new Simeox_Form_CMS_Sub_Carousel(); - $carousel->setLegend(__('Carrousel')); + $carousel->setLegend('Carrousel'); $this->addSubForm($carousel, 'carousel'); $operation = new Simeox_Form_CMS_Sub_Operation(); - $operation->setLegend(__("Bloc 'Fonctionnement'")); + $operation->setLegend("Bloc 'Fonctionnement'"); $this->addSubForm($operation, 'operation'); $benefits = new Simeox_Form_CMS_Sub_Benefits(); - $benefits->setLegend(__("Bloc 'Bénéfices'")); + $benefits->setLegend("Bloc 'Bénéfices'"); $this->addSubForm($benefits, 'benefits'); $interface = new Simeox_Form_CMS_Sub_Interface(); - $interface->setLegend(__("Bloc 'L'interface graphique'")); + $interface->setLegend("Bloc 'L'interface graphique'"); $this->addSubForm($interface, 'interface'); } } \ No newline at end of file diff --git a/framework/application/forms/CMS/Sub/Team.php b/framework/application/forms/CMS/Sub/Team.php index 963f313..680c01b 100644 --- a/framework/application/forms/CMS/Sub/Team.php +++ b/framework/application/forms/CMS/Sub/Team.php @@ -6,20 +6,20 @@ class Simeox_Form_CMS_Sub_Team extends CubeIT_Form_SubForm { parent::init(); $heading = new Zend_Form_Element_Text('heading'); - $heading->setLabel(__('Titre')); + $heading->setLabel('Titre'); $this->addElement($heading); $people = new Simeox_Form_CMS_Sub_Team_Team(); - $people->setLegend(__("Personnes")); + $people->setLegend("Personnes"); $this->addSubForm($people, 'people'); // Bg colour not needed when image is set to cover the full background //$bg_color = new CubeIT_Form_Element_Color('bg_color'); - //$bg_color->setLabel(__('Couleur en arrière-plan')); + //$bg_color->setLabel('Couleur en arrière-plan'); //$this->addElement($bg_color); $bg_image = new CubeIT_Form_Element_File_Image('bg_image'); - $bg_image->setLabel(__("Image d'arrière-plan")); + $bg_image->setLabel("Image d'arrière-plan"); $bg_image->setMaxItems(1); $this->addElement($bg_image); diff --git a/framework/application/forms/CMS/Sub/Team/Person.php b/framework/application/forms/CMS/Sub/Team/Person.php index 9db9b71..f636ce1 100644 --- a/framework/application/forms/CMS/Sub/Team/Person.php +++ b/framework/application/forms/CMS/Sub/Team/Person.php @@ -6,19 +6,19 @@ class Simeox_Form_CMS_Sub_Team_Person extends CubeIT_Form_SubForm { parent::init(); $name = new Zend_Form_Element_Text('name'); - $name->setLabel(__('Prénom et nom')); + $name->setLabel('Prénom et nom'); $this->addElement($name); $position = new Zend_Form_Element_Text('position'); - $position->setLabel(__('Poste')); + $position->setLabel('Poste'); $this->addElement($position); $bio = new Simeox_Form_Element_Markitup('bio'); - $bio->setLabel(__('Texte')); + $bio->setLabel('Texte'); $this->addElement($bio); $photo = new CubeIT_Form_Element_File_Image('photo'); - $photo->setLabel(__('Photo')); + $photo->setLabel('Photo'); $photo->setMaxItems(1); $this->addElement($photo); } diff --git a/framework/application/forms/CMS/Sub/Team/Team.php b/framework/application/forms/CMS/Sub/Team/Team.php index 5fde002..d35d6c6 100644 --- a/framework/application/forms/CMS/Sub/Team/Team.php +++ b/framework/application/forms/CMS/Sub/Team/Team.php @@ -6,7 +6,7 @@ class Simeox_Form_CMS_Sub_Team_Team extends CubeIT_Form_Multi_SubForm { parent::init(); $this->setBaseSubForm(new Simeox_Form_CMS_Sub_Team_Person()) ->setBaseLegend('Edition de « $name »') - ->setNewLegend(__("Nouveau membre")); + ->setNewLegend("Nouveau membre"); } } \ No newline at end of file diff --git a/framework/application/forms/CMS/Text.php b/framework/application/forms/CMS/Text.php new file mode 100644 index 0000000..e42176c --- /dev/null +++ b/framework/application/forms/CMS/Text.php @@ -0,0 +1,17 @@ +setLabel('Contenu'); + $this->addElement($text); + } +} \ No newline at end of file diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php index 7b0b5a6..e9409e7 100644 --- a/framework/application/forms/Settings.php +++ b/framework/application/forms/Settings.php @@ -7,6 +7,10 @@ class Simeox_Form_Settings extends CubeIT_Form_Settings { $this->setTitle('Edition des paramètres du site'); + $logo = new CubeIT_Form_Element_File_Image('site_logo'); + $logo->setLabel('Logo principal'); + $this->addElement($logo); + $longTitle = new Zend_Form_Element_Text('longTitle'); $longTitle->setLabel('Titre long par défaut'); $this->addElementLocalized($longTitle); @@ -14,6 +18,11 @@ class Simeox_Form_Settings extends CubeIT_Form_Settings { $description = new CubeIT_Form_Element_Textarea('description'); $description->setLabel('Description de la page par défaut'); $this->addElementLocalized($description); + + // Footer text + $footer = new Simeox_Form_Element_Markitup('footer'); + $footer->setLabel('Footer'); + $this->addElementLocalized($footer); } } diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml index e8a3fe4..d404064 100644 --- a/framework/application/views/scripts/common/footer.phtml +++ b/framework/application/views/scripts/common/footer.phtml @@ -1,25 +1,25 @@ \ No newline at end of file diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml index b704b2e..bf63c14 100644 --- a/framework/application/views/scripts/common/header.phtml +++ b/framework/application/views/scripts/common/header.phtml @@ -5,23 +5,26 @@ $this->headScript()->addScriptAndStyle('navigation'); // Major nav sections $sections = array('simeox', 'clinic', 'about', 'contact'); +$data=CubeIT_Util_Cms::getCMSDatasOfPage('home'); +fb($data); + ?>
-
- - - +
+ + + - -
+ +
\ No newline at end of file diff --git a/framework/application/views/scripts/templates/text.phtml b/framework/application/views/scripts/templates/text.phtml new file mode 100644 index 0000000..e48956c --- /dev/null +++ b/framework/application/views/scripts/templates/text.phtml @@ -0,0 +1,5 @@ +headScript()->addScriptAndStyle('text'); +echo '
'; +echo $this->markupDotclear($this->text); +echo '
'; diff --git a/less/_utilities.less b/less/_utilities.less index 635b7ef..2c2607c 100644 --- a/less/_utilities.less +++ b/less/_utilities.less @@ -1,27 +1,29 @@ .col { - display: inline-block; - width: 50%; - vertical-align: top; - white-space: normal; + display: inline-block; + width: 49%; + vertical-align: top; + white-space: normal; } // Media object abstraction .media { - overflow: hidden; + overflow: hidden; } + .media--item { - float: left; - margin-right: 25px; + float: left; + margin-right: 25px; } + .media--body { - overflow: hidden; + overflow: hidden; } // Utility class for self-clearing floats .group:after { - content: ""; - display: table; - clear: both; + content: ""; + display: table; + clear: both; } ////---- Mixins ----//// @@ -30,12 +32,12 @@ // From: https://gist.github.com/interactivellama/5699885 // Note: elements *must* have whitespace between them or this won't work. No minified HTML. .jgroup { - text-align: justify; - font-size: 0.1px; + text-align: justify; + font-size: 0.1px; - &:after{ - content: ''; - display: inline-block; - width: 100%; - } + &:after { + content: ''; + display: inline-block; + width: 100%; + } } \ No newline at end of file diff --git a/less/about.less b/less/about.less index d9d1ee8..a81f963 100644 --- a/less/about.less +++ b/less/about.less @@ -1,147 +1,145 @@ @import "_utilities"; .about-intro { - background-position: center; - background-repeat: no-repeat; - background-size: cover; - padding-top: 120px; - - .content { - padding-right: 520px; - } - - h1 { - margin-bottom: 70px; - } - h2 { - font-size: 20px; - font-weight: 600; - margin-bottom: 10px; - } - - img { - padding-top: 1.5em; - } + background-position: center; + background-repeat: no-repeat; + background-size: cover; + padding-top: 120px; + + .content { + padding-right: 520px; + } + + h1 { + margin-bottom: 70px; + } + h2 { + font-size: 20px; + font-weight: 600; + margin-bottom: 10px; + } + + img { + padding-top: 1.5em; + } } .team { - background-position: top center; - background-repeat: no-repeat; - background-color: #0080c8; - background-size: cover; - color: #fff; - padding: 75px 0; - - h1 { - color: #fff; - } - - .people { - white-space: nowrap; // For columns - } - .person { - &:extend(.media); - padding-top: 60px; - - img { - &:extend(.media--item); - } - - &:nth-of-type(odd) { - padding-right: 40px; - } - &:nth-of-type(even) { - padding-left: 40px; - } - } - .name { - font-weight: 600; - padding-bottom: 12px; - } - .position { - font-style: italic; - padding-bottom: 10px; - } - .bio { - &:extend(.media--body); - font-size: 13px; - line-height: 18px; - } + background-position: top center; + background-repeat: no-repeat; + background-color: #0080c8; + background-size: cover; + color: #fff; + padding: 75px 0; + + h1 { + color: #fff; + } + + + .person { + &:extend(.media); + padding-top: 60px; + + img { + &:extend(.media--item); + } + + &:nth-of-type(odd) { + padding-right: 40px; + } + &:nth-of-type(even) { + padding-left: 40px; + } + } + .name { + font-weight: 600; + padding-bottom: 12px; + } + .position { + font-style: italic; + padding-bottom: 10px; + } + .bio { + &:extend(.media--body); + font-size: 13px; + line-height: 18px; + } } .partners { - padding: 85px 0; + padding: 85px 0; - h1 { - color: #3c3c3b; - margin-bottom: 100px; - } + h1 { + color: #3c3c3b; + margin-bottom: 100px; + } - hr { - margin: 60px 0; - } + hr { + margin: 60px 0; + } - .logos { + .logos { - img { - filter: grayscale(1); - transition: all 0.3s; + img { + filter: grayscale(1); + transition: all 0.3s; - &:hover { - filter: grayscale(0); - } - } + &:hover { + filter: grayscale(0); + } + } - .jgroup; + .jgroup; - a { - display: inline-block; - } - } + a { + display: inline-block; + } + } - .dotclear { - margin-top: 60px; - } + .dotclear { + margin-top: 60px; + } } #tooltip { - position: absolute; - background: #0080c8; - padding: 15px; - border-radius: 15px; - color: #fff; - font-size: 14px; - margin: -10px 0 0 60px; - min-width: 80px; - min-height: 49px; - -moz-transform: scale(0.99999); // For Mozilla only: forces anti-aliasing on angled lines - - &:before { - content: ""; - position: absolute; - bottom: -10px; - left: 30px; - border: 0; - border-left-width: 15px; - border-bottom-width: 10px; - border-style: solid; - border-color: transparent #0080c8; - display: block; - width: 0; - } - - &:after { - content: ""; - position: absolute; - bottom: -10px; - left: 30px; - border: 0; - border-left-width: 5px; - border-bottom-width: 10px; - border-style: solid; - border-color: transparent #fff; - display: block; - width: 0; - } + position: absolute; + background: #0080c8; + padding: 15px; + border-radius: 15px; + color: #fff; + font-size: 14px; + margin: -10px 0 0 60px; + min-width: 80px; + min-height: 49px; + -moz-transform: scale(0.99999); // For Mozilla only: forces anti-aliasing on angled lines + + &:before { + content: ""; + position: absolute; + bottom: -10px; + left: 30px; + border: 0; + border-left-width: 15px; + border-bottom-width: 10px; + border-style: solid; + border-color: transparent #0080c8; + display: block; + width: 0; + } + + &:after { + content: ""; + position: absolute; + bottom: -10px; + left: 30px; + border: 0; + border-left-width: 5px; + border-bottom-width: 10px; + border-style: solid; + border-color: transparent #fff; + display: block; + width: 0; + } } \ No newline at end of file diff --git a/less/admin.less b/less/admin.less index e69de29..26f3a2d 100644 --- a/less/admin.less +++ b/less/admin.less @@ -0,0 +1,9 @@ +#adminBar { + position: absolute; + width: 100%; + z-index: 99; + + .content { + width: 100%; + } +} diff --git a/less/common.less b/less/common.less index 2c10ffd..cf03d8b 100644 --- a/less/common.less +++ b/less/common.less @@ -1,179 +1,180 @@ @import "_utilities"; + @header-height: 130px; html { - box-sizing: border-box; + box-sizing: border-box; } + *, *:before, *:after { - box-sizing: inherit; + box-sizing: inherit; } - body { - font-family: 'Open Sans', sans-serif; - font-weight: 300; - font-size: 16px; - min-width: 960px; // stops centred background images from moving beyond where they should + font-family: 'Open Sans', sans-serif; + font-weight: 300; + font-size: 16px; + min-width: 960px; // stops centred background images from moving beyond where they should } a { - text-decoration: none; - color: #1d81c2; + text-decoration: none; + color: #1d81c2; - &:hover { - color: #3c3c3b; - } + &:hover { + color: #3c3c3b; + } } strong { - font-weight: 600; + font-weight: 600; } h1, h2 { - font-weight: 300; + font-weight: 300; } h1 { - color: #0080c8; - font-size: 52px; - font-weight: 300; + color: #0080c8; + font-size: 52px; + font-weight: 300; } + h2 { - font-size: 30px; - color: #525151; + font-size: 30px; + color: #525151; } p { - padding: 0.5em 0 1em 0; - line-height: 1.5; + padding: 0.5em 0 1em 0; + line-height: 1.5; } .content { - width: 960px; - margin: 0 auto; - padding-left: 37px; - - ul { - list-style-type: none; - } - li { - padding-left: 32px; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAOCAYAAADwikbvAAABN0lEQVQoU2NkQAMWFhYKLCxMCf//M9rDpBgZ/x/88+ffghMnTjxAVs6IzLG2tu5nZGQoQDcQxv//n2HC169fGy9cuPABJAbXbG1tdZ6RkdEAl0YkAw4cPXrUEa7ZxsaqAWhOPUxBXl4ew+3bdxi2b9+Gw6z/jUeOHGtgNDAwEODh4b4PVCUAU6mqqsowadJkIJ6Ey4APX758VWS0sbFwYGBg3o9uBcyAw4cPM7S1tWK44O/ff4FAzahORlYFM2DevHkMq1evQjPgfyNezYaGhkBb28E2g1yACoCaLS0tA5iZmdaju8vT04uhqqoKqLENh7//OmINMMIaGSABBrIR3d8gzV++fMbiVHhsQ6IKxgWmrv3A1AUMefwAmMpQEwlIOSi+ubm56wklT2DqKoQZj5K2QYKkZAwAhECNnlNX7scAAAAASUVORK5CYII='); - background-repeat: no-repeat; - background-position: 0 5px; - line-height: 1.5; - margin-bottom: 13px; - } - ul li ul { - margin-top: 10px; - margin-left: 10px; - li { - background: none; - padding: 0; - &:before { - content: '• '; - } - } - } + width: 960px; + margin: 0 auto; + padding-left: 37px; + + ul { + list-style-type: none; + } + li { + padding-left: 32px; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAOCAYAAADwikbvAAABN0lEQVQoU2NkQAMWFhYKLCxMCf//M9rDpBgZ/x/88+ffghMnTjxAVs6IzLG2tu5nZGQoQDcQxv//n2HC169fGy9cuPABJAbXbG1tdZ6RkdEAl0YkAw4cPXrUEa7ZxsaqAWhOPUxBXl4ew+3bdxi2b9+Gw6z/jUeOHGtgNDAwEODh4b4PVCUAU6mqqsowadJkIJ6Ey4APX758VWS0sbFwYGBg3o9uBcyAw4cPM7S1tWK44O/ff4FAzahORlYFM2DevHkMq1evQjPgfyNezYaGhkBb28E2g1yACoCaLS0tA5iZmdaju8vT04uhqqoKqLENh7//OmINMMIaGSABBrIR3d8gzV++fMbiVHhsQ6IKxgWmrv3A1AUMefwAmMpQEwlIOSi+ubm56wklT2DqKoQZj5K2QYKkZAwAhECNnlNX7scAAAAASUVORK5CYII='); + background-repeat: no-repeat; + background-position: 0 5px; + line-height: 1.5; + margin-bottom: 13px; + } + ul li ul { + margin-top: 10px; + margin-left: 10px; + li { + background: none; + padding: 0; + &:before { + content: '• '; + } + } + } } header.site { - height: @header-height; - position: fixed; - width: 100%; - background-color: #fff; - z-index: 10; - transition: height 0.3s ease; - - .content { - position: relative; - } - - .logo { - float: left; - margin-top: 50px; - text-indent: 100%; - overflow: hidden; - width: 290px; - height: 49px; - background-size: contain; - transition: all 0.3s ease; - } - - &.small { - height: @header-height/2; - box-shadow: 0 1px 7px rgba(0,0,0,0.2); - - .logo { - height: 25px; - margin-top: 21px; - } - - nav.primary { - //font-size: 16px; - margin-top: 20px; - } - } + height: @header-height; + position: fixed; + width: 100%; + background-color: #fff; + z-index: 10; + transition: height 0.3s ease; + + .content { + position: relative; + } + + .logo { + float: left; + margin-top: 50px; + text-indent: 100%; + overflow: hidden; + width: 290px; + height: 49px; + background-size: contain; + transition: all 0.3s ease; + } + + &.small { + height: @header-height/2; + box-shadow: 0 1px 7px rgba(0, 0, 0, 0.2); + + .logo { + height: 25px; + margin-top: 21px; + } + + nav.primary { + //font-size: 16px; + margin-top: 20px; + } + } } main { - padding-top: @header-height; // offset space for fixed header - overflow: hidden; - max-width: 100%; + padding-top: @header-height; // offset space for fixed header + overflow: hidden; + max-width: 100%; } .hero { - background-position: center; - background-repeat: no-repeat; - - .content { - padding-top: 85px; - padding-left: 440px; - } - - h1, h2 { - color: #fff; - max-width: 520px; - } - h1 { font-size: 70px; } - h2 { font-size: 24px; } + background-position: center; + background-repeat: no-repeat; + + .content { + padding-top: 85px; + padding-left: 440px; + } + + h1, h2 { + color: #fff; + max-width: 520px; + } + h1 { + font-size: 70px; + } + h2 { + font-size: 24px; + } } .footnotes { - font-size: 12px; + font-size: 12px; - h4 { - display: none; - } + h4 { + display: none; + } } footer { - background-color: #333338; - color: #848487; - font-size: 13px; - a { - color: inherit; - &:hover { - color: #fff; - } - } - - p { - padding: 0; - line-height: 44px; - } + background-color: #333338; + color: #848487; + font-size: 13px; + a { + color: inherit; + &:hover { + color: #fff; + } + } + + p { + padding: 0; + line-height: 44px; + } } #cookieBanner { - font-size: 12px !important; + font-size: 12px !important; } -#adminBar { - position: absolute; - width: 100%; - z-index: 99; +.cubeit-content{ + max-width: 960px; +} - .content { - width: 100%; - } -} \ No newline at end of file diff --git a/less/text.less b/less/text.less new file mode 100644 index 0000000..8c692ff --- /dev/null +++ b/less/text.less @@ -0,0 +1,5 @@ +main { + .dotclear { + margin: 50px 0; + } +} \ No newline at end of file -- 2.39.5