Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 05:44:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Marc Ducobu 2015-10-30 10:50:51 +01:00
commit 52b4f1a659
2 changed files with 7 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -2,7 +2,7 @@ services:
- chill/database:latest
before_script:
- export GITHUB_COMPOSER_AUTH=$GITHUB_TOKEN
- composer config github-oauth.github.com $GITHUB_TOKEN
- composer install --no-interaction
- cp Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml Tests/Fixtures/App/app/config/parameters.yml
- php Tests/Fixtures/App/app/console.php --env=test cache:warmup
@ -14,4 +14,4 @@ test:php-5.6:
script: phpunit --testdox
test:php-7:
stage: test
script: phpunit --testdox
script: phpunit --testdox

60
Resources/views/layout.html.twig
View File

@ -100,62 +100,12 @@
{% endblock %}
{% block vertical_menu_content %}
<!-- <div class="grid-3 float-right"> -->
{# Note: activeRouteKey should be defined in Controller or child layout #}
{{ chill_menu('person', {
'layout': 'ChillPersonBundle::menu.html.twig',
'args' : {'person_id': person.id },
'activeRouteKey': activeRouteKey
}) }}
<!-- </div> -->
{{ chill_menu('person', {
'layout': 'ChillPersonBundle::menu.html.twig',
'args' : {'person_id': person.id },
'activeRouteKey': activeRouteKey
}) }}
{% endblock %}
{% block layout_content %}
{#
<div id="person_details" class="content parent">
<section class="container">
<div id="person_details_container" 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('danger') %}
<div class="grid-8 centered error">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
{% for flashMessage in app.session.flashbag.get('info') %}
<div class="grid-8 centered notice">
<span>
{{ flashMessage|raw }}
</span>
</div>
{% endfor %}
</div>
{% block personcontent %}<!-- block personcontent empty -->{%endblock%}
</div>
<div class="grid-3 float-right">
{# Note: activeRouteKey should be defined in Controller or child layout # }
{{ chill_menu('person', {
'layout': 'ChillPersonBundle::menu.html.twig',
'args' : {'person_id': person.id },
'activeRouteKey': activeRouteKey
}) }}
</div>
</section>
</div>
#}
</div>
{% endblock %}