(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 077dbb68a0ba448dc01a47573e9ff9cfa2a40c95..4c8923fa9579dc5730826e456399a21af191aaf7 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -51,7 +51,7 @@ class Bootstrap extends CubeIT_Bootstrap {
                $templates = array();
                $templates['Génériques'] = array('text' => 'Page de texte', 'liens' => 'Liens', 'faq' => 'Questions / Réponses', 'temoignages' => 'Témoignages');
                $templates['Accueil'] = array('home' => 'Page d\'accueil');
-               $templates['Le centre'] = array('equipe' => 'L\'équipe');
+               $templates['Le centre'] = array('equipes' => 'L\'équipe');
                $templates['Parcours patient'] = array('parcours' => 'Parcours', 'soins' => 'Soins support');
                $templates['Traitements'] = array('traitement' => 'Traitement (Texte avec accordéon)');
                $templates['Infos pratiques'] = array('plan' => 'Plan du centre',

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index c183d5a85a02ed52fc7c65807c97eca71736bb45..2be9e23497d7bccd02d27197f2ebe1052f7280d5 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -1,5 +1,5 @@
 [production]
-dev = true
+dev = false
 
 minify.js = true
 minify.css = true
@@ -46,7 +46,6 @@ acl.roles[] = admin
 mail.test = APPLICATION_PATH "/../data/email/test"
 
 [testing : production]
-
 dev = true
 
 httpauth.username = ccgm

diff --git a/framework/application/forms/CMS/Equipes.php b/framework/application/forms/CMS/Equipes.php
new file mode 100644 (file)
index 0000000..7009ca3
--- /dev/null
+++ b/framework/application/forms/CMS/Equipes.php
@@ -0,0 +1,13 @@
+<?php\r
+\r
+class CCGM_Form_CMS_Equipes extends CCGM_Form_CMS_Text {\r
+\r
+       public function init() {\r
+               parent::init();\r
+\r
+               $equipes = new CCGM_Form_CMS_Sub_Equipes_Equipes();\r
+               $equipes->setLegend('Equipes');\r
+               $this->addSubForm($equipes, 'equipes');\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Equipes/Equipe.php b/framework/application/forms/CMS/Sub/Equipes/Equipe.php
new file mode 100644 (file)
index 0000000..3c916b4
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Equipes/Equipe.php
@@ -0,0 +1,21 @@
+<?php\r
+\r
+class CCGM_Form_CMS_Sub_Equipes_Equipe extends CubeIT_Form_SubForm {\r
+\r
+       public function init() {\r
+               parent::init();\r
+               $nom = new Zend_Form_Element_Text('nom');\r
+               $nom->setLabel('Nom');\r
+               $this->addElement($nom);\r
+\r
+               $photo = new CubeIT_Form_Element_File_Image('photo');\r
+               $photo->setLabel('Photo de groupe');\r
+               $photo->setMaxItems(1);\r
+               $this->addElement($photo);\r
+\r
+               $membres = new CCGM_Form_CMS_Sub_Equipes_Personnes();\r
+               $membres->setLegend('Membres');\r
+               $this->addSubForm($membres, 'membres');\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Equipes/Equipes.php b/framework/application/forms/CMS/Sub/Equipes/Equipes.php
new file mode 100644 (file)
index 0000000..5b80ec5
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Equipes/Equipes.php
@@ -0,0 +1,15 @@
+<?php
+
+class CCGM_Form_CMS_Sub_Equipes_Equipes extends CubeIT_Form_Multi_SubForm {
+
+       public function init() {
+               parent::init();
+
+               $base=new CCGM_Form_CMS_Sub_Equipes_Equipe();
+               $this->setBaseSubForm($base);
+               $this->setNewLegend('Nouvelle équipe');
+               $this->setBaseLegend('Editer l\'équipe « $nom »');
+               
+       }
+
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Equipes/Personne.php b/framework/application/forms/CMS/Sub/Equipes/Personne.php
new file mode 100644 (file)
index 0000000..5db261f
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Equipes/Personne.php
@@ -0,0 +1,22 @@
+<?php\r
+\r
+class CCGM_Form_CMS_Sub_Equipes_Personne extends CubeIT_Form_SubForm {\r
+\r
+       public function init() {\r
+               parent::init();\r
+\r
+               $nom = new Zend_Form_Element_Text('nom');\r
+               $nom->setLabel('Nom');\r
+               $this->addElement($nom);\r
+\r
+               $role = new Zend_Form_Element_Text('role');\r
+               $role->setLabel('Rôle');\r
+               $this->addElement($role);\r
+\r
+               $photo = new CubeIT_Form_Element_File_Image('photo');\r
+               $photo->setLabel('Photo');\r
+               $photo->setMaxItems(1);\r
+               $this->addElement($photo);\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Equipes/Personnes.php b/framework/application/forms/CMS/Sub/Equipes/Personnes.php
new file mode 100644 (file)
index 0000000..3de3d84
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Equipes/Personnes.php
@@ -0,0 +1,11 @@
+<?php\r
+\r
+class CCGM_Form_CMS_Sub_Equipes_Personnes extends CubeIT_Form_Multi_SubForm{\r
+       public function init(){\r
+               parent::init();\r
+               \r
+               $this->setBaseSubForm(new CCGM_Form_CMS_Sub_Equipes_Personne());\r
+               $this->setNewLegend('Nouveau membre');\r
+               $this->setBaseLegend('Editer la fiche de « $nom »');\r
+       }\r
+}\r

diff --git a/framework/application/views/helpers/Equipes.php b/framework/application/views/helpers/Equipes.php
new file mode 100644 (file)
index 0000000..daa1e66
--- /dev/null
+++ b/framework/application/views/helpers/Equipes.php
@@ -0,0 +1,68 @@
+<?php
+
+class CCGM_View_Helper_Equipes extends Zend_View_Helper_Abstract {
+
+       public function equipes($equipes) {
+               $res = '<div id="equipes">';
+               $percol = ceil(count($equipes) / 2);
+               $res.='<div class="col">';
+               foreach ($equipes as $i => $e) {
+                       $res.=$this->_equipe($e);
+                       if ($i + 1 == $percol) {
+                               $res.='</div><div class="col">';
+                       }
+               }
+               $res.='</div>';
+               $res.='</div>';
+               return $res;
+       }
+
+       protected function _equipe($equipe) {
+               $res = '<div class="equipe">';
+               $res.='<h3>' . $equipe['nom'] . '</h3>';
+               if ($equipe['photo']) {
+                       $img = $this->view->imageProcess($equipe['photo'], $equipe['nom'], 306, 204);
+               } else {
+                       $img = false;
+               }
+               if ($img) {
+                       $res.=$img;
+               }
+               $res.='<div class="membres">';
+               foreach ($equipe['membres'] as $m) {
+                       $res.=$this->_membre($m, !$img);
+               }
+               $res .= '</div>';
+               $res.='</div>';
+               return $res;
+       }
+
+       protected function _membre($membre, $photo = true) {
+               $res = '<div class="membre">';
+               $img = false;
+               $big = false;
+               if ($photo) {
+                       $img = $this->view->imageProcess($membre['photo'], $membre['nom'], 44, 44,array('class'=>'thumb'));
+                       if ($img) {
+                               $big = $this->view->imageProcess($membre['photo'], $membre['nom'], 104, 134);
+                       }
+               }
+               if ($img) {
+                       $res.=$img;
+                       if ($big) {
+                               $res.='<div class="big">'.$big.'</div>';
+                       }
+               }
+               $res.='<div class="infos">';
+               $res.='<div class="nom">' . $membre['nom'] . '</div>';
+               if ($membre['role']) {
+                       $res.='<div class="role">' . $membre['role'] . '</div>';
+               }
+               $res.='</div>';
+               $res.='</div>';
+               return $res;
+       }
+
+}
+
+?>

diff --git a/framework/application/views/scripts/templates/equipe.phtml b/framework/application/views/scripts/templates/equipe.phtml
deleted file mode 100644 (file)
index a4abe2d..0000000
--- a/framework/application/views/scripts/templates/equipe.phtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-

diff --git a/framework/application/views/scripts/templates/equipes.phtml b/framework/application/views/scripts/templates/equipes.phtml
new file mode 100644 (file)
index 0000000..bd4f097
--- /dev/null
+++ b/framework/application/views/scripts/templates/equipes.phtml
@@ -0,0 +1,12 @@
+<?php
+$this->headScript()->addScriptAndStyle('equipes');
+?>
+
+<section id="content">
+       <div id="c">
+               <?php
+               echo $this->markupDotclear($this->text);
+               echo $this->equipes($this->equipes);
+               ?>
+       </div>
+</section>
\ No newline at end of file

diff --git a/js/equipes.js b/js/equipes.js
new file mode 100644 (file)
index 0000000..a3ff045
--- /dev/null
+++ b/js/equipes.js
@@ -0,0 +1,9 @@
+TO_LOAD_ONCE[TO_LOAD_ONCE.length] = 'load_equipes();';
+
+function load_equipes() {
+       $(".thumb").mouseenter(function() {
+               $(this).siblings(".big").show();
+       }).mouseleave(function() {
+               $(this).siblings(".big").hide();
+       });
+}
\ No newline at end of file

diff --git a/less/common.less b/less/common.less
index f75a498be078839257e39c312ef234963618277f..e679eae53ebbc0fcce0a39bc7351ee99f248a958 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -20,6 +20,10 @@ q{quotes: none;}
 q:before,\r
 q:after{content:"";}\r
 \r
+.dotclear a{\r
+       color:#0EA6DB;\r
+}\r
+\r
 .body{\r
        max-width: 100%;\r
        overflow-x: hidden;\r
@@ -152,6 +156,7 @@ q:after{content:"";}
        overflow:hidden;\r
        background-color:#f1eeee;\r
        color:#5e5e5e;\r
+       clear: both;\r
 }\r
 #footer .footer-content{background-color:#e3dcdc;}\r
 #footer .holder{\r
@@ -236,7 +241,7 @@ q:after{content:"";}
 }\r
 .twocolumns{\r
        margin: 0 0 0 -3px;\r
-       overflow:hidden;\r
+       overflow:visible;\r
 }\r
 .twocolumns #content,\r
 .twocolumns .contents{\r

diff --git a/less/equipes.less b/less/equipes.less
new file mode 100644 (file)
index 0000000..5a6ef97
--- /dev/null
+++ b/less/equipes.less
@@ -0,0 +1,69 @@
+#equipes{
+       .col{
+               width: 334px;
+               display:inline-block;
+               &:first-child{
+                       margin:0 100px 0 0;
+               }
+       }
+       .equipe{
+               h3{
+                       text-transform: none;
+                       font-size: 16px;
+                       font-weight: 500;
+                       margin:20px 0;
+               }
+               img{
+                       border:1px solid #c7c5c5;
+                       border-radius: 5px;
+                       display: block;
+               }
+               >img{
+                       margin: 30px 0;
+               }
+
+               .membre{
+                       margin: 15px 0;
+                       position:relative;
+                       .thumb{
+                               display:inline-block;
+                               width: 44px;
+                               margin:0 16px 0 0;
+                               background-color: #e7e7e7;
+                       }
+                       .big{
+                               display:none;
+                               position: absolute;
+                               top:-54px;
+                               left:52px;
+                               z-index: 2;
+                               background-color:#fff;
+                               padding:6px;
+                               box-shadow: 0 0 5px 2px rgba(0,0,0,0.3);
+                               border-radius:7px;
+                               img{
+                                       border:0;
+                               }
+                               &:after{
+                                       content:"";
+                                       width: 0; 
+                                       height: 0; 
+                                       position:absolute;
+                                       left:-10px;
+                                       top:62px;
+                                       border-top: 10px solid transparent;
+                                       border-bottom: 10px solid transparent; 
+                                       border-right:10px solid #fff; 
+                               }
+                       }
+                       .infos{
+                               display:inline-block;
+                               .role{
+                                       font-weight: 300;
+                                       font-style: italic;
+                                       font-size: 13px;
+                               }
+                       }
+               }
+       }
+}
\ No newline at end of file

diff --git a/pathologies.png b/pathologies.png
deleted file mode 100644 (file)
index 728739a..0000000
Binary files a/pathologies.png and /dev/null differ