(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 8ae54dbfa9cddd0268fd99acbe0ecd8a7c7fddc8..077dbb68a0ba448dc01a47573e9ff9cfa2a40c95 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -9,7 +9,7 @@ class Bootstrap extends CubeIT_Bootstrap {
                $this->bootstrap('scripts');
        }
 
-       protected function _initScripts() {  
+       protected function _initScripts() {
                parent::_initScripts();
                $view = $this->getView();
                $view->headMeta()->setViewport(1024);
@@ -52,7 +52,7 @@ class Bootstrap extends CubeIT_Bootstrap {
                $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['Parcours patient'] = array('parcours' => 'Parcours');
+               $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',
                        'acces' => 'Plan d\'accès',
@@ -63,9 +63,6 @@ class Bootstrap extends CubeIT_Bootstrap {
                        'pageredirection' => 'Redirection interne',
                        'subredirection' => 'Redirection vers une sous-rubrique');
                return $templates;
-
-
-               return $templates;
        }
 
        protected function _makeURL($r, $seoUrl, $locale, $title, $parent, $isAdmin) {

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 11a97afa92ae5df32592a4caefee100e45ca350e..c183d5a85a02ed52fc7c65807c97eca71736bb45 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -1,5 +1,5 @@
 [production]
-dev = false
+dev = true
 
 minify.js = true
 minify.css = true
@@ -8,7 +8,7 @@ bin.mysqldump = /usr/bin/mysqldump
 bin.mysql = /usr/bin/mysql
 bin.zip = /usr/bin/zip
 bin.unzip = /usr/bin/unzip
-;bin.imagemagick=convert
+bin.imagemagick=convert
 bin.cp = /bin/cp
 bin.rm = /bin/rm
 

diff --git a/framework/application/forms/CMS/Soins.php b/framework/application/forms/CMS/Soins.php
new file mode 100644 (file)
index 0000000..35ac029
--- /dev/null
+++ b/framework/application/forms/CMS/Soins.php
@@ -0,0 +1,18 @@
+<?php\r
+\r
+class CCGM_Form_CMS_Soins extends CCGM_Form_CMS_Text {\r
+\r
+       public function init() {\r
+               parent::init();\r
+\r
+               $centre=new CCGM_Form_CMS_Sub_Parcours_Etape('centre');\r
+               $centre->setLabel('Pastille centrale');\r
+               $this->addSubForm($centre, 'centre');\r
+               \r
+               $etapes = new CCGM_Form_CMS_Sub_Parcours_Etapes();\r
+               $etapes->setLegend('Soins');\r
+               $this->addSubForm($etapes, 'soins');\r
+               \r
+               \r
+       }\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Parcours/Etape.php b/framework/application/forms/CMS/Sub/Parcours/Etape.php
index d1c8b3b2908867948bb7973d9b0dae2a7ff8bfe2..0232565e6d3d914bce599855db1a1db0c425cb4b 100644 (file)
--- a/framework/application/forms/CMS/Sub/Parcours/Etape.php
+++ b/framework/application/forms/CMS/Sub/Parcours/Etape.php
@@ -25,7 +25,8 @@ class CCGM_Form_CMS_Sub_Parcours_Etape extends CubeIT_Form_SubForm {
 
                $couleur = new Zend_Form_Element_Select('couleur');
                $couleur->setLabel('Couleur');
-               $couleur->setMultiOptions(array('orange' => 'Orange', 'vert' => 'Vert', 'bleu' => 'Bleu', 'petrole' => 'Petrole', 'rose' => 'Rose'));
+               $couleur->setMultiOptions(array('orange' => 'Orange', 'vert' => 'Vert', 'bleu' => 'Bleu', 'petrole' => 'Petrole', 'rose' => 'Rose',
+                       'prune' => 'Prune', 'aubergine' => 'Aubergine', 'vertfonce' => 'Vert foncé', 'gris' => 'Gris'));
                $this->addElement($couleur);
        }
 

diff --git a/framework/application/views/helpers/Etapes.php b/framework/application/views/helpers/Etapes.php
index 34af26c505181da4890c6fe1ad298cedf79f7c88..4dc78f960d60e50bcf0857f049f671760739a250 100644 (file)
--- a/framework/application/views/helpers/Etapes.php
+++ b/framework/application/views/helpers/Etapes.php
@@ -14,9 +14,13 @@ class CCGM_View_Helper_Etapes extends Zend_View_Helper_Abstract {
                return $res;
        }
 
-       protected function _etape($e, $i, $total) {
+       protected function _etape($e, $i, $total, $class = '') {
+               $c = '';
+               if ($class != '') {
+                       $c = ' ' . $class;
+               }
                $pos = $this->_getPosition($i, $total);
-               $res = '<div class="etape" data-size="' . $e['grand'] . '" data-color="' . $e['couleur'] . '" data-y="' . $pos['top'] . '" data-x="' . $pos['left'] . '">';
+               $res = '<div class="etape' . $c . '" data-size="' . $e['grand'] . '" data-color="' . $e['couleur'] . '" data-y="' . $pos['top'] . '" data-x="' . $pos['left'] . '">';
                $res.='<div class="pastille"></div>';
                $res.='<div class="face">';
                if ($e['titre']) {

diff --git a/framework/application/views/helpers/Soins.php b/framework/application/views/helpers/Soins.php
new file mode 100644 (file)
index 0000000..659ce61
--- /dev/null
+++ b/framework/application/views/helpers/Soins.php
@@ -0,0 +1,32 @@
+<?php\r
+\r
+class CCGM_View_Helper_Soins extends CCGM_View_Helper_Etapes {\r
+\r
+       public function soins($centre, $etapes) {\r
+               $nb = count($etapes);\r
+               $res = '<div id="etapes" class="etoile">';\r
+               $res.=$this->_etape($centre, 0, $nb,'centre');\r
+               foreach ($etapes as $k => $etape) {\r
+                       $res.=$this->_etape($etape, $k + 1, $nb);\r
+               }\r
+               $res.='</div>';\r
+               return $res;\r
+       }\r
+\r
+       protected function _getPosition($i, $total) {\r
+               $dim = array(\r
+                       0 => array(210, 210),\r
+                       1 => array(210, 0-94),\r
+                       2 => array(360+65, 60-65),\r
+                       3 => array(420+94, 210),\r
+                       4 => array(360+65, 360+65),\r
+                       5 => array(210, 420+94),\r
+                       6 => array(60-65, 360+65),\r
+                       7 => array(0-94, 210),\r
+                       8 => array(60-65, 60-65),\r
+               );\r
+               $d = $dim[$i];\r
+               return array('left' => $d[0], 'top' => $d[1]);\r
+       }\r
+\r
+}\r

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

diff --git a/images/etoile.png b/images/etoile.png
new file mode 100644 (file)
index 0000000..e2695a5
Binary files /dev/null and b/images/etoile.png differ

diff --git a/js/parcours.js b/js/parcours.js
index 2e283f5061b3ca2f529576ff9a52e95e173ece59..97165a7ef2eef460778acd2b8b9853b144bb4bc2 100644 (file)
--- a/js/parcours.js
+++ b/js/parcours.js
@@ -118,6 +118,14 @@
                                c = '#afbc19';\r
                        } else if (name == 'rose') {\r
                                c = '#e92699';\r
+                       } else if (name == 'prune') {\r
+                               c = '#b31d76';\r
+                       } else if (name == 'aubergine') {\r
+                               c = '#4c3176';\r
+                       } else if (name == 'vertfonce') {\r
+                               c = '#818c08';\r
+                       } else if (name == 'gris') {\r
+                               c = '#716156';\r
                        }\r
                        return c;\r
                },\r

diff --git a/less/actualites.less b/less/actualites.less
index 4dd919b71c300cc13cb90966e33fd40e81161950..a5fcfb6893df3806028695489f01891ed455e268 100644 (file)
--- a/less/actualites.less
+++ b/less/actualites.less
@@ -13,6 +13,7 @@
        padding: 19px 0 16px;
        background-image:url(../images/news.svg);
        background-position: 0 50%;
+       background-repeat: no-repeat;
 }
 .updates .mask {
        position: relative;
@@ -42,12 +43,14 @@
        right:35px;
        position:absolute;
        background-image: url(../images/arrow-news-left.svg);
+       background-repeat: no-repeat;
        background-size: 30px 30px;
 }
 .updates .btn-next {
        margin:0 0 0 5px;
        right:0px;
        background-image: url(../images/arrow-news-right.svg);
+       background-repeat: no-repeat;
 }
 .updates .btn-area{
        position:absolute;

diff --git a/less/carrousel.less b/less/carrousel.less
index 80ba39eaaa3f2fd6e887116856cb5bea45a25b4f..80e8dbfdd49699449d9d04cb0cd7d2bb108917fc 100644 (file)
--- a/less/carrousel.less
+++ b/less/carrousel.less
@@ -38,7 +38,8 @@
        margin: 0 0 0 9px;
 }
 .slideshow .pagination li a {
-       background:url(../images/elements.png) no-repeat -15px 0;
+       background-image:url(../images/elements.png);
+       background-position:-15px 0;
        width: 15px;
        height: 16px;
        overflow: hidden;

diff --git a/less/common.less b/less/common.less
index 87ddae46e6bf337d53a01cad312530e58ed94963..f75a498be078839257e39c312ef234963618277f 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -1,10 +1,10 @@
 *{ max-height: 1000000px; }\r
-html{background:#f1eeee;}\r
+html{background-color:#f1eeee;}\r
 body {\r
        margin:0;\r
        color:#5e5e5e;\r
        font:300 16px/20px 'Ubuntu', Arial, Helvetica, sans-serif;\r
-       background:#fff;\r
+       background-color:#fff;\r
        min-width:990px;\r
        -webkit-text-size-adjust: 100%;\r
        -ms-text-size-adjust: none;\r
@@ -55,7 +55,7 @@ q:after{content:"";}
        float:right;\r
 }\r
 .logo{\r
-       background:url(../images/logo.svg) no-repeat;\r
+       background-image:url(../images/logo.svg);\r
        width:392px;\r
        height:91px;\r
        overflow:hidden;\r
@@ -97,18 +97,28 @@ q:after{content:"";}
 }\r
 #nav li a[data-name="centre"]{\r
        background-image: url(../images/centre.svg);\r
+       background-position: 50% 0;\r
+       background-repeat: no-repeat;\r
 }\r
 #nav li a[data-name="parcours"]{\r
        background-image: url(../images/parcours.svg);\r
+       background-position: 50% 0;\r
+       background-repeat: no-repeat;\r
 }\r
 #nav li a[data-name="pathologies"]{\r
        background-image: url(../images/pathologies.svg);\r
+       background-position: 50% 0;\r
+       background-repeat: no-repeat;\r
 }\r
 #nav li a[data-name="recherche"]{\r
        background-image: url(../images/recherche.svg);\r
+       background-position: 50% 0;\r
+       background-repeat: no-repeat;\r
 }\r
 #nav li a[data-name="pratique"]{\r
        background-image: url(../images/pratique.svg);\r
+       background-position: 50% 0;\r
+       background-repeat: no-repeat;\r
 }\r
 \r
 \r
@@ -130,7 +140,9 @@ q:after{content:"";}
 }\r
 .add-nav li:last-child{padding:0 0 0 21px;}\r
 .add-nav li:last-child a{\r
-       background:url(../images/arrow-header.svg) no-repeat 100% 2px;\r
+       background-image:url(../images/arrow-header.svg);\r
+       background-repeat: no-repeat;\r
+       background-position: 100% 2px;\r
        padding: 0 19px 0 0;\r
 }\r
 .image-area{margin:0 0 21px;}\r
@@ -138,10 +150,10 @@ q:after{content:"";}
 \r
 #footer{\r
        overflow:hidden;\r
-       background:#f1eeee;\r
+       background-color:#f1eeee;\r
        color:#5e5e5e;\r
 }\r
-#footer .footer-content{background:#e3dcdc;}\r
+#footer .footer-content{background-color:#e3dcdc;}\r
 #footer .holder{\r
        margin:0 auto;\r
        width:979px;\r
@@ -173,7 +185,8 @@ q:after{content:"";}
 .nav li a{\r
        padding:0 0 1px 24px;\r
        display:block;\r
-       background:url(../images/arrow-grey-right.svg) no-repeat 0 1px;\r
+       background-image:url(../images/arrow-grey-right.svg);\r
+       background-position: 0 1px;\r
 }\r
 .info-area{\r
        float:left;\r
@@ -277,12 +290,13 @@ q:after{content:"";}
        list-style:none;\r
 }\r
 #content ul li{\r
-       background:url(../images/arrow-li.svg) no-repeat 0 2px;\r
+       background-image:url(../images/arrow-li.svg);\r
+       background-position: 0 2px;\r
        padding:0 0 3px 30px;\r
 }\r
 #content blockquote{\r
        border-radius:3px;\r
