Minor - format code, use ckeditor from chamilo in dashboard

- Remove unused, sonata categories
pull/2715/head
Julio Montoya 7 years ago
parent ca57efd87a
commit f5688d28b8
  1. 30
      config/packages/sonata_media.yaml
  2. 4
      src/AdminBundle/Resources/views/layout.html.twig
  3. 9
      src/CourseBundle/EventListener/CourseListener.php
  4. 4
      src/ThemeBundle/Resources/views/Layout/head.html.twig

@ -20,24 +20,6 @@ sonata_media:
small: {width: 100, quality: 100}
medium: {width: 300, quality: 100}
big: {width: 970, quality: 100}
course:
providers:
- sonata.media.provider.dailymotion
- sonata.media.provider.youtube
- sonata.media.provider.image
- sonata.media.provider.file
- sonata.media.provider.vimeo
formats:
small: {width: 100, quality: 100}
big: {width: 970, quality: 100}
news:
providers:
- sonata.media.provider.dailymotion
- sonata.media.provider.youtube
- sonata.media.provider.image
formats:
abstract: {width: 100, quality: 100}
wide: {width: 820, quality: 100}
sonata_collection:
providers:
@ -52,12 +34,12 @@ sonata_media:
formats:
preview: {width: 100, quality: 100}
wide: {width: 820, quality: 100}
user:
providers:
- sonata.media.provider.image
formats:
small: {width: 100, quality: 100}
big: {width: 970, quality: 100}
# user:
# providers:
# - sonata.media.provider.image
# formats:
# small: {width: 100, quality: 100}
# big: {width: 970, quality: 100}
cdn:
# define the public base url for the uploaded media
server:

@ -26,8 +26,8 @@
{% block javascripts %}
{{ parent() }}
<script src="{{ asset('bundles/ivoryckeditor/ckeditor.js') }}"
type="text/javascript"></script>
{#<script src="{{ asset('bundles/ivoryckeditor/ckeditor.js') }}" type="text/javascript"></script>#}
<script src="{{ asset('libs/ckeditor/ckeditor.js') }}"></script>
<script src="{{ asset('bundles/sonataformatter/vendor/markitup-markitup/markitup/jquery.markitup.js') }}"
type="text/javascript"></script>
<script src="{{ asset('bundles/sonataformatter/markitup/sets/markdown/set.js') }}"

@ -88,7 +88,8 @@ class CourseListener
$course = null;
if (!empty($courseCode)) {
/** @var Course $course */
$course = $em->getRepository('ChamiloCoreBundle:Course')->findOneByCode($courseCode);
$course = $em->getRepository('ChamiloCoreBundle:Course')->findOneBy(['directory' => $courseCode]);
if ($course === null) {
throw new NotFoundHttpException($translator->trans('Course does not exist'));
}
@ -137,11 +138,7 @@ class CourseListener
$session->setCurrentCourse($course);
// Check if user is allowed to this course-session
// See SessionVoter.php
if (false === $checker->isGranted(
SessionVoter::VIEW,
$session
)
) {
if (false === $checker->isGranted(SessionVoter::VIEW, $session)) {
throw new AccessDeniedException($translator->trans('Unauthorised access to session!'));
}

@ -51,10 +51,6 @@
{#{%- javascripts '@chamilo_js' -%}#}
{#<script src="{{ asset_url }} "></script>#}
{#{% endjavascripts %}#}
{#<script src="{{ asset('bundles/ivoryckeditor/ckeditor.js') }}" type="text/javascript"></script>#}
{#<script src="{{ asset('bundles/fosjsrouting/js/router.min.js') }}"></script>#}
{#<script src="{{ url('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>#}
{#<script src="{{ path('legacy_index') ~ 'public/js/routing?callback=fos.Router.setData' }}"></script>#}
{% block chamilo_header_js %}
{# Loading legacy js using the $htmlHeadXtra array #}
{% autoescape false %}

Loading…
Cancel
Save