diff --git a/gbpui/column_filters.py b/gbpui/column_filters.py index 9939167..bba5b70 100644 --- a/gbpui/column_filters.py +++ b/gbpui/column_filters.py @@ -13,6 +13,7 @@ import logging import os +from django.conf import settings from django.core.urlresolvers import reverse from django.utils.safestring import mark_safe @@ -143,7 +144,8 @@ def update_policyaction_attributes(request, paction): def update_sc_spec_attributes(request, scspec): - img_path = "/static/dashboard/img/" + static_url = getattr(settings, 'STATIC_URL', "/static/") + img_path = static_url + "dashboard/img/" provider = "default" nodes = scspec.nodes nodes = [client.get_servicechain_node(request, item) for item in nodes] @@ -154,8 +156,8 @@ def update_sc_spec_attributes(request, scspec): if os.path.exists(ds_path): local_img_path = ds_path else: - local_img_path = "/usr/share/openstack-dashboard/openstack_dashboard/" \ - + "static/dashboard/img/" + local_img_path = "/usr/share/openstack-dashboard/" \ + + "openstack_dashboard/static/dashboard/img/" if os.path.exists(local_img_path): providers = os.listdir(local_img_path) for p in providers: @@ -239,7 +241,7 @@ def update_classifier_attributes(classifiers): if type(classifiers) == list: for classifier in classifiers: classifier.set_id_as_name_if_empty() - if classifier.protocol in ['tcp', 'udp'] and classifier.port_range \ + if classifier.protocol in ['tcp', 'udp'] and classifier.port_range\ in port_protocol_map: classifier.protocol = port_protocol_map[classifier.port_range] else: diff --git a/gbpui/panels/application_policy/templates/application_policy/_add_policy_classifier.html b/gbpui/panels/application_policy/templates/application_policy/_add_policy_classifier.html index 8441f12..feedad6 100644 --- a/gbpui/panels/application_policy/templates/application_policy/_add_policy_classifier.html +++ b/gbpui/panels/application_policy/templates/application_policy/_add_policy_classifier.html @@ -26,5 +26,5 @@ {% block modal-js %} - + {% endblock %} diff --git a/gbpui/panels/application_policy/templates/application_policy/_update_policy_classifier.html b/gbpui/panels/application_policy/templates/application_policy/_update_policy_classifier.html index c6aaa86..8b6efad 100644 --- a/gbpui/panels/application_policy/templates/application_policy/_update_policy_classifier.html +++ b/gbpui/panels/application_policy/templates/application_policy/_update_policy_classifier.html @@ -25,5 +25,5 @@ {% endblock %} {% block modal-js %} - + {% endblock %} diff --git a/gbpui/panels/network_services/tabs.py b/gbpui/panels/network_services/tabs.py index 87f20ca..cb6b946 100644 --- a/gbpui/panels/network_services/tabs.py +++ b/gbpui/panels/network_services/tabs.py @@ -13,6 +13,7 @@ import json import yaml +from django.contrib.staticfiles.templatetags.staticfiles import static from django.core.urlresolvers import reverse_lazy from django.utils.translation import ugettext_lazy as _ @@ -164,7 +165,7 @@ class ServiceChainNodeDetailsTab(tabs.Tab): node["text"] = key else: node["text"] = key + " : " + str(value) - node["icon"] = "/static/dashboard/img/text.png" + node["icon"] = static("dashboard/img/text.png") tree.append(node) return json.dumps(tree) @@ -206,7 +207,7 @@ class ServiceChainNodeDetailsTab(tabs.Tab): node["text"] = key else: node["text"] = key + " : " + str(value) - node["icon"] = "/static/dashboard/img/text.png" + node["icon"] = static("dashboard/img/text.png") arr.append(node) return arr diff --git a/gbpui/panels/network_services/templates/network_services/_create_service_chain_spec.html b/gbpui/panels/network_services/templates/network_services/_create_service_chain_spec.html index 36e37f6..e9b4997 100644 --- a/gbpui/panels/network_services/templates/network_services/_create_service_chain_spec.html +++ b/gbpui/panels/network_services/templates/network_services/_create_service_chain_spec.html @@ -8,7 +8,7 @@ {% block modal-header %}{% trans "Create Service Chain Spec" %}{% endblock %} {% block modal-body %} - +
@@ -51,7 +51,7 @@ {% block modal-js %} - + + +