Merge pull request #1546 from edx/christina/export

Make export URL restful.

CHANGELOG.rst

@@ -33,7 +33,7 @@ disabilites.  (LMS-1303)
 
 Common: Add skip links for accessibility to CMS and LMS. (LMS-1311)
 
-Studio: Change course overview page, checklists, assets, and course staff
+Studio: Change course overview page, checklists, assets, import, export, and course staff
 management page URLs to a RESTful interface. Also removed "\listing", which
 duplicated "\index".
 

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -1594,10 +1594,7 @@ class ContentStoreTest(ModuleStoreTestCase):
         self.assertEqual(resp.status_code, 200)
 
         # export page
-        resp = self.client.get(reverse('export_course',
-                                       kwargs={'org': loc.org,
-                                               'course': loc.course,
-                                               'name': loc.name}))
+        resp = self.client.get_html(new_location.url_reverse('export/', ''))
         self.assertEqual(resp.status_code, 200)
 
         # course team

cms/djangoapps/contentstore/tests/test_import_export.py

@@ -18,6 +18,7 @@ from django.conf import settings
 from xmodule.modulestore.django import loc_mapper
 
 from xmodule.contentstore.django import _CONTENTSTORE
+from xmodule.modulestore.tests.factories import ItemFactory
 
 TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE)
 TEST_DATA_CONTENTSTORE['DOC_STORE_CONFIG']['db'] = 'test_xcontent_%s' % uuid4().hex
@@ -29,7 +30,6 @@ class ImportTestCase(CourseTestCase):
     """
     Unit tests for importing a course
     """
