Revision 46990631 ui/views.py

b/ui/views.py
71 71
SKIP_TIMEOUTS = getattr(settings, "UI_SKIP_TIMEOUTS", 1)
72 72

  
73 73
# MEDIA PATHS
74
UI_MEDIA_URL = getattr(settings, "MEDIA_URL", "/static/")
75
UI_SYNNEFO_MEDIA_URL = getattr(settings,
76
                    "UI_SYNNEFO_MEDIA_URL", UI_MEDIA_URL + "snf-%s/" % SYNNEFO_JS_LIB_VERSION)
74
UI_MEDIA_URL = getattr(settings, "UI_MEDIA_URL",
75
                    "%ssnf-%s/" % (settings.MEDIA_URL, SYNNEFO_JS_LIB_VERSION))
77 76
UI_SYNNEFO_IMAGES_URL = getattr(settings,
78
                    "UI_SYNNEFO_IMAGES_URL", UI_SYNNEFO_MEDIA_URL + "images/")
77
                    "UI_SYNNEFO_IMAGES_URL", UI_MEDIA_URL + "images/")
79 78
UI_SYNNEFO_CSS_URL = getattr(settings,
80
                    "UI_SYNNEFO_CSS_URL", UI_SYNNEFO_MEDIA_URL + "css/")
79
                    "UI_SYNNEFO_CSS_URL", UI_MEDIA_URL + "css/")
81 80
UI_SYNNEFO_JS_URL = getattr(settings,
82
                    "UI_SYNNEFO_JS_URL", UI_SYNNEFO_MEDIA_URL + "js/")
81
                    "UI_SYNNEFO_JS_URL", UI_MEDIA_URL + "js/")
83 82
UI_SYNNEFO_JS_LIB_URL = getattr(settings,
84 83
                    "UI_SYNNEFO_JS_LIB_URL", UI_SYNNEFO_JS_URL + "lib/")
85 84
UI_SYNNEFO_JS_WEB_URL = getattr(settings,
......
92 91
    t = loader.get_template(current_template)
93 92
    media_context = {
94 93
       'UI_MEDIA_URL': UI_MEDIA_URL,
95
       'SYNNEFO_MEDIA_URL': UI_SYNNEFO_MEDIA_URL,
96 94
       'SYNNEFO_JS_URL': UI_SYNNEFO_JS_URL,
97 95
       'SYNNEFO_JS_LIB_URL': UI_SYNNEFO_JS_LIB_URL,
98 96
       'SYNNEFO_JS_WEB_URL': UI_SYNNEFO_JS_WEB_URL,

Also available in: Unified diff