From ba5c237a5bbdcadb39dd6f5cdd43a8580e8d660d Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 29 Jan 2015 17:23:50 +0100 Subject: [PATCH] Using stable packages --- app/config/sonata/sonata_user.yml | 14 +- composer.json | 38 +++-- .../Resources/views/standard_layout.html.twig | 135 ++++++++---------- 3 files changed, 83 insertions(+), 104 deletions(-) diff --git a/app/config/sonata/sonata_user.yml b/app/config/sonata/sonata_user.yml index 79a8006cd2..8abf81ce59 100644 --- a/app/config/sonata/sonata_user.yml +++ b/app/config/sonata/sonata_user.yml @@ -50,10 +50,10 @@ sonata_user: validation_groups: - ProfileCustom - register: - form: - type: sonata_user_registration - handler: sonata.user.registration.form.handler.default - name: sonata_user_registration_form - validation_groups: - - ProfileCustom +# register: +# form: +# type: sonata_user_registration +# handler: sonata.user.registration.form.handler.default +# name: sonata_user_registration_form +# validation_groups: +# - ProfileCustom diff --git a/composer.json b/composer.json index 759354bd5f..c248f3aea1 100755 --- a/composer.json +++ b/composer.json @@ -87,31 +87,28 @@ "knplabs/gaufrette": "~0.1", "knplabs/knp-menu-bundle": "~2.0", - "sonata-project/easy-extends-bundle": "~2.1@dev", - "sonata-project/seo-bundle": "~1@dev", - "sonata-project/doctrine-extensions": "~1@dev", - "sonata-project/intl-bundle": "~2.2@dev", - "sonata-project/admin-bundle": "~2.3@dev", - "sonata-project/doctrine-orm-admin-bundle": "~2.3@dev", - "sonata-project/notification-bundle": "~2.2@dev", - "sonata-project/block-bundle": "~2.2@dev", - "sonata-project/media-bundle": "~2.3@dev", - "sonata-project/user-bundle": "~2.2@dev", - "sonata-project/cache-bundle": "~2.1@dev", - "sonata-project/cache": "~1.0@dev", - "sonata-project/page-bundle": "~2.3@dev", - "sonata-project/core-bundle": "~2.2@dev", - "sonata-project/formatter-bundle": "2.3.2", - "sonata-project/news-bundle": "~2.3@dev", "sonata-project/datagrid-bundle": "~2.2@dev", - "sonata-project/exporter": "~1.3@dev", - + "sonata-project/easy-extends-bundle": "~2.1", + "sonata-project/seo-bundle": "~1", + "sonata-project/doctrine-extensions": "~1", + "sonata-project/intl-bundle": "~2.1", + "sonata-project/admin-bundle": "~2.2", + "sonata-project/doctrine-orm-admin-bundle": "~2.2", + "sonata-project/notification-bundle": "~2.2", + "sonata-project/block-bundle": "~2.2", + "sonata-project/media-bundle": "~2.2", + "sonata-project/user-bundle": "~2.2", + "sonata-project/cache-bundle": "~2.1", + "sonata-project/page-bundle": "~2.3", + "sonata-project/formatter-bundle": "~2.3", + "sonata-project/news-bundle": "~2.3", + "sonata-project/exporter": "~1.3", "sonata-project/timeline-bundle": "~2.2@dev", - "sonata-project/classification-bundle": "dev-master", + "sonata-project/classification-bundle": "~2.2", "sonata-project/ecommerce": "dev-develop", "sonata-project/comment-bundle": "~2.2@dev", - "friendsofsymfony/comment-bundle": "~2.0", + "friendsofsymfony/comment-bundle": "~2.0@dev", "simplethings/entity-audit-bundle": "~0.7", "willdurand/faker-bundle": "~1.0", @@ -131,6 +128,7 @@ "gedmo/doctrine-extensions": "~2.3", "zendframework/zend-filter": "2.3.*@dev", + "zendframework/zend-permissions-acl": "2.3.*@dev", "jbroadway/urlify": "~1.0", "composer/composer": "1.0.0-alpha8", diff --git a/src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig b/src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig index f6f40d3112..64cabc0f48 100644 --- a/src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig +++ b/src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig @@ -8,19 +8,17 @@ For the full copyright and license information, please view the LICENSE file that was distributed with this source code. #} -{% set _preview = block('preview') %} -{% set _form = block('form') %} -{% set _show = block('show') %} -{% set _list_table = block('list_table') %} -{% set _list_filters = block('list_filters') %} -{% set _tab_menu = block('tab_menu') %} -{% set _content = block('content') %} -{% set _title = block('title') %} -{% set _breadcrumb = block('breadcrumb') %} -{% set _actions = block('actions') %} -{% set _navbar_title = block('navbar_title') %} -{% set _list_filters_actions = block('list_filters_actions') %} - +{% set _preview = block('preview') %} +{% set _form = block('form') %} +{% set _show = block('show') %} +{% set _list_table = block('list_table') %} +{% set _list_filters = block('list_filters') %} +{% set _tab_menu = block('tab_menu') %} +{% set _content = block('content') %} +{% set _title = block('title') %} +{% set _breadcrumb = block('breadcrumb') %} +{% set _actions = block('actions') %} +{% set _navbar_title = block('navbar_title') %} @@ -30,11 +28,11 @@ file that was distributed with this source code. {% endblock %} {% block stylesheets %} - {% if admin_pool is defined %} - {% for stylesheet in admin_pool.getOption('stylesheets', []) %} - - {% endfor %} - {% endif %} + + {% for stylesheet in admin_pool.getOption('stylesheets', []) %} + + {% endfor %} + {% endblock %} {% block javascripts %} @@ -49,11 +47,9 @@ file that was distributed with this source code. }; - {% if admin_pool is defined %} {% for javascript in admin_pool.getOption('javascripts', []) %} {% endfor %} - {% endif %} {# localize select2 #} {% if admin_pool is defined and admin_pool.getOption('use_select2') %} @@ -62,7 +58,7 @@ file that was distributed with this source code. {# omit default EN locale #} {% if locale[:2] != 'en' %} - + {% endif %} {% endif %} @@ -102,18 +98,16 @@ file that was distributed with this source code. {% endblock %} {% block logo %} - {% if admin_pool is defined %} - {% spaceless %} - - {% endspaceless %} - {% endif %} + {% spaceless %} + + {% endspaceless %} {% endblock %} {% block sonata_nav %} {% if admin_pool is defined %} @@ -127,31 +121,29 @@ file that was distributed with this source code.
{% block sonata_breadcrumb %} - + {% else %} + {{ _breadcrumb|raw }} + {% endif %} + + {% endif %} {% endblock sonata_breadcrumb %}
@@ -261,7 +253,7 @@ file that was distributed with this source code.
{% block sonata_page_content_header %} {% block sonata_page_content_nav %} - {% if _tab_menu is not empty or _actions is not empty or _list_filters_actions is not empty %} + {% if _tab_menu is not empty or _actions is not empty %} {% endif %} @@ -331,16 +311,17 @@ file that was distributed with this source code. {% endif %} {% if _list_table is not empty or _list_filters is not empty %} - {% if _list_filters|trim %} -
- {{ _list_filters|raw }} +
+
+ {{ _list_table|raw }}
- {% endif %} -
- {{ _list_table|raw }} + {% if _list_filters|trim %} +
+ {{ _list_filters|raw }} +
+ {% endif %}
- {% endif %} {% endblock sonata_admin_content %}