adjust for simplecms routing refactoring

Author: dbu

book/simplecms.rst

@@ -37,6 +37,9 @@ The SimpleCmsBundle provides a class called ``Page`` which extends from the core
 ``NodeInterface``, so you can use inside the menu. This three-in-one approach is
 the key concept behind the bundle.
 
+The mapping of the ``Page`` to a template and controller works as explained in
+the :doc:`previous chapter <routing>`.
+
 Creating a new Page
 ~~~~~~~~~~~~~~~~~~~
 
@@ -49,7 +52,7 @@ To create a page, use the
     use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
     use Doctrine\ODM\PHPCR\DocumentManager;
 
-    class LoadRoutingData implements FixtureInterface
+    class LoadSimpleCms implements FixtureInterface
     {
         /**
          * @param DocumentManager $dm
@@ -79,7 +82,7 @@ have the following tree structure:
 
 .. code-block:: text
 
-    /cmf/simple/
+    /cms/simple/
         about/
         blog/
             symfony-cmf-is-great/
@@ -97,7 +100,7 @@ structure, you would do::
     use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
     use Doctrine\ODM\PHPCR\DocumentManager;
 
-    class LoadRoutingData implements FixtureInterface
+    class LoadSimpleCms implements FixtureInterface
     {
         /**
          * @param DocumentManager $dm
@@ -130,11 +133,11 @@ structure, you would do::
 
 Every PHPCR-ODM document must have a parent document. Parents are never
 created automatically, so we use the PHPCR NodeHelper to ensure we have
-the root element (``/cmf/simple`` in this case).
+the root element (``/cms/simple`` in this case).
 
 .. note::
 
-    The Page at ``/cmf/simple`` is created by an
+    The Page at ``/cms/simple`` is created by an
     :ref:`initializer <phpcr-odm-repository-initializers>` of the
     SimpleCmsBundle.
 

bundles/simple_cms/multilang.rst

@@ -43,9 +43,7 @@ For example::
     ``http://foo.com/en/hello-world`` for english content will look like
     ``http://foo.com/de/hello-world`` for german content.
 
-    At times it might be most feasible to use integers as the node names and
-    simple append the title of the node in the given locale as an anchor. So
-    for example ``http://foo.com/de/1#my title`` and
-    ``http://foo.com/de/1#mein title``. If you need language specific URLs,
-    you want to use the CMF RoutingBundle and ContentBundle directly to have
-    a separate route document per language.
+    If you need language specific URLs, you can either add Route documents for
+    the other locales and configure the dynamic router to look for routes under
+    both prefixes. You can also completely separate routing and content by using
+    the separate documents from the RoutingBundle and ContentBundle.

bundles/simple_cms/rendering.rst

@@ -4,9 +4,13 @@
 Rendering
 ---------
 
-You can specify the template to render a page by setting the
-``_template`` default or by specifying the controller by setting the
-``_controller`` default in the page instance. Alternatively one can
+You can configure a mapping of document class to template and/or controller
+by configuring the :ref:`RoutingBundle <reference-config-routing-dynamic>`.
+When you need specific settings for a single page, you can call
+``setDefault()`` for the key ``_template`` or ``_controller`` default in the
+page instance.
+
+ Alternatively one can
 configure the template and controller also via the SimpleCmsBundle
 :ref:`routing configuration <config-simple-cms-routing>`.
 

reference/configuration/simple_cms.rst

@@ -179,112 +179,18 @@ Configure integration with CmfMenuBundle.
             'use_menu' => 'auto',
         ));
 
-.. _config-simple-cms-routing:
-
 routing
 ~~~~~~~
 
-This configures how pages should be rendered. The simple cms uses its own
-instance of the ``DynamicRouter``. The options here are the same as described
-in :ref:`routing configuration <reference-config-routing-dynamic>`.
-
-Pages that are loaded from the ``cmf_simple_cms.persistence.phpcr.basepath``
-need to be configured here. Pages loaded from the
-``cmf_routing.persistence.phpcr.basepath`` must be configured in the
-CmfRoutingBundle configuration.
-
-.. configuration-block::
+.. versionadded:: 1.1
 
-    .. code-block:: yaml
-
-        cmf_simple_cms:
-            routing:
-                controller_by_alias: []
-                controller_by_class: []
-                templates_by_class:
-                  Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page: CmfSimpleCmsBundle:Page:index.html.twig
-                generic_controller: cmf_content.controller:indexAction
-                content_repository_id: cmf_routing.content_repository
-                uri_filter_regexp: ~
-
-    .. code-block:: xml
-
-        <?xml version="1.0" charset="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services">
-
-            <config xmlns="http://cmf.symfony.com/schema/dic/simplecms">
-                <routing xmlns="http://cmf.symfony.com/schema/dic/simplecms">
-                    <controller-by-alias></controller-by-alias>
-                    <controller-by-class></controller-by-class>
-                    <template-by-class alias="Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page">CmfSimpleCmsBundle:Page:index.html.twig</template-by-class>
-                    <generic-controller>cmf_content.controller:indexAction</generic-controller>
-                    <content-repository-id>cmf_routing.content_repository</content-repository-id>
-                    <uri-filter-regexp>null</uri-filter-regexp>
-                </routing>
-            </config>
-        </container>
-
-    .. code-block:: php
-
-        $container->loadFromExtension('cmf_simple_cms', array(
-            'routing' => array(
-                'controller_by_alias' => array(),
-                'controller_by_class' => array(),
-                'templates_by_class' => array(
-                    'Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page' => 'CmfSimpleCmsBundle:Page:index.html.twig',
-                ),
-                'generic_controller' => 'cmf_content.controller:indexAction',
-                'content_repository_id' => 'cmf_routing.content_repository',
-                'uri_filter_regexp' => null,
-            ),
-        ));
-
-.. _config-simple_cms-multilang:
+    Since SimpleCmsBundle 1.1, this configuration is done directly on the
+    :ref:`RoutingBundle <reference-config-routing-dynamic>`.
 
 multilang
 ~~~~~~~~~
 
-Multilanguage is activated if the ``locales`` option is configured (either in
-SimpleCmsBundle or in CoreBundle).
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        cmf_simple_cms:
-            multilang:
-                locales: [en, fr]
-
-    .. code-block:: xml
+.. versionadded:: 1.1
 
-        <?xml version="1.0" charset="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services">
-
-            <config xmlns="http://cmf.symfony.com/schema/dic/simplecms">
-                <multilang>
-                    <locales>en</locales>
-                    <locales>fr</locales>
-                </multilang>
-            </config>
-        </container>
-
-    .. code-block:: php
-
-        $container->loadFromExtension('cmf_simple_cms', array(
-            'multilang' => array(
-                'locales' => array(
-                    'en',
-                    'fr',
-                ),
-            ),
-        ));
-
-locales
-.......
-
-**type**: ``array`` **default**: ``null``
-
-This define languages that can be used.
-
-If the :doc:`CoreBundle <../../bundles/core/index>` is registered, this will default to
-the value of ``cmf_core.multilang.locales``.
+    Since SimpleCmsBundle 1.1, this configuration is done directly on the
+    :ref:`RoutingBundle <reference-config-routing-locales>`.