From 72401afb7cc73033944b8f8700db6d525db9d264 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Wed, 16 Jul 2014 15:22:03 +0200 Subject: [PATCH] Include _scripts.html in details.html directly --- tuskar_sat_ui/templates/infrastructure/_scripts.html | 8 -------- tuskar_sat_ui/templates/infrastructure/nodes/details.html | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 tuskar_sat_ui/templates/infrastructure/_scripts.html diff --git a/tuskar_sat_ui/templates/infrastructure/_scripts.html b/tuskar_sat_ui/templates/infrastructure/_scripts.html deleted file mode 100644 index c54d15f..0000000 --- a/tuskar_sat_ui/templates/infrastructure/_scripts.html +++ /dev/null @@ -1,8 +0,0 @@ -{% block custom_js_files %} - - - -{% endblock %} - -{% comment %} Tuskar-UI Client-side Templates (These should *not* be inside the "compress" tag.) {% endcomment %} -{% include "client_side/templates.html" %} diff --git a/tuskar_sat_ui/templates/infrastructure/nodes/details.html b/tuskar_sat_ui/templates/infrastructure/nodes/details.html index 300c411..a2b7fd7 100644 --- a/tuskar_sat_ui/templates/infrastructure/nodes/details.html +++ b/tuskar_sat_ui/templates/infrastructure/nodes/details.html @@ -8,10 +8,13 @@ {% block js %} - {% include "overrides/infrastructure/templates/_scripts.html" %} + + +{% include "client_side/templates.html" %} {% endblock %} + {% block main %}