From 93fcf76a19693a029e74b42671822181997be386 Mon Sep 17 00:00:00 2001 From: Julio Date: Fri, 22 Apr 2016 15:22:28 +0200 Subject: [PATCH] Fix contact UI --- app/config/config.yml | 2 +- .../Controller/ContactController.php | 1 - .../ContactBundle/Form/Type/ContactType.php | 2 +- .../Resources/views/index.html.twig | 12 +++-- .../Resources/views/layout_one_col.html.twig | 37 ++++++++++++++ .../Resources/views/layout_two_col.html.twig | 48 +++++++++++++++++++ .../views/Layout/base-layout.html.twig | 4 ++ .../Resources/views/Layout/header.js.twig | 4 +- 8 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 src/Chamilo/CoreBundle/Resources/views/layout_one_col.html.twig create mode 100644 src/Chamilo/CoreBundle/Resources/views/layout_two_col.html.twig diff --git a/app/config/config.yml b/app/config/config.yml index 017e65de7b..7b9288985c 100644 --- a/app/config/config.yml +++ b/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' diff --git a/src/Chamilo/ContactBundle/Controller/ContactController.php b/src/Chamilo/ContactBundle/Controller/ContactController.php index a6e4fc7313..beb64d3f2b 100644 --- a/src/Chamilo/ContactBundle/Controller/ContactController.php +++ b/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() ) diff --git a/src/Chamilo/ContactBundle/Form/Type/ContactType.php b/src/Chamilo/ContactBundle/Form/Type/ContactType.php index 679b1a075d..63972b1754 100644 --- a/src/Chamilo/ContactBundle/Form/Type/ContactType.php +++ b/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']]) ; } diff --git a/src/Chamilo/ContactBundle/Resources/views/index.html.twig b/src/Chamilo/ContactBundle/Resources/views/index.html.twig index 301d50823f..1e0438d799 100644 --- a/src/Chamilo/ContactBundle/Resources/views/index.html.twig +++ b/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 %} + +
+

{{ 'Contact' | trans }}

+
{{ form_start(form) }} - {{ form_widget(form) }} + {{ form_widget(form, {'attr': {'class': ''}}) }} + {{ form_end(form) }} +
{% endblock %} diff --git a/src/Chamilo/CoreBundle/Resources/views/layout_one_col.html.twig b/src/Chamilo/CoreBundle/Resources/views/layout_one_col.html.twig new file mode 100644 index 0000000000..bd682bb656 --- /dev/null +++ b/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 %} + +
+
+ {# 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 %} +
+ {% autoescape false %} + {{ content }} + {% endautoescape %} +
+ {% endblock %} +
+
+{% endblock %} + + diff --git a/src/Chamilo/CoreBundle/Resources/views/layout_two_col.html.twig b/src/Chamilo/CoreBundle/Resources/views/layout_two_col.html.twig new file mode 100644 index 0000000000..faf7d72088 --- /dev/null +++ b/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 #} +
+ {% block chamilo_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'}) }}#} +
+ {% endblock %} +
+ + {# Right column #} +
+ {% 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 %} +
+ {% autoescape false %} + {{ content }} + {% endautoescape %} +
+ {% endblock %} + {% endblock %} +
+{% endblock %} diff --git a/src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig b/src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig index 7629257725..f3c3dc75da 100644 --- a/src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig +++ b/src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig @@ -234,6 +234,10 @@ {% endblock %} +{% block page_content %} +{% endblock %} + + {% block sonata_page_container %} {% endblock %} diff --git a/src/Chamilo/ThemeBundle/Resources/views/Layout/header.js.twig b/src/Chamilo/ThemeBundle/Resources/views/Layout/header.js.twig index 4f7d4e39f7..ac3016d231 100644 --- a/src/Chamilo/ThemeBundle/Resources/views/Layout/header.js.twig +++ b/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'); } }