From cbced8ecf308c8246d3f10ddd226b7577385c966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jib=C3=A9=20Barth?= <barth.jib@gmail.com>
Date: Sun, 16 Dec 2018 18:06:51 +0100
Subject: [PATCH 1/2] Display form and list extending sonata standard layout

---
 src/Controller/DefaultController.php                   | 2 ++
 src/DependencyInjection/BarthSimpleConfigExtension.php | 4 +++-
 src/DependencyInjection/Configuration.php              | 3 +++
 src/Resources/views/sonata_base.html.twig              | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/Resources/views/sonata_base.html.twig

diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php
index 721a9c5..335c5af 100644
--- a/src/Controller/DefaultController.php
+++ b/src/Controller/DefaultController.php
@@ -129,6 +129,8 @@ protected function getParentTemplate()
         switch ($this->defaultAdminBundle) {
             case 'easy_admin':
                 return '@EasyAdmin/default/layout.html.twig';
+            case 'sonata_admin':
+                return '@BarthSimpleConfig/sonata_base.html.twig';
             default:
                 return '@BarthSimpleConfig/base.html.twig';
         }
diff --git a/src/DependencyInjection/BarthSimpleConfigExtension.php b/src/DependencyInjection/BarthSimpleConfigExtension.php
index da769df..bb409e0 100644
--- a/src/DependencyInjection/BarthSimpleConfigExtension.php
+++ b/src/DependencyInjection/BarthSimpleConfigExtension.php
@@ -36,9 +36,11 @@ public function load(array $configs, ContainerBuilder $container)
         if (isset($bundles['EasyAdminBundle']) && $config['enable_easyadmin_integration'] === true) {
             $container->getDefinition(DefaultController::class)->setArgument('$defaultAdminBundle', 'easy_admin');
         }
+        if (isset($bundles['SonataAdminBundle']) && $config['enable_sonata_integration'] === true) {
+            $container->getDefinition(DefaultController::class)->setArgument('$defaultAdminBundle', 'sonata_admin');
+        }
 
         if (true === $config['enable_blacklist']) {
-            $this->blacklistedBundles = $config['blacklisted_bundles'];
             $container
                 ->getDefinition(ExtensionLocatorService::class)
                 ->setArgument(1, $config['blacklisted_bundles']);
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index c144f9d..9b3bfab 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -30,6 +30,9 @@ public function getConfigTreeBuilder()
                 ->booleanNode('enable_easyadmin_integration')
                     ->defaultValue(true)
                 ->end()
+                ->booleanNode('enable_sonata_integration')
+                    ->defaultValue(true)
+                ->end()
                 ->variableNode('blacklisted_bundles')
                     ->defaultValue($this->getDefaultBlacklistBundle())
                     ->cannotBeOverwritten()
diff --git a/src/Resources/views/sonata_base.html.twig b/src/Resources/views/sonata_base.html.twig
new file mode 100644
index 0000000..c4812b6
--- /dev/null
+++ b/src/Resources/views/sonata_base.html.twig
@@ -0,0 +1,5 @@
+{% extends '@SonataAdmin/standard_layout.html.twig' %}
+
+{% block sonata_page_content %}
+    {% block main %}{% endblock %}
+{% endblock %}

From a84377ecad6c9f06d3747b7cd25d0c011c8115a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jib=C3=A9=20Barth?= <barth.jib@gmail.com>
Date: Sun, 16 Dec 2018 18:34:42 +0100
Subject: [PATCH 2/2] Use sonata form to render config_form

---
 src/Resources/views/form.html.twig        |  4 ++--
 src/Resources/views/list.html.twig        |  2 +-
 src/Resources/views/sonata_base.html.twig | 23 ++++++++++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/Resources/views/form.html.twig b/src/Resources/views/form.html.twig
index ff9b3bb..374bd89 100644
--- a/src/Resources/views/form.html.twig
+++ b/src/Resources/views/form.html.twig
@@ -12,8 +12,8 @@
         {% endfor %}
     </div>
     <section class="content-footer">
-        <div class="form-actions">
-            {{ form_row(config_form.save, {attr:{class:'btn-primary'}}) }}
+        <div class="form-actions sonata-ba-form-actions well well-small ">
+            {{ form_row(config_form.save, {attr:{class:'btn btn-primary'}}) }}
         </div>
         {{ form_end(config_form) }}
     </section>
diff --git a/src/Resources/views/list.html.twig b/src/Resources/views/list.html.twig
index 6f4e8bb..67e05f5 100644
--- a/src/Resources/views/list.html.twig
+++ b/src/Resources/views/list.html.twig
@@ -4,7 +4,7 @@
 {% block main %}
     <main class="col-xs-12 col-12 row m-2">
         {% for bundle in bundles %}
-            <div class="col-xs-3 col-3 border text-center m-2 p-2">
+            <div class="col-xs-3 col-3 border text-center m-2 p-2 box-body">
                 <span class="h5 text-capitalize clearfix">{{ bundle | snakeToCamel}}</span>
                 <a href="{{ path('barth_simpleconfig_edit', {'package' : bundle}) }}" class="btn btn-primary btn-xs mt-3 mb-2" >
                     Edit configuration
diff --git a/src/Resources/views/sonata_base.html.twig b/src/Resources/views/sonata_base.html.twig
index c4812b6..90672c7 100644
--- a/src/Resources/views/sonata_base.html.twig
+++ b/src/Resources/views/sonata_base.html.twig
@@ -1,5 +1,22 @@
 {% extends '@SonataAdmin/standard_layout.html.twig' %}
-
-{% block sonata_page_content %}
-    {% block main %}{% endblock %}
+{% block sonata_admin_content %}
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box box-primary">
+                <div class="box-header with-border">
+                    <h3 class="box-title">
+                        <i class="fa fa-cogs"></i> {% block content_title %}{% endblock %}
+                    </h3>
+                </div>
+                <div class="box-body">
+                    <div class="list-group">
+                        {% if config_form is defined %}
+                            {% form_theme config_form '@SonataAdmin/Form/form_admin_fields.html.twig'%}
+                        {% endif %}
+                        {% block main %}{% endblock %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 {% endblock %}