added more examples of mixed documents

Author: lsmith77

app/config/config.yml

@@ -79,6 +79,8 @@ symfony_cmf_simple_cms:
     routing:
         templates_by_class:
             Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page:  SymfonyCmfSimpleCmsBundle:Page:index.html.twig
+        controllers_by_class:
+            Symfony\Cmf\Bundle\RoutingExtraBundle\Document\RedirectRoute:  symfony_cmf_routing_extra.redirect_controller:redirectAction
     multilang:
         locales: %locales%
     use_sonata_admin: false

app/config/routing.yml

@@ -10,6 +10,13 @@ home_redirect:
         route: /cms/simple
         permanent: true # this for 301
 
+static:
+    pattern: /{_locale}/static
+    defaults:
+        _controller: AcmeMainBundle:Demo:static
+    requirements:
+        _locale: en|de
+
 cmf_create_rest:
     resource: "@SymfonyCmfCreateBundle/Resources/config/routing/rest.xml"
 

app/tests/StaticPageTest.php

@@ -40,6 +40,7 @@ public function contentDataProvider()
             array('/en/contact/map', 'A map of a location in the US'),
             array('/de/contact/map', 'Eine Karte von einem Ort in Deutschland'),
             array('/en/contact/team', 'A team page'),
+            array('/en/static', 'A hardcoded title'),
         );
     }
 
@@ -53,11 +54,23 @@ public function testMenu()
 
         $this->assertEquals('/en/contact/map', $crawler->selectLink('Map')->attr('href'), 'Page does not contain an a tag pointing to: /en/contact/map');
         $this->assertEquals('http://cmf.symfony.com', $crawler->selectLink('Website')->attr('href'), 'Page does not contain an a tag pointing to: cmf.symfony.com');
-        $this->assertEquals('http://cmf.liip.ch', $crawler->selectLink('Demo')->attr('href'), 'Page does not contain an a tag pointing to: cmf.symfony.com');
+        $this->assertEquals('/en/demo', $crawler->selectLink('Demo')->attr('href'), 'Page does not contain an a tag pointing to: /en/demo');
 
         $crawler = $client->request('GET', '/de/about');
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
         $this->assertEquals('http://cmf.symfony.com', $crawler->selectLink('Webseite')->attr('href'), 'Page does not contain an a tag pointing to: cmf.symfony.com');
     }
+
+    public function testRedirectToDemo()
+    {
+        $client = $this->createClient();
+
+        $client->request('GET', '/en/demo');
+
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+        $this->assertEquals('http://cmf.liip.ch', $client->getResponse()->headers->get('Location'));
+    }
+
 }

composer.lock

@@ -0,0 +1,18 @@
+<?php
+
+namespace Acme\MainBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class DemoController extends Controller
+{
+    public function dynamicAction()
+    {
+        return $this->render('AcmeMainBundle:Demo:dynamic.html.twig');
+    }
+
+    public function staticAction()
+    {
+        return $this->render('AcmeMainBundle:Demo:static.html.twig');
+    }
+}

src/Acme/MainBundle/Controller/DemoController.php

@@ -12,6 +12,8 @@
 
 use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page;
 use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\MultilangPage;
+use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\MultilangRoute;
+use Symfony\Cmf\Bundle\SimpleCmsBundle\Document\MultilangRedirectRoute;
 use Symfony\Cmf\Bundle\MenuBundle\Document\MultilangMenuItem;
 
 class LoadSimpleCmsData extends ContainerAware implements FixtureInterface
@@ -38,7 +40,23 @@ public function load(ObjectManager $dm)
         $this->createPage($dm, $contact, 'team', 'Team', array('' => array('A team page', 'Our team consists of C, M and F.')));
 
         $this->createMenuItem($dm, $root, 'link', 'http://cmf.symfony.com', array('en' => 'Website', 'de' => 'Webseite'));
-        $this->createMenuItem($dm, $root, 'demo', 'http://cmf.liip.ch', array('en' => 'Demo', 'de' => 'Demo'));
+
+        $route = new MultilangRedirectRoute();
+        $route->setPosition($root, 'demo');
+        $route->setUri('http://cmf.liip.ch');
+        $dm->persist($route);
+
+        $this->createMenuItem($dm, $root, 'demo_redirect', $route, array('en' => 'Demo', 'de' => 'Demo'));
+
+        $route = new MultilangRoute();
+        $route->setPosition($root, 'dynamic');
+        $route->setDefault('_controller', 'AcmeMainBundle:Demo:dynamic');
+
+        $dm->persist($route);
+
+        $this->createMenuItem($dm, $root, 'hardcoded_dynamic', $route, array('en' => 'Dynamic', 'de' => 'Dynamisch'));
+
+        $this->createMenuItem($dm, $root, 'hardcoded_static', 'static', array('en' => 'Static', 'de' => 'Statisch'));
 
         $dm->flush();
     }
@@ -67,11 +85,15 @@ protected function createPage(ObjectManager $dm, $parent, $name, $label, array $
     /**
      * @return MenuItem instance with the specified information
      */
-    protected function createMenuItem(ObjectManager $dm, $parent, $name, $uri, array $content)
+    protected function createMenuItem(ObjectManager $dm, $parent, $name, $target, array $content)
     {
         $menuItem = new MultilangMenuItem();
         $menuItem->setPosition($parent, $name);
-        $menuItem->setUri($uri);
+        if (is_object($target)) {
+            $menuItem->setRoute($target->getPath());
+        } else {
+            $menuItem->setUri($target);
+        }
 
         $dm->persist($menuItem);
         foreach ($content as $locale => $label) {

src/Acme/MainBundle/DataFixtures/PHPCR/LoadSimpleCmsData.php

@@ -0,0 +1,12 @@
+{% extends "AcmeMainBundle::layout.html.twig" %}
+
+{% set title = 'A hardcoded title' %}
+{% block title %}{{ title }}{% endblock %}
+
+{% block content %}
+
+    <h1>{{ title }}</h1>
+
+    This is some hardcoded text on a dynamic route
+
+{% endblock %}

src/Acme/MainBundle/Resources/views/Demo/dynamic.html.twig

@@ -0,0 +1,12 @@
+{% extends "AcmeMainBundle::layout.html.twig" %}
+
+{% set title = 'A hardcoded title' %}
+{% block title %}{{ title }}{% endblock %}
+
+{% block content %}
+
+    <h1>{{ title }}</h1>
+
+    This is some hardcoded text on a static route
+
+{% endblock %}

src/Acme/MainBundle/Resources/views/Demo/static.html.twig

@@ -30,9 +30,7 @@
         </div>
         <div id="language_selector" class="pull-right">
             {% block language_selector %}
-                {% if cmfMainContent is defined %}
-                    {{ locale_switcher(cmfMainContent) }}
-                {% endif %}
+                {{ locale_switcher() }}
             {% endblock %}
         </div>
     </div>