Commit 1923f2da authored by Antonin's avatar Antonin

Pas mal de modifs.

parent 737d6153
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\AbstractMigration;
use Doctrine\DBAL\Schema\Schema;
/**
* Auto-generated Migration: Please modify to your needs!
*/
class Version20151105172050 extends AbstractMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
// this up() migration is auto-generated, please modify it to your needs
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
// this down() migration is auto-generated, please modify it to your needs
}
}
......@@ -3,7 +3,7 @@ assetic:
use_controller: false
read_from: %kernel.root_dir%/../web
write_to: %kernel.root_dir%/../web
bundles: [] # disable bundles parsing
bundles: [SonataPageBundle] # disable bundles parsing
filters:
cssrewrite: ~
......@@ -127,10 +127,8 @@ assetic:
inputs:
- %kernel.root_dir%/../web/bundles/sonataadmin/vendor/jquery/dist/jquery.js
- %kernel.root_dir%/../web/bundles/sonataadmin/vendor/bootstrap/dist/js/bootstrap.js
- %kernel.root_dir%/../web/bundles/sonataproduct/js/product.js
- %kernel.root_dir%/../web/bundles/sonatacore/js/base.js
- %kernel.root_dir%/../web/bundles/sonatacore/vendor/select2/select2.min.js
- %kernel.root_dir%/../web/bundles/sonatademo/js/demo.js
filters:
- yui_js
......@@ -140,8 +138,7 @@ assetic:
- %kernel.root_dir%/../web/bundles/sonataadmin/vendor/bootstrap/dist/css/bootstrap.min.css
- %kernel.root_dir%/../web/bundles/sonatacore/vendor/select2/select2.css
- %kernel.root_dir%/../web/bundles/mopabootstrap/css/datepicker.css
- %kernel.root_dir%/../web/bundles/sonatademo/css/demo.css
filters:
- cssrewrite
- yui_css
- yui_css
\ No newline at end of file
......@@ -97,6 +97,13 @@ doctrine:
auto_generate_proxy_classes: "%kernel.debug%"
auto_mapping: true
# app/config/config.yml
doctrine_migrations:
dir_name: "%kernel.root_dir%/DoctrineMigrations"
namespace: Application\Migrations
table_name: migration_versions
name: Application Migrations
# Swiftmailer Configuration
swiftmailer:
transport: "%mailer_transport%"
......
acl:
resource: "@ACLBundle/Resources/config/routing.yml"
prefix: /ok
sonata_user_security:
resource: "@SonataUserBundle/Resources/config/routing/sonata_security_1.xml"
......
......@@ -73,7 +73,6 @@ sonata_admin:
icon: '<i class="fa fa-puzzle-piece"></i>'
items:
- sonata.page.admin.page
- sonata.page.admin.site
sonata.admin.group.administration:
label: sonata_administration
......
......@@ -42,21 +42,6 @@ sonata_block:
sonata.news.block.recent_comments:
sonata.news.block.recent_posts:
# Ecommerce's Blocks
sonata.order.block.recent_orders:
sonata.product.block.recent_products:
sonata.product.block.similar_products:
sonata.product.block.categories_menu:
sonata.product.block.filters_menu:
sonata.product.block.variations_form:
sonata.customer.block.recent_customers:
sonata.basket.block.nb_items:
cache: sonata.page.cache.js_async
contexts: [user]
sonata.basket.block.nb_items:
cache: sonata.page.cache.js_async
contexts: [user]
# TimelineBundle's Blocks
sonata.timeline.block.timeline:
......
......@@ -41,13 +41,11 @@ sonata_page:
assets:
stylesheets:
- assetic/perso.css
- assetic/bootstrap/css/bootstrap.min.css
- assetic/sonata_front_css.css
- assetic/animate.css
javascripts:
- assetic/sonata_front_js.js
- assetic/jquery/jquery-2.1.4.min.js
- assetic/bootstrap/js/bootstrap.min.js
- assetic/main.js
......@@ -79,7 +77,7 @@ sonata_page:
F: footer
2columns:
path: 'ApplicationSonataPageBundle::demo_2columns_layout.html.twig'
path: 'ApplicationSonataPageBundle::2columns_layout.html.twig'
name: '2 columns layout'
containers:
header:
......@@ -110,6 +108,41 @@ sonata_page:
B: content_bottom
F: footer
home:
path: 'ApplicationSonataPageBundle::home_layout.html.twig'
name: 'home layout'
containers:
header:
name: Header
content_top:
name: Top content
left_col:
name: Left content
center_col:
name: Center content
right_col:
name: Right content
content_bottom:
name: Bottom content
footer:
name: Footer
matrix:
layout: |
HHHHHHHH
TTTTTTTT
LLCCCCRR
BBBBBBBB
FFFFFFFF
mapping:
H: header
T: content_top
L: left_col
C: center_col
R: right_col
B: content_bottom
F: footer
page_defaults:
homepage: { decorate: false, enabled: true }
......
......@@ -6,7 +6,7 @@ body {
width: 100%;
height: 50vh;
min-height: 300px;
background: url(../../web/img/banner.jpg) no-repeat center;
background: url(/img/banner.jpg) no-repeat center;
-webkit-background-size: cover;
background-size: cover;
}
......@@ -30,6 +30,11 @@ h1.title {
margin-right: -15px;
width: 100%;
z-index: 100;
opacity: 0.95;
}
#menu:hover {
opacity: 1;
}
.header-content, .header-content > div, .header-content img{
......@@ -44,7 +49,6 @@ h1.title {
#menu h2.navbar-brand {
margin-top: 12px;
height: 20px;
}
#menu a {
......@@ -53,11 +57,9 @@ h1.title {
#menu .navbar-brand img{
height: 100%;
-moz-animation-duration: 2s;
-webkit-animation-duration: 2s;
animation-duration: 2s;
}
#menu.affix-top {
......@@ -69,6 +71,11 @@ h1.title {
background-color: transparent;
border: none;
font-weight: bold;
padding: 8px;
margin: 7px;
}
#menu.affix-top a:hover{
border-bottom: 1px solid white;
}
#menu.affix-top .dropdown-menu li,#menu.affix-top .dropdown-menu {
......@@ -89,4 +96,9 @@ h1.title {
.content {
margin-top: 15px;
}
.home_center {
padding-left: 15px;
padding-right: 15px;
}
\ No newline at end of file
......@@ -12,37 +12,29 @@ file that was distributed with this source code.
{% block block %}
{% if settings.title %}
<h3 class=""><i class="fa fa-pencil"></i> {{ settings.title }}</h3>
<h3 class=""><i class="glyphicon glyphicon-pencil"></i> {{ settings.title }}</h3>
{% endif %}
<div class="sonata-news-block-recent-post panel panel-default">
<div class="panel-body">
<div class="sonata-blog-post-container list-group">
{% for post in pager.getResults() %}
{% if context.getSetting('mode') == 'admin' %}
<a class="list-group-item" href="{{ url('admin_sonata_news_post_edit', { 'id': post.id }) }}">
{% if post.ispublic %}
<span class="label label-success">{{ 'post_is_public'|trans({}, 'SonataNewsBundle') }}</span>
{% else %}
<span class="label">{{ 'post_is_not_public'|trans({}, 'SonataNewsBundle') }}</span>
{% endif %}&nbsp;
{{ post.title }} - {{ 'archive_author'|trans({'%author%': post.author }, 'SonataNewsBundle') }} - {{ post.publicationDateStart | format_date }}</a>
{% else %}
<a class="list-group-item" href="{{ url('sonata_news_view', { 'permalink': sonata_news_permalink(post) }) }}">{{ post.title }} - {{ 'archive_author'|trans({'%author%': post.author }, 'SonataNewsBundle') }} - {{ post.publicationDateStart | format_date }}</a>
<p>{{ post.content|raw }}</div>
{% endif %}
{% else %}
<a class="list-group-item" href="#">{{ 'no_post_found'|trans({}, 'SonataNewsBundle') }}</a>
{% endfor %}
<div>
{% for post in pager.getResults() %}
<div class="panel panel-default">
<div class="panel-heading">
<span class="label label-default">{{ post.publicationDateStart | format_date }}</span>
<a href="{{ url('sonata_news_view', { 'permalink': sonata_news_permalink(post) }) }}">
{{ post.title }} - {{'archive_author'|trans({'%author%': post.author }, 'SonataNewsBundle') }}
</a>
</div>
<div class="panel-body">
<p>{{ post.content|raw }}</p>
</div>
</div>
{% if context.getSetting('mode') == 'admin' %}
<a href="{{ url('admin_sonata_news_post_list') }}" class="btn btn-block"><i class="fa fa-list"></i> {{ 'view_all_posts'|trans({}, 'SonataNewsBundle') }}</a>
{% else %}
<a href="{{ url('sonata_news_archive') }}" class="btn btn-block"><i class="fa fa-list"></i> {{ 'view_all_posts'|trans({}, 'SonataNewsBundle') }}</a>
{% endif %}
</div>
{% else %}
<a class="list-group-item" href="#">{{ 'no_post_found'|trans({}, 'SonataNewsBundle') }}</a>
{% endfor %}
{% if context.getSetting('mode') == 'admin' %}
<a href="{{ url('admin_sonata_news_post_list') }}" class="btn btn-block"><i class="glyphicon glyphicon-list"></i> {{ 'view_all_posts'|trans({}, 'SonataNewsBundle') }}</a>
{% else %}
<a href="{{ url('sonata_news_archive') }}" class="btn btn-block"><i class="glyphicon glyphicon-list"></i> {{ 'view_all_posts'|trans({}, 'SonataNewsBundle') }}</a>
{% endif %}
</div>
{% endblock %}
{% extends 'SonataPageBundle::base_layout.html.twig' %}
{% block sonata_page_container %}
<div class="container">
<div class="content">
{% if page is defined %}
<div class="row">
<div class="col-md-12">
{% if page.name != 'global'%}
{{ sonata_page_render_container('content_top', 'global') }}
{% endif %}
{{ sonata_page_render_container('content_top', page) }}
</div>
</div>
{% endif %}
<div class="row">
{% block page_content %}
{% if page is defined %}
<div class="col-md-6">
{% if page.name != 'global'%}
{{ sonata_page_render_container('left_col', 'global') }}
{% endif %}
{{ sonata_page_render_container('left_col', page) }}
</div>
<div class="col-md-6">
{% if page.name != 'global'%}
{{ sonata_page_render_container('right_col', 'global') }}
{% endif %}
{{ sonata_page_render_container('right_col', page) }}
</div>
<div style="clear: both"></div>
{% endif %}
{% endblock %}
</div>
{% if page is defined %}
<div class="row">
<div class="col-md-12">
{{ sonata_page_render_container('content_bottom', page) }}
{% if page.name != 'global'%}
{{ sonata_page_render_container('content_bottom', 'global') }}
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
{% endblock %}
{% block sonata_page_breadcrumb %}{% endblock %}
......@@ -24,15 +24,14 @@ file that was distributed with this source code.
{% for stylesheet in sonata_page.assets.stylesheets %}
<link rel="stylesheet" href="{{ asset(stylesheet) }}" media="all">
{% endfor %}
{% stylesheets '@ACLBundle/Resources/public/css/perso.css' filter='cssrewrite' %}
<link rel="stylesheet" href="{{ asset_url }}" />
{% endstylesheets %}
{% endblock %}
{% endblock %}
{% block sonata_page_javascripts %}
{% block page_javascripts %} {# Deprecated block #}
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
{% for js in sonata_page.assets.javascripts %}
<script src="{{ asset(js) }}"></script>
......@@ -65,7 +64,7 @@ file that was distributed with this source code.
</script>
{% endif %}
<header class="sonata-bc sonata-page-top-bar navbar navbar-inverse navbar-fixed-top" role="banner">
<div class="sonata-bc sonata-page-top-bar navbar navbar-inverse navbar-fixed-top" role="banner">
<div class="container">
<ul class="nav navbar-nav">
{% if app.security and app.security.token and is_granted('ROLE_SONATA_ADMIN') %}
......@@ -133,9 +132,70 @@ file that was distributed with this source code.
</ul>
</div>
</header>
</div>
{% endif %}
<header id="header" class="container-fluid">
<nav id="menu" class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<a class="navbar-brand" href="#"><img src="{{ asset('img/logo-simple.png')}}" alt="Logo ACL"></a>
<h2 class="navbar-brand">L'Amicale Du Combat Libre</h2>
</div>
{#<div class="navbar-left ariane">#}
{#{% block sonata_page_breadcrumb %}#}
{#{% if sonata_seo_context is not defined %}#}
{#{% set sonata_seo_context = 'homepage' %}#}
{#{% endif %}#}
{#{{ sonata_block_render_event('breadcrumb', { 'context': sonata_seo_context, 'current_uri': app.request.requestUri }) }}#}
{#{% endblock %}#}
{#</div>#}
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-right" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="{{ path('sonata_news_home') }}">Blog</a></li>
<li><a href="{{ path('_page_alias_home') }}#infos-pratiques">Info pratiques</a></li>
<li><a href="admin/">Connexion</a></li>
{#<li class="dropdown">#}
{#<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>#}
{#<ul class="dropdown-menu">#}
{#<li><a href="#">Action</a></li>#}
{#<li><a href="#">Another action</a></li>#}
{#<li><a href="#">Something else here</a></li>#}
{#<li role="separator" class="divider"></li>#}
{#<li><a href="#">Separated link</a></li>#}
{#<li role="separator" class="divider"></li>#}
{#<li><a href="#">One more separated link</a></li>#}
{#</ul>#}
{#</li>#}
</ul>
{#<ul class="nav navbar-nav navbar-right">#}
{#<li><a href="#">Link</a></li>#}
{#<li class="dropdown">#}
{#<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>#}
{#<ul class="dropdown-menu">#}
{#<li><a href="#">Action</a></li>#}
{#<li><a href="#">Another action</a></li>#}
{#<li><a href="#">Something else here</a></li>#}
{#<li role="separator" class="divider"></li>#}
{#<li><a href="#">Separated link</a></li>#}
{#</ul>#}
{#</li>#}
{#</ul>#}
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
<div class="row header-content">
<div class="col-md-5 center-block">
<img src="{{ asset('img/logo.png')}}" class="center-block img-responsive animated fadeInLeftBig" alt="Logo ACL">
</div>
<div class="col-md-7">
<h1 class="title animated fadeIn">L'Amicale du Combat Libre</h1>
</div>
</div>
</header>
{% endblock %}
{% endblock %}
......
{#
This file is part of the Sonata package.
(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
#}
{% extends 'SonataPageBundle::2columns_layout.html.twig' %}
{% block sonata_page_body_tag %}
{{ parent() }}
{% include "SonataSeoBundle:Block:_facebook_sdk.html.twig" %}
{% include "SonataSeoBundle:Block:_twitter_sdk.html.twig" %}
{% include "SonataSeoBundle:Block:_pinterest_sdk.html.twig" %}
{% endblock %}
{% block sonata_page_javascripts %}
<script type="text/javascript">
var basket_update_confirmation_message = '{{ 'sonata_basket_update_confirmation'|trans({}, 'SonataDemoBundle')|escape('js') }}';
</script>
<script src="{{ asset('assetic/sonata_front_js.js') }}" type="text/javascript"></script>
{% endblock %}
{% block sonata_page_container %}
<div class="demonstration-bar">aa{{ 'sonata.demo.demonstration.message'|trans({}, 'SonataDemoBundle') }}</div>
<a href="https://github.com/sonata-project"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub"></a>
{{ parent() }}
{% endblock %}
{% block sonata_page_breadcrumb %}{% endblock %}
{% extends 'SonataPageBundle::base_layout.html.twig' %}
{% block sonata_page_container %}
<div class="container">
<div class="content">
{% if page is defined %}
<div class="row">
<div class="col-md-12">
{% if page.name != 'global'%}
{{ sonata_page_render_container('content_top', 'global') }}
{% endif %}
{{ sonata_page_render_container('content_top', page) }}
</div>
</div>
{% endif %}
<div class="row">
{% block page_content %}
{% if page is defined %}
<div class="col-md-3">
{% if page.name != 'global'%}
{{ sonata_page_render_container('left_col', 'global') }}
{% endif %}
{{ sonata_page_render_container('left_col', page) }}
</div>
<div class="col-md-6 home_center">
{% if page.name != 'global'%}
{{ sonata_page_render_container('center_col', 'global') }}
{% endif %}
{{ sonata_page_render_container('center_col', page) }}
</div>
<div class="col-md-3">
{% if page.name != 'global'%}
{{ sonata_page_render_container('right_col', 'global') }}
{% endif %}
{{ sonata_page_render_container('right_col', page) }}
</div>
<div style="clear: both"></div>
{% endif %}
{% endblock %}
</div>
{% if page is defined %}
<div class="row">
<div class="col-md-12">
{{ sonata_page_render_container('content_bottom', page) }}
{% if page.name != 'global'%}
{{ sonata_page_render_container('content_bottom', 'global') }}
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
{% endblock %}
{% block sonata_page_breadcrumb %}{% endblock %}
{#
This file is part of the Sonata package.
(c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
#}
{% extends 'SonataPageBundle::base_layout.html.twig' %}
{% block sonata_page_container %}
<div id="header" class="container-fluid">
<nav id="menu" class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<a class="navbar-brand" href="#"><img src="{{ asset('img/logo-simple.png')}}" alt="Logo ACL"></a>
<h2 class="navbar-brand">L'Amicale Du Combat Libre</h2>
</div>
{#<div class="navbar-left ariane">#}
{#{% block sonata_page_breadcrumb %}#}
{#{% if sonata_seo_context is not defined %}#}
{#{% set sonata_seo_context = 'homepage' %}#}
{#{% endif %}#}
{#{{ sonata_block_render_event('breadcrumb', { 'context': sonata_seo_context, 'current_uri': app.request.requestUri }) }}#}
{#{% endblock %}#}
{#</div>#}
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-right" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="{{ path('sonata_news_home') }}">Blog</a></li>
<li><a href="{{ path('_page_alias_home') }}#infos-pratiques">Info pratiques</a></li>
<li><a href="admin/">Connexion</a></li>
{#<li class="dropdown">#}
{#<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>#}
{#<ul class="dropdown-menu">#}
{#<li><a href="#">Action</a></li>#}
{#<li><a href="#">Another action</a></li>#}
{#<li><a href="#">Something else here</a></li>#}
{#<li role="separator" class="divider"></li>#}
{#<li><a href="#">Separated link</a></li>#}
{#<li role="separator" class="divider"></li>#}
{#<li><a href="#">One more separated link</a></li>#}
{#</ul>#}
{#</li>#}
</ul>
{#<ul class="nav navbar-nav navbar-right">#}
{#<li><a href="#">Link</a></li>#}
{#<li class="dropdown">#}
{#<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>#}
{#<ul class="dropdown-menu">#}
{#<li><a href="#">Action</a></li>#}
{#<li><a href="#">Another action</a></li>#}
{#<li><a href="#">Something else here</a></li>#}
{#<li role="separator" class="divider"></li>#}
{#<li><a href="#">Separated link</a></li>#}
{#</ul>#}
{#</li>#}
{#</ul>#}
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
<div class="row header-content">
<div class="col-md-5 center-block">
<img src="{{ asset('img/logo.png')}}" class="center-block img-responsive animated fadeInLeftBig" alt="Logo ACL">
</div>
<div class="col-md-7">
<h1 class="title animated fadeIn">L'Amicale du Combat Libre</h1>
</div>
</div>
</div>
<div class="container">
<div class="container">
<div class="content">
{% if page is defined %}
<div class="row">
{% if page.name != 'global'%}
{{ sonata_page_render_container('content_top', 'global') }}
{% endif %}
{{ sonata_page_render_container('content_top', page) }}
<div class="col-md-12">
{% if page.name != 'global'%}
{{ sonata_page_render_container('content_top', 'global') }}
{% endif %}
{{ sonata_page_render_container('content_top', page) }}
</div>
</div>
{% endif %}
<div class="row">
{% block page_content %}
{% if content is defined %}
{{ content|raw }}
{% else %}
{% set content = block('content') %}
{% if content|length > 0 %}
<div class="col-md-12">
{% block page_content %}
{% if content is defined %}
{{ content|raw }}
{% elseif page is defined %}
{{ sonata_page_render_container('content', page) }}
{% else %}
{% set content = block('content') %}
{% if content|length > 0 %}
{{ content|raw }}
{% elseif page is defined %}
{{ sonata_page_render_container('content', page) }}
{% endif %}
{% endif %}