Fixing classic admin.

1.10.x
Julio Montoya 11 years ago
parent 630cfde440
commit d12b6b47c9
  1. 3
      app/Resources/views/layout.html.twig
  2. 2
      app/config/routing.yml
  3. 4
      app/config/sonata/sonata_page.yml
  4. 11
      src/ChamiloLMS/CoreBundle/Controller/Admin/AdminController.php
  5. 63
      src/ChamiloLMS/CoreBundle/Menu/SimpleMenuBuilder.php
  6. 17
      src/ChamiloLMS/CoreBundle/Resources/views/Admin/index.html.twig
  7. 2
      web/app_dev.php

@ -42,7 +42,8 @@
{{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:loginMenu', {'automenu': 'pills', 'stacked':true}) }} {{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:loginMenu', {'automenu': 'pills', 'stacked':true}) }}
{% endif %} {% endif %}
{{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:helpMenu', {'automenu': 'pills', 'stacked':true}) }} {#{{ mopa_bootstrap_menu('ChamiloLMSCoreBundle:SimpleMenuBuilder:helpMenu', {'automenu': 'pills', 'stacked':true}) }}#}
{% endblock %} {% endblock %}
{% block javascripts_head %} {% block javascripts_head %}

@ -10,7 +10,7 @@ _front:
_admin: _admin:
resource: routing_admin.yml resource: routing_admin.yml
prefix: /admin prefix: /administration
_api: _api:
resource: routing_api.yml resource: routing_api.yml

@ -14,11 +14,11 @@ sonata_page:
use_streamed_response: false # set the value to false in debug mode or if the reverse proxy does not handle streamed response use_streamed_response: false # set the value to false in debug mode or if the reverse proxy does not handle streamed response
ignore_uri_patterns: ignore_uri_patterns:
- ^/admin(.*) - ^/administration(.*) # sonata admin
- ^/api/(.*) - ^/api/(.*)
ignore_route_patterns: ignore_route_patterns:
- (.*)admin(.*) # ignore admin route, ie route containing 'admin' - (.*)administration(.*) # ignore admin route, ie route containing 'admin' # sonata admin
- ^_(.*) # ignore symfony routes - ^_(.*) # ignore symfony routes
- login - login
- home - home

@ -24,12 +24,11 @@ class AdminController extends BaseController
*/ */
public function indexAction() public function indexAction()
{ {
$template = $this->getTemplate();
$security = $this->getSecurity(); $security = $this->getSecurity();
// Already filter by the router
if (!$security->isGranted('ROLE_ADMIN')) { /*if (!$security->isGranted('ROLE_ADMIN')) {
//return $this->abort(403, 'Access denied'); return $this->abort(403, 'Access denied');
} }*/
if ($security->isGranted('ROLE_ADMIN')) { if ($security->isGranted('ROLE_ADMIN')) {
return $this->loadAdminMenu(); return $this->loadAdminMenu();
@ -214,7 +213,7 @@ class AdminController extends BaseController
$items[] = array('url' => $adminUrl.'filler.php', 'label' => get_lang('DataFiller')); $items[] = array('url' => $adminUrl.'filler.php', 'label' => get_lang('DataFiller'));
} }
$items[] = array('url' => $adminUrl.'archive_cleanup.php', 'label' => get_lang('ArchiveDirCleanup')); $items[] = array('url' => $adminUrl.'archive_cleanup.php', 'label' => get_lang('ArchiveDirCleanup'));
$items[] = array('url' => $adminUrl.'system_management.php', 'label' => get_lang('SystemManagement')); //$items[] = array('url' => $adminUrl.'system_management.php', 'label' => get_lang('SystemManagement'));
$blocks['settings']['items'] = $items; $blocks['settings']['items'] = $items;
$blocks['settings']['extra'] = null; $blocks['settings']['extra'] = null;

@ -91,7 +91,68 @@ class SimpleMenuBuilder extends ContainerAware
) )
); );
$menu->addChild('Administration',array('route' => 'administration')); /*$menu->addChild(
'Plugins',
array(
'route' => 'main',
'routeParameters' => array('name' => urlencode('admin/plugins.php')),
array("attributes" => array("id" => 'nav'))
)
);*/
/*$menu->addChild(
'Sonata Admin',
array(
'route' => 'admin'
)
);*/
$admin = $menu->addChild(
'Administration',
array(
'route' => 'administration',
)
);
$admin->addChild(
'Users',
array(
'route' => 'main',
'routeParameters' => array('name' => 'admin/user_list.php'),
array("attributes" => array("id" => 'nav'))
)
);
$admin->addChild(
'Courses',
array(
'route' => 'main',
'routeParameters' => array('name' => 'admin/course_list.php'),
array("attributes" => array("id" => 'nav'))
)
);
$admin->addChild(
'Sessions',
array(
'route' => 'main',
'routeParameters' => array('name' => 'session/session_list.php'),
array("attributes" => array("id" => 'nav'))
)
);
$menu->addChild(
'Sonata Admin',
array(
'route' => 'sonata_admin_dashboard'
)
);
// Sonata admin
//$menu->addChild('Administration', array('route' => 'administration'));
/* /*
$dropdownExtrasOptions = $isFooter ? array( $dropdownExtrasOptions = $isFooter ? array(

@ -1,12 +1,7 @@
{% extends '::Themes/page.html.twig' %} {% extends "::layout.html.twig" %}
{% block page_content %}
{% block layout %}
{% embed '::Layouts/3-9.html.twig' %}
{% block content %}
{% autoescape false %} {% autoescape false %}
<div id="settings"> <div id="settings">
{% for block_item in blocks %} {% for block_item in blocks %}
<div id="tabs-{{ loop.index }}" class="col-md-6"> <div id="tabs-{{ loop.index }}" class="col-md-6">
<div class="well_border"> <div class="well_border">
@ -37,11 +32,9 @@
</div> </div>
{% endfor %} {% endfor %}
<div class="row"> <div class="row">
{% for role in app.user.roles %} {% for role in app.user.roles %}
{% set role = role.role | lower | replace ({ 'role_' : ''}) %} {% set role = role | lower | replace ({ 'role_' : ''}) %}
{% if role in ['global_admin'] %} {% if role in ['global_admin'] %}
{% include "ChamiloLMSCoreBundle:Admin:" ~ role ~ "/role_index.html.twig" %} {% include "ChamiloLMSCoreBundle:Admin:" ~ role ~ "/role_index.html.twig" %}
@ -71,8 +64,4 @@
</div> </div>
{% endif %} {% endif %}
{% endautoescape %} {% endautoescape %}
{% endblock %}
{% endembed %}
{% endblock %} {% endblock %}

@ -22,7 +22,7 @@ require_once __DIR__.'/legacy.php';
// using different relative paths, you must change the request // using different relative paths, you must change the request
// object to use the SiteRequest // object to use the SiteRequest
//$request = Request::createFromGlobals('host_with_path'); //$request = Request::createFromGlobals('host_with_path');
$request = Sonata\PageBundle\Request\RequestFactory::createFromGlobals('host_with_path'); $request = Sonata\PageBundle\Request\RequestFactory::createFromGlobals('host_with_path_by_locale');
$kernel = new AppKernel('dev', true); $kernel = new AppKernel('dev', true);

Loading…
Cancel
Save