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

Internal: Include Twig helpers for Encore resources

Browse Source
pull/4677/head^2
Angel Fernando Quiroz Campos 2 years ago
parent 9f8c748903
commit ab5f8dc01d
21 changed files with 49 additions and 50 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. 11
      assets/js/exercise.js
  2. 0
      assets/js/legacy/annotation.js
  3. 0
      assets/js/legacy/app.js
  4. 2
      assets/js/legacy/document.js
  5. 11
      assets/js/legacy/exercise.js
  6. 0
      assets/js/legacy/free-jqgrid.js
  7. 0
      assets/js/legacy/lp.js
  8. 0
      assets/js/legacy/main.js
  9. 4
      assets/js/legacy/vendor.js
  10. 5
      public/documentation/changelog.html
  11. 25
      public/main/install/index.php
  12. 1
      src/CoreBundle/Resources/views/Editor/custom.html.twig
  13. 2
      src/CoreBundle/Resources/views/Editor/elfinder.html.twig
  14. 1
      src/CoreBundle/Resources/views/Index/vue.html.twig
  15. 2
      src/CoreBundle/Resources/views/Layout/base-layout.html.twig
  16. 1
      src/CoreBundle/Resources/views/Layout/blank.html.twig
  17. 2
      src/CoreBundle/Resources/views/Layout/document.html.twig
  18. 1
      src/CoreBundle/Resources/views/Layout/foot.html.twig
  19. 9
      src/CoreBundle/Resources/views/Layout/head.html.twig
  20. 9
      src/CoreBundle/Resources/views/Layout/layout_one_col.html.twig
  21. 13
      webpack.config.js

11
assets/js/exercise.js
Unescape View File

@ -1,11 +0,0 @@
// Script to be added in the exercises tool.
import 'jsplumb';
import 'jquery-ui-touch-punch';
// import 'xcolor/jquery.xcolor.js';
import 'signature_pad';
import '../../public/main/inc/lib/javascript/epiclock/javascript/jquery.dateformat.min.js';
import '../../public/main/inc/lib/javascript/epiclock/javascript/jquery.epiclock.js';
import '../../public/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js';
import './annotation'
import '../../public/main/inc/lib/javascript/hotspot/js/hotspot.js';
import '../../public/main/inc/lib/javascript/d3/jquery.xcolor.js';

0
assets/js/annotation.js → assets/js/legacy/annotation.js
Unescape View File

0
assets/js/app.js → assets/js/legacy/app.js
Unescape View File

2
assets/js/document.js → assets/js/legacy/document.js
Unescape View File

@ -1,6 +1,6 @@
/** This JS will be included when loading an HTML in the Document tool */
import translateHtml from './translatehtml.js';
import translateHtml from './../translatehtml.js';
document.addEventListener('DOMContentLoaded', function () {
translateHtml();
});

11
assets/js/legacy/exercise.js
Unescape View File

@ -0,0 +1,11 @@
// Script to be added in the exercises tool.
import 'jsplumb';
import 'jquery-ui-touch-punch';
// import 'xcolor/jquery.xcolor.js';
import 'signature_pad';
import '../../../public/main/inc/lib/javascript/epiclock/javascript/jquery.dateformat.min.js';
import '../../../public/main/inc/lib/javascript/epiclock/javascript/jquery.epiclock.js';
import '../../../public/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js';
import './annotation'
import '../../../public/main/inc/lib/javascript/hotspot/js/hotspot.js';
import '../../../public/main/inc/lib/javascript/d3/jquery.xcolor.js';

0
assets/js/free-jqgrid.js → assets/js/legacy/free-jqgrid.js
Unescape View File

0
assets/js/lp.js → assets/js/legacy/lp.js
Unescape View File

0
assets/js/main.js → assets/js/legacy/main.js
Unescape View File

4
assets/js/vendor.js → assets/js/legacy/vendor.js
Unescape View File

@ -21,8 +21,8 @@ global.textcomplete = textcomplete;
require('chart.js');
require('./annotation.js');
require('./editor.js');
import translateHtml from './translatehtml.js';
require('../editor.js');
import translateHtml from '../translatehtml.js';
document.addEventListener('DOMContentLoaded', function () {
translateHtml();
});

5
public/documentation/changelog.html
Unescape View File

