Merge pull request #317 from symfony-cmf/remove_createjs

dbu · dbu · commit d61c5d037882 · 2016-02-08T09:20:08.000+01:00
Temporary remove CmfCreateBundle from the sandbox
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -48,8 +48,7 @@ public function registerBundles()
             // language switcher
             new Lunetics\LocaleBundle\LuneticsLocaleBundle(),
 
-            // create.js editing related
-            new Symfony\Cmf\Bundle\CreateBundle\CmfCreateBundle(),
+            // API
             new FOS\RestBundle\FOSRestBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle(),
 
diff --git a/app/Resources/CmfSimpleCmsBundle/views/Page/index.html.twig b/app/Resources/CmfSimpleCmsBundle/views/Page/index.html.twig
@@ -7,7 +7,6 @@
         <a class="docref" href="http://symfony.com/doc/current/cmf/bundles/simple_cms/introduction.html"><i class="glyphicon glyphicon-chevron-right"></i>Read about this feature in the CMF documentation.</a>
     </div>
 
-    {% createphp cmfMainContent as="rdf" %}
-        {{ rdf|raw }}
-    {% endcreatephp %}
+    <h1>{{ cmfMainContent.title }}</h1>
+    {{ cmfMainContent.body|raw }}
 {% endblock %}
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -12,10 +12,6 @@
         {% block includes %}
             <link rel="stylesheet" href="{{ asset("assets/vendor/bootstrap.min.css") }}">
             <link rel="stylesheet" href="{{ asset("assets/css/style.css") }}">
-
-            {% if is_granted("IS_AUTHENTICATED_ANONYMOUSLY") %}
-                {% include "CmfCreateBundle::includecssfiles.html.twig" %}
-            {% endif %}
         {% endblock %}
 
         {% block top_scripts %}
@@ -124,10 +120,7 @@
         </div>
 
         {% block bottom_scripts %}
-            <script type="text/javascript" src="{{ asset("assets/vendor/jquery.min.js") }}"></script>
-
-            {% render(controller("cmf_create.jsloader.controller:includeJSFilesAction")) %}
-
+            <script src="{{ asset("assets/vendor/jquery.min.js") }}"></script>
             <script src="{{ asset("assets/js/rawdata.js") }}"></script>
             <script src="{{ asset("assets/vendor/bootstrap.min.js") }}"></script>
         {% endblock %}
diff --git a/app/Resources/views/demo/template_explicit.html.twig b/app/Resources/views/demo/template_explicit.html.twig
@@ -8,9 +8,8 @@
         <a class="docref" href="http://symfony.com/doc/current/cmf/bundles/routing/dynamic.html#configuring-the-controller-for-a-route"><i class="glyphicon glyphicon-chevron-right"></i>Read about this feature in the CMF documentation.</a>
     </div>
 
-    {% createphp cmfMainContent as="rdf" %}
-        {{ rdf|raw }}
-    {% endcreatephp %}
+    <h1>{{ cmfMainContent.title }}</h1>
+    {{ cmfMainContent.body|raw }}
 
     {{ parent() }}
 {% endblock %}
diff --git a/app/Resources/views/homepage/index.html.twig b/app/Resources/views/homepage/index.html.twig
@@ -23,9 +23,9 @@
         <a class="docref" href="http://symfony.com/doc/current/cmf/bundles/routing/dynamic.html#configuring-the-controller-for-a-route"><i class="glyphicon glyphicon-chevron-right"></i>Read about this feature in the CMF documentation.</a>
     </div>
 
-    {% createphp cmfMainContent as="rdf" %}
-        {{ rdf|raw }}
-    {% endcreatephp %}
+    <h1>{{ cmfMainContent.title }}</h1>
+
+    {{ cmfMainContent.body|raw }}
 
     {{ sonata_block_render({ 'name': 'additionalInfoBlock' }, {
         'divisible_by': 3,
diff --git a/app/Resources/views/static_content/index.html.twig b/app/Resources/views/static_content/index.html.twig
@@ -7,9 +7,8 @@
         <a class="docref" href="http://symfony.com/doc/current/cmf/bundles/content/introduction.html"><i class="glyphicon glyphicon-chevron-right"></i>Read about this feature in the CMF documentation.</a>
     </div>
 
-    {% createphp cmfMainContent as="rdf" %}
-        {{ rdf|raw }}
-    {% endcreatephp %}
+    <h1>{{ cmfMainContent.title }}</h1>
+    {{ cmfMainContent.body|raw }}
 
     {{ sonata_block_render({ 'name': 'additionalInfoBlock' }) }}
 {% endblock %}
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -113,13 +113,6 @@ cmf_routing:
             Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig
             Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent: static_content/index.html.twig
 
-cmf_create:
-    editor_base_path: /bundles/cmfcreate/vendor/ckeditor/
-    security:
-        # WARNING: REMOVE THIS FOR PRODUCTION SITES
-        # for demo purposes we are allowing anonymous inline editing
-        role: IS_AUTHENTICATED_ANONYMOUSLY
-
 cmf_seo:
     title: 'CMF Sandbox - %%content_title%%'
     description: 'The Content Management Framework. %%content_description%%'
diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -55,12 +55,6 @@ cmf_tree:
     resource: .
     type: 'cmf_tree'
 
-create:
-    resource: '@CmfCreateBundle/Resources/config/routing/rest.xml'
-
-create_image:
-    resource: '@CmfCreateBundle/Resources/config/routing/image.xml'
-
 liip_search:
     resource: '@CmfSearchBundle/Resources/config/routing/phpcr/search.xml'
 
diff --git a/composer.json b/composer.json
@@ -24,9 +24,8 @@
 
         "symfony-cmf/symfony-cmf": "1.3.*",
         "symfony-cmf/simple-cms-bundle": "1.3.*",
-        "symfony-cmf/search-bundle": "1.1.*",
-        "symfony-cmf/create-bundle": "1.2.*",
-        "symfony-cmf/seo-bundle": "1.1.*",
+        "symfony-cmf/search-bundle": "1.2.*",
+        "symfony-cmf/seo-bundle": "1.2.*",
         "symfony-cmf/routing-auto-bundle": "1.0.*",
 
         "jackalope/jackalope-doctrine-dbal": "1.2.*",
@@ -42,10 +41,10 @@
         "sonata-project/translation-bundle": "1.0.0",
 
         "jms/serializer-bundle": "^0.13|^1.0",
+        "friendsofsymfony/rest-bundle": "~1.7",
         "eko/feedbundle": "^1.0",
         "lunetics/locale-bundle": "^2.3",
         "liip/imagine-bundle": "^1.0",
-        "wjzijderveld/check-bundles": "^1.1",
         "helios-ag/fm-elfinder-bundle": "^1.4",
         "burgov/key-value-form-bundle": "^1.0",
         "incenteev/composer-parameter-handler": "^2.0",
@@ -61,17 +60,13 @@
     "scripts": {
         "post-install-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
-            "WillemJan\\CheckBundles\\Composer\\CheckBundles::postPackageUpdate",
-            "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",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-update-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
-            "WillemJan\\CheckBundles\\Composer\\CheckBundles::postPackageUpdate",
-            "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",
@@ -82,10 +77,6 @@
         "bin-dir": "bin"
     },
     "extra": {
-        "checkbundles-ignore": [
-            "Liip\\FunctionalTestBundle\\LiipFunctionalTestBundle",
-            "Sensio\\Bundle\\DistributionBundle\\SensioDistributionBundle"
-        ],
         "symfony-app-dir": "app",
         "symfony-web-dir": "web",
         "incenteev-parameters": [
diff --git a/composer.lock b/composer.lock
