Revision 7970aa87 ui/views.py

b/ui/views.py
46 46

  
47 47
from django.http import Http404
48 48

  
49
SYNNEFO_JS_LIB_VERSION = "0.7"
50

  
49 51
IMAGE_ICONS = settings.IMAGE_ICONS
50 52
LOGOUT_URL = getattr(settings, "LOGOUT_URL", settings.LOGIN_URL)
51 53
INVITATIONS_PER_PAGE = getattr(settings, "INVITATIONS_PER_PAGE", 10)
......
68 70
HANDLE_WINDOW_EXCEPTIONS = getattr(settings, "UI_HANDLE_WINDOW_EXCEPTIONS", True)
69 71
SKIP_TIMEOUTS = getattr(settings, "UI_SKIP_TIMEOUTS", 1)
70 72

  
71
UI_MEDIA_URL = getattr(settings, "UI_SYNNEFO_MEDIA_URL", "/static/")
73
# MEDIA PATHS
74
UI_MEDIA_URL = getattr(settings, "MEDIA_URL", "/static/")
72 75
UI_SYNNEFO_MEDIA_URL = getattr(settings,
73
                    "UI_SYNNEFO_MEDIA_URL", UI_MEDIA_URL + "snf/")
76
                    "UI_SYNNEFO_MEDIA_URL", UI_MEDIA_URL + "snf-%s/" % SYNNEFO_JS_LIB_VERSION)
77
UI_SYNNEFO_IMAGES_URL = getattr(settings,
78
                    "UI_SYNNEFO_IMAGES_URL", UI_SYNNEFO_MEDIA_URL + "images/")
79
UI_SYNNEFO_CSS_URL = getattr(settings,
80
                    "UI_SYNNEFO_CSS_URL", UI_SYNNEFO_MEDIA_URL + "css/")
74 81
UI_SYNNEFO_JS_URL = getattr(settings,
75 82
                    "UI_SYNNEFO_JS_URL", UI_SYNNEFO_MEDIA_URL + "js/")
76 83
UI_SYNNEFO_JS_LIB_URL = getattr(settings,
......
83 90
    template_path = os.path.join(os.path.dirname(__file__), "templates/")
84 91
    current_template = template_path + name + '.html'
85 92
    t = loader.get_template(current_template)
93
    media_context = {
94
       'UI_MEDIA_URL': UI_MEDIA_URL,
95
       'SYNNEFO_MEDIA_URL': UI_SYNNEFO_MEDIA_URL,
96
       'SYNNEFO_JS_URL': UI_SYNNEFO_JS_URL,
97
       'SYNNEFO_JS_LIB_URL': UI_SYNNEFO_JS_LIB_URL,
98
       'SYNNEFO_JS_WEB_URL': UI_SYNNEFO_JS_WEB_URL,
99
       'SYNNEFO_IMAGES_URL': UI_SYNNEFO_IMAGES_URL,
100
       'SYNNEFO_CSS_URL': UI_SYNNEFO_CSS_URL,
101
       'SYNNEFO_JS_LIB_VERSION': SYNNEFO_JS_LIB_VERSION,
102
       'DEBUG': settings.DEBUG
103
    }
104
    context.update(media_context)
86 105
    return HttpResponse(t.render(Context(context)))
87 106

  
88 107
def home(request):
......
102 121
               'update_hidden_views': json.dumps(UPDATE_HIDDEN_VIEWS),
103 122
               'handle_window_exceptions': json.dumps(HANDLE_WINDOW_EXCEPTIONS),
104 123
               'skip_timeouts': json.dumps(SKIP_TIMEOUTS),
105

  
106
               'UI_MEDIA_URL': UI_MEDIA_URL,
107
               'SYNNEFO_MEDIA_URL': UI_SYNNEFO_MEDIA_URL,
108
               'SYNNEFO_JS_URL': UI_SYNNEFO_JS_URL,
109
               'SYNNEFO_JS_LIB_URL': UI_SYNNEFO_JS_LIB_URL,
110
               'SYNNEFO_JS_WEB_URL': UI_SYNNEFO_JS_WEB_URL,
111

  
112
               'DEBUG': settings.DEBUG}
124
               }
113 125
    return template('home', context)
114 126

  
115
def machines(request):
116
    context = {'default_keywords': settings.DEFAULT_KEYWORDS}
117
    return template('machines', context)
118

  
119
def machines_icon(request):
120
    context = {'default_keywords': settings.DEFAULT_KEYWORDS}
121
    return template('machines_icon', context)
122

  
123
def machines_list(request):
124
    context = {'default_keywords': settings.DEFAULT_KEYWORDS}
125
    return template('machines_list', context)
126

  
127
def machines_single(request):
128
    context = {'default_keywords': settings.DEFAULT_KEYWORDS}
129
    return template('machines_single', context)
130

  
131 127
def machines_console(request):
132 128
    host, port, password = ('','','')
133 129
    host = request.GET.get('host','')
......
283 279

  
284 280
    return HttpResponse('{"status":"send"}');
285 281

  
286
def images(request):
287
    context = {}
288
    return template('images', context)
289

  
290
def disks(request):
291
    context = {}
292
    return template('disks', context)
293

  
294
def networks(request):
295
    context = {}
296
    return template('networks', context)
297

  
298
def files(request):
299
    context = {}
300
    return template('files', context)
301

  
302
def desktops(request):
303
    context = {}
304
    return template('desktops', context)
305

  
306
def apps(request):
307
    context = {}
308
    return template('apps', context)

Also available in: Unified diff