diff --git a/src/ThemeBundle/Controller/ExceptionController.php b/src/ThemeBundle/Controller/ExceptionController.php index e32e0bbdf9..42bacb8740 100644 --- a/src/ThemeBundle/Controller/ExceptionController.php +++ b/src/ThemeBundle/Controller/ExceptionController.php @@ -23,10 +23,15 @@ class ExceptionController extends BaseExceptionController */ protected function findTemplate(Request $request, $format, $code, $debug) { - if (strpos($request->getPathInfo(), '/admin') !== 0) { + // Only show custom error when APP_DEBUG = 0 + if ($debug) { return parent::findTemplate($request, $format, $code, $debug); } + /*if (strpos($request->getPathInfo(), '/admin') !== 0) { + return parent::findTemplate($request, $format, $code, $debug); + }*/ + $name = $debug ? 'exception' : 'error'; if ($debug && 'html' == $format) { $name = 'exception_full'; diff --git a/src/ThemeBundle/DependencyInjection/ChamiloThemeExtension.php b/src/ThemeBundle/DependencyInjection/ChamiloThemeExtension.php index 22db5bf935..2dec489e22 100644 --- a/src/ThemeBundle/DependencyInjection/ChamiloThemeExtension.php +++ b/src/ThemeBundle/DependencyInjection/ChamiloThemeExtension.php @@ -1,4 +1,5 @@ load('services.xml'); + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yaml'); } /** diff --git a/src/ThemeBundle/Resources/config/services.xml b/src/ThemeBundle/Resources/config/services.xml index dcaad99637..9e1fbc2916 100644 --- a/src/ThemeBundle/Resources/config/services.xml +++ b/src/ThemeBundle/Resources/config/services.xml @@ -33,12 +33,13 @@ %chamilo_admin_theme.dependency_resolver.class% - - - - - - + + + %chamilo_admin_theme.css_base% + %chamilo_admin_theme.lte_admin% + + + diff --git a/src/ThemeBundle/Resources/config/services.yaml b/src/ThemeBundle/Resources/config/services.yaml new file mode 100644 index 0000000000..61d7269875 --- /dev/null +++ b/src/ThemeBundle/Resources/config/services.yaml @@ -0,0 +1,18 @@ +services: + _defaults: + autowire: true + + Chamilo\ThemeBundle\Controller\ExceptionController: + public: true + arguments: + $twig: '@twig' + $debug: '%kernel.debug%' + + chamilo_theme_widget_extension: + class: 'Chamilo\ThemeBundle\Twig\WidgetExtension' + tags: + - 'twig.extension' + +# chamilo_theme.context_listener: +# class: + diff --git a/src/ThemeBundle/Resources/views/Exception/error.html.twig b/src/ThemeBundle/Resources/views/Exception/error.html.twig new file mode 100644 index 0000000000..5c753fdbda --- /dev/null +++ b/src/ThemeBundle/Resources/views/Exception/error.html.twig @@ -0,0 +1,11 @@ +{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %} +{% block page_title %} Error {% endblock %} +{% block page_subtitle %} {{ status_code }} {% endblock %} +{% block page_content %} +
+

{{ status_code }}

+
+

{{ 'Something seems to have gone wrong'|trans() }}

+
+
+{% endblock %} diff --git a/src/ThemeBundle/Resources/views/Exception/error404.html.twig b/src/ThemeBundle/Resources/views/Exception/error404.html.twig new file mode 100644 index 0000000000..33e1283869 --- /dev/null +++ b/src/ThemeBundle/Resources/views/Exception/error404.html.twig @@ -0,0 +1,11 @@ +{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %} +{% block page_title %} Error {% endblock %} +{% block page_subtitle %} {{ status_code }} {% endblock %} +{% block page_content %} +
+

{{ status_code }}

+
+

{{ 'Page not found'|trans() }}

+
+
+{% endblock %} diff --git a/src/ThemeBundle/Resources/views/Exception/exception_full.html.twig b/src/ThemeBundle/Resources/views/Exception/exception_full.html.twig index d3238945c3..5c753fdbda 100644 --- a/src/ThemeBundle/Resources/views/Exception/exception_full.html.twig +++ b/src/ThemeBundle/Resources/views/Exception/exception_full.html.twig @@ -1,94 +1,11 @@ {% extends '@ChamiloTheme/Layout/base-layout.html.twig' %} {% block page_title %} Error {% endblock %} {% block page_subtitle %} {{ status_code }} {% endblock %} - {% block page_content %}

{{ status_code }}

-

{{ 'Something seems to have gone wrong'|trans() }}

- -

{{ exception.message }}

- -
- - {% for n, position in exception.toarray %} - -
-
- - -

{{ position.class|abbr_class }}

-
-
- -
- {{ position.message|nl2br|format_file_from_text }} -
- -
- - - -
-
-

- - {{ 'Stack Trace'|trans() }} - -

-
-
-
-
-
    - {% for i, trace in position.trace %} -
  • - - Stack #{{ i }} - -
    • -
  • - - -
    -

    - {{ trace.file }} -

    - -
    - {% if trace.function %} - at - - {{ trace.short_class }} - {{ trace.type ~ trace.function }} - - ({{ trace.args|format_args }}) - {% endif %} - - {% if trace.file is defined and trace.file and trace.line is defined and trace.line %} - {{ trace.function ? '
    ' : '' }} - in {{ trace.file|format_file(trace.line) }}  - {{ trace.file|file_excerpt(trace.line) }} - - {% endif %} -
    -
    -
    • - {% endfor %} -
-
-
-
-
-
-
-
-
- {% endfor %} - {% endblock %} diff --git a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig index 319cfbdec8..397f0e1060 100644 --- a/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig +++ b/src/ThemeBundle/Resources/views/Layout/base-layout.html.twig @@ -24,7 +24,7 @@ - + julio {% block title %} {{ chamilo_settings_get('platform.institution') }} - {{ chamilo_settings_get('platform.site_name') }} @@ -60,7 +60,6 @@ <script src="{{ asset('build/chamilo.js') }}"></script> <script src="{{ asset('libs/ckeditor/ckeditor.js') }}"></script> <script src="{{ asset('libs/readmore-js/readmore.min.js') }}"></script> - {#<script src="{{ asset('assets/modernizr/modernizr.js') }}"></script>#} {# Check chamilo_js key in assetic.yml #} diff --git a/templates/bundles/TwigBundle/Exception/error404.html.twig b/templates/bundles/TwigBundle/Exception/error404.html.twig deleted file mode 100644 index ddde678a4a..0000000000 --- a/templates/bundles/TwigBundle/Exception/error404.html.twig +++ /dev/null @@ -1 +0,0 @@ -error404 \ No newline at end of file