#ccgm update cms, adapt web video

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index bd7204bccf2d0855d37f4e9a45bf84d6bd6505f5..5cc08ac14f7167d0f60a2bdd3a3d28250e289232 100644 (file)
--- 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 e86d0d2dbbcfd1f9b17306ce7be10546f3c1104c..1e2c1834a687bda1a691787bd060fa2cab85ef1e 100644 (file)
--- 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 1c01282cccf0a9a015549a919e9e3836eb1bc160..9a03b46a92baa0b5538ad4cd9f6604f3861d3fb3 100644 (file)
--- 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 0239cf9c3338a86419a08cfa4c310d8ec0ff4d6d..ccf7a944b323d933105707086b598e332972ecf1 100644 (file)
--- 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 5ba51d08ff1cd720f3ab52ca450404fb99936174..dbf6f7a69c4bd4a3dddeacaacae5c9441f3a98e3 100644 (file)
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -1,4 +1,5 @@
 <?php\r
+$this->contentWidth = 769;\r
 \r
 $content = $this->layout()->content . "\n";\r
 \r
@@ -15,19 +16,18 @@ if (isset($this->currentPage) && $this->currentPage->getTemplate() == 'home') {
        }\r
 \r
 \r
-\r
        $c = $this->topimage();\r
-       $c.='<div id="main"' . $classmain . '>';\r
-       $c.=$this->bcrumbs();\r
+       $c .= '<div id="main"' . $classmain . '>';\r
+       $c .= $this->bcrumbs();\r
        if ($this->showsidebar) {\r
-               $c.='<div class="twocolumns">';\r
+               $c .= '<div class="twocolumns">';\r
        }\r
-       $c.=$content;\r
+       $c .= $content;\r
        if ($this->showsidebar) {\r
-               $c.=$leftbar;\r
-               $c.='</div>';\r
+               $c .= $leftbar;\r
+               $c .= '</div>';\r
        }\r
-       $c.='</div>';\r
+       $c .= '</div>';\r
 }\r
 \r
 echo '<div class="body">';\r

diff --git a/framework/application/views/scripts/templates/text.phtml b/framework/application/views/scripts/templates/text.phtml
index 33716e78f04a8feb7081f789277b89cad29ea8d6..c161a14a4d51255abf556336c0e4a5c84e0c0ae2 100644 (file)
--- a/framework/application/views/scripts/templates/text.phtml
+++ b/framework/application/views/scripts/templates/text.phtml
@@ -1,3 +1,7 @@
+<?php\r
+$this->contentWidth = 662;\r
+?>\r
+\r
 <section id="content">\r
        <div id="c">\r
                <?php\r

diff --git a/less/actualites.less b/less/actualites.less
index 69e0318b0cd6c49498aa0fe324b597b33d70a874..521e71efce325da374ef85cfe27f8dabb8652110 100644 (file)
--- 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 5c286de8bfac280548772bd788d9cc605a1512c7..f2e4b539711807c642df4065601bd2a88fb11c51 100644 (file)
--- a/less/admin.less
+++ b/less/admin.less
@@ -1,3 +1,6 @@
+@import "constants.less";\r
+\r
+\r
 #adminBar{\r
        background-color:#ACA1A1;\r
        padding:0 0 2px 0;\r

diff --git a/less/carrousel.less b/less/carrousel.less
index 80e8dbfdd49699449d9d04cb0cd7d2bb108917fc..e5481c251b4b4dda3c3677eaf107683b9a10f619 100644 (file)
--- 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 5a6ef97a8eefd102e14e8f9750bcaa66d0144a59..6b3b087a4c8986c6dc843d70aa67a6b06f4a64b7 100644 (file)
--- 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 01d31298f3b73c694045be6b0f5d20d530c4c57e..23bb6c27b0635a0305c788167089f666b3c98a47 100644 (file)
--- 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 9ed411e756d3817502f5a49ccdc4bf1b20a24189..830b7ca01dfdd282a32d202871f6bbd0158fdbd1 100644 (file)
--- 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 43ae7fd220ba6eb4bc5e9f6832835c0ef839fd04..fc8298c2c9f87e05643f8589838219149baabe13 100644 (file)
--- 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 ed50211c8f8345ce8741e4d6271aad0061933452..8d487bddea4aba9963d22a030fb11321c2bddd2d 100644 (file)
--- 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 e483542d44dd577a7f0024aef942cc3a75007629..46c3ee9bec4739a2a72a07611256dc123e7b4349 100644 (file)
--- 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 426005861ae2702d9f40dcabf216f18b9bfb5a80..3742ea77371a5aa4fdc0f01b03401c0fc6e65721 100644 (file)
--- 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 9016859c9d9d26c62b6c531191bb5c3c30e2fe4a..a10bcb992cf0fc36fb3852b75092b9ca11224b8f 100644 (file)
--- 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 0f73392d5887012a47d4fdd021d4d1cefe58a0ad..6b8522f5b9ad23b730f30bf56fff44ac5f9471b6 100644 (file)
--- 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 addff43a0f1304853acfa224545097ae8874b668..0cb69df75571342cc274cef50c6c29696d1401fe 100644 (file)
--- 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 c78d10cbe60f7275bd4392c73acdc362f6282490..b4376c5c8119995e140498056b569745493ebbfe 100644 (file)
--- 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 173618e68479a5dd156782c3730fcbd5ce008fda..33c990f7cae830f03c26c7492b205b453b26693e 100644 (file)
--- 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;
                                        }
                                }