(no commit message)

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 7a736c418a337eb010e10dabb1cd39a6fa235fb6..febcaa7db0930470a7fa9bc644d90250bf4f40e7 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -8,11 +8,11 @@ bin.mysqldump = /usr/bin/mysqldump
 bin.mysql = /usr/bin/mysql
 bin.zip = /usr/bin/zip
 bin.unzip = /usr/bin/unzip
-;bin.imagemagick=convert
+bin.imagemagick=convert
 bin.cp = /bin/cp
 bin.rm = /bin/rm
 
-appnamespace = "ZendSample"
+appnamespace = "Cubedesigners"
 
 timezone = 'Europe/Paris'
 
@@ -23,9 +23,9 @@ webhost = www.
 
 database.adapter = pdo_mysql
 database.params.host = localhost
-database.params.username = $username
-database.params.password = $password
-database.params.dbname = $username
+database.params.username = cubev6
+database.params.password = Y0k3C5c51N
+database.params.dbname = cubev6
 
 ;former.database.adapter = pdo_mysql
 ;former.database.params.host =
@@ -45,10 +45,9 @@ navigation.containers[]=-2;
 navigation.containers[]=-3;
 
 locales.fr =
-;locales.en =
+locales.en =
 
-
-acl.perpage = true
+acl.perpage = false
 acl.roles[] = superadmin
 acl.roles[] = admin
 
@@ -58,7 +57,7 @@ mail.test = APPLICATION_PATH "/../data/email/test"
 
 dev = true
 
-;httpauth.username = username
-;httpauth.password = password
+httpauth.username = cubedesigners
+httpauth.password = cubedesigners
 
-webhost = $devdomain
\ No newline at end of file
+webhost = cubev6.dev.cubedesigners.com
\ No newline at end of file

diff --git a/framework/application/models/User.php b/framework/application/models/User.php
index 87098091f7a7b656fe968292ea37ac209e04f8de..c3c84ac98831d4f83cda91b4f5c1e111bc52daac 100644 (file)
--- a/framework/application/models/User.php
+++ b/framework/application/models/User.php
@@ -1,7 +1,7 @@
 <?php
 
-class ZendSample_Model_User extends CubeIT_Model_User {
-       
+class Cubedesigners_Model_User extends CubeIT_Model_User {
+
 }
 
 ?>

diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
new file mode 100644 (file)
index 0000000..b5a2dc8
--- /dev/null
+++ b/framework/application/views/scripts/common/content.phtml
@@ -0,0 +1,10 @@
+<?php\r
+\r
+$content = $this->layout()->content . "\n";\r
+\r
+echo $this->render('common/header.phtml');\r
+echo '<div id="wrapper">';\r
+echo $content;\r
+echo '</div>';\r
+echo $this->render('common/footer.phtml');\r
+?>
\ No newline at end of file

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
new file mode 100644 (file)
index 0000000..4cf4158
--- /dev/null
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -0,0 +1,4 @@
+<?php\r
+$this->headLink()->appendStylesheet('/less/footer.less');\r
+?>\r
+<div id="footer">&nbsp;</div>
\ No newline at end of file

diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
new file mode 100644 (file)
index 0000000..7d15c25
--- /dev/null
+++ b/framework/application/views/scripts/common/header.phtml
@@ -0,0 +1,4 @@
+<?php\r
+$this->headLink()->appendStylesheet('/less/header.less');\r
+?>\r
+<div id="header">&nbsp;</div>
\ No newline at end of file

diff --git a/index.php b/index.php
index 8c3ee7887fbc6d2031acd91c1a8705576c8a8204..f859f1a4b9f5969b794a8af5174134e631d12d18 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,10 +4,10 @@ $start = microtime(true);
 ini_set('log_errors', '1');
 ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
 
-if ($_SERVER['HTTP_HOST'] == '$devdomain') {
-       define('APPLICATION_ENV', 'testing');
+if ($_SERVER['HTTP_HOST'] == 'cubev6.dev.cubedesigners.com') {
+    define('APPLICATION_ENV', 'testing');
 } else if ($_SERVER['HTTP_HOST'] == 'www.') {
-       define('APPLICATION_ENV', 'production');
+    define('APPLICATION_ENV', 'production');
 }
 
 include dirname(__FILE__) . '/CubeIT/common.php';