diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2013-08-01 16:13:52 +0200 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2013-08-01 16:18:58 +0200 |
| commit | 9cc7a2a53f3f77b664a069e869a5bfab9eee5751 (patch) | |
| tree | 5a06d9a5afc82294dc417d3ab069899b57a762a3 | |
| parent | 390771276729350d7e9002ef51e370b84f9f3226 (diff) | |
| download | tuskar-ui-9cc7a2a53f3f77b664a069e869a5bfab9eee5751.tar.gz | |
Move infrastructure JS includes out of horizon
Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
| -rw-r--r-- | horizon/templates/horizon/_scripts.html | 5 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/horizon/templates/horizon/_scripts.html b/horizon/templates/horizon/_scripts.html index 9dfd0f4c..b3edd204 100644 --- a/horizon/templates/horizon/_scripts.html +++ b/horizon/templates/horizon/_scripts.html @@ -39,11 +39,6 @@ <script src='{{ STATIC_URL }}horizon/js/horizon.networktopology.js' type='text/javascript' charset='utf-8'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.d3piechart.js' type='text/javascript' charset='utf-8'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.heattop.js' type='text/javascript' charset='utf-8'></script> -<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> {% block custom_js_files %}{% endblock %} {% endcompress %} diff --git a/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html index cca33756..ef27a68f 100644 --- a/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html +++ b/openstack_dashboard/dashboards/infrastructure/templates/infrastructure/base.html @@ -8,3 +8,11 @@ <link href='{{ STATIC_URL }}infrastructure/less/infrastructure.less' type='text/less' media='screen' rel='stylesheet' /> {% endcompress %} {% 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> +{% endblock %} |