Commit b14dbf03 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

UI static url settings fixes

parent 3897cce2
......@@ -4,7 +4,7 @@
###################
# base url for ui static files
UI_MEDIA_URL = MEDIA_URL
#UI_MEDIA_URL = MEDIA_URL + 'snf/'
# UI requests to the API layer time out after that many milliseconds
TIMEOUT = 10 * 1000
......
......@@ -173,7 +173,7 @@
</head>
<body id="app">
<!--<img id="okeanos-image" src="{{ SYNNEFO_MEDIA_URL }}body-bg2.png" />-->
<!--<img id="okeanos-image" src="{{ SYNNEFO_IMAGES_URL }}body-bg2.png" />-->
<div id="container">
<div id="header">
<div id="user">
......@@ -502,7 +502,7 @@ We welcome any suggestions, questions and bug reports you may have.{% endblocktr
</div>
<div id="loading-view" class="hidden">
<img src="{{ SYNNEFO_MEDIA_URL }}images/icons/indicators/small/progress.gif" />
<img src="{{ SYNNEFO_IMAGES_URL }}icons/indicators/small/progress.gif" />
<div class="header">Loading <span>~okeanos</span></div>
<div class="info hidden"></div>
</div>
......
......@@ -61,7 +61,7 @@ or implied, of GRNET S.A.
<div class="help-text">{% trans "This is a slow connection meant only for troubleshooting. For an optimal experience use the machine's Connect button on the main panel." %}</div>
</div>
<div class="console-container">
<applet code="VncViewer.class" archive="{{ SYNNEFO_MEDIA_URL }}vncviewer/VncViewer.jar">
<applet code="VncViewer.class" archive="{{ UI_MEDIA_URL }}extra/vncviewer/VncViewer.jar">
<param name="HOST" value="{{host}}"></param>
<param name="PORT" value="{{port}}"></param>
<param name="PASSWORD" value="{{password}}"></param>
......
......@@ -71,15 +71,14 @@ HANDLE_WINDOW_EXCEPTIONS = getattr(settings, "UI_HANDLE_WINDOW_EXCEPTIONS", True
SKIP_TIMEOUTS = getattr(settings, "UI_SKIP_TIMEOUTS", 1)
# MEDIA PATHS
UI_MEDIA_URL = getattr(settings, "MEDIA_URL", "/static/")
UI_SYNNEFO_MEDIA_URL = getattr(settings,
"UI_SYNNEFO_MEDIA_URL", UI_MEDIA_URL + "snf-%s/" % SYNNEFO_JS_LIB_VERSION)
UI_MEDIA_URL = getattr(settings, "UI_MEDIA_URL",
"%ssnf-%s/" % (settings.MEDIA_URL, SYNNEFO_JS_LIB_VERSION))
UI_SYNNEFO_IMAGES_URL = getattr(settings,
"UI_SYNNEFO_IMAGES_URL", UI_SYNNEFO_MEDIA_URL + "images/")
"UI_SYNNEFO_IMAGES_URL", UI_MEDIA_URL + "images/")
UI_SYNNEFO_CSS_URL = getattr(settings,
"UI_SYNNEFO_CSS_URL", UI_SYNNEFO_MEDIA_URL + "css/")
"UI_SYNNEFO_CSS_URL", UI_MEDIA_URL + "css/")
UI_SYNNEFO_JS_URL = getattr(settings,
"UI_SYNNEFO_JS_URL", UI_SYNNEFO_MEDIA_URL + "js/")
"UI_SYNNEFO_JS_URL", UI_MEDIA_URL + "js/")
UI_SYNNEFO_JS_LIB_URL = getattr(settings,
"UI_SYNNEFO_JS_LIB_URL", UI_SYNNEFO_JS_URL + "lib/")
UI_SYNNEFO_JS_WEB_URL = getattr(settings,
......@@ -92,7 +91,6 @@ def template(name, context):
t = loader.get_template(current_template)
media_context = {
'UI_MEDIA_URL': UI_MEDIA_URL,
'SYNNEFO_MEDIA_URL': UI_SYNNEFO_MEDIA_URL,
'SYNNEFO_JS_URL': UI_SYNNEFO_JS_URL,
'SYNNEFO_JS_LIB_URL': UI_SYNNEFO_JS_LIB_URL,
'SYNNEFO_JS_WEB_URL': UI_SYNNEFO_JS_WEB_URL,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment