Revision 794852f2 astakos/im/urls.py

b/astakos/im/urls.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
from django.conf import settings
35
from django.conf.urls.defaults import patterns, include
35
from django.conf.urls.defaults import patterns, include, url
36 36
from django.core.urlresolvers import reverse
37 37

  
38 38
urlpatterns = patterns('astakos.im.views',
39
    (r'^$', 'index'),
40
    (r'^login/?$', 'index'),
41
    (r'^profile/?$', 'edit_profile'),
42
    (r'^feedback/?$', 'send_feedback'),
43
    (r'^signup/?$', 'signup'),
44
    (r'^admin/', include('astakos.im.admin.urls')),
39
    url(r'^$', 'index'),
40
    url(r'^login/?$', 'index'),
41
    url(r'^profile/?$', 'edit_profile'),
42
    url(r'^feedback/?$', 'send_feedback'),
43
    url(r'^signup/?$', 'signup'),
44
    url(r'^admin/', include('astakos.im.admin.urls')),
45 45
)
46 46

  
47 47
urlpatterns += patterns('django.contrib.auth.views',
48
    (r'^logout/?$', 'logout'),
49
    (r'^password/?$', 'password_change', {'post_change_redirect':'admin'}),
48
    url(r'^logout/?$', 'logout'),
49
    url(r'^password/?$', 'password_change', {'post_change_redirect':'admin'}),
50 50
)
51 51

  
52 52
urlpatterns += patterns('astakos.im.target',
53
    (r'^login/dummy/?$', 'dummy.login')
53
    url(r'^login/dummy/?$', 'dummy.login')
54 54
)
55 55

  
56 56
urlpatterns += patterns('',
57
    (r'^static/(?P<path>.*)$', 'django.views.static.serve',
57
    url(r'^static/(?P<path>.*)$', 'django.views.static.serve',
58 58
                                {'document_root': settings.PROJECT_PATH + '/im/static'})
59 59
)
60 60

  
61 61
if 'local' in settings.IM_MODULES:
62 62
    urlpatterns += patterns('astakos.im.target',
63
        (r'^local/?$', 'local.login'),
64
        (r'^local/activate/?$', 'local.activate'),
63
        url(r'^local/?$', 'local.login'),
64
        url(r'^local/activate/?$', 'local.activate'),
65 65
    )
66 66
    urlpatterns += patterns('django.contrib.auth.views',
67
        (r'^local/password_reset/?$', 'password_reset',
67
        url(r'^local/password_reset/?$', 'password_reset',
68 68
         {'email_template_name':'registration/password_email.txt'}),
69
        (r'^local/password_reset_done/?$', 'password_reset_done'),
70
        (r'^local/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
69
        url(r'^local/password_reset_done/?$', 'password_reset_done'),
70
        url(r'^local/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
71 71
         'password_reset_confirm'),
72
        (r'^local/password/reset/complete/$', 'password_reset_complete')
72
        url(r'^local/password/reset/complete/$', 'password_reset_complete')
73 73
    )
74 74

  
75 75
if settings.INVITATIONS_ENABLED:
76 76
    urlpatterns += patterns('astakos.im.views',
77
        (r'^invite/?$', 'invite'),
77
        url(r'^invite/?$', 'invite'),
78 78
    )
79 79
    urlpatterns += patterns('astakos.im.target',
80
        (r'^login/invitation/?$', 'invitation.login')
80
        url(r'^login/invitation/?$', 'invitation.login')
81 81
    )
82 82

  
83 83
if 'shibboleth' in settings.IM_MODULES:
84 84
    urlpatterns += patterns('astakos.im.target',
85
        (r'^login/shibboleth/?$', 'shibboleth.login')
85
        url(r'^login/shibboleth/?$', 'shibboleth.login')
86 86
    )
87 87

  
88 88
if 'twitter' in settings.IM_MODULES:
89 89
    urlpatterns += patterns('astakos.im.target',
90
        (r'^login/twitter/?$', 'twitter.login'),
91
        (r'^login/twitter/authenticated/?$', 'twitter.authenticated')
90
        url(r'^login/twitter/?$', 'twitter.login'),
91
        url(r'^login/twitter/authenticated/?$', 'twitter.authenticated')
92 92
    )
93 93

  
94 94
urlpatterns += patterns('astakos.im.api',
95
    (r'^authenticate/?$', 'authenticate')
95
    url(r'^authenticate/?$', 'authenticate')
96 96
)
97 97
    

Also available in: Unified diff