merge hernani > trunk

[osqa.git] / forum / urls.py

diff --git a/forum/urls.py b/forum/urls.py
index 718e390a0a65ad4388e8ef0d655b2e0547e59714..be0d9f3a7e37c1dea8a2a50870e7840d55ed05e9 100644 (file)
--- 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,8 +81,10 @@ 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+)/$' % _('accept_answer/'), app.commands.accept_answer, name="accept_answer")
-                        ,
+                        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+)/$' % _('answer_link/'), app.commands.answer_permanent_link, name="answer_permanent_link"),
                         url(r'^%s(?P<id>\d+)/$' % _('mark_favorite/'), app.commands.mark_favorite, name="mark_favorite")
                         ,
                         url(r'^%s(?P<id>\d+)/' % _('flag/'), app.commands.flag_post, name='flag_post'),
@@ -208,7 +210,11 @@ 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"),
+                        #url(r'^.+$', app.meta.page, name="static_page"),
                         )
+