Browse Source

Minor - add comments

jmontoya 9 years ago
parent
commit
150c4e5a3a

+ 2 - 0
app/config/config.yml

@@ -259,6 +259,7 @@ fm_elfinder:
                         #upload_allow: ['image/png', 'image/jpg', 'image/jpeg']
                         #upload_deny: ['all']
                         upload_max_size: 2M
+
 lunetics_locale:
     guessing_order:
         - query
@@ -266,6 +267,7 @@ lunetics_locale:
         - session
         #- browser
     allowed_locales: "%locales%"
+
 knp_menu:
     twig: true
 #

+ 8 - 6
app/config/sonata/sonata_page.yml

@@ -1,13 +1,13 @@
 # more information can be found here http://sonata-project.org/bundles/page
-
 cmf_routing:
     chain:
         routers_by_id:
             # enable the DynamicRouter with high priority to allow overwriting configured routes with content
             #symfony_cmf_routing_extra.dynamic_router: 200
             # enable the symfony default router with a lower priority
-            sonata.page.router: 100
-            router.default: 150
+
+            router.default: 150 # First chamilo/symfony2 router
+            sonata.page.router: 100 # then the page router
 
 sonata_page:
     class:
@@ -22,18 +22,19 @@ sonata_page:
     ignore_uri_patterns:
         - ^/administration(.*) # sonata admin
         - ^/admin(.*) # chamilo admin
+        - ^/main(.*)
         - /(.*)/(.*)administration(.*)/
         - ^/api/(.*)
         - ^install
         - ^/install/(.*)
         - install.php
         - ^/bundles/(.*)
-        - _wdt/(.*)
+        - ^/_wdt/(.*)
         - ^/userportal
         - ^/userportal/(.*)
         - ^/js/(.*)
         - ^/courses/(.*)
-        - front/editor
+        - ^/front/editor
 
     ignore_route_patterns:
         - (.*)administration(.*)     # ignore admin route, ie route containing 'admin'  # sonata admin
@@ -143,7 +144,8 @@ sonata_page:
                      F: footer
 
     page_defaults:
-        homepage: { decorate: false, enabled: false}
+        homepage: { decorate: false, enabled: true }
+        home: { decorate: false, enabled: true }
 
     caches:
         esi:

+ 0 - 2
src/Chamilo/CoreBundle/Migrations/Data/ORM/LoadPageData.php

@@ -58,12 +58,10 @@ class LoadPageData extends AbstractFixture implements
      */
     public function load(ObjectManager $manager)
     {
-        error_log('page');
         $items = $this->getSiteManager()->findAll();
         if (empty($items)) {
             $site = $this->createSite();
             $this->createGlobalPage($site);
-            error_log('sonata.page.route.page.generator');
             $generator = $this->container->get('sonata.page.route.page.generator');
             $output = new ConsoleOutput();
             $generator->update($site, $output);

+ 0 - 1
src/Chamilo/CoreBundle/Resources/config/routing.yml

@@ -1,7 +1,6 @@
 index:
     resource: "@ChamiloCoreBundle/Controller/IndexController.php"
     type:     annotation
-    prefix:   /
 
 userportal:
     resource: "@ChamiloCoreBundle/Controller/UserPortalController.php"

+ 0 - 1
src/Chamilo/CoreBundle/Resources/views/Index/index.html.twig

@@ -3,7 +3,6 @@
 {% block chamilo_right_column %}
     {% autoescape false %}
         {{ content }}
-
         {% if chamilo_settings_get("display.show_hot_courses")  == 'true' %}
             {# See CourseBlockService.php #}
             {{ sonata_block_render({'type': 'chamilo_core.block.course'}) }}