wrap up rewriting the quick tour

Author: dbu

_images/quick_tour/3rd-party-bundles-homepage.png

@@ -23,14 +23,14 @@ other hand, when choosing to use a CMS, it's more difficult to build custom
 application functionality. It is impossible or at least very hard to customize
 the core parts of the CMS.
 
-The CMF is created to solve this framework versus CMS dilemma. It provides
-bundles, so you can easily add CMS features to your project. But it also
-provides flexibility and you can use the underlying Symfony framework to
-build custom functionality the way you want. This is called a `decoupled CMS`_.
+The Symfony CMF is created to solve this framework versus CMS dilemma. It
+provides Symfony bundles to easily add CMS features to your project. Yet, as
+you're still using the Symfony framework, you can build any custom functionality
+you can think of. This flexibility is called a `decoupled CMS`_.
 
 The bundles provided by the Symfony CMF can work together, but they are also
 able to work standalone. This means that you don't need to add all bundles, you
-can decide to only use one of them (e.g. only the RoutingBundle or the SeoBundle).
+can decide to only use one of them (e.g. only the RoutingBundle).
 
 Downloading the Symfony CMF Sandbox
 -----------------------------------
@@ -65,6 +65,9 @@ extension. After that, run these commands:
 
     $ cd cmf-sandbox
     $ cp app/config/phpcr_doctrine_dbal.yml.dist app/config/phpcr.yml
+    # Or when you're on a Windows PC:
+    # $ copy app\config\phpcr_doctrine_dbal.yml.dist app\config\phpcr.yml
+
     $ php bin/console doctrine:database:create
     $ php bin/console doctrine:phpcr:init:dbal --force
     $ php bin/console doctrine:phpcr:repository:init