-       background:#f1f0f0;\r
+       background-color:#f1f0f0;\r
        margin:-4px 0 0;\r
        padding:19px 10px 24px 24px;\r
 }\r
@@ -301,7 +315,8 @@ q:after{content:"";}
        list-style:none;\r
 }\r
 #content blockquote>ul>li{\r
-       background:url(../images/bullet.svg) no-repeat 2px 8px;\r
+       background-image:url(../images/bullet.svg);\r
+       background-position:  2px 8px;\r
        padding: 0 0 3px 9px;\r
        font-style:italic;\r
        font-weight:300;\r

diff --git a/less/home.less b/less/home.less
index 35288776f7ecd9a91a22845cf2710894c62ba3b7..43ae7fd220ba6eb4bc5e9f6832835c0ef839fd04 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -22,7 +22,7 @@
        margin:0 0 15px;
 }
 .services .col .more{
-       background:#0ea6db;
+       background-color:#0ea6db;
        font-weight:300;
        font-style:italic;
        line-height:29px;

diff --git a/less/parcours.less b/less/parcours.less
index bf81a64d4f15b3a83ce027f149dce42a52de6833..0f73392d5887012a47d4fdd021d4d1cefe58a0ad 100644 (file)
--- a/less/parcours.less
+++ b/less/parcours.less
@@ -9,11 +9,37 @@
                width:709px;
                height:477px;
        }
