From 3fbb54d133fe015e747c03aeff01e45d705e0a88 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Thu, 13 May 2021 17:33:09 +0200
Subject: [PATCH] backports murph-skeleton

---
 assets/css/admin.scss                           | 5 +++++
 package.json                                    | 1 +
 src/Controller/Blog/CategoryAdminController.php | 5 ++---
 src/Controller/Blog/CommentAdminController.php  | 4 ++--
 src/Controller/Blog/PostAdminController.php     | 5 ++---
 yarn.lock                                       | 5 +++++
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/assets/css/admin.scss b/assets/css/admin.scss
index 53a6e99..41dad08 100644
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@@ -14,6 +14,7 @@ $pagination-active-bg: #343a40;
 @import "~choices.js/src/styles/choices.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 @import "~@fortawesome/fontawesome-free/css/all.css";
+@import "~flag-icon-css/sass/flag-icon.scss";
 
 @for $i from 1 through 100 {
     .miw-#{$i*5} {
@@ -21,6 +22,10 @@ $pagination-active-bg: #343a40;
     }
 }
 
+.flag-icon-en {
+    background-image: url(~flag-icon-css/flags/4x3/gb.svg);
+}
+
 body {
     overflow-x: hidden;
 }
diff --git a/package.json b/package.json
index 025df6c..54fd29f 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
         "@fortawesome/fontawesome-free": "^5.11.2",
         "bootstrap": "^4.3.1",
         "choices.js": "^9.0.1",
+        "flag-icon-css": "^3.5.0",
         "flatpickr": "^4.6.9",
         "jquery": "^3.6.0",
         "lozad": "^1.16.0",
diff --git a/src/Controller/Blog/CategoryAdminController.php b/src/Controller/Blog/CategoryAdminController.php
index f3fc00f..dea62dc 100644
--- a/src/Controller/Blog/CategoryAdminController.php
+++ b/src/Controller/Blog/CategoryAdminController.php
@@ -43,8 +43,7 @@ class CategoryAdminController extends CrudController
 
             ->setMaxPerPage('index', 100)
 
-            ->setView('newForm', 'blog/category_admin/_form.html.twig')
-            ->setView('editForm', 'blog/category_admin/_form.html.twig')
+            ->setView('form', 'blog/category_admin/_form.html.twig')
 
             ->setField('index', 'Titre', TextField::class, [
                 'property' => 'title',
@@ -99,7 +98,7 @@ class CategoryAdminController extends CrudController
             ->paginate(1, 10)
         ;
 
-        $this->getConfiguration()->setView('showEntity', 'blog/category_admin/_show.html.twig');
+        $this->getConfiguration()->setView('show_entity', 'blog/category_admin/_show.html.twig');
         $this->getConfiguration()->addViewData('show', 'posts', $posts);
 
         return $this->doShow($entity);
diff --git a/src/Controller/Blog/CommentAdminController.php b/src/Controller/Blog/CommentAdminController.php
index e0f8a80..17d321a 100644
--- a/src/Controller/Blog/CommentAdminController.php
+++ b/src/Controller/Blog/CommentAdminController.php
@@ -41,8 +41,8 @@ class CommentAdminController extends CrudController
 
             ->setAction('index', 'new', false)
 
-            ->setView('showEntity', 'blog/comment_admin/_show.html.twig')
-            ->setView('editForm', 'blog/comment_admin/_form.html.twig')
+            ->setView('show_entity', 'blog/comment_admin/_show.html.twig')
+            ->setView('form', 'blog/comment_admin/_form.html.twig')
 
             ->setField('index', 'Auteur', TextField::class, [
                 'view' => 'blog/comment_admin/field/author.html.twig',
diff --git a/src/Controller/Blog/PostAdminController.php b/src/Controller/Blog/PostAdminController.php
index d9f2ba2..859e7a7 100644
--- a/src/Controller/Blog/PostAdminController.php
+++ b/src/Controller/Blog/PostAdminController.php
@@ -44,9 +44,8 @@ class PostAdminController extends CrudController
             ->setForm('edit', PostType::class, [])
             ->setForm('filter', PostFilterType::class, [])
 
-            ->setView('showEntity', 'blog/post_admin/_show.html.twig')
-            ->setView('editForm', 'blog/post_admin/_form.html.twig')
-            ->setView('newForm', 'blog/post_admin/_form.html.twig')
+            ->setView('show_entity', 'blog/post_admin/_show.html.twig')
+            ->setView('form', 'blog/post_admin/_form.html.twig')
 
             ->setField('index', 'Titre', TextField::class, [
                 'view' => 'blog/post_admin/field/title.html.twig',
diff --git a/yarn.lock b/yarn.lock
index 299d79c..f19d0b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2773,6 +2773,11 @@ find-up@^4.0.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+flag-icon-css@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/flag-icon-css/-/flag-icon-css-3.5.0.tgz#430747d5cb91e60babf85494de99173c16dc7cf2"
+  integrity sha512-pgJnJLrtb0tcDgU1fzGaQXmR8h++nXvILJ+r5SmOXaaL/2pocunQo2a8TAXhjQnBpRLPtZ1KCz/TYpqeNuE2ew==
+
 flatpickr@^4.6.9:
   version "4.6.9"
   resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499"