Skip to content

Commit 02319e5

Browse files
committed
updated urls
1 parent 303877a commit 02319e5

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

symposion/urls.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
11
from django.conf import settings
22
from django.conf.urls.defaults import *
3+
from django.conf.urls.static import static
4+
35
from django.views.generic.simple import direct_to_template
46

57
from django.contrib import admin
68
admin.autodiscover()
79

8-
from pinax.apps.account.openid_consumer import PinaxConsumer
9-
10-
11-
handler500 = "pinax.views.server_error"
10+
# from pinax.apps.account.openid_consumer import PinaxConsumer
1211

1312

1413
urlpatterns = patterns("",
1514
url(r"^$", direct_to_template, {
1615
"template": "homepage.html",
1716
}, name="home"),
18-
url(r"^admin/invite_user/$", "pinax.apps.signup_codes.views.admin_invite_user", name="admin_invite_user"),
1917
url(r"^admin/", include(admin.site.urls)),
20-
url(r"^about/", include("about.urls")),
21-
url(r"^account/", include("pinax.apps.account.urls")),
22-
url(r"^openid/", include(PinaxConsumer().urls)),
18+
url(r"^about/", include("symposion.about.urls")),
19+
url(r"^account/", include("account.urls")),
20+
# url(r"^openid/", include(PinaxConsumer().urls)),
2321
)
2422

2523

26-
if settings.SERVE_MEDIA:
27-
urlpatterns += patterns("",
28-
url(r"", include("staticfiles.urls")),
29-
)
24+
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

0 commit comments

Comments
 (0)