]> _ Git - physioassist.git/commitdiff
#simeox : Fixes team wrap
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Mon, 29 Feb 2016 13:19:34 +0000 (13:19 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Mon, 29 Feb 2016 13:19:34 +0000 (13:19 +0000)
Add legal mention page
Remove translations in cms forms
Update `CubeIT` library

@2

29 files changed:
framework/application/Bootstrap.php
framework/application/forms/CMS/Home.php
framework/application/forms/CMS/Sub/About.php
framework/application/forms/CMS/Sub/Benefits.php
framework/application/forms/CMS/Sub/Carousel.php
framework/application/forms/CMS/Sub/Carousel/Item.php
framework/application/forms/CMS/Sub/Contact.php
framework/application/forms/CMS/Sub/ImageHeader.php
framework/application/forms/CMS/Sub/Interface.php
framework/application/forms/CMS/Sub/Operation.php
framework/application/forms/CMS/Sub/Partners.php
framework/application/forms/CMS/Sub/Partners/Partner.php
framework/application/forms/CMS/Sub/Partners/Partners.php
framework/application/forms/CMS/Sub/RDClinic.php
framework/application/forms/CMS/Sub/Section.php
framework/application/forms/CMS/Sub/Simeox.php
framework/application/forms/CMS/Sub/Team.php
framework/application/forms/CMS/Sub/Team/Person.php
framework/application/forms/CMS/Sub/Team/Team.php
framework/application/forms/CMS/Text.php [new file with mode: 0644]
framework/application/forms/Settings.php
framework/application/views/scripts/common/footer.phtml
framework/application/views/scripts/common/header.phtml
framework/application/views/scripts/templates/text.phtml [new file with mode: 0644]
less/_utilities.less
less/about.less
less/admin.less
less/common.less
less/text.less [new file with mode: 0644]

index e64d4ab6ba515a9443b7ae79bb5b89a2caa48adf..c8c9a6e06ab766730f6b96e9694d42c260738290 100644 (file)
@@ -15,6 +15,7 @@ class Bootstrap extends CubeIT_Bootstrap {
         */
        public function getCMSTemplates() {
                $templates = parent::getCMSTemplates();
+               $templates['text'] = 'Page de texte';
                return $templates;
        }
 
index 851eae50e3c1224c8ca20d123aab8ac847fecc11..22cec30e0845d8290a8611dc3f94bad5f17b224b 100644 (file)
@@ -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
index 52eb17a7894f8fcee7f7454fc0dc9af5e8c0b04b..98ea443d16d7e485ae178882b874c82db7093811 100644 (file)
@@ -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');
 
     }
index 243203b379f3bc75fa91669f5018b2f8cd64e16e..54dc6db4be8e2e218aa20c9e637433699ecd7138 100644 (file)
@@ -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
index a308cb5372d4d8adcafcd502794aacf5daa6acae..d57bbc004b1c7993163f6a224569966646a8ebe0 100644 (file)
@@ -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');
 
 
index 9a487e3480bf570460db7780c79dcf0a9e834b90..2a49d380e01432362dc6ec6b4965e1456e9f33c3 100644 (file)
@@ -6,7 +6,7 @@ class Simeox_Form_CMS_Sub_Carousel_Item extends CubeIT_Form_SubForm {
                parent::init();\r
 \r
         $title = new Zend_Form_Element_Text('title');\r
-        $title->setLabel(__('Titre'));\r
+        $title->setLabel('Titre');\r
         $this->addElement($title);\r
 \r
                $image = new CubeIT_Form_Element_File_Image('image');\r
index 264cdcfce03c8dc8bc6e49b81af050a82b2592e6..43e7918c266daa912aac23a43d1c366b10d4d041 100644 (file)
@@ -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();
index ea5817a84c27d73664566760370169e50537f9d5..a61351e59ca21f012e595b7059b39ad2628ea328 100644 (file)
@@ -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);
     }
index 5be4b63379d0bf7237f28ac1b423dcfb675d98b9..00d310df39116c7bd145014973394ab14d643657 100644 (file)
@@ -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);
     }
index 46849dffdc976e9f0504dfc18636ec0846427e5c..55cea2ffa39bb743aa8712663c37e1d24dbd9b75 100644 (file)
@@ -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);
 
index fb0b42557152bb27654bb4101e9d6d1b8788d979..d9f34c4539251b59c23f41959ea57fc65a007c27 100644 (file)
@@ -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);
     }
 
index 0ce2575e7aae4404f3b05ec6be665259da1a24c8..fef500ebe6ca7da13acef0f9b892b5adb4dea15a 100644 (file)
@@ -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');
index 0cba183fd5e0a96b8b258c517e85da2d095d6853..ba016b93f216cf596eaaf9da65b53b29d46db719 100644 (file)
@@ -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
index 7d6e3fd4d5942610e60c2062851252292296bc73..fed28343b93c8cc7d13f7778a6f04a59e1e27245 100644 (file)
@@ -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);
         */
 
index 2f1d108ca881d55c2637a3e27d17b08028785c63..2a9aedd1e83baa29f88f92d262525a0c11dee2b4 100644 (file)
@@ -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);
 
     }
index bb5c9cbe5c82dbbcf9bcbe4fb1bb9600d1db1a1c..785eae60e3b5efd018b9749c0dade6730b833725 100644 (file)
@@ -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
index 963f31333f1cda730c47661a905d9144703767da..680c01b7014bc1e42b86874eff242259d44c90ef 100644 (file)
@@ -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);
 
