diff --git a/symposion/urls.py b/symposion/urls.py index e8feb4b1..645d558f 100644 --- a/symposion/urls.py +++ b/symposion/urls.py @@ -1,29 +1,24 @@ from django.conf import settings from django.conf.urls.defaults import * +from django.conf.urls.static import static + from django.views.generic.simple import direct_to_template from django.contrib import admin admin.autodiscover() -from pinax.apps.account.openid_consumer import PinaxConsumer - - -handler500 = "pinax.views.server_error" +# from pinax.apps.account.openid_consumer import PinaxConsumer urlpatterns = patterns("", url(r"^$", direct_to_template, { "template": "homepage.html", }, name="home"), - url(r"^admin/invite_user/$", "pinax.apps.signup_codes.views.admin_invite_user", name="admin_invite_user"), url(r"^admin/", include(admin.site.urls)), - url(r"^about/", include("about.urls")), - url(r"^account/", include("pinax.apps.account.urls")), - url(r"^openid/", include(PinaxConsumer().urls)), + url(r"^about/", include("symposion.about.urls")), + url(r"^account/", include("account.urls")), + # url(r"^openid/", include(PinaxConsumer().urls)), ) -if settings.SERVE_MEDIA: - urlpatterns += patterns("", - url(r"", include("staticfiles.urls")), - ) +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file