← Back to branch summary

~widelands-dev/widelands-website/django_staticfiles

« back to all changes in this revision

Viewing changes to urls.py

  • Committer: Holger Rapp
  • Date: 2012-09-01 16:11:57 UTC
  • mfrom: (325.1.23 development)
  • Revision ID: sirver@gmx.de-20120901161157-nm7xupfhd2jlpypg
Merged Shevonars amazing work!

Show diffs side-by-side

added added

removed removed

Lines of Context:
urls.py
8
8
 
9
9
from widelands.news.feeds import NewsPostsFeed
10
10
from widelands.wiki.feeds import RssHistoryFeed
 
11
from django.views.generic.simple import redirect_to
11
12
 
12
13
feeds = {
13
14
    'news': NewsPostsFeed,
20
21
    (r'^admin/', include(admin.site.urls)),
21
22
 
22
23
    # Django builtin / Registration
23
 
    (r'^accounts/logout/(next=(?P<next_page>.*))?$', 'django.contrib.auth.views.logout'),
24
 
url (r'^accounts/register/$', 'mainpage.views.register', name='registration_register'),
25
 
    url(r'^accounts/changepw/$', 'django.contrib.auth.views.password_change', name="auth_change_password"),
 
24
    # overwrite registration with own implementation
 
25
    url (r'^accounts/register/$', 'mainpage.views.register', name='registration_register'),
26
26
    (r'^accounts/', include('registration.backends.default.urls')),
27
27
    (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
28
28
 
42
42
    url(r'^$', mainpage, name="mainpage"),
43
43
    url(r'^changelog/$', "mainpage.views.changelog", name="changelog"),
44
44
    url(r'^developers/$', "mainpage.views.developers", name="developers"),
45
 
    url(r'^help/', include("online_help.urls")),
 
45
    url(r'^help/(?P<path>.*)', redirect_to, { "url": "/encyclopedia/%(path)s", "permanent": True }), # to not break old links
 
46
    url(r'^encyclopedia/', include("wlhelp.urls")),
46
47
    url(r'^webchat/', include("wlwebchat.urls")),
47
48
    url(r'^images/', include("wlimages.urls")),
48
49
    url(r'^profile/', include("wlprofile.urls")),