sync merge jambazov -> trunk

[osqa.git] / forum / urls.py

diff --git a/forum/urls.py b/forum/urls.py
index 51cccefcf9586644335f7254d879c16b27855738..f53ccae3530f4cca85ede58eb506b1156bb2f8a5 100644 (file)
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -6,14 +6,14 @@ from django.conf.urls.defaults import *
 from django.conf import settings as djsettings
 from django.contrib import admin
 from forum import views as app
 from django.conf import settings as djsettings
 from django.contrib import admin
 from forum import views as app

-from forum.sitemap import QuestionsSitemap
+from forum.sitemap import OsqaSitemap

 from django.utils.translation import ugettext as _
 import logging
 
 admin.autodiscover()
 
 sitemaps = {
 from django.utils.translation import ugettext as _
 import logging
 
 admin.autodiscover()
 
 sitemaps = {

-    'questions': QuestionsSitemap
+    'questions': OsqaSitemap

 }
 
 APP_PATH = os.path.dirname(__file__)
 }
 
 APP_PATH = os.path.dirname(__file__)


@@ -31,8 +31,10 @@ for pattern_file in module_patterns:
 
 urlpatterns += patterns('',
                         url(r'^$', app.readers.index, name='index'),
 
 urlpatterns += patterns('',
                         url(r'^$', app.readers.index, name='index'),

-                        url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps},
-                            name='sitemap'),
+                        url(r'^%s(.*)' % _('nimda/'), admin.site.root),
+                        
+                        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"),
 
                         (r'^favicon\.ico$', app.meta.favicon),
                         url(r'^cstyle\.css$', app.meta.custom_css, name="custom_css"),


@@ -49,6 +51,7 @@ urlpatterns += patterns('',
                             {'content': settings.ABOUT_PAGE_TEXT, 'title': _('About')}, name='about'),
                         url(r'^%s$' % _('markdown_help/'), app.meta.markdown_help, name='markdown_help'),
                         url(r'^opensearch\.xml$', app.meta.opensearch, name='opensearch'),
                             {'content': settings.ABOUT_PAGE_TEXT, 'title': _('About')}, name='about'),
                         url(r'^%s$' % _('markdown_help/'), app.meta.markdown_help, name='markdown_help'),
                         url(r'^opensearch\.xml$', app.meta.opensearch, name='opensearch'),

+                        url(r'^opensearch\.xml$', app.meta.opensearch, name='opensearch'),

                         url(r'^%s$' % _('privacy/'), app.meta.privacy, name='privacy'),
                         url(r'^%s$' % _('logout/'), app.meta.logout, name='logout'),
                         url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.writers.edit_answer,
                         url(r'^%s$' % _('privacy/'), app.meta.privacy, name='privacy'),
                         url(r'^%s$' % _('logout/'), app.meta.logout, name='logout'),
                         url(r'^%s(?P<id>\d+)/%s$' % (_('answers/'), _('edit/')), app.writers.edit_answer,


@@ -60,7 +63,7 @@ urlpatterns += patterns('',
                             name='related_questions'),
 
                         url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.readers.unanswered, name='unanswered'),
                             name='related_questions'),
 
                         url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.readers.unanswered, name='unanswered'),

-                        url(r'^%s(?P<mode>[\w-]+)/(?P<user>\d+)/(?P<slug>.+)/$' % _('questions/'), app.readers.user_questions, name="user_questions"),
+                        url(r'^%s(?P<mode>[\w\-]+)/(?P<user>\d+)/(?P<slug>.*)/$' % _('questions/'), app.readers.user_questions, name="user_questions"),

 
 
                         url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('edit/')), app.writers.edit_question,
 
 
                         url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('edit/')), app.writers.edit_question,


@@ -78,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+)/' % _('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'),
                         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'),


@@ -87,9 +92,12 @@ urlpatterns += patterns('',
                         url(r'^%s(?P<id>\d+)/(?P<user>\d+)?$' % _('subscribe/'), app.commands.subscribe, name="subscribe"),
                         url(r'^%s(?P<id>\d+)/$' % _('subscribe/'), app.commands.subscribe, name="subscribe_simple"),
                         url(r'^%s' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'),
                         url(r'^%s(?P<id>\d+)/(?P<user>\d+)?$' % _('subscribe/'), app.commands.subscribe, name="subscribe"),
                         url(r'^%s(?P<id>\d+)/$' % _('subscribe/'), app.commands.subscribe, name="subscribe_simple"),
                         url(r'^%s' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'),

+                        url(r'^%s' % _('matching_users/'), app.commands.matching_users, name='matching_users'),

                         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+)/' % _('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/'),
                         url(r'^%s(?P<id>\d+)/' % _('wikify/'), app.commands.wikify, name='wikify'),
 
                         url(r'^%s(?P<id>\d+)/(?P<slug>[\w-]*)$' % _('question/'),


@@ -116,7 +124,7 @@ urlpatterns += patterns('',
 
 
                         url(r'^%s$' % _('users/'), app.users.users, name='users'),
 
 
                         url(r'^%s$' % _('users/'), app.users.users, name='users'),

-                        url(r'^%s$' % _('online_users/'), app.users.online_users, name='online_users'),
+                        # url(r'^%s$' % _('online_users/'), app.users.online_users, name='online_users'),

 
 
                         url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.users.edit_user, name='edit_user'),
 
 
                         url(r'^%s(?P<id>\d+)/%s$' % (_('users/'), _('edit/')), app.users.edit_user, name='edit_user'),


@@ -126,23 +134,23 @@ urlpatterns += patterns('',
                             ),
                         url(r'^%s(?P<id>\d+)/%s(?P<action>[a-z]+)/(?P<status>[a-z]+)/$' % (_('users/'), _('powers/')),
                             app.users.user_powers, name='user_powers'),
                             ),
                         url(r'^%s(?P<id>\d+)/%s(?P<action>[a-z]+)/(?P<status>[a-z]+)/$' % (_('users/'), _('powers/')),
                             app.users.user_powers, name='user_powers'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)/%s$' % (_('users/'), _('subscriptions/')), app.users.user_subscriptions,
+                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('subscriptions/')), app.users.user_subscriptions,

                             name='user_subscriptions'),
                             name='user_subscriptions'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)/%s$' % (_('users/'), _('preferences/')), app.users.user_preferences,
