File diff c27be5e4c73d → 0b1da0e85e83
pinaxcon/urls.py
Show inline comments
...
 
@@ -5,14 +5,13 @@ from django.views.generic import TemplateView
 

	
 
from django.contrib import admin
 

	
 
import symposion.views
 

	
 

	
 
urlpatterns = patterns(
 
    "",
 
urlpatterns = [
 
    url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"),
 
    url(r"^admin/", include(admin.site.urls)),
 

	
 
    url(r"^account/", include("account.urls")),
 

	
 
    url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
...
 
@@ -24,9 +23,9 @@ urlpatterns = patterns(
 
    url(r"^schedule/", include("symposion.schedule.urls")),
 

	
 
    url(r"^teams/", include("symposion.teams.urls")),
 

	
 
    url(r"^boxes/", include("pinax.boxes.urls")),
 
    url(r"^", include("pinax.pages.urls")),
 
)
 
]
 

	
 
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)