Fix the javascript files

infrastructure js files are under infrastructure's static folder,
these are included by infrastructure/_scripts.html template

Change-Id: I3b9bc41baa18791249c5a451b45c303b2cabc093

6 files changed, 8 insertions, 5 deletions

diff --git a/horizon/static/horizon/js/horizon.capacity.js b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.capacity.js
index c9cb4c0c..c9cb4c0c 100644
--- a/horizon/static/horizon/js/horizon.capacity.js
+++ b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.capacity.js
diff --git a/horizon/static/horizon/js/horizon.d3circleschart.js b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.d3circleschart.js
index 305b2182..305b2182 100644
--- a/horizon/static/horizon/js/horizon.d3circleschart.js
+++ b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.d3circleschart.js
diff --git a/horizon/static/horizon/js/horizon.d3linechart.js b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.d3linechart.js
index f84cee82..f84cee82 100644
--- a/horizon/static/horizon/js/horizon.d3linechart.js
+++ b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.d3linechart.js
diff --git a/horizon/static/horizon/js/horizon.d3singlebarchart.js b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.d3singlebarchart.js
index 5e89a0e7..5e89a0e7 100644
--- a/horizon/static/horizon/js/horizon.d3singlebarchart.js
+++ b/openstack_dashboard/dashboards/infrastructure/static/infrastructure/js/horizon.d3singlebarchart.js
diff --git a/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/_scripts.html b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/_scripts.html
new file mode 100644
index 00000000..44cc82b1
--- /dev/null
+++ b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/_scripts.html
@@ -0,0 +1,7 @@
+{% extends 'horizon/_scripts.html' %}
+{% block custom_js_files %}
+  <script src='{{ STATIC_URL }}infrastructure/js/horizon.capacity.js' type='text/javascript' charset='utf-8'></script>
+  <script src='{{ STATIC_URL }}infrastructure/js/horizon.d3circleschart.js' type='text/javascript' charset='utf-8'></script>
+  <script src='{{ STATIC_URL }}infrastructure/js/horizon.d3linechart.js' type='text/javascript' charset='utf-8'></script>
+  <script src='{{ STATIC_URL }}infrastructure/js/horizon.d3singlebarchart.js' type='text/javascript' charset='utf-8'></script>
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html
index ef27a68f..03d4a166 100644
--- a/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html
+++ b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html
@@ -10,9 +10,5 @@
 {% endblock %}
 
 {% block js %}
-  <script src='{{ STATIC_URL }}horizon/js/horizon.capacity.js' type='text/javascript' charset='utf-8'></script>
-  <script src='{{ STATIC_URL }}horizon/js/horizon.d3modallinechart.js' type='text/javascript' charset='utf-8'></script>
-  <script src='{{ STATIC_URL }}horizon/js/horizon.d3circleschart.js' type='text/javascript' charset='utf-8'></script>
-  <script src='{{ STATIC_URL }}horizon/js/horizon.d3linechart.js' type='text/javascript' charset='utf-8'></script>
-  <script src='{{ STATIC_URL }}horizon/js/horizon.d3singlebarchart.js' type='text/javascript' charset='utf-8'></script>
+  {% include "infrastructure/_scripts.html" %}
 {% endblock %}