Fixed language and code

Author: wouterj

bundles/simple_cms/extending_page_class.rst

@@ -1,12 +1,15 @@
+.. index::
+    single: Extending Page; SimpleCmsBundle
+
 Extending the Page class
 ------------------------
 
-The default Page document ``Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page``
+The default Page document (``Symfony\Cmf\Bundle\SimpleCmsBundle\Model\Page``)
 is relatively simple, shipping with a handful of the most common properties
 for building a typical page: title, body, tags, publish dates etc.
 
 If this is not enough for your project you can easily provide your own
-document by extending the default Page document and explicitly setting the
+document by extending the default ``Page`` document and explicitly setting the
 configuration parameter to your own document class:
 
 .. configuration-block::
@@ -43,13 +46,16 @@ configuration parameter to your own document class:
             ),
         ));
 
-Alternatively, the default Page document contains an ``extras`` property. This
-is a key - value store (where value must be string or null) which can be used
-for small trivial additions, without having to extend the default Page
+Alternatively, the default ``Page`` document contains an ``extras`` property.
+This is a key - value store (where value must be string or ``null``) which can be
+used for small trivial additions, without having to extend the default Page
 document.
 
 For example::
 
+    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
+    // ...
+
     $page = new Page();
 
     $page->setTitle('Hello World!');

bundles/simple_cms/introduction.rst

@@ -14,13 +14,15 @@ some of that flexibility in favor of simplicity.
 The SimpleCmsBundle provides a solution to easily map content, routes and menu
 items based on a single tree structure in the content repository.
 
-For a simple example installation of the bundle check out the
-`Symfony CMF Standard Edition`_
-
 You can find an introduction to the bundle in the
 :doc:`Getting started <../../book/simplecms>` section.
 
-The `CMF website`_ is another application using the SimpleCmsBundle.
+The `CMF website`_ is an application using the SimpleCmsBundle.
+
+.. tip::
+
+    For a simple example installation of the bundle check out the
+    `Symfony CMF Standard Edition`_
 
 Installation
 ------------
@@ -39,4 +41,4 @@ Sections
 
 .. _`Symfony CMF Standard Edition`: https://github.com/symfony-cmf/symfony-cmf-standard
 .. _`CMF website`: https://github.com/symfony-cmf/cmf-website/
-.. _`Packagist`: https://packagist.org/packages/symfony-cmf/simple-cms-bundle
+.. _`Packagist`: https://packagist.org/packages/symfony-cmf/simple-cms-bundle

bundles/simple_cms/multilang.rst

@@ -1,39 +1,51 @@
-Multi-language support
+.. index::
+    single: Multi-Language; SimpleCmsBundle
+
+Multi-Language Support
 ----------------------
 
-Setting ``addLocalePattern`` to ``true`` in ``Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page``
-document will result in prefixing the associated route with ``/{_locale}``. Using the native
-translation capabilities of PHPCR ODM it is now possible to create different versions of the document
-for each language that should be available on the website.
+Setting ``addLocalePattern`` to ``true`` in a
+``Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page`` document will
+result in prefixing the associated route with ``/{_locale}``. Using the native
+translation capabilities of PHPCR ODM it is now possible to create different
+versions of the document for each language that should be available on the
+website.
 
 For example::
 
+    use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
+
+    // ...
+
     // pass true as the 3rd parameter to prefix the route pattern with /{_locale}
     $page = new Page(false, false, true);
 
     $page->setPosition($parent, 'hello-world');
     $page->setTitle('Hello World!');
     $page->setBody('Really interesting stuff...');
     $page->setLabel('Hello World');
+
     $dm->persist($page);
     $dm->bindTranslation($page, 'en');
 
     $page->setTitle('Hallo Welt!');
     $page->setBody('Super interessante Sachen...');
     $page->setLabel('Hallo Welt!');
+
     $dm->bindTranslation($page, 'de');
 
     $dm->flush();
 
-.. note::
+.. sidebar:: Translating the URL
 
     Since SimpleCmsBundle only provides a single tree structure, all nodes
     will have the same node name for all languages. So a url
     ``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 routing bundle
-    and content bundle directly to have a separate route document per
-    language.
+    ``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.

bundles/simple_cms/rendering.rst

@@ -1,3 +1,6 @@
+.. index::
+    single: Rendering; SimpleCmsBundle
+
 Rendering
 ---------
 
@@ -9,19 +12,35 @@ configure the template and controller also via the SimpleCmsBundle
 
 A simple example for such a template could look like this:
 
-.. code-block:: jinja
+.. configuration-block::
 
-    {% block content %}
-        <h1>{{ page.title }}</h1>
+    .. code-block:: html+jinja
+
+        {% block content -%}
+            <h1>{{ page.title }}</h1>
 
-        <div>{{ page.body|raw }}</div>
+            <div>{{ page.body|raw }}</div>
+
+            <ul>
+                {% for tag in page.tags -%}
+                    <li>{{ tag }}</li>
+                {%- endfor %}
+            </ul>
+        {%- endblock %}
+
+    .. code-block:: html+php
+    
+        <?php $view['slots']->start('content') ?>
+        <h1><?php $page->getTitle() ?></h1>
+
+        <div><?php $page->getBody() ?></div>
 
         <ul>
-        {% for tag in page.tags %}
-            <li>{{ tag }}</li>
-        {% endfor %}
+        <?php foreach ($page->getTags() as $tag) : ?>
+            <li><?php echo $tag ?></li>
+        <?php endforeach ?>
         </ul>
-    {% endblock %}
+        <?php $view['slots']->stop() ?>
 
 If you have the CreateBundle enabled, you can also output the document with
 RDFa annotations, allowing you to edit the content as well as the tags in the
@@ -36,4 +55,4 @@ frontend. The most simple form is the following twig block:
     {% endblock %}
 
 If you want to control more detailed what should be shown with RDFa, see
-chapter :doc:`../create`.
+chapter :doc:`../create`.