Revision 69edece7

b/snf-cyclades-app/synnefo/plankton/urls.py
31 31 
# interpreted as representing official policies, either expressed
32 32 
# or implied, of GRNET S.A.
33 33 

  		





  34
  
  
    
from django.conf.urls.defaults import patterns


  		





  
  34
  
    
from django.conf.urls.defaults import patterns, include


  		





  35
  35
  
    
from django.http import HttpResponseNotAllowed


  		





  36
  36
  
    

  		





  37
  37
  
    
from synnefo.plankton import views


  		





  ......




  77
  77
  
    
        return HttpResponseNotAllowed(['DELETE', 'PUT'])


  		





  78
  78
  
    

  		





  79
  79
  
    

  		





  80
  
  
    
urlpatterns = patterns(


  		





  
  80
  
    
image_v1_patterns = patterns(


  		





  81
  81
  
    
    '',


  		





  82
  82
  
    
    (r'^images/$', demux),


  		





  83
  83
  
    
    (r'^images/detail$', views.list_images, {'detail': True}),


  		





  84
  84
  
    
    (r'^images/([\w-]+)$', demux_image),


  		





  85
  85
  
    
    (r'^images/([\w-]+)/members$', demux_image_members),


  		





  86
  86
  
    
    (r'^images/([\w-]+)/members/([\w@._-]+)$', demux_members),


  		





  87
  
  
    
    (r'^shared-images/([\w@._-]+)$', views.list_shared_images)


  		





  
  87
  
    
    (r'^shared-images/([\w@._-]+)$', views.list_shared_images),


  		





  
  88
  
    
)


  		





  
  89
  
    

  		





  
  90
  
    
urlpatterns = patterns(


  		





  
  91
  
    
    '',


  		





  
  92
  
    
    (r'^v1/', include(image_v1_patterns)),


  		





  88
  93
  
    
)


  		












  

    
      b/snf-cyclades-app/synnefo/ui/settings.py
    
  






  62
  62
  
    
                      join_urls(BASE_PATH, cyclades.COMPUTE_PREFIX,


  		





  63
  63
  
    
                                'v1.1'))


  		





  64
  64
  
    
GLANCE_URL = getattr(settings, 'CYCLADES_UI_GLANCE_URL',


  		





  65
  
  
    
                     join_urls(BASE_PATH, cyclades.PLANKTON_PREFIX))


  		





  
  65
  
    
                     join_urls(BASE_PATH, cyclades.PLANKTON_PREFIX + '/v1'))


  		





  66
  66
  
    
USERDATA_URL = getattr(settings, 'CYCLADES_UI_USERDATA_URL',


  		





  67
  67
  
    
                       join_urls(BASE_PATH, cyclades.USERDATA_PREFIX))


  		





  68
  68
  
    
LOGIN_URL = getattr(settings, 'CYCLADES_UI_LOGIN_URL',


  		












Also available in:
  Unified diff