diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss index f47043fe2..c18f2e435 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss @@ -2,3 +2,11 @@ * These custom styles will override bootstrap enabled stylesheets */ + +// hack hérité de scratch: contraindre le footer en bas de page +.container-fluid::after { + content: ""; + display: table; + clear: both; + border-spacing: 0; +} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig index 64270f409..5e6bdfbe0 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig @@ -32,7 +32,7 @@ {% block content %} {% block admin_content %} -
+

{{ 'Welcome to the admin section !'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig index f087578f3..91fc4e3df 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig @@ -19,7 +19,7 @@ {% block form_row %} {% apply spaceless %} {% if form.vars.hideLabel is not defined or form.vars.hideLabel == false %} -
+
+
{{ form_widget(child) }} diff --git a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig index fa4c58bdb..bb9173dfa 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Password/recover_layout.html.twig @@ -29,7 +29,7 @@ -
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index 13fe8de26..f7299e083 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -43,7 +43,7 @@ -
+
@@ -102,7 +102,7 @@
{% block sublayout_containter %} -
+
{# Flash messages ! #} {% for flashMessage in app.session.flashbag.get('success') %}
@@ -129,7 +129,7 @@ {% endfor %} {% block content %} -
+

{{ 'Search'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig index 1d07ee81c..b2250d196 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig @@ -24,10 +24,10 @@ {% extends "@ChillMain/layout.html.twig" %} {% block sublayout_containter %} -
+
{# Flash messages ! #} -
+
{% for flashMessage in app.session.flashbag.get('success') %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig index 7f17a70ec..8c1c558ec 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig @@ -21,7 +21,7 @@ -
+

{{ 'Merge duplicate persons folders'|trans }}

@@ -65,7 +65,7 @@
-
+
{{ form_widget(form.confirm) }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig index 3f5828bb6..366eeee5d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/layout.html.twig @@ -116,7 +116,7 @@ {% endblock %} {% block layout_wvm_content %} -
+
{% block personcontent %}{%endblock%}
{% endblock %}