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. 135
      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: validation_groups:
- ProfileCustom - ProfileCustom
register: # register:
form: # form:
type: sonata_user_registration # type: sonata_user_registration
handler: sonata.user.registration.form.handler.default # handler: sonata.user.registration.form.handler.default
name: sonata_user_registration_form # name: sonata_user_registration_form
validation_groups: # validation_groups:
- ProfileCustom # - ProfileCustom

38
composer.json
Unescape View File

@ -87,31 +87,28 @@
"knplabs/gaufrette": "~0.1", "knplabs/gaufrette": "~0.1",
"knplabs/knp-menu-bundle": "~2.0", "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/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/timeline-bundle": "~2.2@dev",
"sonata-project/classification-bundle": "dev-master", "sonata-project/classification-bundle": "~2.2",
"sonata-project/ecommerce": "dev-develop", "sonata-project/ecommerce": "dev-develop",
"sonata-project/comment-bundle": "~2.2@dev", "sonata-project/comment-bundle": "~2.2@dev",
"friendsofsymfony/comment-bundle": "~2.0", "friendsofsymfony/comment-bundle": "~2.0@dev",
"simplethings/entity-audit-bundle": "~0.7", "simplethings/entity-audit-bundle": "~0.7",
"willdurand/faker-bundle": "~1.0", "willdurand/faker-bundle": "~1.0",
@ -131,6 +128,7 @@
"gedmo/doctrine-extensions": "~2.3", "gedmo/doctrine-extensions": "~2.3",
"zendframework/zend-filter": "2.3.*@dev", "zendframework/zend-filter": "2.3.*@dev",
"zendframework/zend-permissions-acl": "2.3.*@dev",
"jbroadway/urlify": "~1.0", "jbroadway/urlify": "~1.0",
"composer/composer": "1.0.0-alpha8", "composer/composer": "1.0.0-alpha8",

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

