Revision 7eb45083 snf-cyclades-app/synnefo/ui/settings.py

b/snf-cyclades-app/synnefo/ui/settings.py
44 44 
ASTAKOS_ACCOUNTS_URL = join_urls(cyclades.ASTAKOS_BASE_URL,
45 45 
                                 cyclades.ASTAKOS_ACCOUNTS_PREFIX)
46 46 
if cyclades.PROXY_USER_SERVICES:
47 
    ASTAKOS_ACCOUNTS_URL = join_urls(cyclades.BASE_ASTAKOS_PROXY_PATH,
47 
    ASTAKOS_ACCOUNTS_URL = join_urls('/', cyclades.BASE_ASTAKOS_PROXY_PATH,
48 48 
                                     cyclades.ASTAKOS_ACCOUNTS_PREFIX)
49 49 

  		





  50
  50
  
    

  		





  
  51
  
    
BASE_PATH = cyclades.BASE_PATH


  		





  
  52
  
    
if not BASE_PATH.startswith("/"):


  		





  
  53
  
    
    BASE_PATH = "/" + BASE_PATH


  		





  
  54
  
    

  		





  51
  55
  
    
ACCOUNTS_URL = getattr(settings, 'CYCLADES_UI_ACCOUNTS_URL',


  		





  52
  56
  
    
                       join_urls(ASTAKOS_ACCOUNTS_URL))


  		





  53
  57
  
    
USER_CATALOG_URL = getattr(settings, 'CYCLADES_UI_USER_CATALOG_URL',


  		





  ......




  55
  59
  
    
FEEDBACK_URL = getattr(settings, 'CYCLADES_UI_FEEDBACK_URL',


  		





  56
  60
  
    
                       join_urls(ACCOUNTS_URL, 'feedback'))


  		





  57
  61
  
    
COMPUTE_URL = getattr(settings, 'CYCLADES_UI_COMPUTE_URL',


  		





  58
  
  
    
                      join_urls(cyclades.BASE_PATH,


  		





  59
  
  
    
                                cyclades.COMPUTE_PREFIX,


  		





  
  62
  
    
                      join_urls(BASE_PATH, cyclades.COMPUTE_PREFIX,


  		





  60
  63
  
    
                                'v1.1'))


  		





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


  		





  62
  
  
    
                     join_urls(cyclades.BASE_PATH, cyclades.PLANKTON_PREFIX))


  		





  
  65
  
    
                     join_urls(BASE_PATH, cyclades.PLANKTON_PREFIX))


  		





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


  		





  64
  
  
    
                       join_urls(cyclades.BASE_PATH, cyclades.USERDATA_PREFIX))


  		





  
  67
  
    
                       join_urls(BASE_PATH, cyclades.USERDATA_PREFIX))


  		





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


  		





  66
  69
  
    
                    join_urls(cyclades.ASTAKOS_BASE_URL,


  		





  67
  70
  
    
                              cyclades.ASTAKOS_VIEWS_PREFIX, 'login'))


  		












Also available in:
  Unified diff