fix filters, add titles
This commit is contained in:
parent
6034081a93
commit
412db9bd7f
|
@ -122,7 +122,7 @@ class PostAdminController extends AdminController
|
||||||
public function filters(Session $session): Response
|
public function filters(Session $session): Response
|
||||||
{
|
{
|
||||||
$form = $this->createForm(PostFilterType::class);
|
$form = $this->createForm(PostFilterType::class);
|
||||||
$form->submit($session->get('post_filter'));
|
$form->submit($session->get('post_filter', []));
|
||||||
|
|
||||||
return $this->render('blog/post_admin/filters.html.twig', [
|
return $this->render('blog/post_admin/filters.html.twig', [
|
||||||
'form' => $form->createView(),
|
'form' => $form->createView(),
|
||||||
|
@ -167,10 +167,10 @@ class PostAdminController extends AdminController
|
||||||
|
|
||||||
if (empty($filters)) {
|
if (empty($filters)) {
|
||||||
$this->filters = $filters;
|
$this->filters = $filters;
|
||||||
$session->set('post_filter', $this->filters);
|
$session->set('post_filter', $filters);
|
||||||
} elseif ($form->isValid()) {
|
} elseif ($form->isValid()) {
|
||||||
$this->filters = $form->getData();
|
$this->filters = $form->getData();
|
||||||
$session->set('post_filter', $this->filters);
|
$session->set('post_filter', $filters);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||||
use Symfony\Component\Form\FormBuilderInterface;
|
use Symfony\Component\Form\FormBuilderInterface;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
|
use Symfony\Component\Form\ChoiceList\ChoiceList;
|
||||||
|
|
||||||
class PostFilterType extends AbstractType
|
class PostFilterType extends AbstractType
|
||||||
{
|
{
|
||||||
|
@ -50,9 +51,9 @@ class PostFilterType extends AbstractType
|
||||||
'label' => 'Catégories',
|
'label' => 'Catégories',
|
||||||
'class' => Category::class,
|
'class' => Category::class,
|
||||||
'choice_label' => 'title',
|
'choice_label' => 'title',
|
||||||
|
'choice_value' => 'id',
|
||||||
'required' => false,
|
'required' => false,
|
||||||
'attr' => [
|
'attr' => [
|
||||||
'data-jschoice' => '',
|
|
||||||
],
|
],
|
||||||
'query_builder' => function (EntityRepository $repo) {
|
'query_builder' => function (EntityRepository $repo) {
|
||||||
return $repo->createQueryBuilder('a')
|
return $repo->createQueryBuilder('a')
|
||||||
|
|
|
@ -20,4 +20,12 @@
|
||||||
<span class="nav-item-label">Catégories</span>
|
<span class="nav-item-label">Catégories</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link {{ macros_menu.active_class('blog_comment', section) }}" href="{{ path('admin_blog_comment_index') }}">
|
||||||
|
<span class="fa fa-comment-alt"></span>
|
||||||
|
|
||||||
|
<span class="nav-item-label">Commentaires</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -19,16 +19,29 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
|
||||||
<title>Blog - {% block meta_title %}{{ _page ? _page.title.value : null }}{% endblock %}</title>
|
<title>Blog - {% block meta_title %}{{ _page is defined ? _page.title.value }}{% endblock %}</title>
|
||||||
|
|
||||||
{% block metas %}
|
{% block metas %}
|
||||||
<meta name="description" content="{% block meta_description %}{{ _page.metaTitle }}{% endblock %}">
|
<meta name="description" content="{% block meta_description %}{{ _page is defined and _page ? _page.metaTitle }}{% endblock %}">
|
||||||
<link rel="openid.server" href="https://id.deblan.org/" />
|
<link rel="openid.server" href="https://id.deblan.org/" />
|
||||||
<link rel="openid.delegate" href="https://www.deblan.io/" />
|
<link rel="openid.delegate" href="https://www.deblan.io/" />
|
||||||
<link rel="openid2.provider" href="https://id.deblan.org/" />
|
<link rel="openid2.provider" href="https://id.deblan.org/" />
|
||||||
<link rel="openid2.local_id" href="https://www.deblan.io/" />
|
<link rel="openid2.local_id" href="https://www.deblan.io/" />
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block openGraph %}
|
||||||
|
{% if _page is defined and _page %}
|
||||||
|
<meta property="og:title" content="{{ _page.ogTitle }}" />
|
||||||
|
<meta property="og:url" content="{{ app.request.uri }}" />
|
||||||
|
<meta property="og:description" content="{{ _page.ogDescription }}" />
|
||||||
|
|
||||||
|
{% if _page.ogImage %}
|
||||||
|
<meta property="og:image" content="{{ asset(_page.ogImage) }}" />
|
||||||
|
<meta property="og:image:secure_url" content="{{ image }}" />
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
{% block css %}
|
{% block css %}
|
||||||
{{ encore_entry_link_tags('app') }}
|
{{ encore_entry_link_tags('app') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -37,27 +37,27 @@
|
||||||
{{ include('blog/post/_post.html.twig', {full: true}) }}
|
{{ include('blog/post/_post.html.twig', {full: true}) }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{%- block metas -%}
|
{%- block openGraph -%}
|
||||||
{#
|
{% if not post.isQuick %}
|
||||||
{{ parent() }}
|
|
||||||
|
|
||||||
{% if not page.object.quick %}
|
|
||||||
{% set name = 'Deblan Blog' %}
|
{% set name = 'Deblan Blog' %}
|
||||||
{% set title = 'Blog - ' ~ block('meta_title') %}
|
{% set title = 'Blog - ' ~ block('meta_title') %}
|
||||||
{% set image = app.request.getSchemeAndHttpHost() ~ asset(page.object.getWebPathForPicture) %}
|
{% set image = post.image ? asset(post.image) : null %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set image = page.object.quickImage %}
|
{% set image = post.quickImage %}
|
||||||
{% set title = block('meta_title') %}
|
{% set title = block('meta_title') %}
|
||||||
{% set name = '' %}
|
{% set name = '' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<link rel="canonical" href="{{ cms_path('post', {post: page.object.id, slug: page.object.slug}, true) }}" />
|
<link rel="canonical" href="{{ safe_url(_node.routeName, {post: post.id, slug: post.slug}) }}" />
|
||||||
<meta property="og:title" content="{{ title|raw }}" />
|
<meta property="og:title" content="{{ title|raw }}" />
|
||||||
<meta property="og:url" content="{{ cms_path('post', {post: page.object.id, slug: page.object.slug}, true) }}" />
|
<meta property="og:url" content="{{ safe_url(_node.routeName, {post: post.id, slug: post.slug}) }}" />
|
||||||
<meta property="og:image" content="{{ image }}" />
|
|
||||||
<meta property="og:image:secure_url" content="{{ image }}" />
|
{% if image %}
|
||||||
|
<meta property="og:image" content="{{ image }}" />
|
||||||
|
<meta property="og:image:secure_url" content="{{ image }}" />
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<meta property="og:site_name" content="{{ name }}" />
|
<meta property="og:site_name" content="{{ name }}" />
|
||||||
<meta property="og:locale" content="fr_FR" />
|
<meta property="og:locale" content="fr_FR" />
|
||||||
<meta property="og:type" content="article" />
|
<meta property="og:type" content="article" />
|
||||||
#}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
{% extends '@Core/admin/layout.html.twig' %}
|
{% extends '@Core/admin/layout.html.twig' %}
|
||||||
|
|
||||||
|
{% block title %}{{ 'Articles'|trans }} - {{ parent() }}{% endblock %}
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<div class="bg-light pl-5 pr-4 pt-5 pb-5">
|
<div class="bg-light pl-5 pr-4 pt-5 pb-5">
|
||||||
<div class="d-flex">
|
<div class="d-flex">
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
{% extends '@Core/admin/layout.html.twig' %}
|
{% extends '@Core/admin/layout.html.twig' %}
|
||||||
|
|
||||||
|
{% block title %}{{ 'Articles'|trans }} - {{ parent() }}{% endblock %}
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<div class="bg-light pl-5 pr-4 pt-5">
|
<div class="bg-light pl-5 pr-4 pt-5">
|
||||||
<div class="d-flex">
|
<div class="d-flex">
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
{% extends '@Core/admin/layout.html.twig' %}
|
{% extends '@Core/admin/layout.html.twig' %}
|
||||||
|
|
||||||
|
{% block title %}{{ 'Articles'|trans }} - {{ parent() }}{% endblock %}
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<div class="bg-light pl-5 pr-4 pt-5 pb-5">
|
<div class="bg-light pl-5 pr-4 pt-5 pb-5">
|
||||||
<div class="d-flex">
|
<div class="d-flex">
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
{% extends '@Core/admin/layout.html.twig' %}
|
{% extends '@Core/admin/layout.html.twig' %}
|
||||||
|
|
||||||
|
{% block title %}{{ 'Articles'|trans }} - {{ parent() }}{% endblock %}
|
||||||
|
|
||||||
{% block body %}
|
{% block body %}
|
||||||
<div class="bg-light pl-5 pr-4 pt-5 pb-5">
|
<div class="bg-light pl-5 pr-4 pt-5 pb-5">
|
||||||
<div class="d-flex">
|
<div class="d-flex">
|
||||||
|
|
|
@ -61,7 +61,10 @@ Encore
|
||||||
from: './assets/fonts',
|
from: './assets/fonts',
|
||||||
to: 'fonts/[path][name].[hash:8].[ext]'
|
to: 'fonts/[path][name].[hash:8].[ext]'
|
||||||
})
|
})
|
||||||
|
.copyFiles({
|
||||||
|
from: './assets/webapp',
|
||||||
|
to: 'webapp/[path][name].[hash:8].[ext]'
|
||||||
|
})
|
||||||
// enables Sass/SCSS support
|
// enables Sass/SCSS support
|
||||||
.enableSassLoader()
|
.enableSassLoader()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue