From 82a28f069d9f3aff29622b29f76bd60b39e59f35 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 28 Sep 2012 12:19:31 -0400 Subject: [PATCH] Make overview page conform to section/subsection/unit format. Breaks CMS editing of existing courses --- cms/djangoapps/contentstore/views.py | 8 +-- cms/templates/overview.html | 97 ++++++++++++++-------------- cms/urls.py | 4 +- 3 files changed, 54 insertions(+), 55 deletions(-) diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py index 7602674a89..ade2ac8028 100644 --- a/cms/djangoapps/contentstore/views.py +++ b/cms/djangoapps/contentstore/views.py @@ -109,16 +109,16 @@ def course_index(request, org, course, name): }) course = modulestore().get_item(location) - weeks = course.get_children() + sections = course.get_children() return render_to_response('overview.html', { - 'weeks': weeks, + 'sections': sections, 'upload_asset_callback_url': upload_asset_callback_url }) @login_required -def edit_item(request, location): +def edit_unit(request, location): """ Display an editing page for the specified module. @@ -150,7 +150,7 @@ def edit_item(request, location): @login_required -def delete_item(request, location): +def delete_unit(request, location): pass diff --git a/cms/templates/overview.html b/cms/templates/overview.html index fab770ba23..ecf1723d9c 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -2,49 +2,6 @@ <%! from django.core.urlresolvers import reverse %> <%block name="title">CMS Courseware Overview -<%def name="branch(section, depth)"> - <% - has_children = depth > 0 and len(section.get_children()) > 0 - %> - - - -<%def name="actions(unit)"> -
- - - -
- - -<%def name="new_unit()"> -
  • - - New Unit - -
    • - - - <%block name="content">
    @@ -52,21 +9,63 @@
    New Section - % for week in weeks: + % for section in sections:
    -

    ${week.display_name}

    +

    ${section.display_name}

    Unscheduled: click here to set

    - ${actions(week)} +
    + + +
      - % for section in week.get_children(): - ${branch(section, 1)} + % for subsection in section.get_children(): + % endfor - ${new_unit()} + +
    1. + + New Subsection + +
    % endfor diff --git a/cms/urls.py b/cms/urls.py index 2a717085d1..a63be2ad44 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -10,8 +10,8 @@ import django.contrib.auth.views urlpatterns = ('', url(r'^$', 'contentstore.views.index', name='index'), url(r'^new_item$', 'contentstore.views.new_item', name='new_item'), - url(r'^edit/(?P.*?)$', 'contentstore.views.edit_item', name='edit_item'), - url(r'^delete/(?P.*?)$', 'contentstore.views.delete_item', name='delete_item'), + url(r'^edit/(?P.*?)$', 'contentstore.views.edit_unit', name='edit_unit'), + url(r'^delete/(?P.*?)$', 'contentstore.views.delete_unit', name='delete_unit'), url(r'^save_item$', 'contentstore.views.save_item', name='save_item'), url(r'^clone_item$', 'contentstore.views.clone_item', name='clone_item'), url(r'^(?P[^/]+)/(?P[^/]+)/course/(?P[^/]+)$',