[BetterSelection] Le nom est affiche dans le menu.

pyricau · May 23, 2012 · b2c91b8 · b2c91b8
1 parent 637ad5d
commit b2c91b8
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 9 deletions.
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -25,6 +25,10 @@
             <link rel="apple-touch-icon" sizes="72x72" href="{{ asset('bundles/bisoulandfront/images/apple-touch-icon-72x72.png') }}">
             <link rel="apple-touch-icon" sizes="114x114" href="{{ asset('bundles/bisoulandfront/images/apple-touch-icon-114x114.png') }}">
         {% endblock %}
+
+        {% block beforeJs %}
+            <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+        {% endblock %}
     </head>
 
     <body>
@@ -36,20 +40,26 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
+
                     <a class="brand" href="{{ path('homepage') }}">
                         Bisouland
                     </a>
-                    <nav class="nav-collapse collapse">
-                        {{ knp_menu_render("BisoulandFrontBundle:Builder:mainMenu", {"currentClass": "active"}) }}
-                    </nav>
+
+                    <div class="nav-collapse">
+                        <nav>
+                            {{ knp_menu_render("BisoulandFrontBundle:Builder:mainMenu", {"currentClass": "active"}) }}
+                        </nav>
+
+                        <nav class="pull-right">
+                            {{ knp_menu_render("BisoulandBeingsBundle:Builder:selectedMenu", {"currentClass": "active"}) }}
+                        </nav>
+                    </div>
                 </div>
             </div>
         </header>
 
         <div class="container">
-            <script type="text/javascript" src="https://www.google.com/jsapi"></script>
             {% render 'BisoulandBeingsBundle:Update:index' %}
-            {% render 'BisoulandBeingsBundle:Selection:index' %}
 
             <div class="content">
                 {% block view %}{% endblock %}
@@ -116,5 +126,5 @@
     <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
     <script src="{{ asset('js/bootstrap.min.js') }}"></script>
 
-    {% block javascript %}{% endblock %}
+    {% block afterJs %}{% endblock %}
 </html>
diff --git a/src/Bisouland/BeingsBundle/Menu/Builder.php b/src/Bisouland/BeingsBundle/Menu/Builder.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Bisouland\BeingsBundle\Menu;
+
+use Knp\Menu\FactoryInterface;
+use Symfony\Component\DependencyInjection\ContainerAware;
+
+class Builder extends ContainerAware
+{
+    public function selectedMenu(FactoryInterface $factory, array $options)
+    {
+        $request = $this->container->get('request');
+        $selectedBeingName = $request->getSession()->get('nameOfSelectedBeing');
+
+        $menu = $factory->createItem('root');
+        $menu->setChildrenAttribute('class', 'nav');
+        $menu->setCurrentUri($request->getRequestUri());
+
+        $menu->addChild($selectedBeingName, array(
+                    'route' => 'beings_view',
+                    'routeParameters' => array('name' => $selectedBeingName),
+        ));
+
+        return $menu;
+    }
+}
diff --git a/src/Bisouland/BeingsBundle/Resources/views/Default/index.html.twig b/src/Bisouland/BeingsBundle/Resources/views/Default/index.html.twig
@@ -68,7 +68,7 @@
     </article>
 {% endblock %}
 
-{% block javascript %}
+{% block afterJs %}
     {{ parent() }}
     <script type="text/javascript" src="{{ asset('js/jquery.dataTables.min.js') }}"></script>
     <script type="text/javascript" src="{{ asset('bundles/bisoulandbeings/js/table-sorting.js') }}"></script>

diff --git a/src/Bisouland/BeingsBundle/Resources/views/Default/view.html.twig b/src/Bisouland/BeingsBundle/Resources/views/Default/view.html.twig
@@ -7,7 +7,7 @@
 
 {% block title %}Bisouland v2 - Amoureux {{ being.name }}{% endblock %}
 
-{% block css %}
+{% block stylesheets %}
     {{ parent() }}
     <link rel="stylesheet" href="{{ asset('css/jquery.countdown.css') }}" />
 {% endblock %}
@@ -105,7 +105,7 @@
     </article>
 {% endblock %}
 
-{% block javascript %}
+{% block afterJs %}
     {{ parent() }}
     <script type="text/javascript" src="{{ asset('js/jquery.countdown.pack.js') }}"></script>
     <script type="text/javascript" src="{{ asset('js/jquery.countdown-fr.js') }}"></script>