@ -3,11 +3,12 @@
<head>
<meta charset="utf-8" />
<title>Chamilo Changelog</title>
<link rel="stylesheet" href="../build/css/app.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../build/legacy_app.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../build/app.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../build/css/themes/chamilo/default.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
<link rel="stylesheet" href="../build/css/print.css" type="text/css" media="print" />
<script src="../build/app.js"></script>
<script src="../build/legacy_app.js"></script>
</head>
<body>
<nav class="navbar navbar-default navbar-fixed-top">

25
public/main/install/index.php
Unescape View File

@ -643,10 +643,10 @@ $installerData = [
'langIso' => api_get_language_isocode(),
'formAction' => api_get_self().'?'.http_build_query([
'running' => 1,
'installType' => $installType,
'updateFromConfigFile' => $updateFromConfigFile,
]),
'running' => 1,
'installType' => $installType,
'updateFromConfigFile' => $updateFromConfigFile,
]),
'updatePath' => !$badUpdatePath ? api_htmlentities($proposedUpdatePath, ENT_QUOTES) : '',
'urlAppendPath' => api_htmlentities($urlAppendPath, ENT_QUOTES),
@ -691,16 +691,17 @@ $installerData = [
</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="../../build/legacy_app.css">
<link rel="stylesheet" href="../../build/app.css">
<link rel="stylesheet" href="../../build/vue.css">
<link rel="stylesheet" href="../../build/css/app.css">
<script type="text/javascript" src="../../../build/runtime.js"></script>
<script type="text/javascript" src="../../../build/app.js"></script>
<script type="text/javascript" src="../../build/legacy_app.js"></script>
</head>
<body class="flex min-h-screen p-2 md:px-16 md:py-8 xl:px-32 xl:py-16 bg-gradient-to-br from-primary to-primary-gradient">
<div id="app" class="m-auto"></div>
<script>
var installerData = <?php echo json_encode($installerData) ?>;
</script>
<script type="text/javascript" src="../../../build/vue_installer.js"></script>
<div id="app" class="m-auto"></div>
<script>
var installerData = <?php echo json_encode($installerData) ?>;
</script>
<script type="text/javascript" src="../../build/runtime.js"></script>
<script type="text/javascript" src="../../build/vue_installer.js"></script>
</body>
</html>

1
src/CoreBundle/Resources/views/Editor/custom.html.twig
Unescape View File

@ -56,5 +56,6 @@
{% endif %}
{% endautoescape %}
{% include "@ChamiloCore/Layout/foot.html.twig" %}
</body>
</html>

2
src/CoreBundle/Resources/views/Editor/elfinder.html.twig
Unescape View File

@ -3,3 +3,5 @@
{% block chamilo_wrap %}
{% include '@ChamiloCore/Editor/elfinder_standalone.html.twig' %}
{% endblock %}
{% include "@ChamiloCore/Layout/foot.html.twig" %}

1
src/CoreBundle/Resources/views/Index/vue.html.twig
Unescape View File

@ -3,5 +3,4 @@
{%- block content %}
{% include '@ChamiloCore/Layout/vue_setup.html.twig' %}
{# {{ encore_entry_script_tags('vue') }}#}
<script src="{{ url('index') ~ 'build/vue.js' }}"></script>
{% endblock %}

2
src/CoreBundle/Resources/views/Layout/base-layout.html.twig
Unescape View File

@ -22,6 +22,8 @@
{%- block chamilo_footer -%}
{% endblock -%}
{{ modals_block }}
{% include "@ChamiloCore/Layout/foot.html.twig" %}
</body>
</html>
{% else %}

1
src/CoreBundle/Resources/views/Layout/blank.html.twig
Unescape View File

@ -13,6 +13,7 @@
{{ content }}
{% endblock %}
</div>
{% include "@ChamiloCore/Layout/foot.html.twig" %}
</body>
</html>
{% endautoescape %}

2
src/CoreBundle/Resources/views/Layout/document.html.twig
Unescape View File

@ -2,4 +2,4 @@
<link href="/build/css/document.css" rel="stylesheet">
<script src="/build/runtime.js"></script>
<script src="/build/document.js"></script>
<script src="/build/legacy_document.js"></script>

1
src/CoreBundle/Resources/views/Layout/foot.html.twig
Unescape View File

@ -0,0 +1 @@
{{ encore_entry_script_tags('vue') }}

9
src/CoreBundle/Resources/views/Layout/head.html.twig
Unescape View File

@ -23,21 +23,20 @@
{% set profile_link = '' %}
{% set message_link = '' %}
{%- block stylesheets %}
{{ encore_entry_link_tags('legacy_app') }}
{{ encore_entry_link_tags('vue') }}
{{ encore_entry_link_tags('app') }}
{# Files app.css is generated from "assets/css/app.scss" file using the file webpack.config.js #}
{# {{ encore_entry_link_tags('app') }} #}
{% if theme is defined %}
{# <link rel="stylesheet" href="{{ url('index') ~ 'build/css/themes/'~ theme ~'/default.css' }}"/> #}
{% endif %}
{# {{ encore_entry_link_tags('vue') }} #}
<link rel="stylesheet" href="{{ url('index') ~ 'build/vue.css' }}" />
<link rel="stylesheet" href="{{ url('index') ~ 'build/css/app.css' }}" />
{# <link rel="stylesheet" href="{{ url('index') ~ 'build/css/print.css' }}" media="print" /> #}
{% endblock %}
{# app.js is generated using the file webpack.config.js and using yarn read /assets/README.md for more info #}
{# <script src="{{ url('index') ~ 'build/libs/ckeditor/ckeditor.js' }}"></script> #}
<script src="{{ url('index') ~ 'build/runtime.js' }}"></script>
<script src="{{ url('index') ~ 'build/app.js' }}"></script>
{# {{ encore_entry_script_tags('app') }} #}
{{ encore_entry_script_tags('legacy_app') }}
{# Add third party js libraries that can't be loaded using webpack #}
{# <script src="{{ asset('libs/readmore-js/readmore.js') }}"></script> #}
<script src="{{ url('index') ~ 'build/libs/js-cookie/src/js.cookie.js' }}"></script>

9
src/CoreBundle/Resources/views/Layout/layout_one_col.html.twig
Unescape View File

@ -1,11 +1,6 @@
{% extends '@ChamiloCore/Layout/base-layout.html.twig' %}
{%- block page_content %}
{% if from_vue %}
<script src="{{ url('index') ~ 'build/runtime.js' }}"></script>
<script src="{{ url('index') ~ 'build/app.js' }}"></script>
<link rel="stylesheet" href="{{ url('index') ~ 'build/css/app.css' }}"/>
<link rel="stylesheet" href="{{ url('index') ~ 'build/vue.css' }}"/>
{# Loading legacy js using the $htmlHeadXtra array #}
{% autoescape false %}
{% for js in legacy_javascript %}
@ -77,8 +72,4 @@
</div>
{% endif %}
{% endautoescape -%}
{% if not from_vue %}
<script src="{{ url('index') ~ 'build/vue.js' }}"></script>
{% endif %}
{% endblock -%}

13
webpack.config.js
Unescape View File

@ -19,17 +19,18 @@ Encore
.cleanupOutputBeforeBuild()
.enableBuildNotifications()
.addEntry('app', './assets/js/app.js')
.addEntry('legacy_app', './assets/js/legacy/app.js')
//.addEntry('bootstrap', './assets/js/bootstrap.js')
.addEntry('exercise', './assets/js/exercise.js')
.addEntry('free-jqgrid', './assets/js/free-jqgrid.js')
.addEntry('lp', './assets/js/lp.js')
.addEntry('legacy_exercise', './assets/js/legacy/exercise.js')
.addEntry('legacy_free-jqgrid', './assets/js/legacy/free-jqgrid.js')
.addEntry('legacy_lp', './assets/js/legacy/lp.js')
.addEntry('legacy_document', './assets/js/legacy/document.js')
.addEntry('vue', './assets/vue/main.js')
.addEntry('vue_installer', './assets/vue/main_installer.js')
.addEntry('translatehtml', './assets/js/translatehtml.js')
.addEntry('document', './assets/js/document.js')
.addStyleEntry('css/app', './assets/css/app.scss')
.addStyleEntry('app', './assets/css/app.scss')
//.addStyleEntry('css/bootstrap', './assets/css/bootstrap.scss')
.addStyleEntry('css/chat', './assets/css/chat.css')
.addStyleEntry('css/document', './assets/css/document.css')

Write Preview
Loading…
Cancel
Save