This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 4630595e6c0252bb0d87fa3761e6521f7ca9d7f7 Author: Marcus Christie <[email protected]> AuthorDate: Mon Nov 20 10:44:22 2017 -0500 AIRAVATA-2597 Split out common JS/CSS --- .../apps/workspace/templates/django_airavata_workspace/base.html | 6 +++++- .../workspace/templates/django_airavata_workspace/dashboard.html | 2 ++ .../templates/django_airavata_workspace/projects_list.html | 3 ++- django_airavata/apps/workspace/webpack.config.js | 4 ++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/django_airavata/apps/workspace/templates/django_airavata_workspace/base.html b/django_airavata/apps/workspace/templates/django_airavata_workspace/base.html index 844a202..7f6620c 100644 --- a/django_airavata/apps/workspace/templates/django_airavata_workspace/base.html +++ b/django_airavata/apps/workspace/templates/django_airavata_workspace/base.html @@ -3,7 +3,7 @@ {% load static %} {% block css %} -<link rel=stylesheet type=text/css href="{% static 'django_airavata_workspace/dist/main.css' %}"> +<link rel=stylesheet type=text/css href="{% static 'django_airavata_workspace/dist/common.css' %}"> {% endblock %} {% block nav-items %} @@ -18,3 +18,7 @@ <i class="fa fa-folder-open"></i> <span class=sr-only>Projects</span> </a> {% endblock %} + +{% block scripts %} +<script src="{% static "django_airavata_workspace/dist/common.js" %}"></script> +{% endblock %} diff --git a/django_airavata/apps/workspace/templates/django_airavata_workspace/dashboard.html b/django_airavata/apps/workspace/templates/django_airavata_workspace/dashboard.html index 2825ce1..feb9a44 100644 --- a/django_airavata/apps/workspace/templates/django_airavata_workspace/dashboard.html +++ b/django_airavata/apps/workspace/templates/django_airavata_workspace/dashboard.html @@ -3,6 +3,7 @@ {% load static %} {% block css %} +{{ block.super }} <link rel=stylesheet type=text/css href="{% static 'django_airavata_workspace/dist/dashboard.css' %}"> {% endblock %} @@ -13,5 +14,6 @@ {% endblock content %} {% block scripts %} +{{ block.super }} <script src="{% static "django_airavata_workspace/dist/dashboard.js" %}"></script> {% endblock %} diff --git a/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html b/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html index 41b2aae..ba340bb 100644 --- a/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html +++ b/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html @@ -4,6 +4,7 @@ {% load static %} {% block css %} +{{ block.super }} <link rel=stylesheet type=text/css href="{% static 'django_airavata_workspace/dist/project-list.css' %}"> {% endblock %} @@ -14,6 +15,6 @@ {% endblock content %} {% block scripts %} - +{{ block.super }} <script src="{% static "django_airavata_workspace/dist/project-list.js" %}"></script> {% endblock %} \ No newline at end of file diff --git a/django_airavata/apps/workspace/webpack.config.js b/django_airavata/apps/workspace/webpack.config.js index f3e5314..6fd189c 100644 --- a/django_airavata/apps/workspace/webpack.config.js +++ b/django_airavata/apps/workspace/webpack.config.js @@ -64,6 +64,10 @@ module.exports = { new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /^en$/), new ExtractTextPlugin("[name].css"), new CleanWebpackPlugin(['./static/django_airavata_workspace/dist']), + new webpack.optimize.CommonsChunkPlugin({ + name: 'common', + }), + ] } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
