Fix contact UI

app/config/config.yml

@@ -86,7 +86,7 @@ twig:
 
     form:
         resources:
-            - 'bootstrap_3_layout.html.twig'
+            - 'bootstrap_3_horizontal_layout.html.twig'
             - 'SonataFormatterBundle:Form:formatter.html.twig'
             - 'SonataMediaBundle:Form:media_widgets.html.twig'
             - 'SonataCoreBundle:Form:datepicker.html.twig'

src/Chamilo/ContactBundle/Controller/ContactController.php

@@ -67,7 +67,6 @@ class ContactController extends Controller
                                 'firstname' => $form->get('firstname')->getData(),
                                 'lastname' => $form->get('lastname')->getData(),
                                 'subject' => $form->get('subject')->getData(),
-
                                 'email' => $form->get('email')->getData(),
                                 'message' => $form->get('message')->getData()
                             )

src/Chamilo/ContactBundle/Form/Type/ContactType.php

@@ -32,7 +32,7 @@ class ContactType extends AbstractType
             ->add('email')
             ->add('subject')
             ->add('message', 'textarea')
-            ->add('save', SubmitType::class)
+            ->add('save', SubmitType::class, ['attr' => ['class' => 'btn btn-primary']])
         ;
     }
 

src/Chamilo/ContactBundle/Resources/views/index.html.twig

@@ -1,6 +1,12 @@
-{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %}
+{% extends '@ChamiloCore/layout_one_col.html.twig' %}
 
-{% block sonata_page_container %}
+{% block content %}
+
+<section id="main_content">
+    <div class="page-header"><h2>{{ 'Contact' | trans  }}</h2>
+    </div>
     {{ form_start(form) }}
-    {{ form_widget(form) }}
+    {{ form_widget(form, {'attr': {'class': ''}}) }}
+    {{ form_end(form) }}
+</section>
 {% endblock %}

src/Chamilo/CoreBundle/Resources/views/layout_one_col.html.twig

@@ -0,0 +1,37 @@
+{% extends "@ChamiloTheme/Layout/base-layout.html.twig" %}
+
+{% block page_content %}
+
+    {% if js is defined %}
+        {% autoescape false %}
+        {% for item in js %}
+            {{ item }}
+        {% endfor %}
+        {% endautoescape %}
+    {% endif %}
+
+    <div class="row">
+        <div class="col-xs-12 col-md-12">
+            {# Breadcrumb #}
+            {% block chamilo_breadcrumb %}
+                {# {% include '@ChamiloCore/breadcrumb.html.twig' %}#}
+                {% endblock %}
+
+            {% block chamilo_messages %}
+            {# Flash messages #}
+            {% include 'SonataCoreBundle:FlashMessage:render.html.twig' %}
+            {% endblock %}
+
+            {# Content #}
+            {% block content %}
+            <section id="main_content">
+                {% autoescape false %}
+                    {{ content }}
+                {% endautoescape %}
+            </section>
+            {% endblock %}
+        </div>
+    </div>
+{% endblock %}
+
+

src/Chamilo/CoreBundle/Resources/views/layout_two_col.html.twig

@@ -0,0 +1,48 @@
+{% extends "@ChamiloTheme/Layout/base-layout.html.twig" %}
+
+{% set pathInfo = path(
+    app.request.attributes.get('_route'),
+    app.request.attributes.get('_route_params'))
+%}
+
+{% block page_content %}
+    {#  Left column #}
+    <div class="col-md-3">
+        {% block chamilo_left_column %}
+            <section class="left_column">
+            {% if is_granted('IS_AUTHENTICATED_FULLY') %}
+                {{ render(controller('ChamiloThemeBundle:Sidebar:userPanel', {'pathInfo': pathInfo })) }}
+                {#{{ render(controller('ChamiloThemeBundle:Sidebar:searchForm')) }}#}
+            {% endif %}
+
+            {# Sidebar menu #}
+            {{ render(controller('ChamiloThemeBundle:Sidebar:menuKnp', {'request' : app.request, pathInfo: pathInfo })) }}
+
+            {# Skill block see SkillBlockService.php #}
+            {#{{ sonata_block_render({'type': 'chamilo_core.block.skill'}) }}#}
+            </section>
+        {% endblock %}
+    </div>
+
+    {#  Right column #}
+    <div class="col-md-9">
+        {% block chamilo_breadcrumb %}
+            {% include '@ChamiloCore/breadcrumb.html.twig' %}
+        {% endblock %}
+
+        {% block chamilo_messages %}
+            {# Flash messages #}
+            {% include 'SonataCoreBundle:FlashMessage:render.html.twig' %}
+        {% endblock %}
+
+        {% block chamilo_right_column %}
+            {% block content %}
+            <section class="right_column">
+                {% autoescape false %}
+                    {{ content }}
+                {% endautoescape %}
+            </section>
+            {% endblock %}
+        {% endblock %}
+    </div>
+{% endblock %}

src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -234,6 +234,10 @@
 
 {% endblock %}
 
+{% block page_content %}
+{% endblock %}
+
+
 {% block sonata_page_container %}
 {% endblock %}
 

src/Chamilo/ThemeBundle/Resources/views/Layout/header.js.twig

@@ -260,10 +260,10 @@ $(document).scroll(function() {
         }
 
         if (fixed.attr('data-top') - fixed.outerHeight() <= $(this).scrollTop()) {
-            fixed.addClass('subnav-fixed');
+            fixed.addClass('navbar-fixed-top');
             fixed.css('width', '100%');
         } else {
-            fixed.removeClass('subnav-fixed');
+            fixed.removeClass('navbar-fixed-top');
             fixed.css('width', '200px');
         }
     }