X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/174c53e97bcf1e5412c141829d152aa5a2b8684c..25c4f50aaedd1cb457f0dd1b9c2a4c722784629d:/forum/urls.py diff --git a/forum/urls.py b/forum/urls.py index 0c36ffe..c5a8a16 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -6,17 +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 forum.feed import RssLastestQuestionsFeed from forum.sitemap import QuestionsSitemap from django.utils.translation import ugettext as _ import logging admin.autodiscover() -feeds = { -'rss': RssLastestQuestionsFeed -} + sitemaps = { -'questions': QuestionsSitemap + 'questions': QuestionsSitemap } APP_PATH = os.path.dirname(__file__) @@ -63,6 +60,9 @@ urlpatterns += patterns('', name='related_questions'), url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.readers.unanswered, name='unanswered'), + url(r'^%s(?P[\w-]+)/(?P\d+)/(?P.+)/$' % _('questions/'), app.readers.user_questions, name="user_questions"), + + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('edit/')), app.writers.edit_question, name='edit_question'), url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('close/')), app.commands.close, @@ -70,6 +70,7 @@ urlpatterns += patterns('', url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('reopen/')), app.commands.close, kwargs=dict(close=False), name='reopen'), url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('answer/')), app.writers.answer, name='answer'), + url(r'^%s(?P\w+)/$' % _('pending-data/'), app.writers.manage_pending_data, name='manage_pending_data'), url(r'^%s(?P\d+)/(?P[a-z]+)/' % _('vote/'), app.commands.vote_post, name='vote_post'), @@ -83,7 +84,8 @@ urlpatterns += patterns('', , url(r'^%s(?P\d+)/' % _('flag/'), app.commands.flag_post, name='flag_post'), url(r'^%s(?P\d+)/' % _('delete/'), app.commands.delete_post, name='delete_post'), - url(r'^%s(?P\d+)/$' % _('subscribe/'), app.commands.subscribe, name="subscribe"), + url(r'^%s(?P\d+)/(?P\d+)?$' % _('subscribe/'), app.commands.subscribe, name="subscribe"), + url(r'^%s(?P\d+)/$' % _('subscribe/'), app.commands.subscribe, name="subscribe_simple"), url(r'^%s' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'), url(r'^%s(?P\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'), url(r'^%s(?P\d+)/' % _('convert/'), app.commands.convert_to_comment, @@ -92,8 +94,11 @@ urlpatterns += patterns('', url(r'^%s(?P\d+)/(?P[\w-]*)$' % _('question/'), 'django.views.generic.simple.redirect_to', {'url': '/questions/%(id)s/%(slug)s'}), - url(r'^%s(?P\d+)/(?P[\w-]*)$' % _('questions/'), app.readers.question, name='question' - ), + url(r'^%s(?P\d+)/?$' % _('questions/'), app.readers.question, name='question'), + url(r'^%s(?P\d+)/(?P.*)/(?P\d+)$' % _('questions/'), app.readers.question), + url(r'^%s(?P\d+)/(?P.*)$' % _('questions/'), app.readers.question, name='question'), + + url(r'^%s$' % _('tags/'), app.readers.tags, name='tags'), url(r'^%s(?P.*)/$' % _('tags/'), app.readers.tag, name='tag_questions'), @@ -111,6 +116,9 @@ urlpatterns += patterns('', url(r'^%s$' % _('users/'), app.users.users, name='users'), + # url(r'^%s$' % _('online_users/'), app.users.online_users, name='online_users'), + + url(r'^%s(?P\d+)/%s$' % (_('users/'), _('edit/')), app.users.edit_user, name='edit_user'), url(r'^%s(?P\d+)/%s$' % (_('users/'), _('award/')), app.users.award_points, name='user_award_points'), @@ -118,8 +126,10 @@ urlpatterns += patterns('', ), url(r'^%s(?P\d+)/%s(?P[a-z]+)/(?P[a-z]+)/$' % (_('users/'), _('powers/')), app.users.user_powers, name='user_powers'), - url(r'^%s(?P\d+)/%s$' % (_('users/'), _('subscriptions/')), app.users.user_subscriptions, + url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('subscriptions/')), app.users.user_subscriptions, name='user_subscriptions'), + url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('preferences/')), app.users.user_preferences, + name='user_preferences'), url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('favorites/')), app.users.user_favorites, name='user_favorites'), url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('reputation/')), @@ -128,14 +138,11 @@ urlpatterns += patterns('', name='user_votes'), url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('recent/')), app.users.user_recent, name='user_recent'), - url(r'^%s(?P\d+)/(?P.+)/$' % _('users/'), app.users.user_stats, name='user_profile'), - + url(r'^%s(?P\d+)/(?P.+)/$' % _('users/'), app.users.user_profile, name='user_profile'), url(r'^%s$' % _('badges/'), app.meta.badges, name='badges'), - url(r'^%s(?P\d+)/(?P.+)/$' % _('badges/'), app.meta.badge, name='badge'), + url(r'^%s(?P\d+)/(?P.+)$' % _('badges/'), app.meta.badge, name='badge'), # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')), url(r'^%s(.*)' % _('nimda/'), admin.site.root, name='osqa_admin'), - url(r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, - name='feeds'), 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'), @@ -144,8 +151,6 @@ urlpatterns += patterns('', url(r'^%s%s$' % (_('account/'), _('signin/')), app.auth.signin_page, name='auth_signin'), url(r'^%s%s$' % (_('account/'), _('signout/')), app.auth.signout, name='user_signout'), - url(r'^%s%s(?P\w+)/$' % (_('account/'), _('signin/')), app.auth.signin_page, - name='auth_action_signin'), url(r'^%s(?P\w+)/%s$' % (_('account/'), _('signin/')), app.auth.prepare_provider_signin, name='auth_provider_signin'), url(r'^%s(?P\w+)/%s$' % (_('account/'), _('done/')), app.auth.process_provider_signin, @@ -164,6 +169,7 @@ urlpatterns += patterns('', app.auth.remove_external_provider, name='user_remove_external_provider'), url(r'^%s%s%s$' % (_('account/'), _('providers/'), _('add/')), app.auth.signin_page, name='user_add_external_provider'), + url(r'^%s%s$' %(_('account/'), _('send-validation/')), app.auth.send_validation_email, name="send_validation_email"), url(r'^%s$' % _('admin/'), app.admin.dashboard, name="admin_index"), @@ -194,7 +200,7 @@ urlpatterns += patterns('', url(r'^%s%s(?P\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set, name="admin_set"), - url(r'^feeds/rss/$', RssLastestQuestionsFeed, name="latest_questions_feed"), + url(r'^feeds/rss[/]?$', app.readers.feed, name="latest_questions_feed"), - url(r'^(?P.+)$', app.meta.page, name="static_page") + url(r'^(?P.+)$', app.meta.page, name="static_page"), )