Merge branch 'master' of github.com:chamilo/chamilo-lms

pull/2635/head
Angel Fernando Quiroz Campos 6 years ago
commit 5b744c41e5
  1. 23
      assets/README.md
  2. 6
      documentation/dependencies.html
  3. 7
      main/install/index.php

@ -3,9 +3,7 @@
The folder "assets" will be processed by the js library Webpack Encore and the result
will be saved in public/build folder.
In order to accomplish this task there are some prerequisites.
- Install yarn
In order to accomplish this task, we first need to install yarn. Yarn is a JavaScript dependencies manager similar to Bower (that we also used for development in Chamilo 1.11.x), only that Bower seems to be deprecated now.
Follow the installation instructions here https://yarnpkg.com/en/docs/install
@ -14,25 +12,32 @@ After the installation run this command in the Chamilo root:
``yarn install``
yarn will read the dependencies in the **packages.json** file and save the dependencies in the
'node_modules' folder (this must not be committed to the Chamilo repository).
'node_modules' folder (which must **NOT** be committed** to the Chamilo repository).
# Configuring Encore/Webpack
Webpack takes CSS, JS and other files and generates tidy single-files to attach to your web package.
The behaviour of how packages will be processed is describe here: "webpack.config.js".
In order to process that file you can run:
In order to process that file you will first need to edit webpack.config.js (around line 8) and decide whether .setPublicPath() shoud be configured for a subdirectory or a FQDN (Fully Qualified Domain Name). Leave as is for subdirectories or comment and uncomment the following .setPublicPath() for an FQDN.
Then to finally create the public/build contents you can run:
If the public/js/fos_js_routes.json file does not exist (or if you're in doubt about the version of your PHP libs), run:
```
composer update
bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json
```
Compiles assets once:
Then, to create the public/build contents, run one of the following commands:
To compile assets just once:
``yarn run encore dev``
Recompile assets automatically when files change
To recompile assets automatically when files change:
``yarn run encore dev --watch``
Compile assets, but also minify & optimize them
To compile assets and minify & optimize them:
``yarn run encore production``

@ -72,14 +72,14 @@ We recommend using HTML5-compatible technology.
<h2>Dependencies - server-side</h2>
<ul>
<li>Apache 2+</li>
<li>PHP 5.5 or higher with MySQL bindings (mysqlnd is recommended for PHP 5). Now also supports PHP up to 7.2. If you use PHP 5, we highly recommend PHP 5.6. Otherwise, please use the latest stable PHP version available.</li>
<li>MySQL 5.6+ or any version of MariaDB database server</li>
<li>PHP 7.2 or higher with MySQL bindings.</li>
<li>MySQL 5.7+ or any version of MariaDB database server</li>
<li>php-intl package (for international behaviour support)</li>
<li>php-gd package (for images resizing/cropping)</li>
<li>php-mbstring package (for international behaviour support)</li>
<li>php-imagick</li>
<li>php-bcmath</li>
<li>php-curl (only required for a feature in the links tool and an optional installer check)</li>
<li>php-mcrypt (only required for a feature in the survey tool)</li>
<li>php-ldap (only required for connection to a LDAP server)</li>
<li>php-xapian (only required for full-text indexing and search)</li>
</ul><br />

@ -338,12 +338,13 @@ if ($encryptPassForm == '1') {
<head>
<title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
<style type="text/css" media="screen, projection">
@import "../../public/build/chamilo.css";
@import "../../public/build/css/base.css";
@import "../../public/build/css/vendor.css";
@import "../../public/build/css/app.css";
@import "../../public/build/css/themes/chamilo/default.css";
</style>
<script type="text/javascript" src="../../public/build/chamilo.js"></script>
<script type="text/javascript" src="../../public/build/vendor.js"></script>
<script type="text/javascript" src="../../public/build/app.js"></script>
<script type="text/javascript">
$(document).ready( function() {

Loading…
Cancel
Save