diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-24 04:41:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-24 04:41:50 +0000 |
| commit | 0010e0c923219114d3430c77ff2c4349c5a3c487 (patch) | |
| tree | 58186522636310dad58e00ac423bb4333fea7e5b | |
| parent | 0b3c92d06490a2edc6ea86479a6fcdfcd294cd73 (diff) | |
| parent | 1d20ea0852f7f8498dcf18cc94a02acd514e13e9 (diff) | |
| download | horizon-0010e0c923219114d3430c77ff2c4349c5a3c487.tar.gz | |
Merge "Fix static file paths in heat topology view" into stable/kilo
| -rw-r--r-- | openstack_dashboard/dashboards/project/stacks/mappings.py | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/openstack_dashboard/dashboards/project/stacks/mappings.py b/openstack_dashboard/dashboards/project/stacks/mappings.py index d59beca44..bd6ae1d86 100644 --- a/openstack_dashboard/dashboards/project/stacks/mappings.py +++ b/openstack_dashboard/dashboards/project/stacks/mappings.py @@ -14,6 +14,7 @@ import json import logging import re +from django.conf import settings from django.core.urlresolvers import reverse from django.template.defaultfilters import register # noqa from django.utils import html @@ -148,32 +149,33 @@ def stack_output(output): return unicode(output) +static_url = getattr(settings, "STATIC_URL", "/static/") resource_images = { - 'LB_FAILED': '/static/dashboard/img/lb-red.svg', - 'LB_DELETE': '/static/dashboard/img/lb-red.svg', - 'LB_IN_PROGRESS': '/static/dashboard/img/lb-gray.gif', - 'LB_INIT': '/static/dashboard/img/lb-gray.svg', - 'LB_COMPLETE': '/static/dashboard/img/lb-green.svg', - 'DB_FAILED': '/static/dashboard/img/db-red.svg', - 'DB_DELETE': '/static/dashboard/img/db-red.svg', - 'DB_IN_PROGRESS': '/static/dashboard/img/db-gray.gif', - 'DB_INIT': '/static/dashboard/img/db-gray.svg', - 'DB_COMPLETE': '/static/dashboard/img/db-green.svg', - 'STACK_FAILED': '/static/dashboard/img/stack-red.svg', - 'STACK_DELETE': '/static/dashboard/img/stack-red.svg', - 'STACK_IN_PROGRESS': '/static/dashboard/img/stack-gray.gif', - 'STACK_INIT': '/static/dashboard/img/stack-gray.svg', - 'STACK_COMPLETE': '/static/dashboard/img/stack-green.svg', - 'SERVER_FAILED': '/static/dashboard/img/server-red.svg', - 'SERVER_DELETE': '/static/dashboard/img/server-red.svg', - 'SERVER_IN_PROGRESS': '/static/dashboard/img/server-gray.gif', - 'SERVER_INIT': '/static/dashboard/img/server-gray.svg', - 'SERVER_COMPLETE': '/static/dashboard/img/server-green.svg', - 'UNKNOWN_FAILED': '/static/dashboard/img/unknown-red.svg', - 'UNKNOWN_DELETE': '/static/dashboard/img/unknown-red.svg', - 'UNKNOWN_IN_PROGRESS': '/static/dashboard/img/unknown-gray.gif', - 'UNKNOWN_INIT': '/static/dashboard/img/unknown-gray.svg', - 'UNKNOWN_COMPLETE': '/static/dashboard/img/unknown-green.svg', + 'LB_FAILED': static_url + 'dashboard/img/lb-red.svg', + 'LB_DELETE': static_url + 'dashboard/img/lb-red.svg', + 'LB_IN_PROGRESS': static_url + 'dashboard/img/lb-gray.gif', + 'LB_INIT': static_url + 'dashboard/img/lb-gray.svg', + 'LB_COMPLETE': static_url + 'dashboard/img/lb-green.svg', + 'DB_FAILED': static_url + 'dashboard/img/db-red.svg', + 'DB_DELETE': static_url + 'dashboard/img/db-red.svg', + 'DB_IN_PROGRESS': static_url + 'dashboard/img/db-gray.gif', + 'DB_INIT': static_url + 'dashboard/img/db-gray.svg', + 'DB_COMPLETE': static_url + 'dashboard/img/db-green.svg', + 'STACK_FAILED': static_url + 'dashboard/img/stack-red.svg', + 'STACK_DELETE': static_url + 'dashboard/img/stack-red.svg', + 'STACK_IN_PROGRESS': static_url + 'dashboard/img/stack-gray.gif', + 'STACK_INIT': static_url + 'dashboard/img/stack-gray.svg', + 'STACK_COMPLETE': static_url + 'dashboard/img/stack-green.svg', + 'SERVER_FAILED': static_url + 'dashboard/img/server-red.svg', + 'SERVER_DELETE': static_url + 'dashboard/img/server-red.svg', + 'SERVER_IN_PROGRESS': static_url + 'dashboard/img/server-gray.gif', + 'SERVER_INIT': static_url + 'dashboard/img/server-gray.svg', + 'SERVER_COMPLETE': static_url + 'dashboard/img/server-green.svg', + 'UNKNOWN_FAILED': static_url + 'dashboard/img/unknown-red.svg', + 'UNKNOWN_DELETE': static_url + 'dashboard/img/unknown-red.svg', + 'UNKNOWN_IN_PROGRESS': static_url + 'dashboard/img/unknown-gray.gif', + 'UNKNOWN_INIT': static_url + 'dashboard/img/unknown-gray.svg', + 'UNKNOWN_COMPLETE': static_url + 'dashboard/img/unknown-green.svg', } |