Revision 890b0eaf astakos/im/urls.py

b/astakos/im/urls.py
33 33

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

  
37 38
urlpatterns = patterns('astakos.im.views',
38 39
    (r'^$', 'index'),
39 40
    (r'^login/?$', 'index'),
40
    
41
    (r'^admin/', include('astakos.im.admin.urls')),
42
    
43
    (r'^profile/?$', 'users_profile'),
44
    (r'^profile/edit/?$', 'users_edit'),
45
    
41
    (r'^profile/?$', 'edit_profile'),
42
    (r'^feedback/?$', 'send_feedback'),
46 43
    (r'^signup/?$', 'signup'),
47
    #(r'^register/(\w+)?$', 'register'),
48
    #(r'^signup/complete/?$', 'signup_complete'),
49
    #(r'^local/create/?$', 'local_create'),
44
    (r'^admin/', include('astakos.im.admin.urls')),
45
)
46

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

  
52 52
urlpatterns += patterns('astakos.im.target',
......
59 59
)
60 60

  
61 61
if 'local' in settings.IM_MODULES:
62
    urlpatterns += patterns('astakos.im.views',
63
#        (r'^local/create/?$', 'local_create'),
64
        (r'^local/reclaim/?$', 'reclaim_password')
65
    )
66 62
    urlpatterns += patterns('astakos.im.target',
67 63
        (r'^local/?$', 'local.login'),
68 64
        (r'^local/activate/?$', 'local.activate'),
69
        (r'^local/reset/?$', 'local.reset_password')
65
    )
66
    urlpatterns += patterns('django.contrib.auth.views',
67
        (r'^local/password_reset/?$', 'password_reset',
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>.+)/$',
71
         'password_reset_confirm'),
72
        (r'^local/password/reset/complete/$', 'password_reset_complete')
70 73
    )
71 74

  
72 75
if settings.INVITATIONS_ENABLED:

Also available in: Unified diff