-
     def setUp(self):
         super(ImportTestCase, self).setUp()
         self.new_location = loc_mapper().translate_location(
@@ -66,13 +66,11 @@ class ImportTestCase(CourseTestCase):
 
         self.unsafe_common_dir = path(tempfile.mkdtemp(dir=self.content_dir))
 
-
     def tearDown(self):
         shutil.rmtree(self.content_dir)
         MongoClient().drop_database(TEST_DATA_CONTENTSTORE['DOC_STORE_CONFIG']['db'])
         _CONTENTSTORE.clear()
 
-
     def test_no_coursexml(self):
         """
         Check that the response for a tar.gz import without a course.xml is
@@ -97,30 +95,25 @@ class ImportTestCase(CourseTestCase):
 
         self.assertEquals(json.loads(resp_status.content)["ImportStatus"], 2)
 
-
     def test_with_coursexml(self):
         """
         Check that the response for a tar.gz import with a course.xml is
         correct.
         """
         with open(self.good_tar) as gtar:
-            resp = self.client.post(
-                    self.url,
-                    {
-                        "name": self.good_tar,
-                        "course-data": [gtar]
-                    })
+            args = {"name": self.good_tar, "course-data": [gtar]}
+            resp = self.client.post(self.url, args)
+
         self.assertEquals(resp.status_code, 200)
 
     ## Unsafe tar methods #####################################################
     # Each of these methods creates a tarfile with a single type of unsafe
     # content.
-
     def _fifo_tar(self):
         """
         Tar file with FIFO
         """
-        fifop    = self.unsafe_common_dir / "fifo.file"
+        fifop = self.unsafe_common_dir / "fifo.file"
         fifo_tar = self.unsafe_common_dir / "fifo.tar.gz"
         os.mkfifo(fifop)
         with tarfile.open(fifo_tar, "w:gz") as tar:
@@ -136,7 +129,7 @@ class ImportTestCase(CourseTestCase):
         symlinkp = self.unsafe_common_dir / "symlink.txt"
         symlink_tar = self.unsafe_common_dir / "symlink.tar.gz"
         outsidep.symlink(symlinkp)
-        with tarfile.open(symlink_tar, "w:gz" ) as tar:
+        with tarfile.open(symlink_tar, "w:gz") as tar:
             tar.add(symlinkp)
 
         return symlink_tar
@@ -185,10 +178,8 @@ class ImportTestCase(CourseTestCase):
 
         def try_tar(tarpath):
             with open(tarpath) as tar:
-                resp = self.client.post(
-                        self.url,
-                        { "name": tarpath, "course-data": [tar] }
-                )
+                args = { "name": tarpath, "course-data": [tar] }
+                resp = self.client.post(self.url, args)
             self.assertEquals(resp.status_code, 400)
             self.assertTrue("SuspiciousFileOperation" in resp.content)
 
@@ -207,3 +198,77 @@ class ImportTestCase(CourseTestCase):
         )
         import_status = json.loads(resp_status.content)["ImportStatus"]
         self.assertIn(import_status, (0, 3))
+
+
+@override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE)
+class ExportTestCase(CourseTestCase):
+    """
+    Tests for export_handler.
+    """
+    def setUp(self):
+        """
+        Sets up the test course.
+        """
+        super(ExportTestCase, self).setUp()
+        location = loc_mapper().translate_location(self.course.location.course_id, self.course.location, False, True)
+        self.url = location.url_reverse('export/', '')
+
+    def test_export_html(self):
+        """
+        Get the HTML for the page.
+        """
+        resp = self.client.get_html(self.url)
+        self.assertEquals(resp.status_code, 200)
+        self.assertContains(resp, "Export a Copy of My Course Data")
+
+    def test_export_json_unsupported(self):
+        """
+        JSON is unsupported.
+        """
+        resp = self.client.get(self.url, HTTP_ACCEPT='application/json')
+        self.assertEquals(resp.status_code, 406)
+
+    def test_export_targz(self):
+        """
+        Get tar.gz file, using HTTP_ACCEPT.
+        """
+        resp = self.client.get(self.url, HTTP_ACCEPT='application/x-tgz')
+        self._verify_export_succeeded(resp)
+
+    def test_export_targz_urlparam(self):
+        """
+        Get tar.gz file, using URL parameter.
+        """
+        resp = self.client.get(self.url + '?_accept=application/x-tgz')
+        self._verify_export_succeeded(resp)
+
+    def _verify_export_succeeded(self, resp):
+        """ Export success helper method. """
+        self.assertEquals(resp.status_code, 200)
+        self.assertTrue(resp.get('Content-Disposition').startswith('attachment'))
+
+    def test_export_failure_top_level(self):
+        """
+        Export failure.
+        """
+        ItemFactory.create(parent_location=self.course.location, category='aawefawef')
+        self._verify_export_failure('/course/MITx.999.Robot_Super_Course/branch/draft/block/Robot_Super_Course')
+
+    def test_export_failure_subsection_level(self):
+        """
+        Slightly different export failure.
+        """
+        vertical = ItemFactory.create(parent_location=self.course.location, category='vertical', display_name='foo')
+        ItemFactory.create(
+            parent_location=vertical.location,
+            category='aawefawef'
+        )
+        self._verify_export_failure('/edit/i4x://MITx/999/vertical/foo')
+
+    def _verify_export_failure(self, expectedText):
+        """ Export failure helper method. """
+        resp = self.client.get(self.url, HTTP_ACCEPT='application/x-tgz')
+        self.assertEquals(resp.status_code, 200)
+        self.assertIsNone(resp.get('Content-Disposition'))
+        self.assertContains(resp, 'Unable to create xml for module')
+        self.assertContains(resp, expectedText)

cms/djangoapps/contentstore/views/import_export.py

@@ -29,17 +29,17 @@ from xmodule.modulestore.xml_importer import import_from_xml
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.xml_exporter import export_to_xml
 from xmodule.modulestore.django import modulestore, loc_mapper
-from xmodule.modulestore import Location
 from xmodule.exceptions import SerializationError
+
 from xmodule.modulestore.locator import BlockUsageLocator
 from .access import has_access
 
-from .access import get_location_and_verify_access
 from util.json_request import JsonResponse
 from extract_tar import safetar_extractall
 
 
-__all__ = ['import_handler', 'import_status_handler', 'generate_export_course', 'export_course']
+__all__ = ['import_handler', 'import_status_handler', 'export_handler']
+
 
 log = logging.getLogger(__name__)
 
@@ -287,88 +287,102 @@ def import_status_handler(request, tag=None, course_id=None, branch=None, versio
 
 @ensure_csrf_cookie
 @login_required
-def generate_export_course(request, org, course, name):
+@require_http_methods(("GET",))
+def export_handler(request, tag=None, course_id=None, branch=None, version_guid=None, block=None):
     """
-    This method will serialize out a course to a .tar.gz file which contains a
-    XML-based representation of the course
+    The restful handler for exporting a course.
+
+    GET
+        html: return html page for import page
+        application/x-tgz: return tar.gz file containing exported course
+        json: not supported
+
+    Note that there are 2 ways to request the tar.gz file. The request header can specify
+    application/x-tgz via HTTP_ACCEPT, or a query parameter can be used (?_accept=application/x-tgz).
+
+    If the tar.gz file has been requested but the export operation fails, an HTML page will be returned
+    which describes the error.
     """
-    location = get_location_and_verify_access(request, org, course, name)
-    course_module = modulestore().get_instance(location.course_id, location)
-    loc = Location(location)
-    export_file = NamedTemporaryFile(prefix=name + '.', suffix=".tar.gz")
+    location = BlockUsageLocator(course_id=course_id, branch=branch, version_guid=version_guid, usage_id=block)
+    if not has_access(request.user, location):
+        raise PermissionDenied()
 
-    new_location = loc_mapper().translate_location(course_module.location.course_id, course_module.location, False, True)
+    old_location = loc_mapper().translate_locator_to_location(location)
+    course_module = modulestore().get_item(old_location)
 
-    root_dir = path(mkdtemp())
+    # an _accept URL parameter will be preferred over HTTP_ACCEPT in the header.
+    requested_format = request.REQUEST.get('_accept', request.META.get('HTTP_ACCEPT', 'text/html'))
 
-    try:
-        export_to_xml(modulestore('direct'), contentstore(), loc, root_dir, name, modulestore())
-    except SerializationError, e:
-        logging.exception('There was an error exporting course {0}. {1}'.format(course_module.location, unicode(e)))
-        unit = None
-        failed_item = None
-        parent = None
-        try:
-            failed_item = modulestore().get_instance(course_module.location.course_id, e.location)
-            parent_locs = modulestore().get_parent_locations(failed_item.location, course_module.location.course_id)
+    export_url = location.url_reverse('export/', '') + '?_accept=application/x-tgz'
+    if 'application/x-tgz' in requested_format:
+        name = old_location.name
+        export_file = NamedTemporaryFile(prefix=name + '.', suffix=".tar.gz")
+        root_dir = path(mkdtemp())
 
-            if len(parent_locs) > 0:
-                parent = modulestore().get_item(parent_locs[0])
-                if parent.location.category == 'vertical':
-                    unit = parent
-        except:
-            # if we have a nested exception, then we'll show the more generic error message
-            pass
+        try:
+            export_to_xml(modulestore('direct'), contentstore(), old_location, root_dir, name, modulestore())
 
+        except SerializationError, e:
+            logging.exception('There was an error exporting course {0}. {1}'.format(course_module.location, unicode(e)))
+            unit = None
+            failed_item = None
+            parent = None
+            try:
+                failed_item = modulestore().get_instance(course_module.location.course_id, e.location)
+                parent_locs = modulestore().get_parent_locations(failed_item.location, course_module.location.course_id)
+
+                if len(parent_locs) > 0:
+                    parent = modulestore().get_item(parent_locs[0])
+                    if parent.location.category == 'vertical':
+                        unit = parent
+            except:
+                # if we have a nested exception, then we'll show the more generic error message
+                pass
+
+            return render_to_response('export.html', {
+                'context_course': course_module,
+                'in_err': True,
+                'raw_err_msg': str(e),
+                'failed_module': failed_item,
+                'unit': unit,
+                'edit_unit_url': reverse('edit_unit', kwargs={
+                    'location': parent.location
+                }) if parent else '',
+                'course_home_url': location.url_reverse("course/", ""),
+                'export_url': export_url
+
+            })
+        except Exception, e:
+            logging.exception('There was an error exporting course {0}. {1}'.format(course_module.location, unicode(e)))
+            return render_to_response('export.html', {
+                'context_course': course_module,
+                'in_err': True,
+                'unit': None,
+                'raw_err_msg': str(e),
+                'course_home_url': location.url_reverse("course/", ""),
+                'export_url': export_url
+            })
+
+        logging.debug('tar file being generated at {0}'.format(export_file.name))
+        tar_file = tarfile.open(name=export_file.name, mode='w:gz')
+        tar_file.add(root_dir / name, arcname=name)
+        tar_file.close()
+
+        # remove temp dir
+        shutil.rmtree(root_dir / name)
+
+        wrapper = FileWrapper(export_file)
+        response = HttpResponse(wrapper, content_type='application/x-tgz')
+        response['Content-Disposition'] = 'attachment; filename=%s' % os.path.basename(export_file.name)
+        response['Content-Length'] = os.path.getsize(export_file.name)
+        return response
+
+    elif 'text/html' in requested_format:
         return render_to_response('export.html', {
             'context_course': course_module,
-            'successful_import_redirect_url': '',
-            'in_err': True,
-            'raw_err_msg': str(e),
-            'failed_module': failed_item,
-            'unit': unit,
-            'edit_unit_url': reverse('edit_unit', kwargs={
-                'location': parent.location
-            }) if parent else '',
-            'course_home_url': new_location.url_reverse("course/", "")
-        })
-    except Exception, e:
-        logging.exception('There was an error exporting course {0}. {1}'.format(course_module.location, unicode(e)))
-        return render_to_response('export.html', {
-            'context_course': course_module,
-            'successful_import_redirect_url': '',
-            'in_err': True,
-            'unit': None,
-            'raw_err_msg': str(e),
-            'course_home_url': new_location.url_reverse("course/", "")
+            'export_url': export_url
         })
 
-    logging.debug('tar file being generated at {0}'.format(export_file.name))
-    tar_file = tarfile.open(name=export_file.name, mode='w:gz')
-    tar_file.add(root_dir / name, arcname=name)
-    tar_file.close()
-
-    # remove temp dir
-    shutil.rmtree(root_dir / name)
-
-    wrapper = FileWrapper(export_file)
-    response = HttpResponse(wrapper, content_type='application/x-tgz')
-    response['Content-Disposition'] = 'attachment; filename=%s' % os.path.basename(export_file.name)
-    response['Content-Length'] = os.path.getsize(export_file.name)
-    return response
-
-
-@ensure_csrf_cookie
-@login_required
-def export_course(request, org, course, name):
-    """
-    This method serves up the 'Export Course' page
-    """
-    location = get_location_and_verify_access(request, org, course, name)
-
-    course_module = modulestore().get_item(location)
-
-    return render_to_response('export.html', {
-        'context_course': course_module,
-        'successful_import_redirect_url': ''
-    })
+    else:
+        # Only HTML or x-tgz request formats are supported (no JSON).
+        return HttpResponse(status=406)

cms/static/sass/_base.scss

@@ -417,70 +417,6 @@ p, ul, ol, dl {
   > section {
     margin: 0 0 $baseline 0;
   }
-
-  .bit {
-    @extend %t-copy-sub1;
-    margin: 0 0 $baseline 0;
-    border-bottom: 1px solid $gray-l4;
-    padding: 0 0 $baseline 0;
-    color: $gray-l1;
-
-    &:last-child {
-      margin-bottom: 0;
-      border: none;
-      padding-bottom: 0;
-    }
-
-    h3 {
-      @extend %t-title7;
-      margin: 0 0 ($baseline/4) 0;
-      color: $gray-d2;
-      font-weight: 600;
-    }
-
-    p {
-      margin: 0 0 $baseline 0;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    // actions
-    .list-actions {
-      @extend %cont-no-list;
-
-      .action-item {
-        margin-bottom: ($baseline/4);
-        border-bottom: 1px dotted $gray-l4;
-        padding-bottom: ($baseline/4);
-
-
-        &:last-child {
-          margin-bottom: 0;
-          border: none;
-          padding-bottom: 0;
-        }
-      }
-    }
-
-    // navigation
-    .nav-related, .nav-page {
-
-      .nav-item {
-        margin-bottom: ($baseline/4);
-        border-bottom: 1px dotted $gray-l4;
-        padding-bottom: ($baseline/4);
-
-
-        &:last-child {
-          margin-bottom: 0;
-          border: none;
-          padding-bottom: 0;
-        }
-      }
-    }
-  }
 }
 
 // ====================

cms/static/sass/elements/_system-help.scss

@@ -211,3 +211,71 @@
     color: $gray;
   }
 }
+
+// ====================
+
+// informational bits (rename once UI pattern is further defined)
+.bit {
+  @extend %t-copy-sub1;
+  margin: 0 0 $baseline 0;
+  border-bottom: 1px solid $gray-l4;
+  padding: 0 0 $baseline 0;
+  color: $gray-l1;
+
+  &:last-child {
+    margin-bottom: 0;
+    border: none;
+    padding-bottom: 0;
+  }
+
+  h3, .title {
+    @extend %t-title7;
+    margin: 0 0 ($baseline/4) 0;
+    color: $gray-d2;
+    font-weight: 600;
+  }
+
+  p, .copy {
+    margin: 0 0 $baseline 0;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  // actions
+  .list-actions {
+    @extend %cont-no-list;
+
+    .action-item {
+      @extend %wipe-last-child;
+      margin-bottom: ($baseline/4);
+      border-bottom: 1px dotted $gray-l4;
+      padding-bottom: ($baseline/4);
+    }
+  }
+
+  // details
+  .list-details {
+    @extend %cont-no-list;
+
+    .item-detail {
+      @extend %wipe-last-child;
+      margin-bottom: ($baseline/4);
+      border-bottom: 1px dotted $gray-l4;
+      padding-bottom: ($baseline/4);
+    }
+  }
+
+  // navigation
+  .nav-related, .nav-page {
+    @extend %cont-no-list;
+
+    .nav-item {
+      @extend %wipe-last-child;
+      margin-bottom: ($baseline/4);
+      border-bottom: 1px dotted $gray-l4;
+      padding-bottom: ($baseline/4);
+    }
+  }
+}

cms/static/sass/views/_export.scss

@@ -3,12 +3,92 @@
 
 .view-export {
 
-  .export-overview {
+  // UI: basic layout
+  .content-primary, .content-supplementary {
+    @include box-sizing(border-box);
+    float: left;
+  }
+
+  .content-primary {
+    width: flex-grid(9,12);
+    margin-right: flex-gutter();
+  }
+
+  .content-supplementary {
+    width: flex-grid(3,12);
+  }
+
+
+  // UI: introduction
+  .introduction {
+
+    .title {
+      @extend %cont-text-sr;
+    }
+  }
+
+  // UI: export controls
+  .export-controls {
+    @include box-sizing(border-box);
     @extend %ui-window;
-    @include clearfix;
-    padding: 30px 40px;
+    padding: $baseline ($baseline*1.5) ($baseline*1.5) ($baseline*1.5);
+
+    .title {
+      @extend %t-title4;
+    }
+
+    .action-export {
+      @extend %btn-primary-blue;
+      @extend %t-action1;
+      display: block;
+      margin: $baseline 0;
+      padding: ($baseline*0.75) $baseline;
+    }
+
+    .action {
+
+      [class^="icon"] {
+        @extend %t-icon2;
+        display: inline-block;
+        vertical-align: middle;
+        margin-right: ($baseline/4);
+      }
+
+      .copy {
+        display: inline-block;
+        vertical-align: middle;
+      }
+    }
   }
 
+
+  // UI: export rules
+  .export-contents {
+    @include clearfix();
+    margin: ($baseline*2) 0;
+
+    .export-includes, .export-excludes {
+      width: flex-grid(4,9);
+
+      .item-detail {
+        @extend %t-copy-sub1;
+        @extend %wipe-last-child;
+        padding-bottom: ($baseline/4);
+        border-bottom: 1px solid $gray-l4;
+        margin-bottom: ($baseline/4);
+      }
+    }
+
+    .export-includes {
+      float: left;
+    }
+
+    .export-excludes {
+      float: right;
+    }
+  }
+
+  // OLD
   .description {
     float: left;
     width: 62%;
@@ -102,24 +182,5 @@
         line-height: 48px;
       }
     }
-
-    // downloading state
-    &.is-downloading {
-
-      .progress-bar {
-        display: block;
-      }
-
-      .button-export {
-        padding: 10px 50px 11px;
-        font-size: 17px;
-
-        &.disabled {
-
-          pointer-events: none;
-          cursor: default;
-        }
-      }
-    }
   }
 }

cms/static/sass/views/_import.scss

@@ -17,6 +17,13 @@
     width: flex-grid(3,12);
   }
 
+  // UI: export controls
+  .export-controls {
+    @extend %ui-window;
+    @include clearfix;
+    padding: 30px 40px;
+  }
+
   // UI: import form
   .import-form {
     @include box-sizing(border-box);
@@ -46,11 +53,23 @@
 
   // UI: default
   .action-choose-file {
-    @extend %btn-primary-blue;
+    @extend %btn-primary-green;
     @extend %t-action1;
     display: block;
     margin: $baseline 0;
     padding: ($baseline*0.75) $baseline;
+
+    [class^="icon"] {
+      @extend %t-icon2;
+      display: inline-block;
+      vertical-align: middle;
+      margin-right: ($baseline/4);
+    }
+
+    .copy {
+      display: inline-block;
+      vertical-align: middle;
+    }
   }
 
   // ====================

cms/templates/export.html

@@ -63,7 +63,14 @@ require(["domReady!", "gettext", "js/views/feedback_prompt"], function(doc, gett
       }
     });
   }
+
+  // The CSS animation for the dialog relies on the 'js' class
+  // being on the body. This happens after this JavaScript is executed,
+  // causing a "bouncing" of the dialog after it is initially shown.
+  // As a workaround, add this class first.
+  $('body').addClass('js');
   dialog.show();
+
 });
   </script>
   %endif
@@ -79,51 +86,81 @@ require(["domReady!", "gettext", "js/views/feedback_prompt"], function(doc, gett
   </header>
 </div>
 
-<div class="main-wrapper">
-  <div class="inner-wrapper">
+<div class="wrapper-content wrapper">
+  <section class="content">
+    <article class="content-primary" role="main">
 
-    <article class="export-overview">
-      <div class="description">
-        <h2>${_("About Exporting Courses")}</h2>
-        ## Translators: ".tar.gz" is a file extension, and should not be translated
-        <p>${_("When exporting your course, you will receive a .tar.gz formatted file that contains the following course data:")}</p>
-
-        <ul>
-          <li>${_("Course Structure (Sections and sub-section ordering)")}</li>
-          <li>${_("Individual Units")}</li>
-          <li>${_("Individual Problems")}</li>
-          <li>${_("Static Pages")}</li>
-          <li>${_("Course Assets")}</li>
-        </ul>
+      <div class="introduction">
+        <h2 class="title">${_("About Exporting Courses")}</h2>
+        <div class="copy">
+          ## Translators: ".tar.gz" is a file extension, and should not be translated
 
-        <p>${_("Your course export <strong>will not include</strong>: student data, forum/discussion data, course settings, certificates, grading information, or user data.")}</p>
+          <p>${_("You can export this course to edit it outside of Studio. Select the Export Course Content button below to download a .{em_start}tar.gz{em_end} file that contains the course content.").format(em_start='<strong>', em_end="</strong>")}</p>
+        </div>
+      </div>
+
+      <div class="export-controls">
+        <h2 class="title">${_("Export a Copy of My Course Data")}</h2>
+
+        <ul class="list-actions">
+          <li class="item-action">
+            <a class="action action-export action-primary" href="${export_url}">
+              <i class="icon-download"></i>
+              <span class="copy">${_("Export Course Content")}</span>
+            </a>
+          </li>
+        </ul>
       </div>
 
-      <!-- default state -->
-      <div class="export-form-wrapper">
-        <form action="${reverse('generate_export_course', kwargs=dict(org=context_course.location.org, course=context_course.location.course, name=context_course.location.name))}" method="post" enctype="multipart/form-data" class="export-form">
-          <h2>${_("Export Course:")}</h2>
+      <div class="export-contents">
+        <div class="export-includes">
+          <h3 class="title-3">${_("Data {em_start}exported with{em_end} your course:").format(em_start='<strong>', em_end="</strong>")}</h3>
+          <ul class="list-details list-export-includes">
+            <li class="item-detail">${_("Course Content (all Sections, Sub-sections, and Units)")}</li>
+            <li class="item-detail">${_("Course Structure")}</li>
+            <li class="item-detail">${_("Individual Problems")}</li>
+            <li class="item-detail">${_("Static Pages")}</li>
+            <li class="item-detail">${_("Course Assets")}</li>
+            <li class="item-detail">${_("Course Settings")}</li>
+          </ul>
+        </div>
 
-          <p class="error-block"></p>
+        <div class="export-excludes">
+          <h3 class="title-3">${_("Data {em_start}not exported{em_end} with your course:").format(em_start='<strong>', em_end="</strong>")}</h3>
+          <ul class="list-details list-export-excludes">
+            <li class="item-detail">${_("User Data")}</li>
+            <li class="item-detail">${_("Course Team Data")}</li>
+            <li class="item-detail">${_("Forum/discussion Data")}</li>
+            <li class="item-detail">${_("Certificates")}</li>
+          </ul>
+        </div>
+      </div>
+    </article>
 
-          <a href="${reverse('generate_export_course', kwargs=dict(org=context_course.location.org, course=context_course.location.course, name=context_course.location.name))}" class="button-export">${_("Download Files")}</a>
-        </form>
+    <aside class="content-supplementary" role="complimentary">
+      <div class="bit">
+        <h3 class="title-3">${_("Why export my course?")}</h3>
+
+        <ul class="list-details">
+          <li class="item-detail">${_("Edit the course XML directly, then import the modified course.")}</li>
+          <li class="item-detail">${_("Store a backup of your course in its current state.")}</li>
+          <li class="item-detail">${_("Import the course into another course instance, to create a customized version of your course.")}</li>
+        </ul>
       </div>
 
-      <!-- download state: after user clicks download buttons -->
-      <%doc>
-      <div class="export-form-wrapper is-downloading">
-        <form action="${reverse('export_course', kwargs=dict(org=context_course.location.org, course=context_course.location.course, name=context_course.location.name))}" method="post" enctype="multipart/form-data" class="export-form">
-          <h2>${_("Export Course:")}</h2>
+      <div class="bit">
+        <h3 class="title-3">${_("Opening the downloaded file")}</h3>
 
-          <p class="error-block"></p>
+        <p>${_("Extract the .tar.gz with an archive program on your computer.  Extracted data includes the course.xml file, as well as subfolders containing course content.")}</p>
+      </div>
+
+      <div class="bit">
+        ## Translators: ".tar.gz" is a file extension, and should not be translated
+        <h3 class="title-3">${_("Course Team Data")}</h3>
 
-          <a href="#" class="button-export disabled">Files Downloading</a>
-          <p class="message-status">${_("Download not start?")} <a href="#" class="text-export">${_("Try again")}</a></p>
-        </form>
+        <p>${_("Note that course team data is not exported, and that course team data is not changed when importing a course.")}</p>
       </div>
-      </%doc>
-    </article>
-  </div>
+    </aside>
+  </section>
 </div>
 </%block>

cms/templates/import.html

@@ -34,7 +34,10 @@
 
         <p class="error-block"></p>
 
-        <a href="#" class="action action-choose-file choose-file-button">${_("Choose File")}</a>
+        <a href="#" class="action action-choose-file choose-file-button">
+          <i class="icon-upload"></i>
+          <span class="copy">${_("Choose a File to Import")}</span>
+        </a>
 
         <div class="wrapper wrapper-file-name file-name-block">
             <h3 class="title">
@@ -132,6 +135,13 @@
         ## Translators: ".tar.gz" is a file extension, and files with that extension are called "gzipped tar files": these terms should not be translated
         <p>${_("Please note that if your course has any problems with auto-generated {nodename} nodes, re-importing your course could cause the loss of student data associated with those problems.").format(nodename='<code>url_name</code>')}</p>
       </div>
+
+      <div class="bit">
+        ## Translators: ".tar.gz" is a file extension, and should not be translated
+        <h3 class="title-3">${_("Course Team Info and Exporting/Importing")}</h3>
+
+        <p>${_("Please note that when importing course content, your course team info will not be changed by the imported course's information.")}</p>
+      </div>
     </aside>
   </section>
 </div>

cms/templates/widgets/header.html

@@ -21,6 +21,7 @@
             course_team_url = location.url_reverse('course_team/', '')
             assets_url = location.url_reverse('assets/', '')
             import_url = location.url_reverse('import/', '')
+            export_url = location.url_reverse('export/', '')
       %>
       <h2 class="info-course">
         <span class="sr">${_("Current Course:")}</span>
@@ -95,7 +96,7 @@
                     <a href="${import_url}">${_("Import")}</a>
                   </li>
                   <li class="nav-item nav-course-tools-export">
-                    <a href="${reverse('export_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">${_("Export")}</a>
+                    <a href="${export_url}">${_("Export")}</a>
                   </li>
                 </ul>
               </div>

cms/urls.py

+import re
 from django.conf import settings
 from django.conf.urls import patterns, include, url
 
@@ -32,11 +33,6 @@ urlpatterns = patterns('',  # nopep8
     url(r'^unpublish_unit$', 'contentstore.views.unpublish_unit', name='unpublish_unit'),
     url(r'^reorder_static_tabs', 'contentstore.views.reorder_static_tabs', name='reorder_static_tabs'),
 
-    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/export/(?P<name>[^/]+)$',
-        'contentstore.views.export_course', name='export_course'),
-    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/generate_export/(?P<name>[^/]+)$',
-        'contentstore.views.generate_export_course', name='generate_export_course'),
-
     url(r'^preview/modx/(?P<preview_id>[^/]*)/(?P<location>.*?)/(?P<dispatch>[^/]*)$',
         'contentstore.views.preview_dispatch', name='preview_dispatch'),
 
@@ -124,6 +120,7 @@ urlpatterns += patterns(
     url(r'(?ix)^assets/{}(/)?(?P<asset_id>.+)?$'.format(parsers.URL_RE_SOURCE), 'assets_handler'),
     url(r'(?ix)^import/{}$'.format(parsers.URL_RE_SOURCE), 'import_handler'),
     url(r'(?ix)^import_status/{}/(?P<filename>.+)$'.format(parsers.URL_RE_SOURCE), 'import_status_handler'),
+    url(r'(?ix)^export/{}$'.format(parsers.URL_RE_SOURCE), 'export_handler'),
 )
 
 js_info_dict = {

common/static/sass/_mixins.scss

@@ -80,6 +80,26 @@
 %ui-depth5 { z-index: 100000; }
 
 
+// extends - UI - utility - nth-type style clearing
+%wipe-first-child {
+
+  &:first-child {
+    margin-top: 0;
+    border-top: none;
+    padding-top: 0;
+  }
+}
+
+// extends - UI - utility - nth-type style clearing
+%wipe-last-child {
+
+  &:last-child {
+    margin-bottom: 0;
+    border-bottom: none;
+    padding-bottom: 0;
+  }
+}
+
 // extends - UI - buttons
 %ui-btn {
   @include box-sizing(border-box);