From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 17 Oct 2013 14:25:37 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6d0eb69e5dedd490bff97a99f116862c578ef7d8;p=ccgm.git

---

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 2be9e23..3a92dd0 100644
--- 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 c2daf76..cd2e849 100644
--- 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 fd19d45..744428e 100644
--- 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