(no commit message)

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 2be9e23497d7bccd02d27197f2ebe1052f7280d5..3a92dd09243865584fe54a3f771538a0469b925f 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -28,7 +28,7 @@ database.params.password = 6vr7TbBC
 database.params.dbname = ccgmzwgfweb
 
 seo.universalAnalytics = UA-42799235-1
-seo.google = ICVt8ZuUETC45t3SdN7L2WzwCPkXmkXbK8u3RtOXypc
+seo.google = google93c0129ef18a399d.html
 seo.bing = 8986457D1D126C38A815027C839372DC
 
 navigation.containers[]=0;
@@ -39,7 +39,7 @@ navigation.containers[]=-3;
 locales.fr = 
 ;locales.en = 
 
-acl.perpage = true
+acl.perpage = false
 acl.roles[] = superadmin
 acl.roles[] = admin
 

diff --git a/framework/application/forms/Element/Markitup.php b/framework/application/forms/Element/Markitup.php
index c2daf7613283bbda82208ccdc72cec2278f95d7f..cd2e849709ff2e2449dc382baf49ea87417575b5 100644 (file)
--- a/framework/application/forms/Element/Markitup.php
+++ b/framework/application/forms/Element/Markitup.php
@@ -1,7 +1,30 @@
 <?php
 
-class CCGM_Form_Element_Markitup extends CubeIT_Form_Element_Markitup{
-       
-}
+class CCGM_Form_Element_Markitup extends CubeIT_Form_Element_Markitup {
+
+       protected $_titleMax = 3;
+
+       public function addBasicControls() {
+               $this->addBold();
+               $this->addItalic();
+       }
 
-?>
+       public function addListControls() {
+               $this->addListBullet();
+       }
+
+       public function initSettings() {
+               $this->addTitleControls();
+               $this->addSeparator();
+               $this->addBasicControls();
+               $this->addSeparator();
+               $this->addListControls();
+               $this->addSeparator();
+               $this->addLinkControls();
+               $this->addSeparator();
+               $this->addImagesControls();
+               $this->addSeparator();
+               $this->addHTMLControls();
+       }
+
+}

diff --git a/index.php b/index.php
index fd19d45ae65bff1e4ade1e27e99d6056c3c4efdb..744428e0ebb5f4ef3377ca1f0f8bbd72ca477c9c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,6 +4,6 @@ $start = microtime(true);
 ini_set('log_errors', '1');
 ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
 
-define('APPLICATION_ENV', 'testing');
+define('APPLICATION_ENV', 'production');
 
 include dirname(__FILE__) . '/CubeIT/common.php';
\ No newline at end of file