summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lyle <david.lyle@intel.com>2015-07-14 13:58:11 -0600
committerDavid Lyle <david.lyle@intel.com>2015-08-27 16:42:19 -0600
commit1d20ea0852f7f8498dcf18cc94a02acd514e13e9 (patch)
tree272b601d05c5b5130e05954dbbc793982c520680
parenta1737d20d96c657c4f435e86e4a25f52dbcb7dab (diff)
downloadhorizon-1d20ea0852f7f8498dcf18cc94a02acd514e13e9.tar.gz
Fix static file paths in heat topology view
The svg and gif images are still using '/static/' as the base url. Since WEBROOT is configurable and STATIC_URL is as well. This is needs to be fixed or the images won't be found when either has been changed from the default. Not a clean cherry-pick as additional image files were added in Liberty. This just updates the URLs for those present in Kilo. Conflicts: openstack_dashboard/dashboards/project/stacks/mappings.py Closes-Bug: #1474512 Change-Id: I532216c86e131b947e4377303ff3123f32e236f9 (cherry picked from commit fce980c8ce62a66800d6afb7b2864cb4a99b4672)
-rw-r--r--openstack_dashboard/dashboards/project/stacks/mappings.py52
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',
}