openstack
/
murano-dashboard
Code Issues Proposed changes

Compress murano-dashboard JS scripts within a common context 

This patch moves all murano-dashboard JS scripts to ADD_JS_FILES
setting and gets rid of murano_base.html template which sole purpose
is including these scripts.
This can fix the render issue in Components tab.

Change-Id: If14e3bd4ea9764857deb7a2997d3d2d0f4daba7c
Closes-Bug: #1654809
Co-Authored-By: Timur Sufiev <tsufiev@mirantis.com>
This commit is contained in:
zhurong 2017-01-19 15:07:36 +08:00
parent 6b00791ffb
commit b2e61cb9c5
19 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
muranodashboard/local/enabled/_51_muranodashboard.py
View File

@ -28,10 +28,19 @@ ADD_JS_FILES = [
'muranodashboard/js/upload_form.js',
'muranodashboard/js/import_bundle_form.js',
'muranodashboard/js/more-less.js',
'app/murano/murano.service.js',
'app/murano/murano.module.js'
'app/murano/murano.module.js',
'muranodashboard/js/add-select.js',
'muranodashboard/js/draggable-components.js',
'muranodashboard/js/environments-in-place.js',
'muranodashboard/js/external-ad.js',
'muranodashboard/js/horizon.muranotopology.js',
'muranodashboard/js/murano.tables.js',
'muranodashboard/js/load-modals.js',
'muranodashboard/js/mixed-mode.js',
'muranodashboard/js/passwordfield.js',
'muranodashboard/js/submit-disabled.js',
'muranodashboard/js/support_placeholder.js'
]
FEATURE = True

2
muranodashboard/templates/catalog/app_details.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n sizeformat %}
{% load static %}
{% load compress %}

2
muranodashboard/templates/catalog/index.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% load static %}
{% load compress %}

2
muranodashboard/templates/categories/add.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Add Category" %}{% endblock %}

2
muranodashboard/templates/categories/index.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Application Categories" %}{% endblock %}

2
muranodashboard/templates/deployments/index.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Environment Deployments" %}{% endblock %}

2
muranodashboard/templates/deployments/reports.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n sizeformat %}
{% block title %}{% trans "Deployment Details" %}{% endblock %}

2
muranodashboard/templates/environments/create.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Create Environment" %}{% endblock %}

2
muranodashboard/templates/environments/index.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% load static %}
{% load compress %}

2
muranodashboard/templates/images/index.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Marked Images" %}{% endblock %}

2
muranodashboard/templates/images/mark.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Mark Image" %}{% endblock %}

20
muranodashboard/templates/murano_base.html
View File

@ -1,20 +0,0 @@
{% extends 'base.html' %}
{% load static %}
{% load compress %}
{% block js %}
{{ block.super }}
{% compress js %}
<script src="{% static 'muranodashboard/js/add-select.js' %}"></script>
<script src="{% static 'muranodashboard/js/draggable-components.js' %}"></script>
<script src="{% static 'muranodashboard/js/environments-in-place.js' %}"></script>
<script src="{% static 'muranodashboard/js/external-ad.js' %}"></script>
<script src="{% static 'muranodashboard/js/horizon.muranotopology.js' %}"></script>
<script src="{% static 'muranodashboard/js/murano.tables.js' %}"></script>
<script src="{% static 'muranodashboard/js/load-modals.js' %}"></script>
<script src="{% static 'muranodashboard/js/mixed-mode.js' %}"></script>
<script src="{% static 'muranodashboard/js/passwordfield.js' %}"></script>
<script src="{% static 'muranodashboard/js/submit-disabled.js' %}"></script>
<script src="{% static 'muranodashboard/js/support_placeholder.js' %}"></script>
{% endcompress %}
{% endblock %}

2
muranodashboard/templates/packages/import_bundle.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Import Bundle" %}{% endblock %}

2
muranodashboard/templates/packages/index.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% load static %}
{% load compress %}

2
muranodashboard/templates/packages/modify_package.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Modify Package" %}{% endblock %}

2
muranodashboard/templates/packages/upload.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Import Package" %}{% endblock %}

2
muranodashboard/templates/services/details.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n sizeformat %}
{% load static %}
{% load compress %}

2
muranodashboard/templates/services/index.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% load static %}
{% load compress %}

2
muranodashboard/templates/services/wizard_create.html
View File

@ -1,4 +1,4 @@
{% extends 'murano_base.html' %}
{% extends 'base.html' %}
{% load i18n %}
{% block title %}{% trans "Add Application" %}{% endblock %}