Added a Menu Extension to KnpMenuBundle for cleaner generation of Navbars.

Changed mopa_bootstrap_navbar to be a pass-through for knp_menu_render
with bootstrap options.

Author: isometriks

DependencyInjection/Compiler/NavbarPass.php

@@ -34,7 +34,7 @@ public function load(array $configs, ContainerBuilder $container)
         $yamlloader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $yamlloader->load('twig_extensions.yml');
         $yamlloader->load("form_extensions.yml");
-        
+
         if (isset($config['form'])) {
             foreach ($config['form'] as $key => $value) {
                 if (is_array($value)) {

DependencyInjection/MopaBootstrapExtension.php

@@ -5,14 +5,12 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Mopa\Bundle\BootstrapBundle\DependencyInjection\Compiler\FormPass;
-use Mopa\Bundle\BootstrapBundle\DependencyInjection\Compiler\NavbarPass;
 
 class MopaBootstrapBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
         $container->addCompilerPass(new FormPass());
-        $container->addCompilerPass(new NavbarPass());
     }
 }

MopaBootstrapBundle.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace Mopa\Bundle\BootstrapBundle\Navbar\Factory;
+
+use Knp\Menu\Factory\ExtensionInterface;
+use Knp\Menu\ItemInterface;
+
+class NavbarExtension implements ExtensionInterface
+{
+    public function buildItem(ItemInterface $item, array $options)
+    {
+        if ($options['navbar']) {
+            $item->setChildrenAttribute('class', 'nav navbar-nav');
+        }
+
+        if ($options['subnavbar']) {
+            $item->setChildrenAttribute('class', 'nav nav-pills');
+        }
+
+        if ($options['dropdown_header']) {
+            $item
+                ->setAttribute('role', 'presentation')
+                ->setAttribute('class', 'dropdown-header')
+                ->setUri(null);
+        }
+
+        if ($options['dropdown']) {
+            $item
+                ->setUri('#')
+                ->setAttribute('class', 'dropdown')
+                ->setLinkAttribute('class', 'dropdown-toggle')
+                ->setLinkAttribute('data-toggle', 'dropdown')
+                ->setChildrenAttribute('class', 'dropdown-menu')
+                ->setChildrenAttribute('role', 'menu');
+
+            if ($options['caret']) {
+                $item->setExtra('caret', 'true');
+            }
+        }
+
+        if ($options['divider']) {
+            $item
+                ->setLabel('')
+                ->setUri(null)
+                ->setAttribute('role', 'presentation')
+                ->setAttribute('class', 'divider');
+        }
+
+        if ($options['push_right']) {
+            $class = $item->getChildrenAttribute('class', '');
+            $item->setChildrenAttribute('class', $class . ' pull-right');
+        }
+
+        if ($options['icon']) {
+            $item->setExtra('icon', $options['icon']);
+        }
+    }
+
+    public function buildOptions(array $options)
+    {
+        return array_merge(array(
+            'navbar' => false,
+            'subnavbar' => false,
+            'dropdown_header' => false,
+            'dropdown' => false,
+            'caret' => false,
+            'push_right' => false,
+            'icon' => false,
+            'divider' => false,
+        ), $options);
+    }
+}

Navbar/Factory/NavbarExtension.php

@@ -2,23 +2,24 @@
 
 namespace Mopa\Bundle\BootstrapBundle\Navbar\Twig;
 
-use Mopa\Bundle\BootstrapBundle\Navbar\Renderer\NavbarRenderer;
+use Knp\Menu\Twig\Helper;
 
 class NavbarExtension extends \Twig_Extension
 {
-    protected $renderer;
+    protected $helper;
+
     /**
-     * @param \Mopa\Bootstrap\Menu\Renderer\NavbarRenderer $renderer
+     * @param \Knp\Menu\Twig\Helper $helper
      */
-    public function __construct(NavbarRenderer $renderer)
+    public function __construct(Helper $helper)
     {
-        $this->renderer = $renderer;
+        $this->helper = $helper;
     }
 
     public function getFunctions()
     {
         return array(
-            'mopa_bootstrap_navbar' => new \Twig_Function_Method($this, 'render', array('is_safe' => array('html'))),
+            'mopa_bootstrap_navbar' => new \Twig_Function_Method($this, 'renderNavbar', array('is_safe' => array('html'))),
         );
     }
 
@@ -30,9 +31,16 @@ public function getFunctions()
      * @param  string                               $renderer
      * @return string
      */
-    public function render($name, array $options = array(), $renderer = null)
+    public function renderNavbar($menu, array $options = array(), $renderer = null)
     {
-        return $this->renderer->renderNavbar($name, $options, $renderer);
+        $options = array_merge(array(
+            'template' => 'MopaBootstrapBundle:Menu:menu.html.twig',
+            'currentClass' => 'active',
+            'ancestorClass' => 'active',
+            'allow_safe_labels' => true,
+        ), $options);
+
+        return $this->helper->render($menu, $options, $renderer);
     }
 
     /**

Navbar/Twig/NavbarExtension.php

@@ -1,16 +1,11 @@
-parameters:
-    mopa_bootstrap.navbar.generic: Mopa\Bundle\BootstrapBundle\Navbar\GenericNavbar
-
 services:
-    mopa_bootstrap.navbar_renderer:
-        class: Mopa\Bundle\BootstrapBundle\Navbar\Renderer\NavbarRenderer
-        arguments: [ @service_container, [] ]
-        tags:
-            # The alias is what is used to retrieve the menu
-            - { name: knp_menu.renderer, alias: navbar }
-
     mopa_bootstrap.navbar.twig.extension:
         class: Mopa\Bundle\BootstrapBundle\Navbar\Twig\NavbarExtension
-        arguments: [ @mopa_bootstrap.navbar_renderer ]
+        arguments: [ "@knp_menu.helper" ]
         tags:
             -  { name: twig.extension }
+
+    mopa_bootstrap.navbar.menu.extension:
+        class: Mopa\Bundle\BootstrapBundle\Navbar\Factory\NavbarExtension
+        tags:
+            -  { name: knp_menu.factory_extension, priority: -100 }