+       &.etoile{
+               background-image: url("../images/etoile.png");
+               width:420px;
+               height:420px;
+               margin: 240px 0px 200px 100px;
+
+               .etape{
+                       .face{
+                               h3{
+                                       font-size: 20px;
+                                       line-height: 22px;
+                                       font-weight: normal;
+                               }
+                       }
+               }
+
+       }
+
        position:relative;
 
        margin:140px 0 150px -20px;
 
        .etape{
+               &.centre{
+                       h3{
+                               font-size: 26px;
+                               line-height: 28px;
+                               font-weight: normal;
+                       }
+               }
+
                position:absolute;
                color:#fff;
 
@@ -28,6 +54,8 @@
                        z-index: 1;
                        margin:0 auto;
 
+
+
                        h3,h4{
                                color:#fff;
                                font-weight: 400 !important;

diff --git a/less/sidebar.less b/less/sidebar.less
index 92ebfcf732e0c8ec564d69ca3c068ba7d41d5344..319fddaa1f1cef7e245845aefb8d9b81e407a5bf 100644 (file)
--- a/less/sidebar.less
+++ b/less/sidebar.less
@@ -6,7 +6,7 @@
 .sidenav{
        border-radius:3px;
        padding: 7px 0 8px;
-       background:#0ea6db;
+       background-color:#0ea6db;
 
        ul{
                margin:0;
@@ -39,7 +39,8 @@
 
        >ul{
                >li:hover,>li.active{
-                       background:url(../images/arrow-nav-1.svg) no-repeat 9px 7px;
+                       background-image:url(../images/arrow-nav-1.svg);
+                       background-position:9px 7px;
                }
                >li{
                        >a{
@@ -53,7 +54,7 @@
                                border:0;
                                color:#035277;
                                font:13px;
-                               background:#f3fafd;
+                               background-color:#f3fafd;
                                margin:0 -1px -1px;
                                overflow:hidden; 
 

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