BASE_PATH -> BASE_URL

Author: vinilios

conf/20-snf-ui-settings.conf

@@ -1,5 +1,5 @@
 # The path under which the ui views will be served from
-#UI_PATH = "/ui/"
+#UI_BASE_URL = "/ui/"
 
 # The path used to serve the astakos identity and account endpoints.
 #UI_ASTAKOS_PROXY_PATH = "_astakos"

synnefo_ui/ui_settings.py

@@ -19,18 +19,18 @@
 from synnefo.lib import parse_base_url
 
 
-BASE_PATH = getattr(settings, 'UI_BASE_PATH', '/ui/')
+BASE_URL = getattr(settings, 'UI_BASE_URL', '/ui/')
 
 AUTH_METHOD = getattr(settings, 'UI_AUTH_METHOD', 'cookie:_pithos2_a')
 
 PROXY_PATH = getattr(settings, 'UI_ASTAKOS_PROXY_PATH', '_astakos')
 ASTAKOS_IDENTITY_PROXY_PATH = getattr(settings,
                                 'UI_ASTAKOS_IDENTITY_PROXY_PATH',
-                                '%s%s/identity' % (BASE_PATH, PROXY_PATH))
+                                '%s%s/identity' % (BASE_URL, PROXY_PATH))
 
 ASTAKOS_ACCOUNT_PROXY_PATH = getattr(settings,
                                 'UI_ASTAKOS_ACCOUNT_PROXY_PATH',
-                                '%s%s/account' % (BASE_PATH, PROXY_PATH))
+                                '%s%s/account' % (BASE_URL, PROXY_PATH))
 
 COMMON_AUTH_URL = getattr(settings, 'ASTAKOS_AUTH_URL', None)
 ASTAKOS_ACCOUNT_BASE_URL = getattr(settings,

synnefo_ui/urls.py

@@ -23,7 +23,7 @@
 from snf_django.lib.api import api_endpoint_not_found
 from snf_django.utils.urls import extend_path_with_slash
 
-from synnefo_ui.ui_settings import BASE_PATH, ASTAKOS_IDENTITY_PROXY_PATH, \
+from synnefo_ui.ui_settings import BASE_URL, ASTAKOS_IDENTITY_PROXY_PATH, \
     ASTAKOS_IDENTITY_BASE_URL, ASTAKOS_ACCOUNT_PROXY_PATH, \
     ASTAKOS_ACCOUNT_BASE_URL
 
@@ -54,7 +54,7 @@
 urlpatterns = proxy_patterns
 urlpatterns += patterns(
     '',
-    (prefix_pattern(BASE_PATH), include(ui_patterns)))
+    (prefix_pattern(BASE_URL), include(ui_patterns)))
 
 
-extend_path_with_slash(urlpatterns, BASE_PATH);
+extend_path_with_slash(urlpatterns, BASE_URL);

synnefo_ui/views.py

@@ -41,7 +41,7 @@ def app(request):
     context = {
         'app_settings': json.dumps(app_settings),
         'UI_MEDIA_URL': ui_settings.UI_MEDIA_URL,
-        'UI_BASE_URL': ui_settings.BASE_PATH
+        'UI_BASE_URL': ui_settings.BASE_URL
     }
     return direct_to_template(request, "snf_ui_index.html",
                               extra_context=context)