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

Comment readmore (not working with webpack)

Browse Source 
Fix install assets paths
pull/2487/head
Julio 8 years ago
parent a08afa01c5
commit 538207d380
6 changed files with 42 additions and 37 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. 39
      assets/js/main.js
  2. 2
      main/inc/lib/api.lib.php
  3. 3
      main/inc/lib/template.lib.php
  4. 12
      main/install/index.php
  5. 12
      main/template/default/layout/footer.js.tpl
  6. 11
      webpack.config.js

39
assets/js/main.js
Unescape View File

@ -1,31 +1,36 @@
var moment = require('moment'); var moment = require("moment");
require("moment/min/locales.min"); require("moment/min/locales.min");
global.moment = moment; global.moment = moment;
const $ = require('jquery'); const $ = require("jquery");
// create global $ and jQuery variables // create global $ and jQuery variables
window.jQuery = window.$ = global.$ = global.jQuery = $; window.jQuery = window.$ = global.$ = global.jQuery = $;
// JS is equivalent to the normal "bootstrap" package // JS is equivalent to the normal "bootstrap" package
// no need to set this to a variable, just require it // no need to set this to a variable, just require it
require('bootstrap-sass'); require("bootstrap-sass");
require('readmore-js'); require("chosen-js");
require('chosen-js'); require("webpack-jquery-ui");
require('webpack-jquery-ui'); require("webpack-jquery-ui/css");
require('webpack-jquery-ui/css'); require("font-awesome-webpack");
require('font-awesome-webpack'); require("ckeditor");
require('ckeditor'); require("mediaelement");
require('mediaelement'); require("js-cookie");
require('js-cookie'); require("fullcalendar");
require('fullcalendar'); require("qtip2");
require('qtip2'); require("image-map-resizer");
require('image-map-resizer')
//require ("readmore-js");
import "select2";
require("bootstrap-select");
/* /*
require('jquery-ui-timepicker-addon'); require("jquery-ui-timepicker-addon");
require('chosen-js');*/ require("chosen-js");*/
//require('bootstrap-daterangepicker'); //require("bootstrap-daterangepicker");

2
main/inc/lib/api.lib.php
Unescape View File

@ -789,7 +789,7 @@ function api_get_path($path = '', $configuration = [])
SYS_TEMPLATE_PATH => 'template/', SYS_TEMPLATE_PATH => 'template/',
WEB_UPLOAD_PATH => 'app/upload/', WEB_UPLOAD_PATH => 'app/upload/',
WEB_PUBLIC_PATH => 'public/', WEB_PUBLIC_PATH => 'public/',
SYS_PUBLIC_PATH => 'web/', SYS_PUBLIC_PATH => 'public/',
WEB_FONTS_PATH => 'fonts/', WEB_FONTS_PATH => 'fonts/',
SYS_FONTS_PATH => 'fonts/', SYS_FONTS_PATH => 'fonts/',
]; ];

3
main/inc/lib/template.lib.php
Unescape View File

@ -726,6 +726,9 @@ class Template
public function setCssCustomFiles() public function setCssCustomFiles()
{ {
global $disable_js_and_css_files; global $disable_js_and_css_files;
// chamilo CSS
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'../chamilo.css');
// Base CSS // Base CSS
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css'); $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css');

12
main/install/index.php
Unescape View File

@ -321,15 +321,11 @@ if ($encryptPassForm == '1') {
<head> <head>
<title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title> <title>&mdash; <?php echo get_lang('ChamiloInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
<style type="text/css" media="screen, projection"> <style type="text/css" media="screen, projection">
@import "../../web/assets/bootstrap/dist/css/bootstrap.min.css"; @import "../../public/build/chamilo.css";
@import "../../web/assets/bootstrap-select/dist/css/bootstrap-select.min.css"; @import "../../public/build/css/base.css";
@import "../../web/assets/fontawesome/css/font-awesome.min.css"; @import "../../public/build/css/themes/chamilo/default.css";
@import "../../web/css/base.css";
@import "../../web/css/themes/chamilo/default.css";
</style> </style>
<script type="text/javascript" src="../../web/assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="../../public/build/chamilo.js"></script>
<script type="text/javascript" src="../../web/assets/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../../web/assets/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready( function() { $(document).ready( function() {

12
main/template/default/layout/footer.js.tpl
Unescape View File

@ -10,12 +10,12 @@
return $('#popover-content-' + id).html(); return $('#popover-content-' + id).html();
} }
}); });
}); });
// Date time settings. // Date time settings.
moment.locale('{{ locale }}'); moment.locale('{{ locale }}');
$.datepicker.setDefaults($.datepicker.regional["{{ locale }}"]); $.datepicker.setDefaults($.datepicker.regional["{{ locale }}"]);
@ -122,12 +122,12 @@
$('.boot-tooltip').tooltip(tip_options); $('.boot-tooltip').tooltip(tip_options);
var more = '{{ 'SeeMore' | get_lang | escape('js') }}'; var more = '{{ 'SeeMore' | get_lang | escape('js') }}';
var close = '{{ 'Close' | get_lang | escape('js') }}'; var close = '{{ 'Close' | get_lang | escape('js') }}';
$('.list-teachers').readmore({ /*$('.list-teachers').readmore({
speed: 75, speed: 75,
moreLink: '<a href="#">' + more + '</a>', moreLink: '<a href="#">' + more + '</a>',
lessLink: '<a href="#">' + close + '</a>', lessLink: '<a href="#">' + close + '</a>',
collapsedHeight: 35, collapsedHeight: 35,
blockCSS: 'display: block; width: 100%;' blockCSS: 'display: block; width: 100%;'
}); });*/
}); });
</script> </script>

11
webpack.config.js
Unescape View File

@ -9,10 +9,14 @@ Encore
// If chamilo is installed in a domain my.chamilo.net // If chamilo is installed in a domain my.chamilo.net
//.setPublicPath('/build') //.setPublicPath('/build')
.cleanupOutputBeforeBuild() .cleanupOutputBeforeBuild()
// enable features!
.enableSassLoader()
.autoProvidejQuery()
.enableReactPreset()
// read main.js -> output as public/build/chamilo.js // read main.js -> output as public/build/chamilo.js
.addEntry('chamilo', './assets/js/main.js') .addEntry('chamilo', './assets/js/main.js')
// read main.scss -> output as web/build/chamilo_style.css // read main.scss -> output as web/build/css/base.css
.addStyleEntry('css/base', './assets/css/main.scss') .addStyleEntry('css/base', './assets/css/main.scss')
// Add chamilo themes // Add chamilo themes
@ -20,10 +24,7 @@ Encore
.addStyleEntry('css/themes/chamilo/default', './assets/css/themes/chamilo/default.css') .addStyleEntry('css/themes/chamilo/default', './assets/css/themes/chamilo/default.css')
// enable features!
.enableSassLoader()
.autoProvidejQuery()
.enableReactPreset()
.enableSourceMaps(!Encore.isProduction()) .enableSourceMaps(!Encore.isProduction())
.autoProvideVariables({ .autoProvideVariables({
$: 'jquery', $: 'jquery',

Write Preview
Loading…
Cancel
Save