X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/914442cbeb4f84cb0a54c2b99ee2562c51ec6b2e..49d0961a6f7f585f707cd08817f3e0a9f1a19212:/forum/urls.py diff --git a/forum/urls.py b/forum/urls.py index 5f3fbc5..30fd5ac 100644 --- 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 forum.sitemap import QuestionsSitemap +from forum.sitemap import OsqaSitemap from django.utils.translation import ugettext as _ import logging admin.autodiscover() sitemaps = { - 'questions': QuestionsSitemap + 'questions': OsqaSitemap } APP_PATH = os.path.dirname(__file__) @@ -31,6 +31,8 @@ for pattern_file in module_patterns: 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'), @@ -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'), + 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\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'), - url(r'^%s(?P[\w-]+)/(?P\d+)/(?P.+)/$' % _('questions/'), app.readers.user_questions, name="user_questions"), + 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, @@ -69,7 +72,7 @@ urlpatterns += patterns('', kwargs=dict(close=True), name='close'), 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\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, @@ -84,8 +87,10 @@ 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' % _('matching_users/'), app.commands.matching_users, name='matching_users'), 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, name='convert_to_comment'), @@ -94,8 +99,8 @@ 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+)/?$' % _('questions/'), app.readers.question, name='question'), - url(r'^%s(?P\d+)/(?P[\w-]*)$' % _('questions/'), app.readers.question, name='question'), - url(r'^%s(?P\d+)/(?P[\w-]*)/(?P\d+)$' % _('questions/'), app.readers.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'), @@ -115,6 +120,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'), @@ -122,22 +130,23 @@ 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+)/(?P.+)/%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/'), _('favorites/')), + 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/')), + url(r'^%s(?P\d+)/(?P.*)/%s$' % (_('users/'), _('reputation/')), app.users.user_reputation, name='user_reputation'), - url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('votes/')), app.users.user_votes, + url(r'^%s(?P\d+)/(?P.*)/%s$' % (_('users/'), _('votes/')), app.users.user_votes, name='user_votes'), - url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('recent/')), app.users.user_recent, + 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_profile, 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[\w-]+)/?$' % _('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'^%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'), @@ -185,17 +194,19 @@ urlpatterns += patterns('', 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\d+)/$' % (_('admin/'), _('static_pages/'), _('edit/')), app.admin.edit_page , name="admin_edit_page"), + url(r'^%s%s(?P\w+)/$' % (_('admin/'), _('tools/')), app.admin.tools_page, + name="admin_tools"), + url(r'^%s%s(?P\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set, name="admin_set"), 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"), )