@@ -94,8 +97,6 @@ The Request Flow
 Now, the Sandbox is ready to use. Navigate to the homepage
 (``http://localhost:8000/``) to see the demo:
 
-redo image with current sandbox
-
 .. image:: ../_images/quick_tour/big-picture-home.png
 
 You see that we already have a complete website in our demo. Let's take a
@@ -176,7 +177,7 @@ The Fixtures
 
 Now you know the request flow, you can start editing content. While the normal
 usage will be to edit content through a web interface, the CMF sandbox also
-supports  loading content from static files. This is mainly useful for testing
+supports loading content from static files. This is mainly useful for testing
 purposes.
 
 The fixtures are loaded with the ``doctrine:phpcr:fixtures:load`` command. To

_images/quick_tour/3rd-party-bundles-sonata-admin.png

@@ -77,8 +77,8 @@ dump command:
 .. note::
 
     Previously, the PHPCR tree was compared with a Filesystem. While this
-    gives you a good image of what happens, it's not the truth. You can
-    better compare it to an XML file, where each node is an element and its
+    gives you a good image of what happens, it's not the only truth. You can
+    compare it to an XML file, where each node is an element and its
     properties are attributes.
 
 Doctrine PHPCR-ODM
@@ -90,13 +90,13 @@ directly persisted into and retrieved from the PHPCR tree. This is similar to
 the Doctrine ORM provided by default in the Symfony Standard Edition, but for
 PHPCR instead of SQL databases.
 
-Creating a Page with code
--------------------------
+Creating Content from Code
+--------------------------
 
-Now you know a little bit more about PHPCR and you know the tool to interact
+Now that you know a little bit more about PHPCR and you know the tool to interact
 with it, you can start using it yourself. In the previous chapter, you edited
-a page by using a yaml file which was parsed by the fixture loader of the
-sandbox. This time, you'll create a page by doing it yourself.
+a page by using a Yaml file which was parsed by the fixture loader of the
+sandbox. This time, you'll create a page with PHP code.
 
 First, you have to create a new DataFixture to add your new page. You do this
 by creating a new class in the AppBundle::
@@ -108,7 +108,7 @@ by creating a new class in the AppBundle::
     use Doctrine\Common\DataFixtures\FixtureInterface;
     use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 
-    class LoadPageData implements FixtureInterface, OrderedFixtureInterface
+    class LoadQuickTourData implements FixtureInterface, OrderedFixtureInterface
     {
         public function getOrder()
         {
@@ -119,91 +119,56 @@ by creating a new class in the AppBundle::
 
         public function load(ObjectManager $documentManager)
         {
+            // you will add code to this method in the next steps
         }
     }
 
 The ``$documentManager`` is the object which will persist the document to
 PHPCR. But first, you have to create a new Page document::
 
     use Doctrine\ODM\PHPCR\DocumentManager;
-    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
+    use Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent;
 
     // ...
     public function load(ObjectManager $documentManager)
     {
         if (!$documentManager instanceof DocumentManager) {
-            $class = get_class($documentManager);
-            throw new \RuntimeException("Fixture requires a PHPCR ODM DocumentManager instance, instance of '$class' given.");
+            throw new \RuntimeException(sprintf(
+                'Fixture requires a PHPCR ODM DocumentManager instance, instance of "%s" given.',
+                get_class($documentManager)
+            ));
         }
 
-        $page = new Page(); // create a new Page object (document)
-        $page->setName('quick-tour'); // the name of the node
-
-        vno sandbox übernehmen
-
-        $page->setLabel('Another new Page');
-        $page->setTitle('Another new Page');
-        $page->setBody('I have added this page myself!');
+        $content = new StaticContent();
+        $content->setName('quick-tour'); // the name of the node
+        $content->setTitle('Quick tour new Page');
+        $content->setBody('I have added this page myself!');
     }
 
-Each document needs a parent. In this case, the parent should just be the root
+Each document needs a parent. In this case, the parent should be the content root
 node. To do this, we first retrieve the root document from PHPCR and then set
 it as its parent::
 
     public function load(ObjectManager $documentManager)
     {
         // ...
-        // get root document (/cms/simple)
-        $simpleCmsRoot = $documentManager->find(null, '/cms/simple');
-
-        $page->setParentDocument($simpleCmsRoot); // set the parent to the root
+        // get the root document
+        $contentRoot = $documentManager->find(null, '/cms/content');
+        $content->setParentDocument($contentRoot); // set the parent to the root
     }
 
-And at last, we have to tell the Document Manager to persist our Page
+And finally, we have to tell the Document Manager to persist our content
 document using the Doctrine API::
 
     public function load(ObjectManager $documentManager)
     {
         // ...
-        $documentManager->persist($page); // add the Page in the queue
-        $documentManager->flush(); // add the Page to PHPCR
+        $documentManager->persist($content); // tell the document manager to track the content
+        $documentManager->flush(); // doctrine is like a toilet: never forget to flush
     }
 
 Now you need to execute the ``doctrine:phpcr:fixtures:load`` command again.
-When dumping the nodes again, your new page should turn up under /cms/content.
-
-To actually see this page in the browser, we need a route::
-
-    public function load(ObjectManager $documentManager)
-    {
-        // ...
-        $route = new Route();
-        $routeRoot = $documentManager->find(null, '/cms/routes/en');
-        $route->setPosition($routeRoot, 'quick-tour');
-        $route->setContent($page);
-        $documentManager->persist($route);
-    }
-
-And we add a menu entry to link to this page, and flush the document manager
-at the end::
-
-    public function load(ObjectManager $documentManager)
-    {
-        $menu = new MenuNode();
-        $menu->setName('new_page');
-        $menu->setLabel('Quick Tour');
-        $menu->setContent($page);
-        $menuMain = $documentManager->find(null, '/cms/menu/main');
-        $menu->setParentDocument($menuMain);
-        $documentManager->persist($menu);
-
-        $documentManager->flush();
-    }
-
-Re-run the fixtures loading command and then refresh the web site. Your new
-page will be added, with a menu entry at the bottom of the menu!
-
-.. image:: ../_images/quick_tour/the-model-new-page.png
+When dumping the nodes again, your new page should show up under ``/cms/content/quick-tour``!
 
 .. seealso::