Fixing installer.

app/AppKernel.php

@@ -41,7 +41,7 @@ class AppKernel extends Kernel
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
 
-            // KNP bundles
+            // KNP HELPER BUNDLES
             new Knp\Bundle\MenuBundle\KnpMenuBundle(),
             new Knp\Bundle\MarkdownBundle\KnpMarkdownBundle(),
             new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),

app/Resources/views/layout.html.twig

@@ -1,21 +1,14 @@
 {% extends "AvanzuAdminThemeBundle:layout:base-layout.html.twig" %}
 
-{#{% block stylesheets %}#}
-    {#<link rel="stylesheet" href="{{ asset_url }}" />#}
-{#{% endblock %}#}
-
-{#{% javascripts#}
-{#"@bootstrap_js" %}#}
-{#<script src="{{ asset_url }}"></script>#}
-{#{% endjavascripts %}#}
-
 {% block title %}
     {#{{ parent() }}#}
-    {{ 'site_name' | get_setting -}}
+    {#{{ 'site_name' | get_setting -}}#}
+    {{ chamilo_settings_get('platform.site_name') }}
 {% endblock %}
 
 {% block avanzu_logo %}
-    {{- 'institution' | get_setting -}}
+    {#{{- 'institution' | get_setting -}}#}
+    {{- chamilo_settings_get('platform.institution') -}}
 {% endblock %}
 
 {% block page_title %}

app/config/sonata/sonata_admin.yml

@@ -132,5 +132,3 @@ sonata_admin:
             - assetic/sonata_jqueryui_js.js
             - assetic/sonata_formatter_js.js
             - bundles/sonataformatter/vendor/ckeditor/ckeditor.js
-                    #- sonata.demo.admin.car
-                    #- sonata.demo.admin.engine

src/Chamilo/InstallerBundle/Form/Type/Configuration/MailerType.php

@@ -83,7 +83,7 @@ class MailerType extends AbstractType
                 'chamilo_installer_mailer_password',
                 'password',
                 array(
-                    'label'         => 'configuration.mailer.password',
+                    'label'         => 'form.configuration.mailer.password',
                     'required'      => false,
                 )
             );

src/Chamilo/InstallerBundle/Process/Step/InstallationStep.php

@@ -27,8 +27,19 @@ class InstallationStep extends AbstractStep
 
         $action = $this->getRequest()->query->get('action');
         switch ($action) {
+            case 'pages':
+                $this->handleAjaxAction(
+                    'sonata:page:update-core-routes', array('--site' => 'all')
+                );
+                return $this->handleAjaxAction(
+                    'sonata:page:create-snapshots',
+                    array('--site' => 'all')
+                );
             case 'fixtures':
-                return $this->handleAjaxAction('oro:migration:data:load', array('--fixtures-type' => 'demo'));
+                return $this->handleAjaxAction(
+                    'oro:migration:data:load',
+                    array('--fixtures-type' => 'demo')
+                );
             case 'navigation':
                 return $this->handleAjaxAction('oro:navigation:init');
 //            case 'js-routing':
@@ -40,6 +51,7 @@ class InstallationStep extends AbstractStep
                     'oro:assets:install',
                     array('target' => './', '--exclude' => ['OroInstallerBundle'])
                 );*/
+
                 $settingsManager = $this->container->get('chamilo.settings.manager');
                 $settingsManager->installSchemas();
 

src/Chamilo/InstallerBundle/Resources/translations/messages.en.yml

@@ -34,6 +34,8 @@ form:
                 sendmail: Sendmail
                 smtp: SMTP
             user: User
+            port: Port
+            encryption: Encryption
         system:
             header:       System settings
             secret:       Secret
@@ -50,8 +52,11 @@ form:
             phone:            Phone
         portal:
             header: Portal information
+            institution: Institution
+            institution_url: Institution URL
+            site_name: Site name
             portal_name: Portal name
-            company_title:    Company name
+            company_title: Company name
             company_url: Company URL
             allow_self_registration_as_trainer: Allow self-registration as a trainer
             allow_self_registration: Allow self-registration

src/Chamilo/InstallerBundle/Resources/views/Process/Step/installation.html.twig

@@ -1,6 +1,6 @@
 {% extends 'ChamiloInstallerBundle::layout.html.twig' %}
 {#{% set step, platformSteps = 'administration', ['navigation', 'js-routing', 'localization', 'assets', 'assetic', 'translation', 'requirejs'] %}#}
-{% set step, platformSteps = 'installation', [ 'assets', 'assetic', 'fixtures' ] %}
+{% set step, platformSteps = 'installation', [ 'assets', 'assetic', 'fixtures', 'pages' ] %}
 {% use 'ChamiloInstallerBundle::progress.html.twig' %}
 
 {% if loadFixtures %}