X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9e40b5e5d7e26f4b8d3250cfbde23540a6205fd6..7fb43328b198f5b5dc7f829b2facf9e25704e8e6:/forum/urls.py?ds=sidebyside diff --git a/forum/urls.py b/forum/urls.py index 5c784d3..3d202c7 100644 --- a/forum/urls.py +++ b/forum/urls.py @@ -6,48 +6,45 @@ 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 forum.sitemap import OsqaSitemap from django.utils.translation import ugettext as _ import logging admin.autodiscover() -feeds = { - 'rss': RssLastestQuestionsFeed -} + sitemaps = { - 'questions': QuestionsSitemap + 'questions': OsqaSitemap } APP_PATH = os.path.dirname(__file__) -from forum.modules import get_modules_script - -module_patterns = get_modules_script('urls') - -urlpatterns = patterns('') - -for pattern_file in module_patterns: - pattern = getattr(pattern_file, 'urlpatterns', None) - if pattern: - urlpatterns += pattern - -urlpatterns += patterns('', - url(r'^$', app.readers.index, name='index'), - url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}, name='sitemap'), - - (r'^favicon\.ico$', app.meta.favicon), - url(r'^cstyle\.css$', app.meta.custom_css, name="custom_css"), - +try: + admin_url = url(r'^%s(.*)' % _('nimda/'), admin.site.root) +except AttributeError: + admin_url = url(r'^%s(.*)' % _('nimda/'), admin.site.urls) + +# Choose the user urls pattern +if bool(settings.INCLUDE_ID_IN_USER_URLS.value): + core_user_urls_prefix = r'^%s(?P\d+)/(?P.*)' +else: + core_user_urls_prefix = r'^%s(?P.*)' + +core_urls = ( + url(r'^$', app.readers.index, name='index'), admin_url, + + url(r'^sitemap.xml$', 'forum.sitemap.index', {'sitemaps': sitemaps}), + url(r'^sitemap-(?P
.+)-(?P\d+)\.xml$', 'forum.sitemap.sitemap', {'sitemaps': sitemaps}, name="sitemap_section_page"), + url(r'^sitemap-(?P
.+)\.xml$', 'forum.sitemap.sitemap_section_index', {'sitemaps': sitemaps}, name="sitemap_section_index"), + + url(r'^favicon\.ico$', app.meta.favicon), + url(r'^cstyle\.css$', app.meta.custom_css, name='custom_css'), + url(r'^m/(?P\w+)/media/(?P.*)$', app.meta.media , name='osqa_media'), - url(r'^%s(?P.*)$' % _('upfiles/'), 'django.views.static.serve', - {'document_root': os.path.join(APP_PATH,'upfiles').replace('\\','/')}, - name='uploaded_file', - ), - + url(r'^%s(?P.*)$' % _('upfiles/'), 'django.views.static.serve', {'document_root': os.path.join(APP_PATH, 'upfiles').replace('\\', '/')}, name='uploaded_file',), + 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'^%s$' % _('markdown_help/'), app.meta.markdown_help, name='markdown_help'), + 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'), @@ -58,97 +55,138 @@ urlpatterns += patterns('', url(r'^%s%s$' % (_('questions/'), _('related_questions/')), app.commands.related_questions, 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, 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\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'), - url(r'^%s(?P\d+)/$' % _('like_comment/'), app.commands.like_comment, name="like_comment"), + url(r'^%s(?P\d+)/$' % _('like_comment/'), app.commands.like_comment, name='like_comment'), url(r'^%s(?P\d+)/' % _('comment/'), app.commands.comment, name='comment'), - url(r'^%s(?P\d+)/$' % _('delete_comment/'), app.commands.delete_comment, name="delete_comment"), - url(r'^%s(?P\d+)/$' % _('accept_answer/'), app.commands.accept_answer, name="accept_answer"), - url(r'^%s(?P\d+)/$' % _('mark_favorite/'), app.commands.mark_favorite, name="mark_favorite"), + url(r'^%s(?P\d+)/$' % _('delete_comment/'), app.commands.delete_comment, name='delete_comment'), + url(r'^%s(?P\d+)/$' % _('convert_comment/'), app.commands.convert_comment_to_answer, name='convert_comment'), + url(r'^%s(?P\d+)/$' % _('accept_answer/'), app.commands.accept_answer, name='accept_answer'), + url(r'^%s(?P\d+)/$' % _('answer_link/'), app.commands.answer_permanent_link, name='answer_permanent_link'), + url(r'^%s(?P\d+)/$' % _('mark_favorite/'), app.commands.mark_favorite, name='mark_favorite'), + url(r'^%s%s(?P\d+)/%s(?P\d+)/$' % (_('award_points/'), _('user/'), _('answer/')), app.commands.award_points, name='award_points'), + 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'), + url(r'^%s(?P\d+)/' % _('convert_to_question/'), app.writers.convert_to_question,name='convert_to_question'), url(r'^%s(?P\d+)/' % _('wikify/'), app.commands.wikify, name='wikify'), - + 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'), - - url(r'^%s%s(?P[^/]+)/$' % (_('mark-tag/'),_('interesting/')), app.commands.mark_tag, \ - kwargs={'reason':'good','action':'add'}, \ - name='mark_interesting_tag'), - - url(r'^%s%s(?P[^/]+)/$' % (_('mark-tag/'),_('ignored/')), app.commands.mark_tag, \ - kwargs={'reason':'bad','action':'add'}, \ - name='mark_ignored_tag'), - - url(r'^%s(?P[^/]+)/$' % _('unmark-tag/'), app.commands.mark_tag, \ - kwargs={'action':'remove'}, \ - name='mark_ignored_tag'), - - - - url(r'^%s$' % _('users/'),app.users.users, name='users'), + 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'}, name='mark_interesting_tag'), + url(r'^%s%s(?P[^/]+)/$' % (_('mark-tag/'),_('ignored/')), app.commands.mark_tag, kwargs={'reason':'bad','action':'add'}, name='mark_ignored_tag'), + url(r'^%s(?P[^/]+)/$' % _('unmark-tag/'), app.commands.mark_tag, kwargs={'action':'remove'}, name='mark_ignored_tag'), + + 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'), + url(r'^%s(?P\d+)/%s$' % (_('users/'), _('suspend/')), app.users.suspend, name='user_suspend'), 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, name='user_subscriptions'), - 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/')), app.users.user_reputation, name='user_reputation'), - 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, name='user_recent'), - 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+)/(?P.+)/$' % _('badges/'), app.meta.badge, name='badge'), + url((core_user_urls_prefix + '/%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/')), app.users.user_reputation, name='user_reputation'), + 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, name='user_recent'), + url(core_user_urls_prefix % _('users/'), app.users.user_profile, name='user_profile'), + url(r'^%s$' % _('badges/'), app.meta.badges, name='badges'), + 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'^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'), - + (r'^i18n/', include('django.conf.urls.i18n')), - + 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, name='auth_provider_done'), url(r'^%s%s$' % (_('account/'), _('register/')), app.auth.external_register, name='auth_external_register'), - url(r'^%s%s(?P\d+)/(?P.+)/$' % (_('account/'), _('validate/')), app.auth.validate_email, name="auth_validate_email"), - url(r'^%s%s$' % (_('account/'), _('tempsignin/')), app.auth.request_temp_login, name="auth_request_tempsignin"), - url(r'^%s%s(?P\d+)/(?P.+)/$' % (_('account/'), _('tempsignin/')), app.auth.temp_signin, name="auth_tempsignin"), + url(r'^%s%s(?P\d+)/(?P.+)/$' % (_('account/'), _('validate/')), app.auth.validate_email, name='auth_validate_email'), + url(r'^%s%s$' % (_('account/'), _('tempsignin/')), app.auth.request_temp_login, name='auth_request_tempsignin'), + url(r'^%s%s(?P\d+)/(?P.+)/$' % (_('account/'), _('tempsignin/')), app.auth.temp_signin, name='auth_tempsignin'), url(r'^%s(?P\d+)/%s$' % (_('account/'), _('authsettings/')), app.auth.auth_settings, name='user_authsettings'), - url(r'^%s%s(?P\d+)/%s$' % (_('account/'), _('providers/'), _('remove/')), 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(?P\d+)/%s$' % (_('account/'), _('providers/'), _('remove/')), 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'), + 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'), + url(r'^%s%s(?P\w+)/(?P\w+)/$' % (_('admin/'), _('settings/')), app.admin.get_default, name='admin_default'), + url(r'^%s%s$' % (_('admin/'), _('maintenance/')), app.admin.maintenance, name='admin_maintenance'), + url(r'^%s%s$' % (_('admin/'), _('flagged_posts/')), app.admin.flagged_posts, name='admin_flagged_posts'), + url(r'^%s%s$' % (_('admin/'), _('static_pages/')), app.admin.static_pages, name='admin_static_pages'), + + 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%s(?P\d+)/$' % (_('admin/'), _('static_pages/'), _('delete/')), app.admin.delete_page, name='admin_delete_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'%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'^%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"), - url(r'^%s%s(?P\w+)/(?P\w+)/$' % (_('admin/'), _('settings/')), app.admin.get_default, name="admin_default"), - url(r'^%s%s$' % (_('admin/'), _('maintenance/')), app.admin.maintenance, name="admin_maintenance"), - url(r'^%s%s$' % (_('admin/'), _('flagged_posts/')), app.admin.flagged_posts, name="admin_flagged_posts"), - url(r'^%s%s$' % (_('admin/'), _('static_pages/')), app.admin.static_pages, name="admin_static_pages"), +from forum.modules import get_modules_script - 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"), +module_patterns = get_modules_script('urls') - url(r'^%s%s(?P\w+)/$' % (_('admin/'), _('settings/')), app.admin.settings_set, name="admin_set"), +urlpatterns = patterns('') - url(r'^feeds/rss/$', RssLastestQuestionsFeed, name="latest_questions_feed"), +for pattern_file in module_patterns: + pattern = getattr(pattern_file, 'urlpatterns', None) + if pattern: + urlpatterns += pattern + +module_defined = {} + +for t in urlpatterns: + if hasattr(t, 'name') and t.name: + module_defined[t.name] = True + +core_defined = [] + +for u in core_urls: + if not(hasattr(u, 'name') and u.name and (u.name in module_defined)): + core_defined.append(u) + +def urlname(name): + if name in module_defined: + return None + return name + +urlpatterns += patterns('', *core_defined) - url(r'^(?P.+)$', app.meta.page, name="static_page") -)