Done #2340 @0.5

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index c98a85460c3a92d1ea331aa01461f234de848c95..7e31832b70be098ee430fa5b00690bd50e07d501 100644 (file)
--- 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 4e6be9b2dd00eafcb52b6eef6bf1f1c23971d4a3..fc038d002b803b34a172843d6864d6d1e7d73305 100644 (file)
--- 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 13e83570bc16355c6866abff60aac65b135d0c11..f04ca29532ec403746231f4de83c3514c20f4d1f 100644 (file)
--- 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 2581cb6ff1d85cead81e783215451addd73f0066..8374f73c1ccbd9d8fee02490b1124c910abb865e 100644 (file)
--- 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));
     }