Improving the templates refs closed #628 #627

This commit is contained in:
Marc Ducobu
2015-10-23 13:21:52 +02:00
parent aabcb85f37
commit 69a970cd14
6 changed files with 111 additions and 96 deletions

View File

@@ -18,6 +18,9 @@
{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
{% block navigation_search_bar %}{% endblock %}
{% block navigation_section_menu %}{% endblock %}
{% block vertical_menu_content %}
{{ chill_menu('admin', {
'layout': 'ChillMainBundle::Menu/admin.html.twig',

View File

@@ -20,19 +20,18 @@
Layout for a vertical menu (like admin, export) to use with the
layout ../layoutWithVerticalMenu.html.twig.
#}
<div class="grid-4">
<ul class="tab-nav follow-href-path">
<li class="title">
{% block v_menu_title %}<!-- title of the verticalMenu is empty -->{% endblock %}
<ul class="tab-nav follow-href-path">
<li class="title">
{% block v_menu_title %}<!-- title of the verticalMenu is empty -->{% endblock %}
</li>
{% for route in routes %}
<li class="{% spaceless %}
{% if route.key == activeRouteKey %}
active
{% endif %}
{% endspaceless %} ">
<a href="{{ path(route.key, args ) }}" >{{ route.label|trans }}</a>
</li>
{% for route in routes %}
<li class="{% spaceless %}
{% if route.key == activeRouteKey %}
active
{% endif %}
{% endspaceless %} ">
<a href="{{ path(route.key, args ) }}" >{{ route.label|trans }}</a>
</li>
{% endfor %}
</ul>
</div>
{% endfor %}
</ul>

View File

@@ -16,6 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{#
The basic layout of Chill. All other layouts must extend this layout.
#}
<!DOCTYPE html>
<html lang="fr">
<head>
@@ -56,9 +60,11 @@
<div class="grid-8 text-right">
<div class="nav">
<ul class="navigation-menu">
{{ chill_menu('section', {
'layout': 'ChillMainBundle::Menu/section.html.twig',
}) }}
{% block navigation_section_menu %}
{{ chill_menu('section', {
'layout': 'ChillMainBundle::Menu/section.html.twig',
}) }}
{% endblock %}
{{ chill_menu('user', {
'layout': 'ChillMainBundle::Menu/user.html.twig',
@@ -87,17 +93,21 @@
</ul>
</div>
<div class="navigation-search">
<form action="{{ path('chill_main_search') }}" method="get">
<input name="q" type="search" placeholder="{{ 'Search'|trans }}" {% if _search_pattern is defined %}value="{{ _search_pattern }}"{% endif %}/>
<button type="submit" class="sc-button"><i class="fa fa-search fa-flip-horizontal"></i></button>
</form>
</div>
{% block navigation_search_bar %}
<div class="navigation-search">
<form action="{{ path('chill_main_search') }}" method="get">
<input name="q" type="search" placeholder="{{ 'Search'|trans }}" {% if _search_pattern is defined %}value="{{ _search_pattern }}"{% endif %}/>
<button type="submit" class="sc-button"><i class="fa fa-search fa-flip-horizontal"></i></button>
</form>
</div>
{% endblock %}
</div>
</header>
{% block top_banner %}{# To use if you want to add a banner below the header (ie the menu) #}{% endblock %}
<div id="content_conainter">
{% block layout_content %}
{% block sublayout_containter %}
<div class="container content">
{# Flash messages ! #}
{% for flashMessage in app.session.flashbag.get('success') %}
@@ -149,7 +159,7 @@
</div>
<footer class="footer">
<p>Programme sous license <b>AGPL</b></p>
<p>{{ 'Programme sous license' | trans }} <b>AGPL</b></p>
</footer>
<script type="text/javascript">

View File

@@ -23,41 +23,43 @@
{% extends "ChillMainBundle::layout.html.twig" %}
{% block layout_content %}
<div class="container content">
<div class="grid-8">
{# Flash messages ! #}
<div class="container">
{% for flashMessage in app.session.flashbag.get('success') %}
<div class="grid-8 centered success">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="grid-8 centered error">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('notice') %}
<div class="grid-8 centered notice">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
{% block sublayout_containter %}
<div class="container content">
<div class="grid-8 push-1">
{# Flash messages ! #}
<div class="container">
{% for flashMessage in app.session.flashbag.get('success') %}
<div class="grid-8 centered success">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('error') %}
<div class="grid-8 centered error">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('notice') %}
<div class="grid-8 centered notice">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
</div>
{% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
{% block layout_wvm_content %}<!-- content of the layoutWithVerticalMenu is empty -->
{% endblock %}
<div class="grid-3 float-right">
{% block vertical_menu_content %}<!-- vertical menu of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
</div>
{% block vertical_menu_content %}<!-- vertical menu of the layoutWithVerticalMenu is empty -->
{% endblock %}
</div>
{% endblock %}