+                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('preferences/')), app.users.user_preferences,

                             name='user_preferences'),
                             name='user_preferences'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)/%s$' % (_('users/'), _('favorites/')),
+                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('favorites/')),

                             app.users.user_favorites, name='user_favorites'),
                             app.users.user_favorites, name='user_favorites'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)/%s$' % (_('users/'), _('reputation/')),
+                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('reputation/')),

                             app.users.user_reputation, name='user_reputation'),
                             app.users.user_reputation, name='user_reputation'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)/%s$' % (_('users/'), _('votes/')), app.users.user_votes,
+                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('votes/')), app.users.user_votes,

                             name='user_votes'),
                             name='user_votes'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)/%s$' % (_('users/'), _('recent/')), app.users.user_recent,
+                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)/%s$' % (_('users/'), _('recent/')), app.users.user_recent,

                             name='user_recent'),
                             name='user_recent'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)/$' % _('users/'), app.users.user_profile, name='user_profile'),
+                        url(r'^%s(?P<id>\d+)/(?P<slug>.*)/$' % _('users/'), app.users.user_profile, name='user_profile'),

                         url(r'^%s$' % _('badges/'), app.meta.badges, name='badges'),
                         url(r'^%s$' % _('badges/'), app.meta.badges, name='badges'),

-                        url(r'^%s(?P<id>\d+)/(?P<slug>.+)$' % _('badges/'), app.meta.badge, name='badge'),
+                        url(r'^%s(?P<id>\d+)/(?P<slug>[\w-]+)/?$' % _('badges/'), app.meta.badge, name='badge'),

                         # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),
                         # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')),

-                        url(r'^%s(.*)' % _('nimda/'), admin.site.root, name='osqa_admin'),
+

                         url(r'^%s$' % _('upload/'), app.writers.upload, name='upload'),
                         url(r'^%s$' % _('search/'), app.readers.search, name='search'),
                         url(r'^%s$' % _('contact/'), app.meta.feedback, name='feedback'),
                         url(r'^%s$' % _('upload/'), app.writers.upload, name='upload'),
                         url(r'^%s$' % _('search/'), app.readers.search, name='search'),
                         url(r'^%s$' % _('contact/'), app.meta.feedback, name='feedback'),


@@ -190,16 +198,21 @@ urlpatterns += patterns('',
                             name="admin_flagged_posts"),
                         url(r'^%s%s$' % (_('admin/'), _('static_pages/')), app.admin.static_pages,
                             name="admin_static_pages"),
                             name="admin_flagged_posts"),
                         url(r'^%s%s$' % (_('admin/'), _('static_pages/')), app.admin.static_pages,
                             name="admin_static_pages"),

-                        url(r'^%s%s$' % (_('admin/'), _('moderation/')), app.admin.moderation, name="admin_moderation"),

 
                         url(r'^%s%s%s$' % (_('admin/'), _('static_pages/'), _('new/')), app.admin.edit_page,
                             name="admin_new_page"),
                         url(r'^%s%s%s(?P<id>\d+)/$' % (_('admin/'), _('static_pages/'), _('edit/')), app.admin.edit_page
                             , name="admin_edit_page"),
 
 
                         url(r'^%s%s%s$' % (_('admin/'), _('static_pages/'), _('new/')), app.admin.edit_page,
                             name="admin_new_page"),
                         url(r'^%s%s%s(?P<id>\d+)/$' % (_('admin/'), _('static_pages/'), _('edit/')), app.admin.edit_page
                             , name="admin_edit_page"),
 

+                        url(r'^%s%s(?P<name>\w+)/$' % (_('admin/'), _('tools/')), app.admin.tools_page,
+                            name="admin_tools"),
+

                         url(r'^%s%s(?P<set_name>\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set,
                             name="admin_set"),
 
                         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'^feeds/rss[/]?$', app.readers.feed, name="latest_questions_feed"),
 
                         url(r'^(?P<path>.+)$', app.meta.page, name="static_page"),