From: stephen@cubedesigners.com <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 4 Feb 2019 16:19:27 +0000 (+0000)
Subject: Done #2340 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=56bb11f12bc6bf0999cf7ff9d99e412d8e56fc62;p=ccgm.git

Done #2340 @0.5
---

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index c98a854..7e31832 100644
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -128,7 +128,12 @@ class Bootstrap extends CubeIT_Bootstrap {
 
             $online = true;
 
-            $pageTitle = sprintf(__('Essais sur les cancers en %s'), strtolower($r->name));
+            $pageTitle = $r->title;
+
+            if (empty($pageTitle)) {
+                $pageTitle = sprintf(__('Essais sur les cancers : %s'), strtolower($r->name));
+            }
+
 
             $p = new CubeIT_Navigation_Page_Locale();
             $p->setController('ResearchCategories');
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 4e6be9b..fc038d0 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -2,7 +2,7 @@
 dev = false
 
 minify.js = true
-minify.css = true
+minify.css = false
 
 bin.mysqldump = /usr/bin/mysqldump
 bin.mysql = /usr/bin/mysql
diff --git a/framework/application/forms/CMS/ResearchCategories.php b/framework/application/forms/CMS/ResearchCategories.php
index 13e8357..f04ca29 100644
--- a/framework/application/forms/CMS/ResearchCategories.php
+++ b/framework/application/forms/CMS/ResearchCategories.php
@@ -13,6 +13,10 @@ class CCGM_Form_CMS_ResearchCategories extends CubeIT_Form_List_Model {
         $name->setLabel(__('Nom'));
         $this->addElement($name);
 
+        $title = new Zend_Form_Element_Text('title');
+        $title->setLabel(__('Titre'));
+        $this->addElement($title);
+
         $icon = new CubeIT_Form_Element_File_Image('icon');
         $icon->setLabel(__('Icône (SVG)'));
         $icon->setMaxItems(1);
@@ -26,7 +30,7 @@ class CCGM_Form_CMS_ResearchCategories extends CubeIT_Form_List_Model {
             ->setNewTitle(__('Créer une catégorie de recherche'))
             ->setEditTitle(sprintf(__("Edition de la catégorie « %s »"), '$name'))
             ->setTitleColumn('name')
-            ->setAdditionnalColumns(array('sort_order'))
+            ->setAdditionnalColumns(['title', 'sort_order'])
             ->setModel('CCGM_Model_ResearchCategory');
     }
 
diff --git a/framework/application/models/ResearchCategory.php b/framework/application/models/ResearchCategory.php
index 2581cb6..8374f73 100644
--- a/framework/application/models/ResearchCategory.php
+++ b/framework/application/models/ResearchCategory.php
@@ -4,12 +4,14 @@ class CCGM_Model_ResearchCategory extends CubeIT_Model_Data_Table {
 
     protected static $_table = 'research_categories';
     protected $name;
+    protected $title;
     protected $icon;
     protected $sort_order;
 
     public static function getSchema($schema) {
         $table = parent::getSchema($schema);
         $table->addColumn('name', 'string', array('length' => 128));
+        $table->addColumn('title', 'string', array('length' => 255));
         $table->addColumn('icon', 'string', array('length' => 128));
         $table->addColumn('sort_order', 'smallint', array('unsigned' => true));
     }