X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7f5e25a1b44bd8ad23ecb5d8194306b319998a72..cec50f4a763e8cbd9855ece5af43876471aec874:/forum/urls.py diff --git a/forum/urls.py b/forum/urls.py index e6a0eb8..d6f320a 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -1,6 +1,7 @@ import startup import os.path +from forum import settings from django.conf.urls.defaults import * from django.contrib import admin from forum import views as app @@ -45,18 +46,19 @@ urlpatterns += patterns('', name='uploaded_file', ), #url(r'^%s/$' % _('signin/'), 'django_authopenid.views.signin', name='signin'), - url(r'^%s$' % _('about/'), app.meta.about, name='about'), - url(r'^%s$' % _('faq/'), app.meta.faq, name='faq'), + url(r'^%s$' % _('faq/'), app.meta.static, {'content': settings.FAQ_PAGE_TEXT, 'title': _('FAQ')}, name='faq'), + url(r'^%s$' % _('about/'), app.meta.static, {'content': settings.ABOUT_PAGE_TEXT, 'title': _('About')}, name='about'), + 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, name='edit_answer'), - url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('revisions/')), app.readers.revisions, name='answer_revisions'), + url(r'^%s(?P\d+)/$' % _('revisions/'), app.readers.revisions, name='revisions'), url(r'^%s$' % _('questions/'), app.readers.questions, name='questions'), url(r'^%s%s$' % (_('questions/'), _('ask/')), app.writers.ask, name='ask'), url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.readers.unanswered, name='unanswered'), 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, name='close'), - url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('reopen/')), app.commands.reopen, name='reopen'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('close/')), app.commands.close, 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+)/(?P[a-z]+)/' % _('vote/'), app.commands.vote_post, name='vote_post'), @@ -69,14 +71,12 @@ urlpatterns += patterns('', 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' % _('matching_tags/'), app.commands.matching_tags, name='matching_tags'), - - url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('revisions/')), app.readers.revisions, name='question_revisions'), - url(r'^%s$' % _('command/'), app.commands.ajax_command, name='call_ajax'), + url(r'^%s(?P\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'), #place general question item in the end of other operations url(r'^%s(?P\d+)/(?P[\w-]*)$' % _('question/'), 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'), + url(r'^%s(?P.*)/$' % _('tags/'), app.readers.tag, name='tag_questions'), url(r'^%s%s(?P[^/]+)/$' % (_('mark-tag/'),_('interesting/')), app.commands.mark_tag, \ kwargs={'reason':'good','action':'add'}, \ @@ -93,7 +93,6 @@ urlpatterns += patterns('', url(r'^%s$' % _('users/'),app.users.users, name='users'), - url(r'^%s(?P\d+)/$' % _('moderate-user/'), app.users.moderate_user, name='moderate_user'), url(r'^%s(?P\d+)/%s$' % (_('users/'), _('edit/')), app.users.edit_user, name='edit_user'), url(r'^%s(?P\d+)/(?P.+)/%s$' % (_('users/'), _('subscriptions/')), app.users.user_subscriptions, name='user_subscriptions'), @@ -104,14 +103,13 @@ urlpatterns += patterns('', url(r'^%s(?P\d+)/(?P.+)/$' % _('users/'), app.users.user_stats, name='user_profile'), url(r'^%s$' % _('badges/'),app.meta.badges, name='badges'), - url(r'^%s(?P\d+)//*' % _('badges/'), app.meta.badge, name='badge'), - url(r'^%s%s$' % (_('messages/'), _('markread/')),app.commands.read_message, name='read_message'), + 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$' % _('feedback/'), app.meta.feedback, name='feedback'), + url(r'^%s$' % _('contact/'), app.meta.feedback, name='feedback'), (r'^i18n/', include('django.conf.urls.i18n')), @@ -129,7 +127,9 @@ urlpatterns += patterns('', url(r'^%s%s%s$' % (_('account/'), _('providers/'), _('add/')), app.auth.signin_page, name='user_add_external_provider'), - url(r'^%s$' % _('admin/'), app.admin.index, name="admin_index"), + url(r'^%s$' % _('admin/'), app.admin.dashboard, name="admin_index"), + url(r'^%s%s$' % (_('admin/'), _('switch_interface/')), app.admin.interface_switch, name="admin_switch_interface"), + url(r'^%s%s$' % (_('admin/'), _('statistics/')), app.admin.statistics, name="admin_statistics"), url(r'^%s%s$' % (_('admin/'), _('denormalize/')), app.admin.recalculate_denormalized, name="admin_denormalize"), url(r'^%s%s$' % (_('admin/'), _('go_bootstrap/')), app.admin.go_bootstrap, name="admin_go_bootstrap"), url(r'^%s%s$' % (_('admin/'), _('go_defaults/')), app.admin.go_defaults, name="admin_go_defaults"), @@ -137,4 +137,3 @@ urlpatterns += patterns('', url(r'^feeds/rss/$', RssLastestQuestionsFeed, name="latest_questions_feed"), ) -