summaryrefslogtreecommitdiff
path: root/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/urls.py b/urls.py
index e7a2cbc3..81b45627 100644
--- a/urls.py
+++ b/urls.py
@@ -29,14 +29,13 @@ urlpatterns += patterns('public.views',
{}, 'page-art'),
(r'^https/$', TemplateView.as_view(template_name='public/https.html'),
{}, 'page-https'),
- (r'^hackers/$', 'userlist', { 'user_type':'hackers' }, 'page-devs'),
- (r'^fellows/$', 'userlist', { 'user_type':'fellows' }, 'page-fellows'),
(r'^donate/$', RedirectView.as_view('https://wiki.parabola.nu/Donations'),
{}, 'page-donate'),
(r'^download/$', RedirectView.as_view('https://wiki.parabola.nu/Get_Parabola'),
{}, 'page-download'),
(r'^master-keys/$', 'keys', {}, 'page-keys'),
(r'^master-keys/json/$', 'keys_json', {}, 'pgp-keys-json'),
+ (r'^people/(?P<slug>[-\w]+)/$', 'people', {}, 'people'),
)
# Feeds patterns, used below
@@ -94,15 +93,18 @@ urlpatterns += patterns('django.contrib.auth.views',
legacy_urls = (
('^about.php', '/about/'),
('^changelog.php', '/packages/?sort=-last_update'),
- ('^devs.php', '/developers/'),
+ ('^devs.php', '/people/developers/'),
('^donations.php', '/donate/'),
('^download.php', '/download/'),
('^index.php', '/'),
('^logos.php', '/art/'),
('^news.php', '/news/'),
('^packages.php', '/packages/'),
- ('^people.php', '/developers/'),
+ ('^people.php', '/people/developers/'),
('^todolists/$', '/todo/'),
+ ('^developers/$', '/people/developers/'),
+ ('^fellows/$', '/people/developer-fellows/'),
+ ('^trustedusers/$', '/people/trusted-users/'),
('^docs/en/guide/install/arch-install-guide.html',
'https://wiki.parabola.nu/Installation_Guide'),