(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 072b123c6b3ae6102e3c24456421bd596608944d..5507496c14bc229e76d58f37df5da80d94c4291e 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -51,8 +51,9 @@ class Bootstrap extends CubeIT_Bootstrap {
                $templates['Accueil'] = array('home' => 'Page d\'accueil');
                $templates['Le centre'] = array('equipe' => 'L\'équipe');
                $templates['Parcours patient'] = array('parcours' => 'Parcours');
+               $templates['Traitements'] = array('traitement' => 'Traitement (Texte avec accordéon)');
                $templates['Infos pratiques'] = array('plan' => 'Plan du centre',
-                       'acces' => 'Plan d\accès',
+                       'acces' => 'Plan d\'accès',
                        'rendezvous' => 'Demande de rendez-vous');
                $templates['Redirections'] = array(
                        'externalredirection' => 'Redirection externe',

diff --git a/framework/application/forms/CMS/Traitement.php b/framework/application/forms/CMS/Traitement.php
new file mode 100644 (file)
index 0000000..02eff1c
--- /dev/null
+++ b/framework/application/forms/CMS/Traitement.php
@@ -0,0 +1,7 @@
+<?php
+
+class CCGM_Form_CMS_Traitement extends CCGM_Form_CMS_Text{
+       
+}
+
+?>

diff --git a/framework/application/views/helpers/MarkupDotclear.php b/framework/application/views/helpers/MarkupDotclear.php
new file mode 100644 (file)
index 0000000..b0fe96c
--- /dev/null
+++ b/framework/application/views/helpers/MarkupDotclear.php
@@ -0,0 +1,12 @@
+<?php
+
+class CCGM_View_Helper_MarkupDotclear extends CubeIT_View_Helper_MarkupDotclear {
+
+       public function markupDotclear($text = null, $options = array(), $attributes = array()) {
+               $this->view->headScript()->addAccordion();
+               return parent::markupDotclear($text, $options, $attributes);
+       }
+
+}
+
+?>

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

diff --git a/images/arrow-accordion-bottom.svg b/images/arrow-accordion-bottom.svg
new file mode 100644 (file)
index 0000000..eb29b3c
--- /dev/null
+++ b/images/arrow-accordion-bottom.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="32px" height="21px" viewBox="0 0 32 21" enable-background="new 0 0 32 21" xml:space="preserve">\r
+<g>\r
+       <ellipse fill="#6A6A6A" cx="8.5" cy="19.895" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#6A6A6A" cx="10.97" cy="17.391" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#6A6A6A" cx="13.44" cy="14.887" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#6A6A6A" cx="15.911" cy="12.383" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#6A6A6A" cx="6.03" cy="17.391" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#6A6A6A" cx="3.56" cy="14.887" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#6A6A6A" cx="1.09" cy="12.383" rx="1.09" ry="1.105"/>\r
+       <path fill="#6A6A6A" d="M9.271,16.05c-0.426,0.432-1.116,0.432-1.542,0c-0.425-0.431-0.425-1.131,0-1.562\r
+               c0.425-0.431,1.116-0.431,1.541,0C9.697,14.919,9.697,15.619,9.271,16.05z"/>\r
+       <path fill="#6A6A6A" d="M9.271,12.508c-0.426,0.432-1.116,0.432-1.542,0c-0.425-0.431-0.425-1.13,0-1.562\r
+               c0.425-0.431,1.116-0.431,1.541,0C9.697,11.378,9.697,12.077,9.271,12.508z"/>\r
+       <path fill="#6A6A6A" d="M9.271,8.967c-0.426,0.432-1.116,0.432-1.542,0c-0.425-0.431-0.425-1.13,0-1.562\r
+               c0.425-0.431,1.116-0.431,1.541,0C9.697,7.837,9.697,8.536,9.271,8.967z"/>\r
+       <path fill="#6A6A6A" d="M9.271,5.426c-0.426,0.432-1.116,0.432-1.542,0c-0.425-0.431-0.425-1.13,0-1.562\r
+               c0.425-0.431,1.116-0.431,1.541,0C9.697,4.296,9.697,4.995,9.271,5.426z"/>\r
+       <path fill="#6A6A6A" d="M9.271,1.885c-0.426,0.432-1.116,0.432-1.542,0c-0.425-0.431-0.425-1.13,0-1.562\r
+               c0.425-0.431,1.116-0.431,1.541,0C9.697,0.755,9.697,1.454,9.271,1.885z"/>\r
+</g>\r
+</svg>\r

diff --git a/images/arrow-accordion-top.svg b/images/arrow-accordion-top.svg
new file mode 100644 (file)
index 0000000..3a951e7
--- /dev/null
+++ b/images/arrow-accordion-top.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="17px" height="21px" viewBox="0 0 17 21" enable-background="new 0 0 17 21" xml:space="preserve">\r
+<g>\r
+       <ellipse fill="#696969" cx="8.5" cy="1.105" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#696969" cx="6.03" cy="3.609" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#696969" cx="3.56" cy="6.113" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#696969" cx="1.089" cy="8.617" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#696969" cx="10.97" cy="3.609" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#696969" cx="13.44" cy="6.113" rx="1.09" ry="1.105"/>\r
+       <ellipse fill="#696969" cx="15.91" cy="8.617" rx="1.09" ry="1.105"/>\r
+       <path fill="#696969" d="M7.729,4.95c0.426-0.432,1.116-0.432,1.542,0c0.425,0.431,0.425,1.131,0,1.562\r
+               c-0.425,0.431-1.116,0.431-1.541,0C7.303,6.081,7.303,5.381,7.729,4.95z"/>\r
+       <path fill="#696969" d="M7.729,8.492c0.426-0.432,1.116-0.432,1.542,0c0.425,0.431,0.425,1.13,0,1.562\r
+               c-0.425,0.431-1.116,0.431-1.541,0C7.303,9.622,7.303,8.923,7.729,8.492z"/>\r
+       <path fill="#696969" d="M7.729,12.033c0.426-0.432,1.116-0.432,1.542,0c0.425,0.431,0.425,1.13,0,1.562\r
+               c-0.425,0.431-1.116,0.431-1.541,0C7.303,13.163,7.303,12.464,7.729,12.033z"/>\r
+       <path fill="#696969" d="M7.729,15.574c0.426-0.432,1.116-0.432,1.542,0c0.425,0.431,0.425,1.13,0,1.562\r
+               c-0.425,0.431-1.116,0.431-1.541,0C7.303,16.704,7.303,16.005,7.729,15.574z"/>\r
+       <path fill="#696969" d="M7.729,19.115c0.426-0.432,1.116-0.432,1.542,0c0.425,0.431,0.425,1.13,0,1.562\r
+               c-0.425,0.431-1.116,0.431-1.541,0C7.303,20.245,7.303,19.546,7.729,19.115z"/>\r
+</g>\r
+</svg>\r

diff --git a/less/common.less b/less/common.less
index a6ce9f67b5dfb63bdd29bf4030623e2338c0d6cf..2dbe7b62cbda4aa779db2edc823f7e1a31496e8f 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -342,4 +342,25 @@ q:after{content:"";}
 #footer .info a{\r
        margin:0 5px 0 3px;\r
        color:#0ea6db;\r
+}\r
+\r
+#content .dotclear .accordion{\r
+       h3{\r
+               cursor: pointer;\r
+               font-weight: 500;\r
+               font-size: 16px;\r
+               color:696969;\r
+               border:1px solid #dbdbdb;\r
+               background-color: #f0efef;\r
+               border-radius: 5px;\r
+               text-transform:none;\r
+               padding:14px 20px;\r
+               margin:3px 0 0 0;\r
+               background-image: url("../images/arrow-accordion-bottom.svg");\r
+               background-position:100% 50%;\r
+\r
+               &.open{\r
+                       background-image: url("../images/arrow-accordion-top.svg");\r
+               }\r
+       }\r
 }
\ No newline at end of file

diff --git a/less/sidebar.less b/less/sidebar.less
index a53b7a1c1342b2d5674ec00e0cedc43e6cbf5af6..92ebfcf732e0c8ec564d69ca3c068ba7d41d5344 100644 (file)
--- a/less/sidebar.less
+++ b/less/sidebar.less
@@ -22,13 +22,12 @@
                        }
                        li{
                                margin: 0 0 1px;
-                               padding: 8px 0 0;
-                       }
-                       ul li{
+                               padding: 8px 5px 8 39px;
+                               
                                &:hover,&.active{
-                                       background:url(../images/arrow-nav-2.svg) no-repeat 22px 12px;
-                                       padding:8px 0 0 39px;
-                                       margin:0 0 1px -39px
+                                       background-image:url(../images/arrow-nav-2.svg);
+                                       background-position:22px 14px;
+                                       background-color:#c5e9f6;
                                }
                        }
                }
@@ -55,18 +54,16 @@
                                color:#035277;
                                font:13px;
                                background:#f3fafd;
-                               padding: 0 5px 12px 39px;
-                               width:137px;
                                margin:0 -1px -1px;
-                               overflow:hidden;
+                               overflow:hidden; 
 
-                               &:first-child{padding: 0 5px 20px 39px;}
+                               &:first-child{padding: 0 0 20px 0;}
 
                                >li{
                                        >a{
-                                               font-weight:500;
+                                               font-weight:300;
                                                display:block;
-                                               padding: 5px 0 0;
+                                               padding: 10px 15px 10px 39px;
                                        }
                                }
                        }