Replaced all instances of "admin_pool" with the global "sonata_admin.…

…admin_pool"
leberknecht · Dec 6, 2015 · be41252 · be41252
1 parent 4728a07
commit be41252
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 99 deletions.
diff --git a/Resources/views/CRUD/action.html.twig b/Resources/views/CRUD/action.html.twig
@@ -18,7 +18,7 @@ file that was distributed with this source code.
 
 {% block tab_menu %}
     {% if action is defined %}
-        {{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': admin_pool.getTemplate('tab_menu_template')}, 'twig') }}
+        {{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': sonata_admin.adminPool.getTemplate('tab_menu_template')}, 'twig') }}
     {% endif %}
 {% endblock %}
 

diff --git a/Resources/views/CRUD/base_acl.html.twig b/Resources/views/CRUD/base_acl.html.twig
@@ -22,9 +22,9 @@ file that was distributed with this source code.
 
 {% block form %}
     {% block form_acl_roles %}
-        {{ acl.render_form(aclRolesForm, permissions, 'td_role', admin, admin_pool, object) }}
+        {{ acl.render_form(aclRolesForm, permissions, 'td_role', admin, sonata_admin.adminPool, object) }}
     {% endblock %}
     {% block form_acl_users %}
-        {{ acl.render_form(aclUsersForm, permissions, 'td_username', admin, admin_pool, object) }}
+        {{ acl.render_form(aclUsersForm, permissions, 'td_username', admin, sonata_admin.adminPool, object) }}
     {% endblock %}
 {% endblock %}
diff --git a/Resources/views/CRUD/base_edit.html.twig b/Resources/views/CRUD/base_edit.html.twig
@@ -31,7 +31,7 @@ file that was distributed with this source code.
     <li>{% include 'SonataAdminBundle:Button:create_button.html.twig' %}</li>
 {% endblock %}
 
-{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': admin_pool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
+{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': sonata_admin.adminPool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
 
 {% use 'SonataAdminBundle:CRUD:base_edit_form.html.twig' with form as parentForm %}
 {% import "SonataAdminBundle:CRUD:base_edit_form_macro.html.twig" as form_helper %}

diff --git a/Resources/views/CRUD/base_edit_form.html.twig b/Resources/views/CRUD/base_edit_form.html.twig
@@ -9,11 +9,11 @@
         </div>
     {% else %}
         <form
-              {% if admin_pool.getOption('form_type') == 'horizontal' %}class="form-horizontal"{% endif %}
+              {% if sonata_admin.adminPool.getOption('form_type') == 'horizontal' %}class="form-horizontal"{% endif %}
               role="form"
               action="{% block sonata_form_action_url %}{{ admin.generateUrl(url, {'id': admin.id(object), 'uniqid': admin.uniqid, 'subclass': app.request.get('subclass')}) }}{% endblock %}" {{ form_enctype(form) }}
               method="POST"
-              {% if not admin_pool.getOption('html5_validate') %}novalidate="novalidate"{% endif %}
+              {% if not sonata_admin.adminPool.getOption('html5_validate') %}novalidate="novalidate"{% endif %}
               >
             {% if form.vars.errors|length > 0 %}
                 <div class="sonata-ba-form-error">

diff --git a/Resources/views/CRUD/base_list.html.twig b/Resources/views/CRUD/base_list.html.twig
@@ -19,7 +19,7 @@ file that was distributed with this source code.
 {% endspaceless %}
 {% endblock %}
 
-{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': admin_pool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
+{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': sonata_admin.adminPool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
 
 {% block list_table %}
     <div class="col-xs-12 col-md-12">

diff --git a/Resources/views/CRUD/base_show.html.twig b/Resources/views/CRUD/base_show.html.twig
@@ -18,7 +18,7 @@ file that was distributed with this source code.
     <li>{% include 'SonataAdminBundle:Button:create_button.html.twig' %}</li>
 {% endblock %}
 
-{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': admin_pool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
+{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': sonata_admin.adminPool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
 
 {% block show %}
     <div class="sonata-ba-view row">

diff --git a/Resources/views/CRUD/batch_confirmation.html.twig b/Resources/views/CRUD/batch_confirmation.html.twig
@@ -16,7 +16,7 @@ file that was distributed with this source code.
     <li>{% include 'SonataAdminBundle:Button:create_button.html.twig' %}</li>
 {% endblock %}
 
-{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': admin_pool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
+{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': sonata_admin.adminPool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
 
 {% block content %}
     <div class="sonata-ba-delete">

diff --git a/Resources/views/CRUD/delete.html.twig b/Resources/views/CRUD/delete.html.twig
@@ -17,7 +17,7 @@ file that was distributed with this source code.
     <li>{% include 'SonataAdminBundle:Button:create_button.html.twig' %}</li>
 {% endblock %}
 
-{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': admin_pool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
+{% block tab_menu %}{{ knp_menu_render(admin.sidemenu(action), {'currentClass' : 'active', 'template': sonata_admin.adminPool.getTemplate('tab_menu_template')}, 'twig') }}{% endblock %}
 
 {% block content %}
     <div class="sonata-ba-delete">

diff --git a/Resources/views/Core/add_block.html.twig b/Resources/views/Core/add_block.html.twig
@@ -1,8 +1,8 @@
 {% block user_block %}
-    {% set items_per_column = admin_pool.getOption('dropdown_number_groups_per_colums') %}
+    {% set items_per_column = sonata_admin.adminPool.getOption('dropdown_number_groups_per_colums') %}
     {% set groups = [] %}
 
-    {% for group in admin_pool.dashboardgroups %}
+    {% for group in sonata_admin.adminPool.dashboardgroups %}
         {% set display_group = false %}
 
         {% for admin in group.items if display_group == false %}

diff --git a/Resources/views/Core/dashboard.html.twig b/Resources/views/Core/dashboard.html.twig
@@ -50,7 +50,7 @@ file that was distributed with this source code.
         {% endif %}
     {% endfor %}
 
-    {{ sonata_block_render_event('sonata.admin.dashboard.top', { 'admin_pool': admin_pool }) }}
+    {{ sonata_block_render_event('sonata.admin.dashboard.top', { 'admin_pool': sonata_admin.adminPool }) }}
 
     {% if has_top %}
         <div class="row">
@@ -125,6 +125,6 @@ file that was distributed with this source code.
         </div>
     {% endif %}
 
-    {{ sonata_block_render_event('sonata.admin.dashboard.bottom', { 'admin_pool': admin_pool }) }}
+    {{ sonata_block_render_event('sonata.admin.dashboard.bottom', { 'admin_pool': sonata_admin.adminPool }) }}
 
 {% endblock %}
diff --git a/Resources/views/standard_layout.html.twig b/Resources/views/standard_layout.html.twig
@@ -31,20 +31,18 @@ file that was distributed with this source code.
         {% endblock %}
 
         {% block stylesheets %}
-            {% if admin_pool is defined %}
-                {% for stylesheet in admin_pool.getOption('stylesheets', []) %}
-                        <link rel="stylesheet" href="{{ asset(stylesheet) }}">
-                {% endfor %}
-            {% endif %}
+            {% for stylesheet in sonata_admin.adminPool.getOption('stylesheets', []) %}
+                    <link rel="stylesheet" href="{{ asset(stylesheet) }}">
+            {% endfor %}
         {% endblock %}
 
         {% block javascripts %}
             <script>
                 window.SONATA_CONFIG = {
-                    CONFIRM_EXIT: {% if admin_pool is defined and admin_pool.getOption('confirm_exit') %}true{% else %}false{% endif %},
-                    USE_SELECT2: {% if admin_pool is defined and admin_pool.getOption('use_select2') %}true{% else %}false{% endif %},
-                    USE_ICHECK: {% if admin_pool is defined and admin_pool.getOption('use_icheck') %}true{% else %}false{% endif %},
-                    USE_STICKYFORMS: {% if admin_pool is defined and admin_pool.getOption('use_stickyforms') %}true{% else %}false{% endif %}
+                    CONFIRM_EXIT: {% if sonata_admin.adminPool.getOption('confirm_exit') %}true{% else %}false{% endif %},
+                    USE_SELECT2: {% if sonata_admin.adminPool.getOption('use_select2') %}true{% else %}false{% endif %},
+                    USE_ICHECK: {% if sonata_admin.adminPool.getOption('use_icheck') %}true{% else %}false{% endif %},
+                    USE_STICKYFORMS: {% if sonata_admin.adminPool.getOption('use_stickyforms') %}true{% else %}false{% endif %}
                 };
                 window.SONATA_TRANSLATIONS = {
                     CONFIRM_EXIT:  '{{ 'confirm_exit'|trans({}, 'SonataAdminBundle')|escape('js') }}'
@@ -58,11 +56,9 @@ file that was distributed with this source code.
                 }
             </script>
 
-            {% if admin_pool is defined %}
-                {% for javascript in admin_pool.getOption('javascripts', []) %}
-                    <script src="{{ asset(javascript) }}"></script>
-                {% endfor %}
-            {% endif %}
+            {% for javascript in sonata_admin.adminPool.getOption('javascripts', []) %}
+                <script src="{{ asset(javascript) }}"></script>
+            {% endfor %}
 
             {% set locale = app.request.locale %}
             {# localize moment #}
@@ -71,7 +67,7 @@ file that was distributed with this source code.
             {% endif %}
 
             {# localize select2 #}
-            {% if admin_pool is defined and admin_pool.getOption('use_select2') %}
+            {% if sonata_admin.adminPool.getOption('use_select2') %}
                 {% if locale == 'pt' %}{% set locale = 'pt_PT' %}{% endif %}
 
                 {# omit default EN locale #}
@@ -118,78 +114,74 @@ file that was distributed with this source code.
                     </noscript>
                 {% endblock %}
                 {% block logo %}
-                    {% if admin_pool is defined %}
-                        {% spaceless %}
-                            <a class="logo" href="{{ path('sonata_admin_dashboard') }}">
-                                {% if 'single_image' == admin_pool.getOption('title_mode') or 'both' == admin_pool.getOption('title_mode') %}
-                                    <img src="{{ asset(admin_pool.titlelogo) }}" alt="{{ admin_pool.title }}">
-                                {% endif %}
-                                {% if 'single_text' == admin_pool.getOption('title_mode') or 'both' == admin_pool.getOption('title_mode') %}
-                                    <span>{{ admin_pool.title }}</span>
-                                {% endif %}
-                            </a>
-                        {% endspaceless %}
-                    {% endif %}
+                    {% spaceless %}
+                        <a class="logo" href="{{ path('sonata_admin_dashboard') }}">
+                            {% if 'single_image' == sonata_admin.adminPool.getOption('title_mode') or 'both' == sonata_admin.adminPool.getOption('title_mode') %}
+                                <img src="{{ asset(sonata_admin.adminPool.titlelogo) }}" alt="{{ sonata_admin.adminPool.title }}">
+                            {% endif %}
+                            {% if 'single_text' == sonata_admin.adminPool.getOption('title_mode') or 'both' == sonata_admin.adminPool.getOption('title_mode') %}
+                                <span>{{ sonata_admin.adminPool.title }}</span>
+                            {% endif %}
+                        </a>
+                    {% endspaceless %}
                 {% endblock %}
                 {% block sonata_nav %}
-                    {% if admin_pool is defined %}
-                        <nav class="navbar navbar-static-top" role="navigation">
-                            <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
-                                <span class="sr-only">Toggle navigation</span>
-                            </a>
-
-                            <div class="navbar-left">
-                                {% block sonata_breadcrumb %}
-                                    <div class="hidden-xs">
-                                        {% if _breadcrumb is not empty or action is defined %}
-                                            <ol class="nav navbar-top-links breadcrumb">
-                                                {% if _breadcrumb is empty %}
-                                                    {% if action is defined %}
-                                                        {% for menu in admin.breadcrumbs(action) %}
-                                                            {% if not loop.last  %}
-                                                                <li>
-                                                                    {% if menu.uri is not empty %}
-                                                                        <a href="{{ menu.uri }}">{{ menu.label|raw }}</a>
-                                                                    {% else %}
-                                                                        {{ menu.label }}
-                                                                    {% endif %}
-                                                                </li>
-                                                            {% else %}
-                                                                <li class="active"><span>{{ menu.label }}</span></li>
-                                                            {% endif %}
-                                                        {% endfor %}
-                                                    {% endif %}
-                                                {% else %}
-                                                    {{ _breadcrumb|raw }}
+                    <nav class="navbar navbar-static-top" role="navigation">
+                        <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+                            <span class="sr-only">Toggle navigation</span>
+                        </a>
+
+                        <div class="navbar-left">
+                            {% block sonata_breadcrumb %}
+                                <div class="hidden-xs">
+                                    {% if _breadcrumb is not empty or action is defined %}
+                                        <ol class="nav navbar-top-links breadcrumb">
+                                            {% if _breadcrumb is empty %}
+                                                {% if action is defined %}
+                                                    {% for menu in admin.breadcrumbs(action) %}
+                                                        {% if not loop.last  %}
+                                                            <li>
+                                                                {% if menu.uri is not empty %}
+                                                                    <a href="{{ menu.uri }}">{{ menu.label|raw }}</a>
+                                                                {% else %}
+                                                                    {{ menu.label }}
+                                                                {% endif %}
+                                                            </li>
+                                                        {% else %}
+                                                            <li class="active"><span>{{ menu.label }}</span></li>
+                                                        {% endif %}
+                                                    {% endfor %}
                                                 {% endif %}
-                                            </ol>
-                                        {% endif %}
-                                    </div>
-                                {% endblock sonata_breadcrumb %}
-                            </div>
-
-                            {% block sonata_top_nav_menu %}
-                                <div class="navbar-custom-menu">
-                                    <ul class="nav navbar-nav">
-                                        <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 user-menu">
-                                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                                <i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
-                                            </a>
-                                            <ul class="dropdown-menu dropdown-user">
-                                                {% include admin_pool.getTemplate('user_block') %}
-                                            </ul>
-                                        </li>
-                                    </ul>
+                                            {% else %}
+                                                {{ _breadcrumb|raw }}
+                                            {% endif %}
+                                        </ol>
+                                    {% endif %}
                                 </div>
-                            {% endblock %}
-                        </nav>
-                    {% endif %}
+                            {% endblock sonata_breadcrumb %}
+                        </div>
+
+                        {% block sonata_top_nav_menu %}
+                            <div class="navbar-custom-menu">
+                                <ul class="nav navbar-nav">
+                                    <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 sonata_admin.adminPool.getTemplate('add_block') %}
+                                    </li>
+                                    <li class="dropdown user-menu">
+                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                            <i class="fa fa-user fa-fw"></i> <i class="fa fa-caret-down"></i>
+                                        </a>
+                                        <ul class="dropdown-menu dropdown-user">
+                                            {% include sonata_admin.adminPool.getTemplate('user_block') %}
+                                        </ul>
+                                    </li>
+                                </ul>
+                            </div>
+                        {% endblock %}
+                    </nav>
                 {% endblock sonata_nav %}
             </header>
         {% endblock sonata_header %}
@@ -217,7 +209,7 @@ file that was distributed with this source code.
                             {% block side_bar_before_nav %} {% endblock %}
                             {% block side_bar_nav %}
                                 {% if app.user and is_granted('ROLE_SONATA_ADMIN') %}
-                                    {{ knp_menu_render('sonata_admin_sidebar', {template: admin_pool.getTemplate('knp_menu_template')}) }}
+                                    {{ knp_menu_render('sonata_admin_sidebar', {template: sonata_admin.adminPool.getTemplate('knp_menu_template')}) }}
                                 {% endif %}
                             {% endblock side_bar_nav %}
                             {% block side_bar_after_nav %}
@@ -334,7 +326,7 @@ file that was distributed with this source code.
         {% endblock sonata_wrapper %}
     </div>
 
-    {% if admin_pool is defined and admin_pool.getOption('use_bootlint') %}
+    {% if sonata_admin.adminPool.getOption('use_bootlint') %}
         {% block bootlint %}
             {# Bootlint - https://github.com/twbs/bootlint#in-the-browser #}
             <script type="text/javascript">