Merge pull request #199 from symfony-cmf/elfinder

use ckeditor and elfinder

Author: lsmith77

app/AppKernel.php

@@ -33,6 +33,7 @@ public function registerBundles()
             new Liip\SearchBundle\LiipSearchBundle(),
             new Symfony\Cmf\Bundle\SearchBundle\CmfSearchBundle(),
             new Symfony\Cmf\Bundle\MediaBundle\CmfMediaBundle(),
+            new FM\ElfinderBundle\FMElfinderBundle(),
 
             // language switcher
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),

app/config/config.yml

@@ -121,8 +121,7 @@ cmf_simple_cms:
             Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page:  CmfSimpleCmsBundle:Page:index.html.twig
 
 cmf_create:
-    map:
-        'http://rdfs.org/sioc/ns#Post': 'Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent'
+    editor_base_path: /bundles/cmfcreate/vendor/ckeditor/
 
 sonata_block:
     default_contexts: [cms]
@@ -259,12 +258,12 @@ liip_search:
     restrict_by_language: true;
 
 cmf_search:
-    translation_strategy: child
-#    translation_strategy: attribute
-#    search_path: /cms/simple
-    search_fields:
-        title: title
-        summary: body
+    persistence:
+        phpcr:
+            translation_strategy: child
+            search_fields:
+                title: title
+                summary: body
 
 lunetics_locale:
     strict_mode: true
@@ -274,14 +273,6 @@ lunetics_locale:
         - browser
     allowed_locales: %locales%
 
-# jackalope doctrine caching
-#liip_doctrine_cache:
-#    namespaces:
-#        meta:
-#            type: file_system
-#        nodes:
-#            type: file_system
-
 # The LiipImagineBundle can be used if you want to convert on demand an image
 # to a specific format. (ie a controller render the file)
 # more information can be found here : https://github.com/liip/LiipImagineBundle
@@ -298,3 +289,31 @@ liip_imagine:
             quality: 85
             filters:
                 thumbnail: { size: [50, 50], mode: outbound }
+
+cmf_media:
+    upload_file_role:        ROLE_CAN_UPLOAD_FILE
+    use_jms_serializer:      auto
+    use_elfinder:            auto
+    use_imagine:             auto
+    imagine_filter:
+        upload_thumbnail:   ~ # default: image_upload_thumbnail
+        elfinder_thumbnail: ~ # default: elfinder_thumbnail
+
+fm_elfinder:
+    locale: %locale%
+    editor: ckeditor
+    connector:
+        roots:
+            media:
+                driver: cmf_media.adapter.elfinder.phpcr_driver
+                path: %cmf_media.persistence.phpcr.media_basepath%
+                upload_allow: ['all']
+                upload_max_size: 2M
+
+# jackalope doctrine caching
+#liip_doctrine_cache:
+#    namespaces:
+#        meta:
+#            type: file_system
+#        nodes:
+#            type: file_system

app/config/routing.yml

@@ -63,7 +63,7 @@ create_image:
     resource: "@CmfCreateBundle/Resources/config/routing/image.xml"
 
 liip_search:
-    resource: "@CmfSearchBundle/Resources/config/routing.xml"
+    resource: "@CmfSearchBundle/Resources/config/routing/phpcr/search.xml"
 
 block_cache:
     resource: "@CmfBlockBundle/Resources/config/routing/cache.xml"
@@ -75,6 +75,5 @@ cmf_media_file:
 cmf_media_image:
     resource: "@CmfMediaBundle/Resources/config/routing/image.xml"
 
-tree:
-    resource: "@SonataDoctrinePHPCRAdminBundle/Resources/config/routing/phpcrodmbrowser.xml"
-    prefix: /phpcrodmbrowser
+elfinder:
+     resource: "@FMElfinderBundle/Resources/config/routing.yml"

app/config/security.yml

@@ -27,3 +27,5 @@ security:
     access_control:
         - { path: ^(/(de|fr|en))?/admin, roles: ROLE_ADMIN }
         #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/efconnect, role: ROLE_USER }
+        - { path: ^/elfinder, role: ROLE_USER }

app/tests/AdminTest.php

@@ -42,7 +42,7 @@ public function testEdit()
 
         $response = $client->getResponse();
         $this->assertEquals(200, $response->getStatusCode());
-        $this->assertContains('Edit "External Link"', $response->getContent());
+        $this->assertContains('Edit "external-item"', $response->getContent());
 
         $this->assertCount(11, $crawler->filter('.control-group'));
         $this->assertContains('Parent', $crawler->filter('.control-group')->first()->children()->first()->text());

composer.json

@@ -19,23 +19,24 @@
         "sensio/distribution-bundle": "2.3.*",
         "sensio/framework-extra-bundle": "2.3.*",
         "sensio/generator-bundle": "2.3.*",
-        "symfony-cmf/symfony-cmf": "1.0.0-beta6",
-        "symfony-cmf/simple-cms-bundle": "1.0.0-RC2",
-        "symfony-cmf/search-bundle": "1.0.0-beta2",
-        "symfony-cmf/create-bundle": "1.0.0-beta4",
+        "symfony-cmf/symfony-cmf": "1.0.0-RC1",
+        "symfony-cmf/simple-cms-bundle": "1.0.0-RC3",
+        "symfony-cmf/search-bundle": "1.0.0-RC1",
+        "symfony-cmf/create-bundle": "1.0.0-RC1",
         "symfony-cmf/routing-auto-bundle": "1.0.0-alpha4",
-        "symfony-cmf/blog-bundle": "1.0.0-beta4",
-        "jackalope/jackalope-doctrine-dbal": "1.0.0-beta3",
+        "symfony-cmf/blog-bundle": "1.0.0-beta5",
+        "jackalope/jackalope-doctrine-dbal": "1.0.0-beta4",
         "jackalope/jackalope-jackrabbit": "1.0.0-beta4",
         "doctrine/doctrine-bundle": "1.2.*",
         "doctrine/data-fixtures": "1.0.*",
         "sonata-project/cache-bundle": "2.1.*",
-        "sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-beta4",
+        "sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-beta5",
         "eko/feedbundle": "1.0.*",
         "lunetics/locale-bundle": "2.2.*",
         "liip/functional-test-bundle": "1.0.*",
         "liip/imagine-bundle": "~0.12",
-        "wjzijderveld/check-bundles": "dev-master"
+        "wjzijderveld/check-bundles": "1.0.*",
+        "helios-ag/fm-elfinder-bundle": "1.x"
     },
     "require-dev": {
         "symfony-cmf/testing": "1.0.*"
@@ -46,14 +47,14 @@
     "scripts": {
         "post-install-cmd": [
             "WillemJan\\CheckBundles\\Composer\\CheckBundles::postPackageUpdate",
-            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreate",
+            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreateAndCkeditor",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets"
         ],
         "post-update-cmd": [
             "WillemJan\\CheckBundles\\Composer\\CheckBundles::postPackageUpdate",
-            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreate",
+            "Symfony\\Cmf\\Bundle\\CreateBundle\\Composer\\ScriptHandler::downloadCreateAndCkeditor",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets"