Commit a0762f75 authored by Daniel W Bond's avatar Daniel W Bond

the goddamn urls are fixed

parent 864395a3
......@@ -2,11 +2,11 @@ from django.conf.urls import patterns, include, url
from django.contrib import admin
admin.autodiscover()
# from django.contrib.auth.views import login, logout
#from advisor.views import index, about, privacy
from django.contrib.auth.views import login, logout
from advisor.views import index, about, privacy
#, login?
urlpatterns = patterns('advisor.views',
urlpatterns = patterns('',
# URL Schema:
# / - homepage
# /about - about page
......@@ -17,16 +17,16 @@ urlpatterns = patterns('advisor.views',
# /admin - administrator portal
# homepage
url(r'^$', 'index', name = 'homepage'),
# log in
url(r'^login/$', 'login', name = 'login'),
url(r'^$', index, name = 'homepage'),
# about page
url(r'^about/$', 'about', name = 'about'),
url(r'^about/$', about, name = 'about'),
# privacy page
url(r'^privacy/$', 'privacy', name = 'privacy'),
url(r'^privacy/$', privacy, name = 'privacy'),
# log in
url(r'^login/$', login, name = 'login'),
# admin pages
url(r'^admin/', include(admin.site.urls)),
......
......@@ -2,16 +2,13 @@ from django.conf.urls import patterns, include, url
from analysis.views import compare, analytics
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'advisor.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
# comparison page
# url(r'^user/(?P<username>\w+)/compare/$', 'compare', name = 'compare'),
url(r'^compare/$', 'compare', name = 'compare'),
url(r'^compare/$', compare, name = 'compare'),
# analytics page
# url(r'user/(?P<username>\w+)/analytics/$', 'analytics', name = 'analytics'),
url(r'^analytics/$', 'analytics', name = 'analytics'),
url(r'^analytics/$', analytics, name = 'analytics'),
)
......@@ -2,27 +2,24 @@ from django.conf.urls import patterns, include, url
from django.contrib import admin
admin.autodiscover()
from trajectories.views import course, student, trajectory, create, new
from trajectories.views import course, student, trajectory, new, create
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'advisor.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),
# course
url(r'^course/(?P<courseSlug>\w+)/$', 'course', name = 'course'),
url(r'^course/(?P<courseSlug>\w+)/$', course, name = 'course'),
# student's page
url(r'^(?P<username>\w+)/$', 'student', name = 'student'),
url(r'^(?P<username>\w+)/$', student, name = 'student'),
# single trajectory page
url(r'^(?P<username>\w+)/(?P<trajectorySlug>\w+)$', 'trajectory', name = 'trajectory'),
url(r'^(?P<username>\w+)/(?P<trajectorySlug>\w+)$', trajectory, name = 'trajectory'),
# a new trajectory
# url(r'^user/(?P<username>\w+)/new/$', 'new', name = 'new'),
url(r'^new/$', 'new', name = 'new'),
url(r'^new/$', new, name = 'new'),
# creating the trajectory
# url(r'^user/(?P<username>\w+)/create/$', 'create', name = 'create'),
url(r'^create/$', 'create', name = 'create'),
url(r'^create/$', create, name = 'create'),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment