From bec93819637a6418f415cde9a09a4ef3c4b4e967 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 10 Oct 2013 11:27:36 +0000 Subject: [PATCH] --- framework/application/Bootstrap.php | 7 +--- framework/application/configs/application.ini | 4 +- framework/application/forms/CMS/Soins.php | 18 +++++++++ .../forms/CMS/Sub/Parcours/Etape.php | 3 +- .../application/views/helpers/Etapes.php | 8 +++- framework/application/views/helpers/Soins.php | 32 ++++++++++++++++ .../views/scripts/templates/soins.phtml | 13 +++++++ images/etoile.png | Bin 0 -> 16542 bytes js/parcours.js | 8 ++++ less/actualites.less | 3 ++ less/carrousel.less | 3 +- less/common.less | 35 +++++++++++++----- less/home.less | 2 +- less/parcours.less | 28 ++++++++++++++ less/sidebar.less | 7 ++-- pathologies.png | Bin 0 -> 3084 bytes 16 files changed, 146 insertions(+), 25 deletions(-) create mode 100644 framework/application/forms/CMS/Soins.php create mode 100644 framework/application/views/helpers/Soins.php create mode 100644 framework/application/views/scripts/templates/soins.phtml create mode 100644 images/etoile.png create mode 100644 pathologies.png diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index 8ae54db..077dbb6 100644 --- 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 11a97af..c183d5a 100644 --- 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 index 0000000..35ac029 --- /dev/null +++ b/framework/application/forms/CMS/Soins.php @@ -0,0 +1,18 @@ +setLabel('Pastille centrale'); + $this->addSubForm($centre, 'centre'); + + $etapes = new CCGM_Form_CMS_Sub_Parcours_Etapes(); + $etapes->setLegend('Soins'); + $this->addSubForm($etapes, 'soins'); + + + } +} \ 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 d1c8b3b..0232565 100644 --- 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 34af26c..4dc78f9 100644 --- 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 = '
'; + $res = '
'; $res.='
'; $res.='
'; if ($e['titre']) { diff --git a/framework/application/views/helpers/Soins.php b/framework/application/views/helpers/Soins.php new file mode 100644 index 0000000..659ce61 --- /dev/null +++ b/framework/application/views/helpers/Soins.php @@ -0,0 +1,32 @@ +'; + $res.=$this->_etape($centre, 0, $nb,'centre'); + foreach ($etapes as $k => $etape) { + $res.=$this->_etape($etape, $k + 1, $nb); + } + $res.='
'; + return $res; + } + + protected function _getPosition($i, $total) { + $dim = array( + 0 => array(210, 210), + 1 => array(210, 0-94), + 2 => array(360+65, 60-65), + 3 => array(420+94, 210), + 4 => array(360+65, 360+65), + 5 => array(210, 420+94), + 6 => array(60-65, 360+65), + 7 => array(0-94, 210), + 8 => array(60-65, 60-65), + ); + $d = $dim[$i]; + return array('left' => $d[0], 'top' => $d[1]); + } + +} diff --git a/framework/application/views/scripts/templates/soins.phtml b/framework/application/views/scripts/templates/soins.phtml new file mode 100644 index 0000000..260f6ee --- /dev/null +++ b/framework/application/views/scripts/templates/soins.phtml @@ -0,0 +1,13 @@ +headScript()->addRaphael(); +$this->headScript()->addScriptAndStyle('parcours'); +?> +
+
+ markupDotclear($this->text); + echo $this->soins($this->centre, $this->soins); + ?> +
+ rightbar() ?> +
\ No newline at end of file diff --git a/images/etoile.png b/images/etoile.png new file mode 100644 index 0000000000000000000000000000000000000000..e2695a523869fd727561dcb1fe5f2ccb27d34f26 GIT binary patch literal 16542 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 YNUJBRqt}{C47dr>QrA_hSFw%!KR3gc_5c6? literal 0 HcmV?d00001 diff --git a/js/parcours.js b/js/parcours.js index 2e283f5..97165a7 100644 --- a/js/parcours.js +++ b/js/parcours.js @@ -118,6 +118,14 @@ c = '#afbc19'; } else if (name == 'rose') { c = '#e92699'; + } else if (name == 'prune') { + c = '#b31d76'; + } else if (name == 'aubergine') { + c = '#4c3176'; + } else if (name == 'vertfonce') { + c = '#818c08'; + } else if (name == 'gris') { + c = '#716156'; } return c; }, diff --git a/less/actualites.less b/less/actualites.less index 4dd919b..a5fcfb6 100644 --- 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 80ba39e..80e8dbf 100644 --- 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 87ddae4..f75a498 100644 --- a/less/common.less +++ b/less/common.less @@ -1,10 +1,10 @@ *{ max-height: 1000000px; } -html{background:#f1eeee;} +html{background-color:#f1eeee;} body { margin:0; color:#5e5e5e; font:300 16px/20px 'Ubuntu', Arial, Helvetica, sans-serif; - background:#fff; + background-color:#fff; min-width:990px; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: none; @@ -55,7 +55,7 @@ q:after{content:"";} float:right; } .logo{ - background:url(../images/logo.svg) no-repeat; + background-image:url(../images/logo.svg); width:392px; height:91px; overflow:hidden; @@ -97,18 +97,28 @@ q:after{content:"";} } #nav li a[data-name="centre"]{ background-image: url(../images/centre.svg); + background-position: 50% 0; + background-repeat: no-repeat; } #nav li a[data-name="parcours"]{ background-image: url(../images/parcours.svg); + background-position: 50% 0; + background-repeat: no-repeat; } #nav li a[data-name="pathologies"]{ background-image: url(../images/pathologies.svg); + background-position: 50% 0; + background-repeat: no-repeat; } #nav li a[data-name="recherche"]{ background-image: url(../images/recherche.svg); + background-position: 50% 0; + background-repeat: no-repeat; } #nav li a[data-name="pratique"]{ background-image: url(../images/pratique.svg); + background-position: 50% 0; + background-repeat: no-repeat; } @@ -130,7 +140,9 @@ q:after{content:"";} } .add-nav li:last-child{padding:0 0 0 21px;} .add-nav li:last-child a{ - background:url(../images/arrow-header.svg) no-repeat 100% 2px; + background-image:url(../images/arrow-header.svg); + background-repeat: no-repeat; + background-position: 100% 2px; padding: 0 19px 0 0; } .image-area{margin:0 0 21px;} @@ -138,10 +150,10 @@ q:after{content:"";} #footer{ overflow:hidden; - background:#f1eeee; + background-color:#f1eeee; color:#5e5e5e; } -#footer .footer-content{background:#e3dcdc;} +#footer .footer-content{background-color:#e3dcdc;} #footer .holder{ margin:0 auto; width:979px; @@ -173,7 +185,8 @@ q:after{content:"";} .nav li a{ padding:0 0 1px 24px; display:block; - background:url(../images/arrow-grey-right.svg) no-repeat 0 1px; + background-image:url(../images/arrow-grey-right.svg); + background-position: 0 1px; } .info-area{ float:left; @@ -277,12 +290,13 @@ q:after{content:"";} list-style:none; } #content ul li{ - background:url(../images/arrow-li.svg) no-repeat 0 2px; + background-image:url(../images/arrow-li.svg); + background-position: 0 2px; padding:0 0 3px 30px; } #content blockquote{ border-radius:3px; - background:#f1f0f0; + background-color:#f1f0f0; margin:-4px 0 0; padding:19px 10px 24px 24px; } @@ -301,7 +315,8 @@ q:after{content:"";} list-style:none; } #content blockquote>ul>li{ - background:url(../images/bullet.svg) no-repeat 2px 8px; + background-image:url(../images/bullet.svg); + background-position: 2px 8px; padding: 0 0 3px 9px; font-style:italic; font-weight:300; diff --git a/less/home.less b/less/home.less index 3528877..43ae7fd 100644 --- 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 bf81a64..0f73392 100644 --- 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 92ebfcf..319fdda 100644 --- 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 index 0000000000000000000000000000000000000000..728739afe6c097820d0c28bd5a2458294f32308d GIT binary patch literal 3084 zcmV+n4D<7eP){k2}T%okI5xlUvzipTsf6!PhcR)B;`o*_opq;!&jjo&!7?(G8yW~ zUd*+#LjYZcAWO@h34SCyaHPE*PV_}&UAsn;$O42{R1kk!h`(LFOy^M#M4vfBY(yT6 zO>VC9?(&N0mS2ArT5ldAl;DOaxA6(1Jv?+O<{*N?!bk?0g{1IsS^_7eOqgIY19+hh zD=uHAAv7D&sj19<`UFx_Qk+N?Swku-O>GyGIi#k-ec84#lO`dAtR&|*ZNg@fM)DUe z!lTGR6~mZX@j*F_nQ-Sgatt|m;fpV5Ggpq*En8d;RgpF1=bw!&-e?ZFn(j_NP&ztl zQ;3cYjE~1Z$y_oyEDSEFKr9jL&Kx#1kmKK!k{{p!eM$=RAbDH&UR<2x+;Ydb=dNBg zv^awsruGZ@w+XL>g<%iYV$6;mbT_U+Vr^{_w0XwK$TDXtVL?kO$x{j}?j9HVB zVX*n{c7noSALZ-R+}yfGb;i2p!w+!?8OT_k?(o(m+lkGZi_%Qt+Sxa`#oGG+{1mhg+vHZjdvkqyT`KyZ; zk6l`{ObExBo{C30tG-*1z+|5rOK78L11Jh%dGI4#U_Q(<5ZbKbEWQXw2 z2%19nLpNiF(29?AcstoVshVozl9V*maliYMRqNvMc0xgDDE*1wr`*3 z;4s*AgE~Z)NOy6MZ{7Mwiz9@BwMN?&FC7QKJB{I3U2q1rUjxoUE(> zfa53ybh;~7T3Z2)CNHnL8sNCLwyrLrSKWu3sUs$o9AM^e+}M3^=~Di5kHPD++{GWh zB$w+|%nIH7($bNV^kW!XTd5QnGiLMVY106yG$^P$7c3I}*6Ju#sdPG^qa!u7pa5uV zOH9nm>pdC@*4rDPRHNZIK&ATn>yi?nt!?}EAAbbe+js8#=_jD8>)UTDD*-~x%^3!;w2X*& z(^g?`RGxhwCuwvtbqQPUtAVfyt!tbj}NJ%?lghQWLz!dfy9amq1Pvs zE?D604cOQuCeE7&Xf$Wf*3|(`O-q+5l>ngEQ#$nd7-sZnu^4c0$jn@^0uYHD9W5<^ z#>NE;($WB}_TojuC(-YKz0AYhmu_wh7Xkp&rwhFv9*JbyGz@}n1qQM`d)6irERh5T%H@DqJbk)M*83C1V{RT0 z;Og4@-NItwLT_(CBAGh1ucL;GNYwpI;*m;&f)olsByx7{eoMP)7^>BB9H3U`^|6k3Ht<3fS4Dr3DAy{d|;m zb?I~frE0Za-$yYbm9lL2LtP}gI|%^L*tlrX!GnNSd;WYwgR!gwK#7^i&B|i%CKB+v zr>7A`0RYU*{QMjp4L4s$$G&~%&H?rHlP2xj)%)4mnUPUgXb1`2F_>6<>m6$>ND=kJ zg$EvBNG56^Hce_|CB|4=GnhhO!R$VDP4^K55<=(T8!IdJ?x!*i zl`YI;c(M2McBIns@|YN*wHrWRB~8P#ZEXw|Q%7uQ zZWek$e|AVbY7x@f%F?xD9Yp2j0Gt5hzikb9fyB&ABmyifLPLFh`=8h8ii#Q=0ga}h zpuWEMxVgE%zq2#IvR+vd;j6)gUeBK$=3QhW{PbytFUuEt zL4S7ip`s5&Uf+Df^8FDt@5(186koc8F5G~(LLu}5e-DXd_H0j2KqPW=>l@aZnLYH- z*s+F_LkP zJw0u0dq0iE?YS~TLuR0fDi0h004(ZLb38o(Ld4>`%gP!SN;Mk29#E@Ko-8W^^!h7TZrm_}APXdu_dfsJ#in9zOhafW zf4HARYJ%Nq0`>F5dS)iv&Yr#J8f->7HyeQHU*JJ@`1!dOR{SSsVei&izdR=2y2W=4 z3BCS58e|^zB4hXOzugf$gC>^w)-AqcNN7dwb%-y*;C%f$iDw^V95!qi?7Bf6!uQb8 zDb$A?jEWLkp?e*!0I8%lD$41vrK?wGHZ~4+-H@LRwTbfjMCV<*Xb7gzxcd$oDnvoE zK|cD(xxLbJP0XrQzjytR_rmxdI`TN(MqkOv5n9m^&&@sZ=6M$REzz;DLmf8kx2M_& zr;k5Qwy;31gzaq1&c5GCbt@)oY2)Dquv?^7<^^-+@Xd}w8$xhiz*cmJW|>p zdf=0*(-1;lRw}u@B#M)7*)o1@c}4803m1$nUa%ZhZG?wB$=c10YPb~cndhI!MDi05UK! zGc7PUEiy4wF*7ppnF*7YN zI4vKnrE-x-FFKKOIXJvCQaA9<4Z)|U8 aX=QURb9QG&G)qeW0000