diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss similarity index 100% rename from src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss rename to src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js new file mode 100644 index 000000000..3028d6f5c --- /dev/null +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/index.js @@ -0,0 +1 @@ +require('./chillactivity.scss'); diff --git a/src/Bundle/ChillActivityBundle/Resources/public/index.js b/src/Bundle/ChillActivityBundle/Resources/public/index.js deleted file mode 100644 index e219e368b..000000000 --- a/src/Bundle/ChillActivityBundle/Resources/public/index.js +++ /dev/null @@ -1 +0,0 @@ -require('./scss/chillactivity.scss'); diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig index 3be1d49cf..f6ffa2b66 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig @@ -15,7 +15,7 @@ {% block js %} {{ parent() }} - {{ encore_entry_link_tags('async_upload') }} + {{ encore_entry_link_tags('mod_async_upload') }} + {{ encore_entry_script_tags('mod_async_upload') }} {% endblock %} {% block css %} - + {{ encore_entry_link_tags('mod_async_upload') }} {% endblock %} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig index 0586321cb..662477c99 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig @@ -24,7 +24,7 @@ {% block title %}{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %} {% block js %} - + {{ encore_entry_script_tags('mod_async_upload') }} {% endblock %} {% block personcontent %} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig index 109effc9f..b60ad6550 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig @@ -22,11 +22,11 @@ {% block personcontent %}

{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}

- + {{ form_errors(form) }} {{ form_start(form) }} - + {{ form_row(form.title) }} {{ form_row(form.date) }} {{ form_row(form.category) }} @@ -48,9 +48,9 @@ {% endblock %} {% block js %} - + {{ encore_entry_script_tags('mod_async_upload') }} {% endblock %} {% block css %} - + {{ encore_entry_link_tags('mod_async_upload') }} {% endblock %} diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig index e316e189f..f22864645 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig +++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig @@ -23,19 +23,19 @@ {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %} {% block js %} - + {{ encore_entry_script_tags('mod_async_upload') }} {% endblock %} {% block personcontent %}

{{ 'Document %title%' | trans({ '%title%': document.title }) }}

