Fixed Wysiwyg browser

Author: jmsche

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 5.4
+  - 5.5
 
 before_script:
   - curl -s http://getcomposer.org/installer | php

Controller/WysiwygController.php

@@ -7,6 +7,10 @@
 use Leapt\CoreBundle\Datalist\Datalist;
 use Leapt\CoreBundle\Datalist\DatalistFactory;
 use Leapt\CoreBundle\Datalist\Datasource\DoctrineORMDatasource;
+use Leapt\CoreBundle\Datalist\Field\Type\ImageFieldType;
+use Leapt\CoreBundle\Datalist\Field\Type\TextFieldType;
+use Leapt\CoreBundle\Datalist\Filter\Type\SearchFilterType;
+use Leapt\CoreBundle\Datalist\Type\DatalistType;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -29,29 +33,32 @@ public function browserAction(Request $request)
 
         /** @var $datalistBuilder \Leapt\CoreBundle\Datalist\DatalistBuilder */
         $datalistBuilder = $this->get(DatalistFactory::class)
-            ->createBuilder('datalist', [
-                'translation_domain' => 'admin',
-                'data_class'         => 'Leapt\AdminBundle\Entity\File'
+            ->createBuilder(DatalistType::class, [
+                'translation_domain' => 'LeaptAdminBundle',
+                'data_class'         => File::class,
             ]);
 
         /** @var $datalist Datalist */
         $datalist = $datalistBuilder
-            ->addField('path', 'image')
-            ->addField('name', 'text')
-            ->addField('tags', 'text')
-            ->addFilter('name', 'search', ['search_fields' => ['f.name', 'f.tags'], 'label' => 'search'])
+            ->addField('path', ImageFieldType::class, ['label' => 'wysiwyg.browse.image'])
+            ->addField('name', TextFieldType::class)
+            ->addField('tags', TextFieldType::class)
+            ->addFilter('name', SearchFilterType::class, [
+                'search_fields' => ['f.name', 'f.tags'],
+                'label'         => 'wysiwyg.browse.search',
+            ])
             ->getDatalist();
 
         /** @var $em \Doctrine\ORM\EntityManager */
         $em = $this->getDoctrine()->getManager();
         $queryBuilder = $em->createQueryBuilder();
-        $queryBuilder->select('f')->from('LeaptAdminBundle:File', 'f');
+        $queryBuilder->select('f')->from(File::class, 'f');
 
         $datasource = new DoctrineORMDatasource($queryBuilder);
         $datalist->setDatasource($datasource);
         $datalist->bind($request);
 
-        if ('POST' === $request->getMethod()) {
+        if ($request->isMethod('POST')) {
             // Manage upload post
             if ($request->get('admin_leapt_file') !== null) {
                 $uploadForm->handleRequest($request);
@@ -64,7 +71,7 @@ public function browserAction(Request $request)
             }
         }
 
-        return $this->render('LeaptAdminBundle:Wysiwyg:browser.html.twig', array_merge(
+        return $this->render('@LeaptAdmin/Wysiwyg/browser.html.twig', array_merge(
             ['uploadForm' => $uploadForm->createView(), 'datalist' => $datalist, 'arguments' => $arguments],
             $extraParameters
         ));

DependencyInjection/Compiler/ImCompilerPass.php

@@ -2,22 +2,24 @@
 
 namespace Leapt\AdminBundle\DependencyInjection\Compiler;
 
+use Leapt\ImBundle\Manager as LeaptImManager;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class ImCompilerPass implements CompilerPassInterface {
+class ImCompilerPass implements CompilerPassInterface
+{
     /**
      * Add admin thumb formats to LeaptImBundle if applicable
      *
      * @param ContainerBuilder $container
      */
     public function process(ContainerBuilder $container)
     {
-        if ($container->hasDefinition('leapt_im.manager')) {
+        if ($container->hasDefinition(LeaptImManager::class)) {
             $imFormats = $container->getParameter('leapt_admin.im_formats');
             foreach ($imFormats as $name => $config) {
-                $container->getDefinition('leapt_im.manager')->addMethodCall('addFormat', [$name, $config]);
+                $container->getDefinition(LeaptImManager::class)->addMethodCall('addFormat', [$name, $config]);
             }
         }
     }
-}
+}

Form/Type/FileType.php

@@ -2,6 +2,7 @@
 
 namespace Leapt\AdminBundle\Form\Type;
 
+use Leapt\AdminBundle\Entity\File;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -32,8 +33,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('file', \Symfony\Component\Form\Extension\Core\Type\FileType::class)
-            ->add('name', TextType::class)
-            ->add('tags', TextType::class)
+            ->add('name', TextType::class, [
+                'attr' => ['placeholder' => 'wysiwyg.upload.placeholder.name'],
+            ])
+            ->add('tags', TextType::class, [
+                'attr' => ['placeholder' => 'wysiwyg.upload.placeholder.tags'],
+            ])
         ;
     }
 
@@ -43,7 +48,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => 'Leapt\AdminBundle\Entity\File'
+            'data_class' => File::class,
+            'translation_domain' => 'LeaptAdminBundle',
         ]);
     }
-}
+}

Resources/translations/LeaptAdminBundle.en.yml

@@ -63,6 +63,8 @@ wysiwyg:
     browse:
         title: Browse images
         empty: No image yet
+        image: Image
+        search: Search
     upload:
         title: Upload
         placeholder:

Resources/translations/LeaptAdminBundle.fr.yml

@@ -63,6 +63,8 @@ wysiwyg:
     browse:
         title: Parcourir les images
         empty: Pas encore d'image
+        image: Image
+        search: Rechercher
     upload:
         title: Upload
         placeholder:

Resources/views/Wysiwyg/upload.html.twig

@@ -4,13 +4,17 @@
     {{ form_start(form, { 'attr': {
         'method': 'POST',
         'action': path('leapt_admin_wysiwyg_browser', arguments),
-        'class': 'well form-inline',
+        'class': 'well',
         'novalidate': 'novalidate'
     } }) }}
-        {{ form_widget(form.name, { 'attr': { 'placeholder': 'wysiwyg.upload.placeholder.name'|trans({}, 'LeaptAdminBundle') } }) }}
-        {{ form_widget(form.tags, { 'attr': { 'placeholder': 'wysiwyg.upload.placeholder.tags'|trans({}, 'LeaptAdminBundle') } }) }}
-        {{ form_widget(form.file) }}
-        <button type="submit" class="btn">{{ 'wysiwyg.upload.submit'|trans({}, 'LeaptAdminBundle') }}</button>
+        <div class="row">
+            <div class="col-xs-6 col-md-3">{{ form_widget(form.name, { 'attr': { 'class': 'form-control' } }) }}</div>
+            <div class="col-xs-6 col-md-3">{{ form_widget(form.tags, { 'attr': { 'class': 'form-control' } }) }}</div>
+            <div class="col-md-6">
+                {{ form_widget(form.file, { 'attr': { 'style': 'display: inline;' } }) }}
+                <button type="submit" class="btn btn-primary">{{ 'wysiwyg.upload.submit'|trans({}, 'LeaptAdminBundle') }}</button>
+            </div>
+        </div>
         {{ form_rest(form) }}
     {{ form_end(form) }}
 {% endif %}

composer.json

@@ -25,7 +25,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.4",
+        "php": ">=5.5",
         "symfony/framework-bundle": ">=2.7",
         "leapt/core-bundle": "^2.0",
         "leapt/bootstrap-bundle": "~2.0.0-alpha",