Merge pull request #2032 from Bladrak/addNavbar

Added 'create' actions to main navbar

DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php

@@ -270,6 +270,7 @@ class AddDependencyCallsCompilerPass implements CompilerPassInterface
         // make sure the default templates are defined
         $definedTemplates = array_merge(array(
             'user_block'               => 'SonataAdminBundle:Core:user_block.html.twig',
+            'add_block'                => 'SonataAdminBundle:Core:add_block.html.twig',
             'layout'                   => 'SonataAdminBundle::standard_layout.html.twig',
             'ajax'                     => 'SonataAdminBundle::ajax_layout.html.twig',
             'dashboard'                => 'SonataAdminBundle:Core:dashboard.html.twig',

DependencyInjection/Configuration.php

@@ -78,6 +78,7 @@ class Configuration implements ConfigurationInterface
                         ->booleanNode('confirm_exit')->defaultValue(true)->end()
                         ->booleanNode('use_select2')->defaultValue(true)->end()
                         ->integerNode('pager_links')->defaultValue(null)->end()
+                        ->integerNode('dropdown_number_groups_per_colums')->defaultValue(2)->end()
                     ->end()
                 ->end()
                 ->arrayNode('dashboard')
@@ -145,6 +146,7 @@ class Configuration implements ConfigurationInterface
                     ->addDefaultsIfNotSet()
                     ->children()
                         ->scalarNode('user_block')->defaultValue('SonataAdminBundle:Core:user_block.html.twig')->cannotBeEmpty()->end()
+                        ->scalarNode('add_block')->defaultValue('SonataAdminBundle:Core:add_block.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('layout')->defaultValue('SonataAdminBundle::standard_layout.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('ajax')->defaultValue('SonataAdminBundle::ajax_layout.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('dashboard')->defaultValue('SonataAdminBundle:Core:dashboard.html.twig')->cannotBeEmpty()->end()

Resources/doc/reference/configuration.rst

@@ -56,10 +56,11 @@ Full Configuration Options
             title:                Sonata Admin
             title_logo:           bundles/sonataadmin/logo_title.png
             options:
-                html5_validate:       true      # use html5 validation
-                confirm_exit:         true      # enabled confirmation when quitting with unsaved changes
-                use_select2:          true      # enable select2
-                pager_links:          ~         # pager max links to display
+                html5_validate:                         true      # use html5 validation
+                confirm_exit:                           true      # enabled confirmation when quitting with unsaved changes
+                use_select2:                            true      # enable select2
+                pager_links:                            ~         # pager max links to display
+                dropdown_number_groups_per_colums:          2         # max items per column in dropdown menu (add button in top nav)
             dashboard:
                 groups:
 
@@ -94,6 +95,7 @@ Full Configuration Options
                     label:                ~
             templates:
                 user_block:           SonataAdminBundle:Core:user_block.html.twig
+                add_block:            SonataAdminBundle:Core:add_block.html.twig
                 layout:               SonataAdminBundle::standard_layout.html.twig
                 ajax:                 SonataAdminBundle::ajax_layout.html.twig
                 dashboard:            SonataAdminBundle:Core:dashboard.html.twig

Resources/doc/reference/templates.rst

@@ -72,6 +72,7 @@ There are several other templates that can be customized, enabling you to fine-t
 ``SonataAdminBundle``:
 
 * user_block: customizes the Twig block rendered by default in the top right corner of the admin interface, containing user information. Empty by defautl, see ``SonataUserBundle`` for a real example.
+* add_block: customizes the Twig block rendered by default in the top right corner of the admin interface, providing quick access to create operations on available admin classes.
 * history_revision_timestamp: customizes the way timestamps are rendered when using history related actions.
 * action: a generic template you can use for your custom actions
 * short_object_description: used by the ``getShortObjectDescriptionAction`` action from the ``HelperController``, this template displays a small description of a model instance.
@@ -116,6 +117,7 @@ You can specify your templates in the config.yml file, like so:
                 base_list_field:     SonataAdminBundle:CRUD:base_list_field.html.twig
                 list_block:          SonataAdminBundle:Block:block_admin_list.html.twig
                 user_block:          SonataAdminBundle:Core:user_block.html.twig
+                add_block:           SonataAdminBundle:Core:add_block.html.twig
                 pager_links:         SonataAdminBundle:Pager:links.html.twig
                 pager_results:       SonataAdminBundle:Pager:results.html.twig
                 history_revision_timestamp:  SonataAdminBundle:CRUD:history_revision_timestamp.html.twig

Resources/public/css/styles.css

@@ -67,6 +67,24 @@ body {
 
 .sonata-bc .breadcrumb li a {
     display: inline-block;
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
+.sonata-bc .breadcrumb>li+li:before {
+    padding-right: 0;
+    padding-left: 4px;
+}
+
+/* MEGA MENU STYLE
+********************************/
+.dropdown-menu.multi-column .dropdown-menu {
+    display: block !important;
+    position: static !important;
+    margin: 0 !important;
+    border: none !important;
+    box-shadow: none !important;
+    min-width:100px;
 }
 
 /* top right */

Resources/views/Core/add_block.html.twig

@@ -0,0 +1,57 @@
+{% block user_block %}
+    {% set itemsPerColumn = admin_pool.getOption('dropdown_number_groups_per_colums') %}
+    {% set columnsCount = (admin_pool.dashboardgroups|length / itemsPerColumn)|round %}
+
+
+    <ul class="dropdown-menu{% if columnsCount > 1 %} multi-column{% endif %} dropdown-add"
+        {% if columnsCount > 1 %}style="width: {{ columnsCount*140 }}px;"{% endif %}
+            >
+        {% for group in admin_pool.dashboardgroups %}
+            {% set display = (group.roles is empty or is_granted('ROLE_SUPER_ADMIN') ) %}
+            {% for role in group.roles if not display %}
+                {% set display = is_granted(role) %}
+            {% endfor %}
+
+            {# Do not display the group label if no item in group is available #}
+            {% set item_count = 0 %}
+            {% if display %}
+                {% for admin in group.items if item_count == 0 %}
+                    {% if admin.hasroute('list') and admin.isGranted('LIST') %}
+                        {% set item_count = item_count+1 %}
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
+
+            {% if display and (item_count > 0) %}
+                {% if columnsCount > 1 and loop.index0 % itemsPerColumn == 0 %}
+                    {% if loop.first %}
+                        <div class="row">
+                    {% endif %}
+                    <div class="col-md-{{ (12/columnsCount)|round }}">
+                    <ul class="dropdown-menu">
+                {% endif %}
+
+                <li role="presentation" class="dropdown-header">{{ group.label|trans({}, group.label_catalogue) }}</li>
+                {% for admin in group.items %}
+                    {% if admin.hasroute('create') and admin.isGranted('CREATE') %}
+                        <li role="presentation">
+                            <a role="menuitem" tabindex="-1" href="{{ admin.generateUrl('create')}}">{{ admin.label|trans({}, admin.translationdomain) }}</a>
+                        </li>
+                    {% endif %}
+                {% endfor %}
+
+                {% if not loop.last and loop.index % itemsPerColumn != 0 %}
+                    <li role="presentation" class="divider"></li>
+                {% endif %}
+
+            {% if loop.length > itemsPerColumn and loop.index % itemsPerColumn == 0 %}
+                </ul>
+                </div>
+            {% endif %}
+                {% if loop.length > itemsPerColumn and loop.last %}
+                    </div>
+                {% endif %}
+            {% endif %}
+        {% endfor %}
+    </ul>
+{% endblock %}

Resources/views/standard_layout.html.twig

@@ -121,8 +121,6 @@ file that was distributed with this source code.
                                 {% endblock %}
                             </div>
 
-
-
                             <div class="collapse navbar-collapse">
                                 {% block sonata_breadcrumb %}
                                     {% if _breadcrumb is not empty or action is defined %}
@@ -140,7 +138,7 @@ file that was distributed with this source code.
                                                                     {% endif %}
                                                                 </li>
                                                             {% else %}
-                                                                <li class="active navbar-text">{{ menu.label }}</li>
+                                                                <li class="active{% if loop.first %} navbar-text{% endif %}">{{ menu.label }}</li>
                                                             {% endif %}
                                                         {% endfor %}
                                                     {% endif %}
@@ -154,6 +152,12 @@ file that was distributed with this source code.
 
                                 {% block sonata_top_nav_menu %}
                                     <ul class="nav navbar-top-links navbar-right">
+                                        <li class="dropdown">
+                                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                                <i class="fa fa-plus-square fa-fw"></i> <i class="fa fa-caret-down"></i>
+                                            </a>
+                                            {% include admin_pool.getTemplate('add_block') %}
+                                        </li>
                                         <li class="dropdown">
                                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                                                 <i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
@@ -196,8 +200,8 @@ file that was distributed with this source code.
                                         {% endif %}
                                     {% endblock %}
 
-                                    {% block top_bar_before_nav %} {% endblock %}
-                                    {% block sonata_top_bar_nav %}
+                                    {% block side_bar_before_nav %} {% endblock %}
+                                    {% block side_bar_nav %}
                                         {% if app.security.token and is_granted('ROLE_SONATA_ADMIN') %}
                                             {% for group in admin_pool.dashboardgroups %}
                                                 {% set display = (group.roles is empty or is_granted('ROLE_SUPER_ADMIN') ) %}
@@ -230,7 +234,7 @@ file that was distributed with this source code.
                                             {% endfor %}
                                         {% endif %}
                                     {% endblock %}
-                                    {% block top_bar_after_nav %} {% endblock %}
+                                    {% block side_bar_after_nav %} {% endblock %}
 
                                 {% endblock %}
 
@@ -245,32 +249,30 @@ file that was distributed with this source code.
                 <div id="page-wrapper">
 
                     {% block sonata_page_content %}
-                        {% if _tab_menu is not empty or _actions is not empty %}
-                            <nav class="navbar navbar-default" role="navigation">
-                                <div class="container-fluid">
-                                    <div class="navbar-left">
-                                        {% if _tab_menu is not empty %}
-                                            {{ _tab_menu|raw }}
-                                        {% else %}
-                                            <ul class="nav navbar-nav">
-                                                {{ _actions|raw }}
+                        {% block sonata_page_content_nav %}
+                            {% if _tab_menu is not empty or _actions is not empty %}
+                                <nav class="navbar navbar-default" role="navigation">
+                                    <div class="container-fluid">
+                                        <div class="navbar-left">
+                                            {% if _tab_menu is not empty %}
+                                                {{ _tab_menu|raw }}
+                                            {% endif %}
+                                        </div>
+
+                                        {% if _actions is not empty %}
+                                            <ul class="nav navbar-nav navbar-right">
+                                                <li class="dropdown sonata-actions">
+                                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Actions <b class="caret"></b></a>
+                                                    <ul class="dropdown-menu" role="menu">
+                                                        {{ _actions|raw }}
+                                                    </ul>
+                                                </li>
                                             </ul>
                                         {% endif %}
                                     </div>
-
-                                    {% if _actions is not empty and _tab_menu is not empty %}
-                                        <ul class="nav navbar-nav navbar-right">
-                                            <li class="dropdown sonata-actions">
-                                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Actions <b class="caret"></b></a>
-                                                <ul class="dropdown-menu" role="menu">
-                                                    {{ _actions|raw }}
-                                                </ul>
-                                            </li>
-                                        </ul>
-                                    {% endif %}
-                                </div>
-                            </nav>
-                        {% endif %}
+                                </nav>
+                            {% endif %}
+                        {% endblock %}
 
                         {% block notice %}
                             {% include 'SonataCoreBundle:FlashMessage:render.html.twig' %}
@@ -278,16 +280,6 @@ file that was distributed with this source code.
 
                         {% block sonata_admin_content %}
 
-                            {#{% if _list_table is empty and _list_filters is empty and _actions is not empty %}#}
-                            {#{% if _actions is not empty %}#}
-                                {#<div class="row">#}
-                                    {#<div class="{% if _list_filters|trim %}col-md-10{% else %}col-md-12{% endif %}">#}
-                                        {#{{ _actions|raw }}#}
-                                    {#</div>#}
-                                {#</div>#}
-                                {#<br/>#}
-                            {#{% endif %}#}
-
                             {% if _preview is not empty %}
                                 <div class="sonata-ba-preview">{{ _preview|raw }}</div>
                             {% endif %}