From dff55a182729951b64ce2160c827bcafca7f59db Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 13 Aug 2014 15:43:12 +0200
Subject: [PATCH] Activating sonata page.

---
 app/config/sonata/sonata_admin.yml            | 42 +++++++++----------
 app/config/sonata/sonata_page.yml             |  2 +-
 .../CoreBundle/Controller/IndexController.php |  4 ++
 .../Settings/PlatformSettingsSchema.php       |  4 +-
 web/app.php                                   |  2 +-
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/config/sonata/sonata_admin.yml b/app/config/sonata/sonata_admin.yml
index 142916b270..c7d5f23473 100644
--- a/app/config/sonata/sonata_admin.yml
+++ b/app/config/sonata/sonata_admin.yml
@@ -41,20 +41,20 @@ sonata_admin:
             #- { position: right, type: sonata.block.service.rss, settings: { title: Sonata Project's Feeds, url: http://sonata-project.org/blog/archive.rss }}
 
         groups:
-#            sonata_page:
-#                items:
-#                    - sonata.page.admin.page
-#            sonata.admin.group.content:
-#                label:           sonata_content
-#                label_catalogue: SonataDemoBundle
-#                icon:            '<i class="fa fa-th"></i>'
-#                items:
-#                    #- sonata.page.admin.page
-#                    - sonata.news.admin.comment
-#                    - sonata.news.admin.post
-#                    - sonata.media.admin.media
-#                    - sonata.media.admin.gallery
-#                    - sonata.comment.admin.thread
+            sonata_page:
+                items:
+                    - sonata.page.admin.page
+            sonata.admin.group.content:
+                label:           sonata_content
+                label_catalogue: SonataDemoBundle
+                icon:            '<i class="fa fa-th"></i>'
+                items:
+                    #- sonata.page.admin.page
+                    - sonata.news.admin.comment
+                    - sonata.news.admin.post
+                    - sonata.media.admin.media
+                    - sonata.media.admin.gallery
+                    - sonata.comment.admin.thread
             #sonata.admin.group.ecommerce:
              #   label:           sonata_ecommerce
               #  label_catalogue: SonataAdminBundle
@@ -71,13 +71,13 @@ sonata_admin:
 #                    - sonata.classification.admin.category
 #                    - sonata.classification.admin.tag
 #                    - sonata.classification.admin.collection
-#            sonata.admin.group.site_builder:
-#                label:           Site Builder
-#                label_catalogue: SonataDemoBundle
-#                icon:            '<i class="fa fa-puzzle-piece"></i>'
-#                items:
-#                    - sonata.page.admin.page
-#                    - sonata.page.admin.site
+            sonata.admin.group.site_builder:
+                label:           Site Builder
+                label_catalogue: SonataDemoBundle
+                icon:            '<i class="fa fa-puzzle-piece"></i>'
+                items:
+                    - sonata.page.admin.page
+                    - sonata.page.admin.site
             sonata.admin.group.administration:
                 label:           sonata_administration
                 label_catalogue: SonataAdminBundle
diff --git a/app/config/sonata/sonata_page.yml b/app/config/sonata/sonata_page.yml
index 427eb633b9..d8a28954cc 100644
--- a/app/config/sonata/sonata_page.yml
+++ b/app/config/sonata/sonata_page.yml
@@ -124,7 +124,7 @@ sonata_page:
                      F: footer
 
     page_defaults:
-        homepage: { decorate: true, enabled: true }
+        homepage: { decorate: false, enabled: true }
 
     caches:
         esi:
diff --git a/src/Chamilo/CoreBundle/Controller/IndexController.php b/src/Chamilo/CoreBundle/Controller/IndexController.php
index 39b9a2ace4..0f4d959a3c 100644
--- a/src/Chamilo/CoreBundle/Controller/IndexController.php
+++ b/src/Chamilo/CoreBundle/Controller/IndexController.php
@@ -89,6 +89,10 @@ class IndexController extends BaseController
         /** @var \Chamilo\CoreBundle\Entity\CourseManager $courseManager */
         $courseManager = $this->get('chamilo.manager.course');
 
+        /** @var \Application\Sonata\PageBundle\Entity\Site $site */
+        $site = $this->get('sonata.page.site.selector')->retrieve();
+        $site->getId();
+
         $user = $this->getUser();
         $pageController = new \Chamilo\CoreBundle\Framework\PageController();
         $items = null;
diff --git a/src/Chamilo/CoreBundle/Settings/PlatformSettingsSchema.php b/src/Chamilo/CoreBundle/Settings/PlatformSettingsSchema.php
index 53718cd2c2..292813750d 100644
--- a/src/Chamilo/CoreBundle/Settings/PlatformSettingsSchema.php
+++ b/src/Chamilo/CoreBundle/Settings/PlatformSettingsSchema.php
@@ -19,9 +19,9 @@ class PlatformSettingsSchema implements SchemaInterface
     {
         $builder
             ->setDefaults(array(
-                'institution' => 'Campus Chamilo',
+                'institution' => 'Chamilo.org',
                 'institution_url' => 'http://www.chamilo.org',
-                'site_name'    => 'Chamilo Association',
+                'site_name'    => 'Chamilo site',
                 'administrator_email' => 'admin@example.org',
                 'administrator_name' => 'Jane',
                 'administrator_surname' => 'Doe',
diff --git a/web/app.php b/web/app.php
index 2c2a4cfafd..47caf193bd 100644
--- a/web/app.php
+++ b/web/app.php
@@ -24,7 +24,7 @@ require_once __DIR__.'/legacy.php';
 // using different relative paths, you must change the request
 // object to use the SiteRequest
 use Sonata\PageBundle\Request\RequestFactory;
-$request = RequestFactory::createFromGlobals('host_with_path');
+$request = RequestFactory::createFromGlobals('host_with_path_by_locale');
 
 // When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
 //Request::enableHttpMethodParameterOverride();