- +
{{ 'Title'|trans }}
{{ document.title }}
- +
{{ 'Scope' | trans }}
{{ document.scope.name | localize_translatable_string }}
- +
{{ 'Category'|trans }}
{{ document.category.name|localize_translatable_string }}
@@ -58,7 +58,7 @@ {{ 'Back to the list' | trans }} - +
  • {{ m.download_button(document.object, document.title) }}
    • diff --git a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js b/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js index 14f94cd53..833052ef4 100644 --- a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js +++ b/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js @@ -1,3 +1,4 @@ -module.exports = function(encore) { - encore.addEntry('async_upload', __dirname + '/Resources/public/module/async_upload/index.js'); +module.exports = function(encore) +{ + encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js'); }; diff --git a/src/Bundle/ChillEventBundle/Resources/public/css/chillevent.css b/src/Bundle/ChillEventBundle/Resources/public/chill/chillevent.scss similarity index 100% rename from src/Bundle/ChillEventBundle/Resources/public/css/chillevent.css rename to src/Bundle/ChillEventBundle/Resources/public/chill/chillevent.scss diff --git a/src/Bundle/ChillEventBundle/Resources/public/chill/index.js b/src/Bundle/ChillEventBundle/Resources/public/chill/index.js new file mode 100644 index 000000000..adb0dd85e --- /dev/null +++ b/src/Bundle/ChillEventBundle/Resources/public/chill/index.js @@ -0,0 +1 @@ +require('./chillevent.scss'); diff --git a/src/Bundle/ChillEventBundle/Resources/public/index.js b/src/Bundle/ChillEventBundle/Resources/public/index.js deleted file mode 100644 index 697693c59..000000000 --- a/src/Bundle/ChillEventBundle/Resources/public/index.js +++ /dev/null @@ -1 +0,0 @@ -require('./css/chillevent.css'); \ No newline at end of file diff --git a/src/Bundle/ChillEventBundle/chill.webpack.config.js b/src/Bundle/ChillEventBundle/chill.webpack.config.js index a194522ad..83c08a6ce 100644 --- a/src/Bundle/ChillEventBundle/chill.webpack.config.js +++ b/src/Bundle/ChillEventBundle/chill.webpack.config.js @@ -1,4 +1,4 @@ -// this file loads all assets from the Chill Event Bundle -module.exports = function(encore, entries) { - entries.push(__dirname + '/Resources/public/index.js'); -}; \ No newline at end of file +module.exports = function(encore, entries) +{ + entries.push(__dirname + '/Resources/public/chill/index.js'); +}; diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss similarity index 87% rename from src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss rename to src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss index 39464b5db..69572c387 100644 --- a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss +++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss @@ -1,8 +1,5 @@ @import '~ChillMainAssets/module/bootstrap/bootstrap'; -@import "_task-statuses.scss"; -@import "_task-list.scss"; - div#single_task_warningInterval { display: flex; flex-direction: row; @@ -49,22 +46,22 @@ div#single_task_warningInterval { .btn-task-exchange::before { @extend .btn-task; width: 10px; - content: url(../svg/exchange-alt.svg); + content: url('./svg/exchange-alt.svg'); } .btn-task-start::before { @extend .btn-task; - content: url(../svg/play.svg); + content: url('./svg/play.svg'); } .btn-task-cancel::before { @extend .btn-task; - content: url(../svg/archive.svg); + content: url('./svg/archive.svg'); } .btn-task-close::before { @extend .btn-task; - content: url(../svg/check.svg); + content: url('./svg/check.svg'); } .btn-dropdown { diff --git a/src/Bundle/ChillTaskBundle/Resources/public/chill/index.js b/src/Bundle/ChillTaskBundle/Resources/public/chill/index.js new file mode 100644 index 000000000..1261ab752 --- /dev/null +++ b/src/Bundle/ChillTaskBundle/Resources/public/chill/index.js @@ -0,0 +1,5 @@ +require('./scss/_task-statuses.scss'); +require('./scss/_task-list.scss'); + +require('./chilltask.scss'); + diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task-list.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss similarity index 100% rename from src/Bundle/ChillTaskBundle/Resources/public/sass/_task-list.scss rename to src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-list.scss diff --git a/src/Bundle/ChillTaskBundle/Resources/public/sass/_task-statuses.scss b/src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss similarity index 100% rename from src/Bundle/ChillTaskBundle/Resources/public/sass/_task-statuses.scss rename to src/Bundle/ChillTaskBundle/Resources/public/chill/scss/_task-statuses.scss diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/archive.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/archive.svg similarity index 100% rename from src/Bundle/ChillTaskBundle/Resources/public/svg/archive.svg rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/archive.svg diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/check.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/check.svg similarity index 100% rename from src/Bundle/ChillTaskBundle/Resources/public/svg/check.svg rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/check.svg diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/exchange-alt.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/exchange-alt.svg similarity index 100% rename from src/Bundle/ChillTaskBundle/Resources/public/svg/exchange-alt.svg rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/exchange-alt.svg diff --git a/src/Bundle/ChillTaskBundle/Resources/public/svg/play.svg b/src/Bundle/ChillTaskBundle/Resources/public/chill/svg/play.svg similarity index 100% rename from src/Bundle/ChillTaskBundle/Resources/public/svg/play.svg rename to src/Bundle/ChillTaskBundle/Resources/public/chill/svg/play.svg diff --git a/src/Bundle/ChillTaskBundle/Resources/public/index.js b/src/Bundle/ChillTaskBundle/Resources/public/index.js deleted file mode 100644 index ad7fb96c7..000000000 --- a/src/Bundle/ChillTaskBundle/Resources/public/index.js +++ /dev/null @@ -1,3 +0,0 @@ -// this file loads all assets from the Chill task bundle -require('./sass/_task.scss'); - diff --git a/src/Bundle/ChillTaskBundle/chill.webpack.config.js b/src/Bundle/ChillTaskBundle/chill.webpack.config.js index 077d2c500..83c08a6ce 100644 --- a/src/Bundle/ChillTaskBundle/chill.webpack.config.js +++ b/src/Bundle/ChillTaskBundle/chill.webpack.config.js @@ -1,3 +1,4 @@ -module.exports = function(encore, entries) { - entries.push(__dirname + '/Resources/public/index.js'); -}; \ No newline at end of file +module.exports = function(encore, entries) +{ + entries.push(__dirname + '/Resources/public/chill/index.js'); +}; diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js new file mode 100644 index 000000000..0f6a3d5d8 --- /dev/null +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js @@ -0,0 +1,2 @@ +require('./thirdparty.scss'); + diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/sass/thirdparty.scss b/src/Bundle/ChillThirdPartyBundle/Resources/public/chill/thirdparty.scss similarity index 100% rename from src/Bundle/ChillThirdPartyBundle/Resources/public/sass/thirdparty.scss rename to src/Bundle/ChillThirdPartyBundle/Resources/public/chill/thirdparty.scss diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/index.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/index.js deleted file mode 100644 index 9f205177f..000000000 --- a/src/Bundle/ChillThirdPartyBundle/Resources/public/index.js +++ /dev/null @@ -1,3 +0,0 @@ -// sass/css -require('./sass/thirdparty.scss'); - diff --git a/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js b/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js index 98569ccae..83c08a6ce 100644 --- a/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js +++ b/src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js @@ -1,3 +1,4 @@ -module.exports = function(encore, entries) { - entries.push(__dirname + '/Resources/public/index.js'); +module.exports = function(encore, entries) +{ + entries.push(__dirname + '/Resources/public/chill/index.js'); };