From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 26 Jan 2016 13:14:31 +0000 (+0000)
Subject: #ccgm update cms, adapt web video
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7349bbac11fa183d3571d3f801be15857fb1cb9c;p=ccgm.git

#ccgm update cms, adapt web video
---

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index bd7204b..5cc08ac 100644
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -32,14 +32,6 @@ class Bootstrap extends CubeIT_Bootstrap {
 	 */
 	protected function _defineSchema(&$schema, $options) {
 		parent::_defineSchema($schema, $options);
-
-		$user = $schema->createTable('user');
-		$user->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
-		$user->setPrimaryKey(array('id'));
-		$user->addColumn('username', 'string', array('length' => 32));
-		$user->addUniqueIndex(array('username'));
-		$user->addColumn('password', 'string', array('length' => 256));
-		$user->addColumn('role', 'string', array('length' => 32));
 	}
 
 	protected function _initAcl() {
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index e86d0d2..1e2c183 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -1,5 +1,5 @@
 [base]
-dev = false
+dev = true
 
 minify.js = true
 minify.css = true
@@ -21,7 +21,7 @@ session.domain=.ccgm.fr
 session.adapter = cache
 
 database.adapter = pdo_mysql
-database.params.host = mysql51-56.pro
+database.params.host = ccgmzwgfweb.mysql.db
 database.params.username = ccgmzwgfweb
 database.params.password = 6vr7TbBC
 database.params.dbname = ccgmzwgfweb
diff --git a/framework/application/controllers/IndexController.php b/framework/application/controllers/IndexController.php
index 1c01282..9a03b46 100644
--- a/framework/application/controllers/IndexController.php
+++ b/framework/application/controllers/IndexController.php
@@ -4,7 +4,6 @@ class IndexController extends CubeIT_Controller_IndexController {
 
 	public function pageAction() {
 		$this->view->showbreadcrubms = $this->view->showsidebar = $this->view->showtopimage = true;
-		$this->view->contentWidth = 769;
 
 		$res = parent::pageAction();
 
diff --git a/framework/application/views/helpers/Rightbar.php b/framework/application/views/helpers/Rightbar.php
index 0239cf9..ccf7a94 100644
--- a/framework/application/views/helpers/Rightbar.php
+++ b/framework/application/views/helpers/Rightbar.php
@@ -8,7 +8,7 @@ class CCGM_View_Helper_Rightbar extends Zend_View_Helper_Abstract {
 		}
 
 		$s = $this->view->sidebar;
-		if (trim($s['text']) == '' && trim($s['text2']) == '' && !count($s['image'])) {
+		if (trim($s['text']) == '' && trim($s['text2']) == '' && ($s['image']=='' || !count($s['image'])) ) {
 			return;
 		}
 
diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
index 5ba51d0..dbf6f7a 100644
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -1,4 +1,5 @@
 <?php
+$this->contentWidth = 769;
 
 $content = $this->layout()->content . "\n";
 
@@ -15,19 +16,18 @@ if (isset($this->currentPage) && $this->currentPage->getTemplate() == 'home') {
 	}
 
 
-
 	$c = $this->topimage();
-	$c.='<div id="main"' . $classmain . '>';
-	$c.=$this->bcrumbs();
+	$c .= '<div id="main"' . $classmain . '>';
+	$c .= $this->bcrumbs();
 	if ($this->showsidebar) {
-		$c.='<div class="twocolumns">';
+		$c .= '<div class="twocolumns">';
 	}
-	$c.=$content;
+	$c .= $content;
 	if ($this->showsidebar) {
-		$c.=$leftbar;
-		$c.='</div>';
+		$c .= $leftbar;
+		$c .= '</div>';
 	}
-	$c.='</div>';
+	$c .= '</div>';
 }
 
 echo '<div class="body">';
diff --git a/framework/application/views/scripts/templates/text.phtml b/framework/application/views/scripts/templates/text.phtml
index 33716e7..c161a14 100644
--- a/framework/application/views/scripts/templates/text.phtml
+++ b/framework/application/views/scripts/templates/text.phtml
@@ -1,3 +1,7 @@
+<?php
+$this->contentWidth = 662;
+?>
+
 <section id="content">
 	<div id="c">
 		<?php
diff --git a/less/actualites.less b/less/actualites.less
index 69e0318..521e71e 100644
--- a/less/actualites.less
+++ b/less/actualites.less
@@ -1,3 +1,5 @@
+@import "constants.less";
+
 .updates {
 	background:#f4f1f1;
 	position: relative;
diff --git a/less/admin.less b/less/admin.less
index 5c286de..f2e4b53 100644
--- a/less/admin.less
+++ b/less/admin.less
@@ -1,3 +1,6 @@
+@import "constants.less";
+
+
 #adminBar{
 	background-color:#ACA1A1;
 	padding:0 0 2px 0;
diff --git a/less/carrousel.less b/less/carrousel.less
index 80e8dbf..e5481c2 100644
--- a/less/carrousel.less
+++ b/less/carrousel.less
@@ -1,3 +1,5 @@
+@import "constants.less";
+
 .visual .v1{ margin:0 -409px;}
 
 .slideshow {
diff --git a/less/equipes.less b/less/equipes.less
index 5a6ef97..6b3b087 100644
--- a/less/equipes.less
+++ b/less/equipes.less
@@ -1,3 +1,6 @@
+@import "constants.less";
+
+
 #equipes{
 	.col{
 		width: 334px;
diff --git a/less/faq.less b/less/faq.less
index 01d3129..23bb6c2 100644
--- a/less/faq.less
+++ b/less/faq.less
@@ -1,3 +1,6 @@
+
+@import "constants.less";
+
 #content ul.faq{
 	margin:30px 0 0 0;
 }
diff --git a/less/forms.less b/less/forms.less
index 9ed411e..830b7ca 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -1,3 +1,5 @@
+@import "constants.less";
+
 .field(){
 	color:#c7c5c5;
 	font-family: @Ubuntu;
diff --git a/less/home.less b/less/home.less
index 43ae7fd..fc8298c 100644
--- a/less/home.less
+++ b/less/home.less
@@ -1,3 +1,5 @@
+@import "constants.less";
+
 
 .services{
 	overflow:hidden;
diff --git a/less/intranet.less b/less/intranet.less
index ed50211..8d487bd 100644
--- a/less/intranet.less
+++ b/less/intranet.less
@@ -1,3 +1,6 @@
+
+@import "constants.less";
+
 #content section.items{
 	article{
 		margin:0 0 45px 0;
diff --git a/less/intranetident.less b/less/intranetident.less
index e483542..46c3ee9 100644
--- a/less/intranetident.less
+++ b/less/intranetident.less
@@ -1,3 +1,4 @@
+@import "constants.less";
 @import "forms.less";
 
 #content{
diff --git a/less/liens.less b/less/liens.less
index 4260058..3742ea7 100644
--- a/less/liens.less
+++ b/less/liens.less
@@ -1,3 +1,6 @@
+
+@import "constants.less";
+
 .links{
 	font-size: 16px;
 	font-weight: 300;
diff --git a/less/listing.less b/less/listing.less
index 9016859..a10bcb9 100644
--- a/less/listing.less
+++ b/less/listing.less
@@ -1,3 +1,6 @@
+@import "constants.less";
+
+
 #content .essais{
 	section{
 		margin:45px 0;
diff --git a/less/parcours.less b/less/parcours.less
index 0f73392..6b8522f 100644
--- a/less/parcours.less
+++ b/less/parcours.less
@@ -1,3 +1,6 @@
+@import "constants.less";
+
+
 #etapes{
 	&[data-nb="6"]{
 		background-image: url("../images/etapes6.png");
diff --git a/less/reunions.less b/less/reunions.less
index addff43..0cb69df 100644
--- a/less/reunions.less
+++ b/less/reunions.less
@@ -1,3 +1,6 @@
+@import "constants.less";
+
+
 #content h2{
 	font-size: 20px !important;
 }
diff --git a/less/rightbar.less b/less/rightbar.less
index c78d10c..b4376c5 100644
--- a/less/rightbar.less
+++ b/less/rightbar.less
@@ -1,3 +1,6 @@
+@import "constants.less";
+
+
 #rightbar{
 	width:262px;
 	display:inline-block;
diff --git a/less/sidebar.less b/less/sidebar.less
index 173618e..33c990f 100644
--- a/less/sidebar.less
+++ b/less/sidebar.less
@@ -1,70 +1,79 @@
-#sidebar{
-	width:179px;
-	float:left;
-	margin:6px 0 50px 0;
+@import "constants.less";
+
+#sidebar {
+	width: 179px;
+	float: left;
+	margin: 6px 0 50px 0;
 }
-.sidenav{
-	border-radius:3px;
+
+.sidenav {
+	border-radius: 3px;
 	padding: 7px 0 8px;
-	background-color:#0ea6db;
+	background-color: #0ea6db;
 
-	ul{
-		margin:0;
-		padding:0;
-		list-style:none;
+	ul {
+		margin: 0;
+		padding: 0;
+		list-style: none;
 
-		ul{
-			a{
+		ul {
+			a {
 				color: #035277;
 				display: block;
 				font-size: 13px;
 				line-height: 16px;
 			}
-			li{
+			li {
 				margin: 0 0 1px;
 				padding: 8px 5px 8 39px;
-				
-				&:hover,&.active{
-					background-image:url(../images/arrow-nav-2.svg);
-					background-position:22px 14px;
-					background-color:#c5e9f6;
+
+				&:hover, &.active {
+					background-image: url(../images/arrow-nav-2.svg);
+					background-position: 22px 14px;
+					background-color: #c5e9f6;
 				}
 			}
 		}
 	}
 
-	span{font-size:13px;}
+	span {
+		font-size: 13px;
+	}
 
-	a:hover{text-decoration:none;}
+	a:hover {
+		text-decoration: none;
+	}
 
-	>ul{
-		>li:hover,>li.active{
-			background-image:url(../images/arrow-nav-1.svg);
-			background-position:9px 7px;
+	> ul {
+		> li:hover, > li.active {
+			background-image: url(../images/arrow-nav-1.svg);
+			background-position: 9px 7px;
 			background-color: #57c1e6;
 		}
-		>li{
-			>a{
-				padding:7px 0 11px 39px;
-				color:#fff;
-				display:block;
+		> li {
+			> a {
+				padding: 7px 0 11px 39px;
+				color: #fff;
+				display: block;
 			}
 
-			>ul{
-				overflow:hidden;
-				border:0;
-				color:#035277;
-				font:13px;
-				background-color:#f3fafd;
-				margin:0 -1px -1px;
-				overflow:hidden; 
+			> ul {
+				overflow: hidden;
+				border: 0;
+				color: #035277;
+				font: 13px;
+				background-color: #f3fafd;
+				margin: 0 -1px -1px;
+				overflow: hidden;
 
-				&:first-child{padding: 0 0 20px 0;}
+				&:first-child {
+					padding: 0 0 20px 0;
+				}
 
-				>li{
-					>a{
-						font-weight:300;
-						display:block;
+				> li {
+					> a {
+						font-weight: 300;
+						display: block;
 						padding: 10px 15px 10px 39px;
 					}
 				}