Commit f303bc02 by Matthew Mongeau

Hook up about and jobs pages. Use named route for root.

parent 4d7cef8d
...@@ -472,3 +472,8 @@ def course_info(request): ...@@ -472,3 +472,8 @@ def course_info(request):
# TODO: Couse should be a model # TODO: Couse should be a model
return render_to_response('course_info.html', {'csrf': csrf_token }) return render_to_response('course_info.html', {'csrf': csrf_token })
def about(request):
return render_to_response('about.html', None)
def jobs(request):
return render_to_response('jobs.html', None)
...@@ -6,9 +6,7 @@ def url_class(url): ...@@ -6,9 +6,7 @@ def url_class(url):
return "active" return "active"
return "" return ""
%> %>
<%! <%! from django.core.urlresolvers import reverse %>
from django.core.urlresolvers import reverse
%>
<nav class="${active_page} course-material"> <nav class="${active_page} course-material">
<div class="inner-wrapper"> <div class="inner-wrapper">
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</section> </section>
<script type="text/javascript"> <script type="text/javascript">
function getCookie(name) { (function getCookie(name) {
var cookieValue = null; var cookieValue = null;
if (document.cookie && document.cookie != '') { if (document.cookie && document.cookie != '') {
var cookies = document.cookie.split(';'); var cookies = document.cookie.split(';');
...@@ -78,6 +78,6 @@ function postJSON(url, data, callback) { ...@@ -78,6 +78,6 @@ function postJSON(url, data, callback) {
} }
} }
); );
}); });)(this)
// new Modal({el: $(".login-modal")}).render() // new Modal({el: $(".login-modal")}).render()
</script> </script>
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
## one for people who aren't. Assume a Course object is passed to the former, ## one for people who aren't. Assume a Course object is passed to the former,
## instead of using settings.COURSE_TITLE ## instead of using settings.COURSE_TITLE
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%! from django.core.urlresolvers import reverse %>
<header class="app" aria-label="Global Navigation"> <header class="app" aria-label="Global Navigation">
<section class="wrapper"> <section class="wrapper">
<a href="${ MITX_ROOT_URL }" class="logo"> <a href="${reverse('root')}" class="logo">
<img src="${static.url('images/logo.png')}" /> <img src="${static.url('images/logo.png')}" />
</a> </a>
<nav class="find-courses"> <nav class="find-courses">
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<hr> <hr>
</header> </header>
<form id="login_form" method="post"> <form id="enroll_form" method="post">
<label>E-mail</label> <label>E-mail</label>
<input name="email" type="email" placeholder="E-mail"> <input name="email" type="email" placeholder="E-mail">
<label>Password</label> <label>Password</label>
......
...@@ -11,7 +11,9 @@ if settings.DEBUG: ...@@ -11,7 +11,9 @@ if settings.DEBUG:
admin.autodiscover() admin.autodiscover()
urlpatterns = ('', urlpatterns = ('',
url(r'^$', 'student.views.index'), # Main marketing page, or redirect to courseware url(r'^$', 'student.views.index', name="root"), # Main marketing page, or redirect to courseware
url(r'^about$', 'student.views.about', name="about"),
url(r'^jobs$', 'student.views.jobs', name="jobs"),
url(r'^dashboard$', 'student.views.dashboard'), url(r'^dashboard$', 'student.views.dashboard'),
url(r'^course_info$', 'student.views.course_info'), url(r'^course_info$', 'student.views.course_info'),
url(r'^change_email$', 'student.views.change_email_request'), url(r'^change_email$', 'student.views.change_email_request'),
......
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