Merge branch '1.2'

Conflicts:
	book/installation.rst
	bundles/menu/sonata_admin.rst

Author: wouterj

_images/cookbook/basic-cms-intro-sketch.ep

@@ -61,9 +61,9 @@
             <foreignObject x="0" y="0" width="77" height="15" p:name="htmlObject" id="3f77b24bb67c43c58a9d3fe2eca38a28" style="color: rgb(0, 0, 255); opacity: 1; font-family: &quot;Liberation Sans&quot;,Arial,sans-serif; font-size: 13px; font-weight: normal; font-style: normal; text-decoration: none;">
                 <div xmlns="http://www.w3.org/1999/xhtml" p:name="textDiv" id="0931c1825f594a5f8b263000eece8116" style="white-space: nowrap; text-decoration: underline; display: inline-block !important; "><div xmlns="http://www.w3.org/1999/xhtml">MyThird Post</div></div>
             </foreignObject>
-        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.BasicWebElements:htmlLink" id="564d0297914e4492b35d7617f38d737e" transform="matrix(1,0,0,1,27.600006103515625,285.8999938964844)" p:sizing-ox="27.600006103515625" p:sizing-oy="285.8999938964844" p:sizing-ow="79" p:sizing-oh="15"><p:metadata><p:property name="textContent"><![CDATA[MyForth Post]]></p:property><p:property name="textFont"><![CDATA["Liberation Sans",Arial,sans-serif|normal|normal|13px|none]]></p:property><p:property name="textColor"><![CDATA[#0000FFFF]]></p:property><p:property name="customStyle"><![CDATA[]]></p:property></p:metadata>
+        </g><g xmlns="http://www.w3.org/2000/svg" p:type="Shape" xmlns:p="http://www.evolus.vn/Namespace/Pencil" p:def="Evolus.BasicWebElements:htmlLink" id="564d0297914e4492b35d7617f38d737e" transform="matrix(1,0,0,1,27.600006103515625,285.8999938964844)" p:sizing-ox="27.600006103515625" p:sizing-oy="285.8999938964844" p:sizing-ow="79" p:sizing-oh="15"><p:metadata><p:property name="textContent"><![CDATA[MyFourth Post]]></p:property><p:property name="textFont"><![CDATA["Liberation Sans",Arial,sans-serif|normal|normal|13px|none]]></p:property><p:property name="textColor"><![CDATA[#0000FFFF]]></p:property><p:property name="customStyle"><![CDATA[]]></p:property></p:metadata>
 
             <foreignObject x="0" y="0" width="79" height="15" p:name="htmlObject" id="75996185a54f41879de44be59b7fa575" style="color: rgb(0, 0, 255); opacity: 1; font-family: &quot;Liberation Sans&quot;,Arial,sans-serif; font-size: 13px; font-weight: normal; font-style: normal; text-decoration: none;">
-                <div xmlns="http://www.w3.org/1999/xhtml" p:name="textDiv" id="23ebaafa874e4e1aa1150e06c0a156d5" style="white-space: nowrap; text-decoration: underline; display: inline-block !important; "><div xmlns="http://www.w3.org/1999/xhtml">MyForth Post</div></div>
+                <div xmlns="http://www.w3.org/1999/xhtml" p:name="textDiv" id="23ebaafa874e4e1aa1150e06c0a156d5" style="white-space: nowrap; text-decoration: underline; display: inline-block !important; "><div xmlns="http://www.w3.org/1999/xhtml">MyFourth Post</div></div>
             </foreignObject>
         </g></g></g></Content></Page></Pages></Document>

_images/cookbook/basic-cms-objects.svg

@@ -60,7 +60,7 @@ and then get the Symfony CMF code with it (this may take a while):
 
 .. code-block:: bash
 
-    $ composer create-project symfony-cmf/standard-edition <path-to-install> '~1.2'
+    $ composer create-project symfony-cmf/standard-edition <path-to-install> "~1.2"
     $ cd <path-to-install>
 
 .. note::

book/installation.rst

@@ -44,6 +44,7 @@ library or they introduce a complete new concept.
   * :doc:`menu/menu_factory`
   * :doc:`menu/menu_provider`
   * :doc:`menu/voters`
+  * :doc:`menu/sonata_admin`
   * :doc:`menu/configuration`
 
 * :doc:`routing/index`

bundles/map.rst.inc

@@ -185,10 +185,23 @@ These are the list of available options:
 See the `KnpMenuBundle documentation`_ for more information about these
 attributes.
 
+Advanced Menu Options
+~~~~~~~~~~~~~~~~~~~~~
+
 By default the only available options are **Display** and **Display Children**.
-To enable the advanced options you need to add ``burgov/key-value-form-bundle``
-requirement in your ``composer.json`` and enable the advanced options in
-your config file:
+You can enable advanced options, but need to add the BurgovKeyValueFormBundle_
+to your project. Run ``composer require burgov/key-value-form-bundle``,
+instantiate the bundle in the kernel and extend the template
+``SonataAdminBundle:Form:form_admin_fields.html.twig`` to add:
+
+.. code-block:: jinja
+
+    {% block burgov_key_value_widget %}
+        {{- block('sonata_type_native_collection_widget') -}}
+    {% endblock %}
+
+Once you enabled the bundle, you can enable the advanced menu options in your
+configuration:
 
 .. configuration-block::
 
@@ -232,3 +245,4 @@ your config file:
 .. _SonataDoctrinePHPCRAdminBundle: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/index.html
 .. _`configuring sonata admin`: http://sonata-project.org/bundles/doctrine-phpcr-admin/master/doc/reference/configuration.html
 .. _`KnpMenuBundle documentation`: http://github.com/KnpLabs/KnpMenu/blob/master/doc/01-Basic-Menus.markdown#menu-attributes
+.. _BurgovKeyValueFormBundle: https://github.com/Burgov/KeyValueFormBundle

bundles/menu/sonata_admin.rst

@@ -151,6 +151,8 @@ Now you can add a new ``Route`` to the tree using Doctrine::
 
     use Doctrine\Common\Persistence\ObjectManager;
     use Doctrine\Common\DataFixtures\FixtureInterface;
+    
+    use PHPCR\Util\NodeHelper;
 
     use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 
@@ -162,6 +164,9 @@ Now you can add a new ``Route`` to the tree using Doctrine::
                 $class = get_class($documentManager);
                 throw new \RuntimeException("Fixture requires a PHPCR ODM DocumentManager instance, instance of '$class' given.");
             }
+            
+            $session = $documentManager->getPhpcrSession();
+            NodeHelper::createPath($session, '/cms/routes');
 
             $routesRoot = $documentManager->find(null, '/cms/routes');
 

quick_tour/the_router.rst

@@ -45,7 +45,7 @@ Enable the routing bundles to your kernel::
         }
     }
 
