Skip to content

E
edx-platform
Commit 9bde5e7a by David Ormsbee
Options

Merge pull request #467 from MITx/bridger/feature/clean_up 

Bridger/feature/clean up
parents bc2164e2 9bc5aec0
Showing with 44 additions and 71 deletions
lms/djangoapps/courseware/views.py
...@@ -154,7 +154,7 @@ def index(request, course_id, chapter=None, section=None, ...@@ -154,7 +154,7 @@ def index(request, course_id, chapter=None, section=None,
# Add a list of all the errors... # Add a list of all the errors...
context['course_errors'] = modulestore().get_item_errors(course.location) context['course_errors'] = modulestore().get_item_errors(course.location)
result = render_to_response('courseware.html', context) result = render_to_response('courseware/courseware.html', context)
except: except:
# In production, don't want to let a 500 out for any reason # In production, don't want to let a 500 out for any reason
if settings.DEBUG: if settings.DEBUG:
...@@ -170,8 +170,9 @@ def index(request, course_id, chapter=None, section=None, ...@@ -170,8 +170,9 @@ def index(request, course_id, chapter=None, section=None,
position=position position=position
)) ))
try: try:
result = render_to_response('courseware-error.html', result = render_to_response('courseware/courseware-error.html',
{'staff_access': staff_access}) {'staff_access': staff_access,
'course' : course})
except: except:
result = HttpResponse("There was an unrecoverable error") result = HttpResponse("There was an unrecoverable error")
...@@ -215,7 +216,7 @@ def course_info(request, course_id): ...@@ -215,7 +216,7 @@ def course_info(request, course_id):
course = get_course_with_access(request.user, course_id, 'load') course = get_course_with_access(request.user, course_id, 'load')
staff_access = has_access(request.user, course, 'staff') staff_access = has_access(request.user, course, 'staff')
return render_to_response('info.html', {'course': course, return render_to_response('courseware/info.html', {'course': course,
'staff_access': staff_access,}) 'staff_access': staff_access,})
...@@ -288,7 +289,7 @@ def progress(request, course_id, student_id=None): ...@@ -288,7 +289,7 @@ def progress(request, course_id, student_id=None):
} }
context.update() context.update()
return render_to_response('progress.html', context) return render_to_response('courseware/progress.html', context)
...@@ -316,7 +317,7 @@ def gradebook(request, course_id): ...@@ -316,7 +317,7 @@ def gradebook(request, course_id):
} }
for student in enrolled_students] for student in enrolled_students]
return render_to_response('gradebook.html', {'students': student_info, return render_to_response('courseware/gradebook.html', {'students': student_info,
'course': course, 'course': course,
'course_id': course_id, 'course_id': course_id,
# Checked above # Checked above
...@@ -331,7 +332,7 @@ def grade_summary(request, course_id): ...@@ -331,7 +332,7 @@ def grade_summary(request, course_id):
# For now, just a static page # For now, just a static page
context = {'course': course, context = {'course': course,
'staff_access': True,} 'staff_access': True,}
return render_to_response('grade_summary.html', context) return render_to_response('courseware/grade_summary.html', context)
@cache_control(no_cache=True, no_store=True, must_revalidate=True) @cache_control(no_cache=True, no_store=True, must_revalidate=True)
...@@ -342,5 +343,5 @@ def instructor_dashboard(request, course_id): ...@@ -342,5 +343,5 @@ def instructor_dashboard(request, course_id):
# For now, just a static page # For now, just a static page
context = {'course': course, context = {'course': course,
'staff_access': True,} 'staff_access': True,}
return render_to_response('instructor_dashboard.html', context) return render_to_response('courseware/instructor_dashboard.html', context)
lms/templates/courseware-error.html → lms/templates/courseware/courseware-error.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%namespace name='static' file='../static_content.html'/>
<%block name="bodyclass">courseware</%block> <%block name="bodyclass">courseware</%block>
<%block name="title"><title>Courseware – edX</title></%block> <%block name="title"><title>Courseware – edX</title></%block>
<%include file="course_navigation.html" args="active_page='courseware'" /> <%block name="headextra">
<%static:css group='course'/>
</%block>
<%include file="/courseware/course_navigation.html" args="active_page='courseware'" />
<section class="container"> <section class="container">
<section class="outside-app"> <section class="outside-app">
......
lms/templates/courseware.html → lms/templates/courseware/courseware.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="bodyclass">courseware</%block> <%block name="bodyclass">courseware</%block>
<%block name="title"><title>Courseware – MITx 6.002x</title></%block> <%block name="title"><title>${course.number} Courseware</title></%block>
<%block name="headextra"> <%block name="headextra">
<%static:css group='course'/> <%static:css group='course'/>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<%static:js group='courseware'/> <%static:js group='courseware'/>
<%include file="mathjax_include.html" /> <%include file="/mathjax_include.html" />
<!-- TODO: http://docs.jquery.com/Plugins/Validation --> <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
<script type="text/javascript"> <script type="text/javascript">
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</script> </script>
</%block> </%block>
<%include file="course_navigation.html" args="active_page='courseware'" /> <%include file="/courseware/course_navigation.html" args="active_page='courseware'" />
<section class="container"> <section class="container">
<div class="course-wrapper"> <div class="course-wrapper">
......
lms/templates/grade_summary.html → lms/templates/courseware/grade_summary.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%include file="course_navigation.html" args="active_page=''" /> <%include file="/courseware/course_navigation.html" args="active_page=''" />
<section class="container"> <section class="container">
<div class="gradebook-summary-wrapper"> <div class="gradebook-summary-wrapper">
......
lms/templates/gradebook.html → lms/templates/courseware/gradebook.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="js_extra"> <%block name="js_extra">
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</%block> </%block>
<%include file="course_navigation.html" args="active_page=''" /> <%include file="/courseware/course_navigation.html" args="active_page=''" />
<section class="container"> <section class="container">
<div class="gradebook-wrapper"> <div class="gradebook-wrapper">
......
lms/templates/info.html → lms/templates/courseware/info.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="headextra"> <%block name="headextra">
<%static:css group='course'/> <%static:css group='course'/>
</%block> </%block>
<%include file="course_navigation.html" args="active_page='info'" /> <%block name="title"><title>${course.number} Course Info</title></%block>
<%include file="/courseware/course_navigation.html" args="active_page='info'" />
<%! <%!
from courseware.courses import get_course_info_section from courseware.courses import get_course_info_section
%> %>
......
lms/templates/instructor_dashboard.html → lms/templates/courseware/instructor_dashboard.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="headextra"> <%block name="headextra">
<%static:css group='course'/> <%static:css group='course'/>
</%block> </%block>
<%include file="course_navigation.html" args="active_page='instructor'" /> <%include file="/courseware/course_navigation.html" args="active_page='instructor'" />
<section class="container"> <section class="container">
<div class="instructor-dashboard-wrapper"> <div class="instructor-dashboard-wrapper">
......
lms/templates/progress.html → lms/templates/courseware/progress.html
<%inherit file="main.html" /> <%inherit file="/main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="headextra"> <%block name="headextra">
<%static:css group='course'/> <%static:css group='course'/>
</%block> </%block>
<%namespace name="profile_graphs" file="profile_graphs.js"/> <%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
<%block name="title"><title>Progress - edX 6.002x</title></%block> <%block name="title"><title>${course.number} Progress</title></%block>
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script> <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script>
<script> <script>
${profile_graphs.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")} ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")}
</script> </script>
</%block> </%block>
<%include file="course_navigation.html" args="active_page='progress'" /> <%include file="/courseware/course_navigation.html" args="active_page='progress'" />
<section class="container"> <section class="container">
<div class="profile-wrapper"> <div class="profile-wrapper">
...@@ -81,9 +81,5 @@ ${profile_graphs.body(grade_summary, course.grade_cutoffs, "grade-detail-graph") ...@@ -81,9 +81,5 @@ ${profile_graphs.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")
</ol> <!--End chapters--> </ol> <!--End chapters-->
</section> </section>
<section aria-label="Profile Navigation" class="user-info">
</section>
</div> </div>
</section> </section>
lms/templates/gradebook_profilegraphs.html deleted 100644 → 0
<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
<%namespace name="profile_graphs" file="profile_graphs.js"/>
<%block name="js_extra">
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
<script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script>
% for s in students:
<script>
${profile_graphs.body(s['grade_info']['grade_summary'], "grade-detail-graph-" + str(s['id']))}
</script>
%endfor
</%block>
<%include file="navigation.html" args="active_page=''" />
<section class="container">
<div class="gradebook-wrapper">
<section class="gradebook-content">
<h1>Gradebook</h1>
<ol>
% for s in students:
<li>
<h2><a href=/profile/${s['id']}>${s['username']}</a></h2>
<div id="grade-detail-graph-${s['id']}" style="width:1000px;height:300px;"></div>
</li>
% endfor
</ol>
</section>
</div>
</section>
lms/templates/simplewiki/simplewiki_base.html
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<%block name="bodyextra"> <%block name="bodyextra">
%if course: %if course:
<%include file="../course_navigation.html" args="active_page='wiki'" /> <%include file="/courseware/course_navigation.html" args="active_page='wiki'" />
%endif %endif
<section class="container"> <section class="container">
......
lms/templates/staticbook.html
...@@ -61,7 +61,7 @@ $("#open_close_accordion a").click(function(){ ...@@ -61,7 +61,7 @@ $("#open_close_accordion a").click(function(){
</script> </script>
</%block> </%block>
<%include file="course_navigation.html" args="active_page='book'" /> <%include file="/courseware/course_navigation.html" args="active_page='book'" />
<section class="container"> <section class="container">
<div class="book-wrapper"> <div class="book-wrapper">
......
lms/templates/wiki/base.html
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
{% block body %} {% block body %}
{% if course %} {% if course %}
{% include "course_navigation.html" with active_page_context="wiki" %} {% include "courseware/course_navigation.html" with active_page_context="wiki" %}
{% endif %} {% endif %}
<section class="container wiki {{ selected_tab }}"> <section class="container wiki {{ selected_tab }}">
......
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