Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 8cd4695

Browse files
wouterjwouterj
committed
Remove ImagineBlockAdmin as CmfMediaBundle is abandoned
1 parent 62ea7c1 commit 8cd4695

18 files changed

+30
-373
lines changed

‎src/Admin/Block/Imagine/ImagineBlockAdmin.php

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎src/Admin/Block/Imagine/SlideshowBlockAdmin.php renamed to ‎src/Admin/Block/SlideshowBlockAdmin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Block\Imagine;
12+
namespace Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Block;
1313

1414
use Sonata\AdminBundle\Form\FormMapper;
1515
use Sonata\AdminBundle\Datagrid\ListMapper;

‎src/DependencyInjection/Factory/BlockAdminFactory.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ public function addConfiguration(NodeBuilder $builder)
4848
->end()
4949
->scalarNode('basepath')->defaultNull()->end()
5050
->scalarNode('menu_basepath')->defaultNull()->end()
51-
->enumNode('use_imagine')
52-
->values([true, false, 'auto'])
53-
->defaultValue('auto')
54-
->end()
5551
->enumNode('enable_menu')
5652
->values([true, false, 'auto'])
5753
->defaultValue('auto')
@@ -73,11 +69,6 @@ public function create(array $config, ContainerBuilder $container, XmlFileLoader
7369
$loader->load('block.xml');
7470

7571
$bundles = $container->getParameter('kernel.bundles');
76-
if (true === $config['use_imagine']
77-
|| ('auto' === $config['use_imagine'] && isset($bundles['CmfMediaBundle']))
78-
) {
79-
$loader->load('block-imagine.xml');
80-
}
8172

8273
if (true === $config['enable_menu']
8374
|| ('auto' === $config['enable_menu'] && isset($bundles['CmfMenuBundle']))

‎src/Resources/config/block-imagine.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/Resources/config/block.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,33 @@
134134
</call>
135135
</service>
136136

137+
<service
138+
id="cmf_sonata_phpcr_admin_integration.block.slideshow_admin"
139+
class="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Block\SlideshowBlockAdmin"
140+
parent="cmf_sonata_phpcr_admin_integration.abstract_admin">
141+
<tag
142+
name="sonata.admin"
143+
manager_type="doctrine_phpcr"
144+
group="dashboard.cmf"
145+
label_catalogue="CmfBlockBundle"
146+
label="dashboard.label_slideshow_block"
147+
label_translator_strategy="sonata.admin.label.strategy.underscore" />
148+
<argument/>
149+
<argument>Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock</argument>
150+
<argument>SonataAdminBundle:CRUD</argument>
151+
152+
<call method="setRouteBuilder">
153+
<argument type="service" id="sonata.admin.route.path_info_slashes" />
154+
</call>
155+
156+
<call method="setEmbeddedSlidesAdmin">
157+
<argument>cmf_block.imagine.imagine_admin</argument>
158+
</call>
159+
160+
<call method="setRootPath">
161+
<argument>%cmf_sonata_phpcr_admin_integration.block.persistence.basepath%</argument>
162+
</call>
163+
</service>
164+
137165
</services>
138166
</container>

‎src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.cs.xliff

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@
7979
<source>dashboard.label_slideshow_block</source>
8080
<target>Slideshow blok</target>
8181
</trans-unit>
82-
<trans-unit id="dashboard.label_imagine_block">
83-
<source>dashboard.label_imagine_block</source>
84-
<target>Obrázkový blok</target>
85-
</trans-unit>
8682
<trans-unit id="dashboard.label_string_block">
8783
<source>dashboard.label_string_block</source>
8884
<target>Textový blok</target>
@@ -211,22 +207,6 @@
211207
<source>breadcrumb.link_string_block_delete</source>
212208
<target>Vymazat</target>
213209
</trans-unit>
214-
<trans-unit id="breadcrumb.link_imagine_block_list">
215-
<source>breadcrumb.link_imagine_block_list</source>
216-
<target>Obrázkové bloky</target>
217-
</trans-unit>
218-
<trans-unit id="breadcrumb.link_imagine_block_create">
219-
<source>breadcrumb.link_imagine_block_create</source>
220-
<target>Vytvořit</target>
221-
</trans-unit>
222-
<trans-unit id="breadcrumb.link_imagineblock_edit">
223-
<source>breadcrumb.link_imagine_block_edit</source>
224-
<target>Upravit</target>
225-
</trans-unit>
226-
<trans-unit id="breadcrumb.link_imagine_block_delete">
227-
<source>breadcrumb.link_imagine_block_delete</source>
228-
<target>Vymazat</target>
229-
</trans-unit>
230210

231211

232212
<!-- $Content -->

‎src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.de.xliff

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@
117117
<source>breadcrumb.link_slideshow_block_list</source>
118118
<target>Slideshow Blöcke</target>
119119
</trans-unit>
120-
<trans-unit id="dashboard.label_imagine_block">
121-
<source>dashboard.label_imagine_block</source>
122-
<target>Image Blöcke</target>
123-
</trans-unit>
124120
<trans-unit id="breadcrumb.link_slideshow_block_create">
125121
<source>breadcrumb.link_slideshow_block_create</source>
126122
<target>Erstellen</target>
@@ -229,22 +225,6 @@
229225
<source>breadcrumb.link_menu_block_delete</source>
230226
<target>Löschen</target>
231227
</trans-unit>
232-
<trans-unit id="breadcrumb.link_imagine_block_list">
233-
<source>breadcrumb.link_imagine_block_list</source>
234-
<target>Imageblöcke</target>
235-
</trans-unit>
236-
<trans-unit id="breadcrumb.link_imagine_block_create">
237-
<source>breadcrumb.link_imagine_block_create</source>
238-
<target>Erstellen</target>
239-
</trans-unit>
240-
<trans-unit id="breadcrumb.link_imagineblock_edit">
241-
<source>breadcrumb.link_imagine_block_edit</source>
242-
<target>Bearbeiten</target>
243-
</trans-unit>
244-
<trans-unit id="breadcrumb.link_imagine_block_delete">
245-
<source>breadcrumb.link_imagine_block_delete</source>
246-
<target>Löschen</target>
247-
</trans-unit>
248228

249229

250230
<!-- $Content -->

‎src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.en.xliff

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
<source>dashboard.label_slideshow_block</source>
7979
<target>Slideshow block</target>
8080
</trans-unit>
81-
<trans-unit id="dashboard.label_imagine_block">
82-
<source>dashboard.label_imagine_block</source>
83-
<target>Image block</target>
84-
</trans-unit>
8581
<trans-unit id="dashboard.label_string_block">
8682
<source>dashboard.label_string_block</source>
8783
<target>String block</target>
@@ -229,22 +225,6 @@
229225
<source>breadcrumb.link_menu_block_delete</source>
230226
<target>Delete</target>
231227
</trans-unit>
232-
<trans-unit id="breadcrumb.link_imagine_block_list">
233-
<source>breadcrumb.link_imagine_block_list</source>
234-
<target>Image blocks</target>
235-
</trans-unit>
236-
<trans-unit id="breadcrumb.link_imagine_block_create">
237-
<source>breadcrumb.link_imagine_block_create</source>
238-
<target>Create</target>
239-
</trans-unit>
240-
<trans-unit id="breadcrumb.link_imagineblock_edit">
241-
<source>breadcrumb.link_imagine_block_edit</source>
242-
<target>Edit</target>
243-
</trans-unit>
244-
<trans-unit id="breadcrumb.link_imagine_block_delete">
245-
<source>breadcrumb.link_imagine_block_delete</source>
246-
<target>Delete</target>
247-
</trans-unit>
248228

249229

250230
<!-- $Content -->

‎src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.es.xliff

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
<source>dashboard.label_slideshow_block</source>
7979
<target>Bloque de presentación de diapositivas</target>
8080
</trans-unit>
81-
<trans-unit id="dashboard.label_imagine_block">
82-
<source>dashboard.label_imagine_block</source>
83-
<target>Bloque de imagen</target>
84-
</trans-unit>
8581
<trans-unit id="dashboard.label_string_block">
8682
<source>dashboard.label_string_block</source>
8783
<target>Bloque de texto</target>
@@ -229,22 +225,6 @@
229225
<source>breadcrumb.link_menu_block_delete</source>
230226
<target>Eliminar</target>
231227
</trans-unit>
232-
<trans-unit id="breadcrumb.link_imagine_block_list">
233-
<source>breadcrumb.link_imagine_block_list</source>
234-
<target>Bloques de imagen</target>
235-
</trans-unit>
236-
<trans-unit id="breadcrumb.link_imagine_block_create">
237-
<source>breadcrumb.link_imagine_block_create</source>
238-
<target>Crear</target>
239-
</trans-unit>
240-
<trans-unit id="breadcrumb.link_imagineblock_edit">
241-
<source>breadcrumb.link_imagine_block_edit</source>
242-
<target>Editar</target>
243-
</trans-unit>
244-
<trans-unit id="breadcrumb.link_imagine_block_delete">
245-
<source>breadcrumb.link_imagine_block_delete</source>
246-
<target>Eliminar</target>
247-
</trans-unit>
248228

249229

250230
<!-- $Content -->

‎src/Resources/translations/CmfSonataPhpcrAdminIntegrationBundle.fr.xliff

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@
8282
<source>dashboard.label_slideshow_block</source>
8383
<target>Bloc slideshow</target>
8484
</trans-unit>
85-
<trans-unit id="dashboard.label_imagine_block">
86-
<source>dashboard.label_imagine_block</source>
87-
<target>Bloc image</target>
88-
</trans-unit>
8985
<trans-unit id="dashboard.label_string_block">
9086
<source>dashboard.label_string_block</source>
9187
<target>Bloc texte</target>
@@ -229,22 +225,6 @@
229225
<source>breadcrumb.link_string_block_delete</source>
230226
<target>Supprimer</target>
231227
</trans-unit>
232-
<trans-unit id="breadcrumb.link_imagine_block_list">
233-
<source>breadcrumb.link_imagine_block_list</source>
234-
<target>Blocs image</target>
235-
</trans-unit>
236-
<trans-unit id="breadcrumb.link_imagine_block_create">
237-
<source>breadcrumb.link_imagine_block_create</source>
238-
<target>Créer</target>
239-
</trans-unit>
240-
<trans-unit id="breadcrumb.link_imagineblock_edit">
241-
<source>breadcrumb.link_imagine_block_edit</source>
242-
<target>Éditer</target>
243-
</trans-unit>
244-
<trans-unit id="breadcrumb.link_imagine_block_delete">
245-
<source>breadcrumb.link_imagine_block_delete</source>
246-
<target>Supprimer</target>
247-
</trans-unit>
248228

249229

250230
<!-- $Content -->

0 commit comments

Comments
 (0)