(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 104a21c627e2fde271b8823e694fdec3044b96ec..c8d254e361aa7159db673bf354a978ed86e7b23c 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -66,6 +66,8 @@ class Bootstrap extends CubeIT_Bootstrap {
                $templates['Infos pratiques'] = array('plan' => 'Plan du centre',
                        'acces' => 'Plan d\'accès',
                        'rendezvous' => 'Demande de rendez-vous');
+               $templates['Intranet'] = array('intranetident' => 'Identification',
+                       'intranet' => 'Comptes rendus, actualités');
                $templates['Redirections'] = array(
                        'externalredirection' => 'Redirection externe',
                        'nextredirection' => 'Redirection vers la première sous-rubrique',

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 1ab33925de9487aaaaad2a8258bad30c91ed461a..40781655a19715086f3f447bb6ecc1a1418227f8 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -17,6 +17,7 @@ appnamespace = "CCGM"
 timezone = 'Europe/Paris'
 
 session.lifetime = 31536000 ;1 year
+session.domain=.ccgm.fr
 session.adapter = cache
 
 webhost = www.ccgm.fr
@@ -49,6 +50,7 @@ mailjet.password = b4d51c4c1d0193f9b0963c2c374dd882
 
 locales.fr = 
 [production : base]
+dev = true
 variant = 0
 
 [medecins : base]

diff --git a/framework/application/controllers/AjaxController.php b/framework/application/controllers/AjaxController.php
index 5104783daf6ec3bbf9a2bde9b71be336350c5ce7..583f6930894fc4aab794cd8473001db6f9fb6784 100644 (file)
--- a/framework/application/controllers/AjaxController.php
+++ b/framework/application/controllers/AjaxController.php
@@ -12,7 +12,6 @@ class AjaxController extends CubeIT_Controller_AjaxController {
                        $this->_datas->addShow("#messageerreur");
                        $this->_datas->addScrollTo("#c", 0.35);
                } else {
-
                        $mail = new CubeIT_Mail();
                        $mail->setFrom('rdv@ccgm.fr');
                        $mail->addTo($data['destinataire']);

diff --git a/framework/application/forms/CMS/Intranet.php b/framework/application/forms/CMS/Intranet.php
new file mode 100644 (file)
index 0000000..4254c47
--- /dev/null
+++ b/framework/application/forms/CMS/Intranet.php
@@ -0,0 +1,18 @@
+<?php
+
+class CCGM_Form_CMS_Intranet extends CCGM_Form_CMS_Text {
+
+       public function init() {
+               parent::init();
+
+               $this->removeSubForm('sidebar');
+               $this->getElement('text')->setAttrib('rows', 6);
+
+               $items = new CCGM_Form_CMS_Sub_Intranet_Items();
+               $items->setLegend('Actualités / Compte-rendus');
+               $this->addSubForm($items, 'items');
+       }
+
+}
+
+?>

diff --git a/framework/application/forms/CMS/Listing.php b/framework/application/forms/CMS/Listing.php
index a057e6542cb0c17979bc5061d0ef91336f22779f..80d2627556547652dd66e13f8e40ce6f368bbf2c 100644 (file)
--- a/framework/application/forms/CMS/Listing.php
+++ b/framework/application/forms/CMS/Listing.php
@@ -1,17 +1,14 @@
 <?php\r
 \r
 class CCGM_Form_CMS_Listing extends CCGM_Form_CMS_Text {\r
-\r
        public function init() {\r
                parent::init();\r
                \r
                $this->removeSubForm('sidebar');\r
-               \r
                $this->getElement('text')->setAttrib('rows', 6);\r
 \r
                $essais = new CCGM_Form_CMS_Sub_Listing_Listes();\r
                $essais->setLegend('Essais');\r
                $this->addSubForm($essais, 'listes');\r
        }\r
-\r
-}\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Reunion.php b/framework/application/forms/CMS/Reunion.php
index ea37aea5d5e8f8f6b138756fc2438b2c4f726f4b..968dcab423df8642702bd07990e9c25b1fe60297 100644 (file)
--- a/framework/application/forms/CMS/Reunion.php
+++ b/framework/application/forms/CMS/Reunion.php
@@ -1,7 +1,14 @@
 <?php\r
 \r
-class CCGM_Form_CMS_Reunion extends CCGM_Form_CMS_Default{\r
-       public function init(){\r
+class CCGM_Form_CMS_Reunion extends CCGM_Form_CMS_Text {\r
+\r
+       public function init() {\r
                parent::init();\r
+               $this->removeSubForm('sidebar');\r
+\r
+               $reunions = new CCGM_Form_CMS_Sub_Reunions_Reunions();\r
+               $reunions->setLegend('Réunions');\r
+               $this->addSubForm($reunions, 'reunions');\r
        }\r
-}
\ No newline at end of file
+\r
+}\r

diff --git a/framework/application/forms/CMS/Sub/Intranet/Item.php b/framework/application/forms/CMS/Sub/Intranet/Item.php
new file mode 100644 (file)
index 0000000..b03f1de
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Intranet/Item.php
@@ -0,0 +1,28 @@
+<?php
+
+class CCGM_Form_CMS_Sub_Intranet_Item extends CubeIT_Form_SubForm {
+
+       public function init() {
+               parent::init();
+
+               $titre = new Zend_Form_Element_Text('titre');
+               $titre->setLabel('Titre');
+               $this->addElement($titre);
+
+               $date = new CubeIT_Form_Element_Date('date');
+               $date->setLabel('Date');
+               $date->setPrecision(Zend_Date::DAY);
+               $this->addElement($date);
+
+               $text = new Zend_Form_Element_Textarea('text');
+               $text->setLabel('Texte');
+               $this->addElement($text);
+
+               $lien = new CubeIT_Form_Element_Link();
+               $lien->setLabel('Lien');
+               $lien->pageEnabled(false);
+               $lien->fileEnabled();
+               $this->addSubForm($lien, 'lien');
+       }
+
+}

diff --git a/framework/application/forms/CMS/Sub/Intranet/Items.php b/framework/application/forms/CMS/Sub/Intranet/Items.php
new file mode 100644 (file)
index 0000000..27ce992
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Intranet/Items.php
@@ -0,0 +1,16 @@
+<?php
+
+class CCGM_Form_CMS_Sub_Intranet_Items extends CubeIT_Form_Multi_SubForm {
+
+       public function init() {
+               parent::init();
+
+               $base = new CCGM_Form_CMS_Sub_Intranet_Item();
+               $this->setBaseSubForm($base)
+                               ->setBaseLegend('Edition de l\'élément « $titre »')
+                               ->setNewLegend('Nouvel élément');
+       }
+
+}
+
+?>

diff --git a/framework/application/forms/CMS/Sub/Listing/Essai.php b/framework/application/forms/CMS/Sub/Listing/Essai.php
index 8cdfe255c4bd204f7966e4a1a7dce3122a961b16..61c1a79656ebebcd60cdceedea603af007c1877e 100644 (file)
--- a/framework/application/forms/CMS/Sub/Listing/Essai.php
+++ b/framework/application/forms/CMS/Sub/Listing/Essai.php
@@ -20,7 +20,7 @@ class CCGM_Form_CMS_Sub_Listing_Essai extends CubeIT_Form_SubForm {
                $this->addElement($localisation);\r
 \r
                $phase = new Zend_Form_Element_Select('phase');\r
-               $phase->setMultiOptions(array('I'=>'I','II'=>'II','III'=>'III','IV'=>'IV'));\r
+               $phase->setMultiOptions(array('' => '', 'I' => 'I', 'II' => 'II', 'III' => 'III', 'IV' => 'IV'));\r
                $phase->setLabel('Phase');\r
                $this->addElement($phase);\r
 \r

diff --git a/framework/application/forms/CMS/Sub/Reunions/Reunion.php b/framework/application/forms/CMS/Sub/Reunions/Reunion.php
new file mode 100644 (file)
index 0000000..7a168bf
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Reunions/Reunion.php
@@ -0,0 +1,28 @@
+<?php
+
+class CCGM_Form_CMS_Sub_Reunions_Reunion extends CubeIT_Form_SubForm {
+
+       public function init() {
+               parent::init();
+
+               $staff = new Zend_Form_Element_Text('staff');
+               $staff->setLabel('Staffs concernés');
+               $this->addElement($staff);
+
+               $frequence = new Zend_Form_Element_Text('frequence');
+               $frequence->setLabel('Fréquence');
+               $this->addElement($frequence);
+
+               $lieu = new Zend_Form_Element_Text('lieu');
+               $lieu->setLabel('Lieu');
+               $this->addElement($lieu);
+
+               $medecins = new Zend_Form_Element_Textarea('medecins');
+               $medecins->setLabel('Médecins participants');
+               $medecins->setAttrib('rows', 4);
+               $this->addElement($medecins);
+       }
+
+}
+
+?>

diff --git a/framework/application/forms/CMS/Sub/Reunions/Reunions.php b/framework/application/forms/CMS/Sub/Reunions/Reunions.php
new file mode 100644 (file)
index 0000000..481c677
--- /dev/null
+++ b/framework/application/forms/CMS/Sub/Reunions/Reunions.php
@@ -0,0 +1,16 @@
+<?php
+
+class CCGM_Form_CMS_Sub_Reunions_Reunions extends CubeIT_Form_Multi_SubForm {
+
+       public function init() {
+               parent::init();
+
+               $base = new CCGM_Form_CMS_Sub_Reunions_Reunion();
+               $this->setBaseSubForm($base)
+                               ->setBaseLegend('Editer la réunion $staff / $frequence')
+                               ->setNewLegend('Nouvelle réunion');
+       }
+
+}
+
+?>

diff --git a/framework/application/views/helpers/Reunions.php b/framework/application/views/helpers/Reunions.php
new file mode 100644 (file)
index 0000000..2b850f5
--- /dev/null
+++ b/framework/application/views/helpers/Reunions.php
@@ -0,0 +1,17 @@
+<?php
+
+class CCGM_View_Helper_Reunions extends Zend_View_Helper_Abstract {
+
+       public function reunions($reunions) {
+               $classes = array(array('class' => 'staff'), array('class' => 'frequence'), array('class' => 'lieu'), array('class' => 'medecins'));
+               $head = array(array('Staffs', 'Fréquence', 'Lieu', 'Médecins participants'));
+               $datas = array();
+               foreach ($reunions as $r) {
+                       $datas[] = array($r['staff'], $r['frequence'], $r['lieu'], nl2br(trim($r['medecins'])));
+               }
+               return $this->view->table($head, $datas, array(), array(), $classes);
+       }
+
+}
+
+?>

diff --git a/framework/application/views/scripts/templates/intranet.phtml b/framework/application/views/scripts/templates/intranet.phtml
new file mode 100644 (file)
index 0000000..ab4fa67
--- /dev/null
+++ b/framework/application/views/scripts/templates/intranet.phtml
@@ -0,0 +1,2 @@
+<?php\r
+\r

diff --git a/framework/application/views/scripts/templates/intranetident.phtml b/framework/application/views/scripts/templates/intranetident.phtml
new file mode 100644 (file)
index 0000000..fb9e0c3
--- /dev/null
+++ b/framework/application/views/scripts/templates/intranetident.phtml
@@ -0,0 +1,8 @@
+<?php\r
+\r
+/* \r
+ * To change this license header, choose License Headers in Project Properties.\r
+ * To change this template file, choose Tools | Templates\r
+ * and open the template in the editor.\r
+ */\r
+\r

diff --git a/framework/application/views/scripts/templates/reunion.phtml b/framework/application/views/scripts/templates/reunion.phtml
index fb9e0c3df3f9df03a4d95c24d7787e3ecad6f4e5..7b6fc590cfea65acccd4c75dd0df67c3471e2881 100644 (file)
--- a/framework/application/views/scripts/templates/reunion.phtml
+++ b/framework/application/views/scripts/templates/reunion.phtml
@@ -1,8 +1,11 @@
-<?php\r
-\r
-/* \r
- * To change this license header, choose License Headers in Project Properties.\r
- * To change this template file, choose Tools | Templates\r
- * and open the template in the editor.\r
- */\r
-\r
+<?php $this->headScript()->addScriptAndStyle('reunions') ?>\r
+<section id="content">\r
+       <div id="c">\r
+               <?php\r
+               $t = $this->markupDotclear($this->text);\r
+               $t = str_replace('%reunions%', $this->reunions($this->reunions), $t);\r
+               echo $t;\r
+               ?>\r
+       </div>\r
+       <?php echo $this->rightbar() ?>\r
+</section>
\ No newline at end of file

diff --git a/less/reunions.less b/less/reunions.less
new file mode 100644 (file)
index 0000000..addff43
--- /dev/null
+++ b/less/reunions.less
@@ -0,0 +1,38 @@
+#content h2{
+       font-size: 20px !important;
+}
+
+table{
+       margin:30px 0 20px;
+       border-collapse:collapse;
+       table-layout: fixed;
+
+       td,th{
+               text-align: center;
+               border:1px solid #c7c7c7;
+               vertical-align: middle;
+               width:193px;
+       }
+
+       td{
+               padding:10px;
+               background-color:#f0eff0;
+               &.staff{
+                       font-weight: 500;
+                       text-transform: uppercase;
+               }
+       }
+
+       tr.odd td{
+               background-color:#fff;
+       }
+
+       th{
+               padding:20px;
+               color:#e71a92;
+               font-size:24px;
+               line-height: 29px;
+               text-transform: uppercase;
+               font-weight: 300;
+       }
+}
\ No newline at end of file