diff --git a/sapl-frontend/src/global/main.js b/sapl-frontend/src/global/main.js new file mode 100644 index 000000000..15e186144 --- /dev/null +++ b/sapl-frontend/src/global/main.js @@ -0,0 +1 @@ +window.$ = window.jQuery = require("jquery"); diff --git a/sapl-frontend/vue.config.js b/sapl-frontend/vue.config.js index 169086322..6b86d8fd8 100644 --- a/sapl-frontend/vue.config.js +++ b/sapl-frontend/vue.config.js @@ -45,8 +45,8 @@ module.exports = { //.add(THEME_CUSTOM + '/src/main.js') .end() - config.entry('hellow') - .add('./src/hellow/main.js') + config.entry('global') + .add('./src/global/main.js') .end() /*config diff --git a/sapl/templates/base.html b/sapl/templates/base.html index cbb1a4b01..0e9eabde5 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -30,7 +30,8 @@ {# Scripts #} {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} {% endcomment %} - {% render_bundle THEME_CUSTOM 'css' %} + {% render_bundle 'global' 'css' %} + {% render_bundle THEME_CUSTOM 'css' %} {% endblock %} @@ -233,6 +234,7 @@ {% endif %} {% block foot_js %} + {% render_bundle 'global' 'js' %} {% render_bundle THEME_CUSTOM 'js' %} {% comment "" %}