chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using stable packages

Browse Source
1.10.x
Julio Montoya 11 years ago
parent 0ac0b9dddd
commit ba5c237a5b
3 changed files with 83 additions and 104 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      app/config/sonata/sonata_user.yml
  2. 38
      composer.json
  3. 41
      src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig

14
app/config/sonata/sonata_user.yml
Unescape View File

@ -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

38
composer.json
Unescape View File

@ -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",

41
src/Application/Sonata/AdminBundle/Resources/views/standard_layout.html.twig
Unescape View File

@ -19,8 +19,6 @@ file that was distributed with this source code.
{% set _breadcrumb = block('breadcrumb') %}
{% set _actions = block('actions') %}
{% set _navbar_title = block('navbar_title') %}
{% set _list_filters_actions = block('list_filters_actions') %}
<!DOCTYPE html>
<html {% block html_attributes %}class="no-js"{% endblock %}>
<head>
@ -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', []) %}
<link rel="stylesheet" href="{{ asset(stylesheet) }}">
{% endfor %}
{% endif %}
{% endblock %}
{% block javascripts %}
@ -49,11 +47,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 %}
{# 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' %}
<script src="{{ asset('bundles/sonatacore/vendor/select2/select2_locale_' ~ locale|replace({'_':'-'}) ~ '.js') }}"></script>
<script src="{{ asset('bundles/sonataadmin/vendor/select2/select2_locale_' ~ locale|replace({'_':'-'}) ~ '.js') }}"></script>
{% endif %}
{% endif %}
@ -102,9 +98,8 @@ 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') }}">
<a class="logo" href="{{ url('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 %}
@ -113,7 +108,6 @@ file that was distributed with this source code.
{% endif %}
</a>
{% endspaceless %}
{% endif %}
{% endblock %}
{% block sonata_nav %}
{% if admin_pool is defined %}
@ -127,7 +121,6 @@ file that was distributed with this source code.
<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 %}
@ -151,7 +144,6 @@ file that was distributed with this source code.
{% endif %}
</ol>
{% endif %}
</div>
{% endblock sonata_breadcrumb %}
</div>
@ -261,7 +253,7 @@ file that was distributed with this source code.
<section class="content-header">
{% 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 %}
<nav class="navbar navbar-default" role="navigation">
{% block tab_menu_navbar_header %}
{% if _navbar_title is not empty %}
@ -277,14 +269,6 @@ file that was distributed with this source code.
{% endif %}
</div>
{% if admin is defined and action is defined and action == 'list' and admin.listModes|length > 1 %}
<div class="nav navbar-right btn-group">
{% for mode, settings in admin.listModes %}
<a href="{{ admin.generateUrl('list', app.request.query.all|merge({_list_mode: mode})) }}" class="btn btn-default navbar-btn btn-sm{% if admin.getListMode() == mode %} active{% endif %}"><i class="{{ settings.class }}"></i></a>
{% endfor %}
</div>
{% endif %}
{% if _actions|replace({ '<li>': '', '</li>': '' })|trim is not empty %}
<ul class="nav navbar-nav navbar-right">
<li class="dropdown sonata-actions">
@ -295,10 +279,6 @@ file that was distributed with this source code.
</li>
</ul>
{% endif %}
{% if _list_filters_actions is not empty %}
{{ _list_filters_actions|raw }}
{% endif %}
</div>
</nav>
{% 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 %}
<div class="row">
<div class="sonata-ba-list {% if _list_filters|trim %}col-md-10{% else %}col-md-12{% endif %}">
{{ _list_table|raw }}
</div>
{% if _list_filters|trim %}
<div class="sonata-ba-filter col-md-2">
{{ _list_filters|raw }}
</div>
{% endif %}
<div class="row">
{{ _list_table|raw }}
</div>
{% endif %}
{% endblock sonata_admin_content %}
</section>

Write Preview
Loading…
Cancel
Save