(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 6300f324269928a7c9ae2d65c2f55e445635ccbb..86e8e92a9657cdc9ea580f68257e13b2c8df183d 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -44,6 +44,7 @@ class Bootstrap extends CubeIT_Bootstrap {
         $casestudies = $schema->createTable('casestudies');
         $casestudies->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
         $casestudies->setPrimaryKey(array('id'));
+        $casestudies->addColumn('online', 'boolean');
         $casestudies->addColumn('titre', 'text');
         $casestudies->addColumn('description', 'text');
         $casestudies->addColumn('url', 'text');
@@ -140,6 +141,12 @@ class Bootstrap extends CubeIT_Bootstrap {
             $p->setAutoUri($r, $datas['seourl_stu'], $page->getLocale());
             $p->setSitemap(true);
             $p->setEditable(false);
+
+            //fb($r->online);
+            if ($r->online != 1)
+                $p->setOnline(false);
+
+
             $p->setDomain($page->getDomain());
             $p->setLabel($r->titre);
             $page->addPage($p);

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studies.php b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
index 91a5fa83d3c34c60a6156d30d0c368ca08df4b31..dcedda0c2e44effad758c08ae4907e26dda889da 100644 (file)
--- a/framework/application/forms/CMS/Sub/Casestudies/Studies.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
@@ -7,6 +7,10 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
         $id = new CubeIT_Form_Element_Id();
         $this->addElement($id);
 
+        $online = new Zend_Form_Element_Checkbox('online');
+        $online->setLabel('En ligne');
+        $this->addElement($online);
+
         $titre = new Zend_Form_Element_Text('titre');
         $titre->setLabel('Titre');
         $this->addElement($titre);
@@ -50,7 +54,7 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
 
         $this->setListTitle('Etudes de cas')
                 ->setNewTitle('Créer une étude de cas')
-                ->setEditTitle("Edition de l'étude de cas « $titre »")
+                ->setEditTitle('Edition de l\'étude de cas « $titre »')
                 ->setBaseTable('casestudies')
                 ->setIdColumn('id')
                 ->setTitleColumn('titre');

diff --git a/framework/application/views/helpers/CasestudiesList.php b/framework/application/views/helpers/CasestudiesList.php
index 476dc10b725371245553d9531d065c21ad53a7fb..6d4a54f3c1f23436fca98753f634fccdb4487219 100644 (file)
--- a/framework/application/views/helpers/CasestudiesList.php
+++ b/framework/application/views/helpers/CasestudiesList.php
@@ -7,6 +7,7 @@ class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstrac
         $db = Zend_Db_Table::getDefaultAdapter();\r
         $s = $db->select()->from('casestudies')\r
                 ->order('id ASC');\r
+        $s->where('online = ?', 1);\r
         $q = $s->query();\r
 \r
         $count = 1;\r

diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 99f722e1354bfe2a1260c9b30892780b0f855e74..7c948a54af3e221a6947dd17161138b464228054 100644 (file)
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -1,5 +1,6 @@
 <?php\r
 $this->headScript()->addScriptAndStyle('home');\r
+fb($this->slideshow);\r
 ?>\r
 \r
 <div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r

diff --git a/less/agence.less b/less/agence.less
index 6fc78ed0f14713c6cddf74a44db74a25b248580f..95bf6bac22751896eccb1020809cd330f8d5e7d0 100644 (file)
--- a/less/agence.less
+++ b/less/agence.less
@@ -18,8 +18,6 @@
     }
 }
 
-
-
 /* Agence pictos */
 .agency-pictos .bloc-holder {
     min-width: 980px;