index 9db9b71e0918c1a2fa411bc79451a4613569a3b4..f636ce1ef768441c4de567e5f264acbff630065d 100644 (file)
@@ -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);
     }
index 5fde002310ef15054799279393e03d7700553a8b..d35d6c6fa6e168a8479b3b01efa862424e65d745 100644 (file)
@@ -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 (file)
index 0000000..e42176c
--- /dev/null
@@ -0,0 +1,17 @@
+<?php\r
+\r
+/**\r
+ * Created by IntelliJ IDEA.\r
+ * User: Vincent\r
+ * Date: 29/02/2016\r
+ * Time: 12:07\r
+ */\r
+class Simeox_Form_CMS_Text extends CubeIT_Form_CMS {\r
+       public function init() {\r
+               parent::init();\r
+\r
+               $text = new CubeIT_Form_Element_Markitup('text');\r
+               $text->setLabel('Contenu');\r
+               $this->addElement($text);\r
+       }\r
+}
\ No newline at end of file
index 7b0b5a697fb914b1a86c31dd29b1885cab3b093b..e9409e75d716b6f4d8011f7308670ad763d2da7d 100644 (file)
@@ -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);
        }
 
 }
index e8a3fe46ea3b46fa86e3572ff13a64fe3d1078fc..d4040646892932ebc04581202c6018b237ab8647 100644 (file)
@@ -1,25 +1,25 @@
 <footer class="group">
-    <div class="content">
-        <nav class="locales">
-            <ul>
-                <?php
+       <div class="content">
+               <nav class="locales">
+                       <ul>
+                               <?php
 
-                $locales = Bootstrap::getInstance()->getOpt('locales');
-                fb($locales, 'locales');
+                               $locales = Bootstrap::getInstance()->getOpt('locales');
+                               fb($locales, 'locales');
 
-                foreach ($locales as $locale => $url) {
+                               foreach ($locales as $locale => $url) {
 
-                    // Check which locale URL we are on
-                    $attr = ($_SERVER['HTTP_HOST'] == $url) ? array('class' => 'active') : array();
-                    $attr['target'] = '_self';
+                                       // Check which locale URL we are on
+                                       $attr = ($_SERVER['HTTP_HOST'] == $url) ? array('class' => 'active') : array();
+                                       $attr['target'] = '_self';
 
-                    echo '<li>'. $this->link($locale, 'http://'.$url, $attr) .'</li>';
-                }
+                                       echo '<li>' . $this->link($locale, 'http://' . $url, $attr) . '</li>';
+                               }
 
-                ?>
-            </ul>
-        </nav>
+                               ?>
+                       </ul>
+               </nav>
 
-        <?php echo $this->markupDotclear($this->footer); ?>
-    </div>
+               <?php echo $this->markupDotclear($this->option(footer)); ?>
+       </div>
 </footer>
\ No newline at end of file
index b704b2ecc30a287e10a8407c12d330c3cd747b15..bf63c14d5582102ebe57d8d3195cdfe737393a35 100644 (file)
@@ -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);
+
 ?>
 <header class="site">
-    <div class="content">
-        <a href="#top">
-        <div class="logo" style="background-image: url(<?php echo CubeIT_View_Helper_ImageCms::getPath($this->site_logo); ?>);">
-            <h1><?php echo $this->shortTitle ?></h1>
-        </div>
-        </a>
+       <div class="content">
+               <a href="/#top">
+                       <div class="logo" style="background-image: url(<?php echo CubeIT_View_Helper_ImageCms::getPath($this->option('site_logo')); ?>);">
+                               <h1><?php echo $data->shortTitle ?></h1>
+                       </div>
+               </a>
 
-        <nav class="primary">
-            <ul>
-            <?php
-                foreach ($sections as $s) {
-                    echo '<li><a href="#'. $s .'">'. $this->{$s}['menu_title'] .'</a></li>';
-                }
-            ?>
-            </ul>
-        </nav>
-    </div>
+               <nav class="primary">
+                       <ul>
+                               <?php
+                               foreach ($sections as $s) {
+                                       echo '<li><a href="/#' . $s . '">' . $data[$s]['menu_title'] . '</a></li>';
+                               }
+                               ?>
+                       </ul>
+               </nav>
+       </div>
 </header>
\ 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 (file)
index 0000000..e48956c
--- /dev/null
@@ -0,0 +1,5 @@
+<?php\r
+$this->headScript()->addScriptAndStyle('text');\r
+echo '<div class="content">';\r
+echo $this->markupDotclear($this->text);\r
+echo '</div>';\r
index 635b7ef1d0c35265e25873b0b5e582b6c635bd75..2c2607cec479c469ed929214ba03a24a7ccb9ce8 100644 (file)
@@ -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 ----////
 // 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
index d9d1ee8ef39a975691dbae619417d59946b8ab9b..a81f963cee90248688ae78be221a5789334919a7 100644 (file)
 @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
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..26f3a2d4eb10bcb938a86f172e59b5225e7ea306 100644 (file)
@@ -0,0 +1,9 @@
+#adminBar {\r
+       position: absolute;\r
+       width: 100%;\r
+       z-index: 99;\r
+\r
+       .content {\r
+               width: 100%;\r
+       }\r
+}\r
index 2c10ffd63e8ba399c2469fb24ab3398097dfd04e..cf03d8b1e5d0de78781191c070788c53728b304c 100644 (file)
 @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 (file)
index 0000000..8c692ff
--- /dev/null
@@ -0,0 +1,5 @@
+main {\r
+       .dotclear {\r
+               margin: 50px 0;\r
+       }\r
+}
\ No newline at end of file