diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 94bc520cb..bb4b1dcf2 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -189,6 +189,7 @@ div.vertical-menu { } div.list-group-item-header { text-transform: uppercase; + font-weight: bold; } } @@ -213,6 +214,20 @@ footer.footer { } } +/* + * ADMIN STYLES + */ + + div.admin { + flex-direction: row-reverse; + div.vertical-menu { + font-size: 0.9em; + .list-group-item { + padding: 0.3rem 0.7rem; + } + } + } + /* * GENERIC MAIN STYLES * miscellaneous @@ -220,7 +235,7 @@ footer.footer { /// titles h1, h2, -.h1, .h2 { +.h1, .h2 { font-weight: $headings-font-weight + 100; } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig index ba17f1d84..057fe5639 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig @@ -1,8 +1,5 @@ {% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %} -{% block vertical_menu_content %} -{% endblock %} - {% block admin_content %}

{{ 'Administration interface'|trans }}

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig index 900a794b6..bdb26bc2b 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig @@ -1,13 +1,43 @@ -{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %} +{% extends "@ChillMain/layout.html.twig" %} -{% block vertical_menu_content %} - {{ chill_menu('admin_section', { - 'layout': '@ChillMain/Admin/menu_admin_section.html.twig', - }) }} +{% block sublayout_content %} +
+
+ + {# Flash messages ! #} + {% if app.session.flashbag.keys()|length > 0 %} +
+ + {% for flashMessage in app.session.flashbag.get('success') %} +
+ {{ flashMessage|raw }} +
+ {% endfor %} + + {% for flashMessage in app.session.flashbag.get('error') %} +
+ {{ flashMessage|raw }} +
+ {% endfor %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +
+ {{ flashMessage|raw }} +
+ {% endfor %} + +
+ {% endif %} + + {% block admin_content %} + + {% endblock %} +
+
+ {{ chill_menu('admin_section', { + 'layout': '@ChillMain/Admin/menu_admin_section.html.twig', + }) }} +
+
{% endblock %} -{% block layout_wvm_content %} - {% block admin_content %} - - {% endblock %} -{% endblock %}