Commit d35c2367 by Bridger Maxwell

More cleanup of templates directory.

parent 34c9dd93
...@@ -642,7 +642,7 @@ def confirm_email_change(request, key): ...@@ -642,7 +642,7 @@ def confirm_email_change(request, key):
'new_email': pec.new_email} 'new_email': pec.new_email}
if len(User.objects.filter(email=pec.new_email)) != 0: if len(User.objects.filter(email=pec.new_email)) != 0:
return render_to_response("email_exists.html", d) return render_to_response("portal/email_exists.html", d)
subject = render_to_string('emails/email_change_subject.txt', d) subject = render_to_string('emails/email_change_subject.txt', d)
subject = ''.join(subject.splitlines()) subject = ''.join(subject.splitlines())
...@@ -662,7 +662,7 @@ def confirm_email_change(request, key): ...@@ -662,7 +662,7 @@ def confirm_email_change(request, key):
# And send it to the new email... # And send it to the new email...
user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
return render_to_response("email_change_successful.html", d) return render_to_response("portal/email_change_successful.html", d)
@ensure_csrf_cookie @ensure_csrf_cookie
......
...@@ -18,7 +18,7 @@ def index(request, course_id, book_index, page=None): ...@@ -18,7 +18,7 @@ def index(request, course_id, book_index, page=None):
if page is None: if page is None:
page = textbook.start_page page = textbook.start_page
return render_to_response('staticbook.html', return render_to_response('courseware/staticbook.html',
{'book_index': book_index, 'page': int(page), {'book_index': book_index, 'page': int(page),
'course': course, 'book_url': textbook.book_url, 'course': course, 'book_url': textbook.book_url,
'table_of_contents': table_of_contents, 'table_of_contents': table_of_contents,
......
<%inherit file="main.html" /> ## mako
<%namespace name='static' file='static_content.html'/> <%inherit file="../main.html" />
<%namespace name='static' file='../static_content.html'/>
<%block name="title"><title>${course.number} Textbook</title></%block> <%block name="title"><title>${course.number} Textbook</title></%block>
<%block name="headextra"> <%block name="headextra">
......
<h1>E-mail change successful!</h1>
<p> You should see your new name in your profile.
<h1> ${ homework['name']} Test </h1>
<ol>
% for problem in homework['problems']:
<li>
<h2>${ problem['name'] }</h2>
${ problem['html'] }
<section>
<input type="hidden" name="problem_id" value="${ problem['name'] }">
<input type="submit" value="Check">
</section>
</li>
% endfor
</ol>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<section class="container"> <section class="container">
## I'm removing this for now since we aren't using it for the fall. ## I'm removing this for now since we aren't using it for the fall.
## <%include file="course_filter.html" /> ## <%include file="/portal/course_filter.html" />
<section class="courses"> <section class="courses">
<section class='university-column'> <section class='university-column'>
%for course in universities['MITx']: %for course in universities['MITx']:
......
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