X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/74a95513f60ac1cddd488fad7d5cbcfdc674c221..c6c168511f18d8984901b2c828a47310a2d54d64:/forum/urls.py

diff --git a/forum/urls.py b/forum/urls.py
index 30fd5ac..2817521 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -33,8 +33,8 @@ urlpatterns += patterns('',
                         url(r'^$', app.readers.index, name='index'),
                         url(r'^%s(.*)' % _('nimda/'), admin.site.root),
                         
-                        url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps},
-                            name='sitemap'),
+                        url(r'^sitemap.xml$', 'forum.sitemap.index', {'sitemaps': sitemaps}),
+                        url(r'^sitemap-(?P<section>.+)\.xml$', 'forum.sitemap.sitemap', {'sitemaps': sitemaps}),
 
                         (r'^favicon\.ico$', app.meta.favicon),
                         url(r'^cstyle\.css$', app.meta.custom_css, name="custom_css"),
@@ -81,6 +81,8 @@ urlpatterns += patterns('',
                         url(r'^%s(?P<id>\d+)/' % _('comment/'), app.commands.comment, name='comment'),
                         url(r'^%s(?P<id>\d+)/$' % _('delete_comment/'), app.commands.delete_comment,
                             name="delete_comment"),
+                        url(r'^%s(?P<id>\d+)/$' % _('convert_comment/'), app.commands.convert_comment_to_answer,
+                            name="convert_comment"),
                         url(r'^%s(?P<id>\d+)/$' % _('accept_answer/'), app.commands.accept_answer, name="accept_answer")
                         ,
                         url(r'^%s(?P<id>\d+)/$' % _('mark_favorite/'), app.commands.mark_favorite, name="mark_favorite")
@@ -94,6 +96,8 @@ urlpatterns += patterns('',
                         url(r'^%s(?P<id>\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'),
                         url(r'^%s(?P<id>\d+)/' % _('convert/'), app.commands.convert_to_comment,
                             name='convert_to_comment'),
+                        url(r'^%s(?P<id>\d+)/' % _('convert_to_question/'), app.commands.convert_to_question,
+                            name='convert_to_question'),
                         url(r'^%s(?P<id>\d+)/' % _('wikify/'), app.commands.wikify, name='wikify'),
 
                         url(r'^%s(?P<id>\d+)/(?P<slug>[\w-]*)$' % _('question/'),
@@ -206,6 +210,9 @@ urlpatterns += patterns('',
                         url(r'^%s%s(?P<set_name>\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set,
                             name="admin_set"),
 
+                        url(r'%s%s' % (_('admin/'), _('test_email_settings/')), app.admin.test_email_settings,
+                            name="test_email_settings"),
+
                         url(r'^feeds/rss[/]?$', app.readers.feed, name="latest_questions_feed"),
 
                         url(r'^(?P<path>.+)$', app.meta.page, name="static_page"),