@ -8,19 +8,17 @@ For the full copyright and license information, please view the LICENSE
file that was distributed with this source code. file that was distributed with this source code.
#} #}
{% set _preview = block('preview') %} {% set _preview = block('preview') %}
{% set _form = block('form') %} {% set _form = block('form') %}
{% set _show = block('show') %} {% set _show = block('show') %}
{% set _list_table = block('list_table') %} {% set _list_table = block('list_table') %}
{% set _list_filters = block('list_filters') %} {% set _list_filters = block('list_filters') %}
{% set _tab_menu = block('tab_menu') %} {% set _tab_menu = block('tab_menu') %}
{% set _content = block('content') %} {% set _content = block('content') %}
{% set _title = block('title') %} {% set _title = block('title') %}
{% set _breadcrumb = block('breadcrumb') %} {% set _breadcrumb = block('breadcrumb') %}
{% set _actions = block('actions') %} {% set _actions = block('actions') %}
{% set _navbar_title = block('navbar_title') %} {% set _navbar_title = block('navbar_title') %}
{% set _list_filters_actions = block('list_filters_actions') %}
<!DOCTYPE html> <!DOCTYPE html>
<html {% block html_attributes %}class="no-js"{% endblock %}> <html {% block html_attributes %}class="no-js"{% endblock %}>
<head> <head>
@ -30,11 +28,11 @@ file that was distributed with this source code.
{% endblock %} {% endblock %}
{% block stylesheets %} {% block stylesheets %}
{% if admin_pool is defined %}
{% for stylesheet in admin_pool.getOption('stylesheets', []) %} {% for stylesheet in admin_pool.getOption('stylesheets', []) %}
<link rel="stylesheet" href="{{ asset(stylesheet) }}"> <link rel="stylesheet" href="{{ asset(stylesheet) }}">
{% endfor %} {% endfor %}
{% endif %}
{% endblock %} {% endblock %}
{% block javascripts %} {% block javascripts %}
@ -49,11 +47,9 @@ file that was distributed with this source code.
}; };
</script> </script>
{% if admin_pool is defined %}
{% for javascript in admin_pool.getOption('javascripts', []) %} {% for javascript in admin_pool.getOption('javascripts', []) %}
<script src="{{ asset(javascript) }}"></script> <script src="{{ asset(javascript) }}"></script>
{% endfor %} {% endfor %}
{% endif %}
{# localize select2 #} {# localize select2 #}
{% if admin_pool is defined and admin_pool.getOption('use_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 #} {# omit default EN locale #}
{% if locale[:2] != 'en' %} {% 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 %}
{% endif %} {% endif %}
@ -102,18 +98,16 @@ file that was distributed with this source code.
</noscript> </noscript>
{% endblock %} {% endblock %}
{% block logo %} {% block logo %}
{% if admin_pool is defined %} {% spaceless %}
{% spaceless %} <a class="logo" href="{{ url('sonata_admin_dashboard') }}">
<a class="logo" href="{{ path('sonata_admin_dashboard') }}"> {% if 'single_image' == admin_pool.getOption('title_mode') or 'both' == admin_pool.getOption('title_mode') %}
{% 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 }}">
<img src="{{ asset(admin_pool.titlelogo) }}" alt="{{ admin_pool.title }}"> {% endif %}
{% endif %} {% if 'single_text' == admin_pool.getOption('title_mode') or 'both' == admin_pool.getOption('title_mode') %}
{% if 'single_text' == admin_pool.getOption('title_mode') or 'both' == admin_pool.getOption('title_mode') %} <span>{{ admin_pool.title }}</span>
<span>{{ admin_pool.title }}</span> {% endif %}
{% endif %} </a>
</a> {% endspaceless %}
{% endspaceless %}
{% endif %}
{% endblock %} {% endblock %}
{% block sonata_nav %} {% block sonata_nav %}
{% if admin_pool is defined %} {% if admin_pool is defined %}
@ -127,31 +121,29 @@ file that was distributed with this source code.
<div class="navbar-left"> <div class="navbar-left">
{% block sonata_breadcrumb %} {% block sonata_breadcrumb %}
<div class="hidden-xs"> {% if _breadcrumb is not empty or action is defined %}
{% if _breadcrumb is not empty or action is defined %} <ol class="nav navbar-top-links breadcrumb">
<ol class="nav navbar-top-links breadcrumb"> {% if _breadcrumb is empty %}
{% if _breadcrumb is empty %} {% if action is defined %}
{% if action is defined %} {% for menu in admin.breadcrumbs(action) %}
{% for menu in admin.breadcrumbs(action) %} {% if not loop.last %}
{% if not loop.last %} <li>
<li> {% if menu.uri is not empty %}
{% if menu.uri is not empty %} <a href="{{ menu.uri }}">{{ menu.label|raw }}</a>
<a href="{{ menu.uri }}">{{ menu.label|raw }}</a> {% else %}
{% else %} {{ menu.label }}
{{ menu.label }} {% endif %}
{% endif %} </li>
</li> {% else %}
{% else %} <li class="active"><span>{{ menu.label }}</span></li>
<li class="active"><span>{{ menu.label }}</span></li> {% endif %}
{% endif %} {% endfor %}
{% endfor %}
{% endif %}
{% else %}
{{ _breadcrumb|raw }}
{% endif %} {% endif %}
</ol> {% else %}
{% endif %} {{ _breadcrumb|raw }}
</div> {% endif %}
</ol>
{% endif %}
{% endblock sonata_breadcrumb %} {% endblock sonata_breadcrumb %}
</div> </div>
@ -261,7 +253,7 @@ file that was distributed with this source code.
<section class="content-header"> <section class="content-header">
{% block sonata_page_content_header %} {% block sonata_page_content_header %}
{% block sonata_page_content_nav %} {% 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"> <nav class="navbar navbar-default" role="navigation">
{% block tab_menu_navbar_header %} {% block tab_menu_navbar_header %}
{% if _navbar_title is not empty %} {% if _navbar_title is not empty %}
@ -277,14 +269,6 @@ file that was distributed with this source code.
{% endif %} {% endif %}
</div> </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 %} {% if _actions|replace({ '<li>': '', '</li>': '' })|trim is not empty %}
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown sonata-actions"> <li class="dropdown sonata-actions">
@ -295,10 +279,6 @@ file that was distributed with this source code.
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
{% if _list_filters_actions is not empty %}
{{ _list_filters_actions|raw }}
{% endif %}
</div> </div>
</nav> </nav>
{% endif %} {% endif %}
@ -331,16 +311,17 @@ file that was distributed with this source code.
{% endif %} {% endif %}
{% if _list_table is not empty or _list_filters is not empty %} {% if _list_table is not empty or _list_filters is not empty %}
{% if _list_filters|trim %} <div class="row">
<div class="row"> <div class="sonata-ba-list {% if _list_filters|trim %}col-md-10{% else %}col-md-12{% endif %}">
{{ _list_filters|raw }} {{ _list_table|raw }}
</div> </div>
{% endif %}
<div class="row"> {% if _list_filters|trim %}
{{ _list_table|raw }} <div class="sonata-ba-filter col-md-2">
{{ _list_filters|raw }}
</div>
{% endif %}
</div> </div>
{% endif %} {% endif %}
{% endblock sonata_admin_content %} {% endblock sonata_admin_content %}
</section> </section>

Write Preview
Loading…
Cancel
Save