Revision c08d0b66 pithos/im/urls.py

b/pithos/im/urls.py
45 45
    (r'^admin/users/(\d+)/?$', 'users_info'),
46 46
    (r'^admin/users/create$', 'users_create'),
47 47
    (r'^admin/users/(\d+)/modify/?$', 'users_modify'),
48
    (r'^admin/users/(\d+)/delete/?$', 'users_delete'),
49
    
50
    (r'^invite/?$', 'invite'),
51
    (r'^local/create/?$', 'local_create'),
52
    (r'^local/reclaim/?$', 'reclaim_password'),
53
    
48
    (r'^admin/users/(\d+)/delete/?$', 'users_delete')
54 49
)
55 50

  
56 51
urlpatterns += patterns('pithos.im.target',
57
    (r'^login/shibboleth/?$', 'shibboleth.login'),
58
    (r'^login/twitter/?$', 'twitter.login'),
59
    (r'^login/twitter/authenticated/?$', 'twitter.authenticated'),
60
    (r'^login/invitation/?$', 'invitation.login'),
61
    (r'^local/?$', 'local.login'),
62
    (r'^local/activate/?$', 'local.activate'),
63
    (r'^local/reset/?$', 'local.reset_password'),
64 52
    (r'^login/dummy/?$', 'dummy.login')
65 53
)
66 54

  
......
68 56
    (r'^static/(?P<path>.*)$', 'django.views.static.serve',
69 57
                                {'document_root': settings.PROJECT_PATH + '/im/static'})
70 58
)
59

  
60
if 'local' in settings.IM_STANDARD_MODULES:
61
    urlpatterns += patterns('pithos.im.views',
62
        (r'^local/create/?$', 'local_create'),
63
        (r'^local/reclaim/?$', 'reclaim_password')
64
    )
65
    urlpatterns += patterns('pithos.im.target',
66
        (r'^local/?$', 'local.login'),
67
        (r'^local/activate/?$', 'local.activate'),
68
        (r'^local/reset/?$', 'local.reset_password')
69
    )
70

  
71
if 'invitation' in settings.IM_STANDARD_MODULES:
72
    urlpatterns += patterns('pithos.im.views',
73
        (r'^invite/?$', 'invite'),
74
    )
75
    urlpatterns += patterns('pithos.im.target',
76
        (r'^login/invitation/?$', 'invitation.login')
77
    )
78

  
79
if 'shibboleth' in settings.IM_OTHER_MODULES:
80
    urlpatterns += patterns('pithos.im.target',
81
        (r'^login/shibboleth/?$', 'shibboleth.login')
82
    )
83

  
84
if 'twitter' in settings.IM_OTHER_MODULES:
85
    urlpatterns += patterns('pithos.im.target',
86
        (r'^login/twitter/?$', 'twitter.login'),
87
        (r'^login/twitter/authenticated/?$', 'twitter.authenticated')
88
    )

Also available in: Unified diff