Merge branch 'develop' into debian-develop-wheezy

[pithos-web-client] / snf-pithos-webclient / pithos_webclient / urls.py

diff --git a/snf-pithos-webclient/pithos_webclient/urls.py b/snf-pithos-webclient/pithos_webclient/urls.py
index bc41d16..15c4e16 100644 (file)
--- a/snf-pithos-webclient/pithos_webclient/urls.py
+++ b/snf-pithos-webclient/pithos_webclient/urls.py
@@ -31,10 +31,22 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from django.conf.urls.defaults import include, patterns
+try:
+    from django.conf.urls import include, patterns
+except ImportError:  # Django 1.2
+    from django.conf.urls.defaults import include, patterns
 
+from pithos_webclient import settings
+from snf_django.lib.api.utils import prefix_pattern
+from snf_django.utils.urls import extend_with_root_redirects
+from synnefo.lib import join_urls
 
-urlpatterns = patterns('',
-    (r'^$', 'pithos_webclient.views.index')
+
+urlpatterns = patterns('', (
+    prefix_pattern(join_urls(settings.BASE_PATH, settings.UI_PREFIX)) + '$',
+    'pithos_webclient.views.index'),
 )
 
+# set utility redirects
+extend_with_root_redirects(urlpatterns, settings.pithos_services, 'pithos_ui',
+                           settings.BASE_PATH)