From: vincent@cubedesigners.com Date: Thu, 10 Oct 2013 11:27:36 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bec93819637a6418f415cde9a09a4ef3c4b4e967;p=ccgm.git --- 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 0000000..e2695a5 Binary files /dev/null and b/images/etoile.png differ 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 0000000..728739a Binary files /dev/null and b/pathologies.png differ