-.. note:: 
+.. note::
 
     The `symfony-cmf/routing-bundle` package is installed automatically as
     `symfony-cmf/routing-auto-bundle` depends on it.
@@ -206,15 +206,15 @@ You can now proceed to mapping your documents, create the following in your
     see the :doc:`../bundles/routing_auto/introduction` documentation for more information.
 
 This will configure the routing auto system to automatically create and update
-route documents for both the ``Page`` and ``Post`` documents. 
+route documents for both the ``Page`` and ``Post`` documents.
 
 In summary, for each class:
 
 * We defined a ``uri_schema`` which defines the form of the URI which will be
   generated.
   * Within the schema you place ``{tokens}`` - placeholders for values provided by...
 * Token providers provide values which will be substituted into the URI. Here
-  you use two different providers - ``content_date`` and ``content_method``.
+  you use two different providers - ``content_datetime`` and ``content_method``.
   Both will return dynamic values from the subject object itself.
 
 Now reload the fixtures:
@@ -242,12 +242,12 @@ Have a look at what you have:
                   my-first-post:
                   my-second-post:
                   my-third-post:
-                  my-forth-post:
+                  my-fourth-post:
         posts:
           My First Post:
           My Second Post:
           My Third Post:
-          My Forth Post:
+          My Fourth Post:
 
 The routes have been automatically created!
 

tutorial/auto-routing.rst

@@ -197,7 +197,7 @@ other documents to hold a reference to the page. The ``Post`` class will also
 be referenceable and in addition will automatically set the date using the
 `pre persist lifecycle event`_ if it has not been explicitly set previously::
 
-    // src/Acme/BasicCms/Document/Post.php
+    // src/Acme/BasicCmsBundle/Document/Post.php
     namespace Acme\BasicCmsBundle\Document;
 
     use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCR;
@@ -411,7 +411,7 @@ and add some posts::
 
             $parent = $dm->find(null, '/cms/posts');
 
-            foreach (array('First', 'Second', 'Third', 'Forth') as $title) {
+            foreach (array('First', 'Second', 'Third', 'Fourth') as $title) {
                 $post = new Post();
                 $post->setTitle(sprintf('My %s Post', $title));
                 $post->setParentDocument($parent);
@@ -427,9 +427,7 @@ and add some posts::
         }
     }
 
-The 
-
-and load the fixtures:
+Then load the fixtures:
 
 .. code-block:: bash
 

tutorial/getting-started.rst

@@ -121,13 +121,13 @@ The menu system expects to be able to find a root item which contains the
 first level of child items. Modify your fixtures to declare a root element
 to which you will add the existing ``Home`` page and an additional ``About`` page::
 
-    // src/Acme/BasicCmsBundle/DataFixtures/Phpcr/LoadPageData.php
-    namespace Acme\DemoBundle\DataFixtures\PHPCR;
+    // src/Acme/BasicCmsBundle/DataFixtures/PHPCR/LoadPageData.php
+    namespace Acme\BasicCmsBundle\DataFixtures\PHPCR;
 
     use Doctrine\Common\DataFixtures\FixtureInterface;
     use Doctrine\Common\Persistence\ObjectManager;
     use Doctrine\ODM\PHPCR\DocumentManager;
-    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
+    use Acme\BasicCmsBundle\Document\Page;
 
     class LoadPageData implements FixtureInterface
     {