Merge branch 'master' into jonahstanley/add-gradingsettings-tests

2013-06-18 12:47:30 -04:00
parent 29275c48d1 cf2675d701
commit ce3bc1e1cb
220 changed files with 6353 additions and 1690 deletions
--- a/cms/CHANGELOG.md
+++ b/cms/CHANGELOG.md
@@ -1,21 +0,0 @@
-Instructions
-============
-For each pull request, add one or more lines to the bottom of the change list. When
-code is released to production, change the `Upcoming` entry to todays date, and add
-a new block at the bottom of the file.
-
-    Upcoming
-    --------
-
-Change log entries should be targeted at end users. A good place to start is the
-user story that instigated the pull request.
-
-
-Changes
-=======
-
-Upcoming
--------
-* Fix: Deleting last component in a unit does not work
-* Fix: Unit name is editable when a unit is public
-* Fix: Visual feedback inconsistent when saving a unit name change
--- a/cms/djangoapps/contentstore/features/advanced-settings.feature
+++ b/cms/djangoapps/contentstore/features/advanced-settings.feature
@@ -28,11 +28,18 @@ Feature: Advanced (manual) course policy

  Scenario: Test how multi-line input appears
    Given I am on the Advanced Course Settings page in Studio
-    When I create a JSON object as a value
+    When I create a JSON object as a value for "discussion_topics"
    Then it is displayed as formatted
    And I reload the page
    Then it is displayed as formatted

+  Scenario: Test error if value supplied is of the wrong type
+    Given I am on the Advanced Course Settings page in Studio
+    When I create a JSON object as a value for "display_name"
+    Then I get an error on save
+    And I reload the page
+    Then the policy key value is unchanged
+
  Scenario: Test automatic quoting of non-JSON values
    Given I am on the Advanced Course Settings page in Studio
    When I create a non-JSON value not in quotes
--- a/cms/djangoapps/contentstore/features/advanced-settings.py
+++ b/cms/djangoapps/contentstore/features/advanced-settings.py
@@ -2,13 +2,8 @@
 #pylint: disable=W0621

 from lettuce import world, step
-from common import *
-from nose.tools import assert_false, assert_equal
-
-"""
-http://selenium.googlecode.com/svn/trunk/docs/api/py/webdriver/selenium.webdriver.common.keys.html
-"""
-from selenium.webdriver.common.keys import Keys
+from nose.tools import assert_false, assert_equal, assert_regexp_matches
+from common import type_in_codemirror

 KEY_CSS = '.key input.policy-key'
 VALUE_CSS = 'textarea.json'
@@ -38,13 +33,7 @@ def press_the_notification_button(step, name):

@step(u'I edit the value of a policy key$')
 def edit_the_value_of_a_policy_key(step):
-    """
-    It is hard to figure out how to get into the CodeMirror
-    area, so cheat and do it from the policy key field :)
-    """
-    world.css_find(".CodeMirror")[get_index_of(DISPLAY_NAME_KEY)].click()
-    g = world.css_find("div.CodeMirror.CodeMirror-focused > div > textarea")
-    g._element.send_keys(Keys.ARROW_LEFT, ' ', 'X')
+    type_in_codemirror(get_index_of(DISPLAY_NAME_KEY), 'X')


@step(u'I edit the value of a policy key and save$')
@@ -52,9 +41,9 @@ def edit_the_value_of_a_policy_key_and_save(step):
    change_display_name_value(step, '"foo"')


-@step('I create a JSON object as a value$')
-def create_JSON_object(step):
-    change_display_name_value(step, '{"key": "value", "key_2": "value_2"}')
+@step('I create a JSON object as a value for "(.*)"$')
+def create_JSON_object(step, key):
+    change_value(step, key, '{"key": "value", "key_2": "value_2"}')


@step('I create a non-JSON value not in quotes$')
@@ -82,7 +71,12 @@ def they_are_alphabetized(step):

@step('it is displayed as formatted$')
 def it_is_formatted(step):
-    assert_policy_entries([DISPLAY_NAME_KEY], ['{\n    "key": "value",\n    "key_2": "value_2"\n}'])
+    assert_policy_entries(['discussion_topics'], ['{\n    "key": "value",\n    "key_2": "value_2"\n}'])
+
+
+@step('I get an error on save$')
+def error_on_save(step):
+    assert_regexp_matches(world.css_text('#notification-error-description'), 'Incorrect setting format')


@step('it is displayed as a string')
@@ -124,12 +118,9 @@ def get_display_name_value():


 def change_display_name_value(step, new_value):
+    change_value(step, DISPLAY_NAME_KEY, new_value)

-    world.css_find(".CodeMirror")[get_index_of(DISPLAY_NAME_KEY)].click()
-    g = world.css_find("div.CodeMirror.CodeMirror-focused > div > textarea")
-    display_name = get_display_name_value()
-    for count in range(len(display_name)):
-        g._element.send_keys(Keys.END, Keys.BACK_SPACE)
-        # Must delete "" before typing the JSON value
-    g._element.send_keys(Keys.END, Keys.BACK_SPACE, Keys.BACK_SPACE, new_value)
+
+def change_value(step, key, new_value):
+    type_in_codemirror(get_index_of(key), new_value)
    press_the_notification_button(step, "Save")
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -169,3 +169,14 @@ def open_new_unit(step):
    step.given('I have added a new subsection')
    step.given('I expand the first section')
    world.css_click('a.new-unit-item')
+
+
+def type_in_codemirror(index, text):
+    world.css_click(".CodeMirror", index=index)
+    g = world.css_find("div.CodeMirror.CodeMirror-focused > div > textarea")
+    if world.is_mac():
+        g._element.send_keys(Keys.COMMAND + 'a')
+    else:
+        g._element.send_keys(Keys.CONTROL + 'a')
+    g._element.send_keys(Keys.DELETE)
+    g._element.send_keys(text)
--- a/cms/djangoapps/contentstore/features/problem-editor.feature
+++ b/cms/djangoapps/contentstore/features/problem-editor.feature
@@ -3,65 +3,71 @@ Feature: Problem Editor

  Scenario: User can view metadata
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then I see five alphabetized settings and their expected values
    And Edit High Level Source is not visible

  Scenario: User can modify String values
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then I can modify the display name
    And my display name change is persisted on save

  Scenario: User can specify special characters in String values
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then I can specify special characters in the display name
    And my special characters and persisted on save

  Scenario: User can revert display name to unset
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then I can revert the display name to unset
    And my display name is unset on save

  Scenario: User can select values in a Select
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then I can select Per Student for Randomization
    And my change to randomization is persisted
    And I can revert to the default value for randomization

  Scenario: User can modify float input values
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then I can set the weight to "3.5"
    And my change to weight is persisted
    And I can revert to the default value of unset for weight

  Scenario: User cannot type letters in float number field
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then if I set the weight to "abc", it remains unset

  Scenario: User cannot type decimal values integer number field
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then if I set the max attempts to "2.34", it displays initially as "234", and is persisted as "234"

  Scenario: User cannot type out of range values in an integer number field
    Given I have created a Blank Common Problem
-    And I edit and select Settings
-    Then if I set the max attempts to "-3", it displays initially as "-3", and is persisted as "1"
+    When I edit and select Settings
+    Then if I set the max attempts to "-3", it displays initially as "-3", and is persisted as "0"

  Scenario: Settings changes are not saved on Cancel
    Given I have created a Blank Common Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then I can set the weight to "3.5"
    And I can modify the display name
    Then If I press Cancel my changes are not persisted

  Scenario: Edit High Level source is available for LaTeX problem
    Given I have created a LaTeX Problem
-    And I edit and select Settings
+    When I edit and select Settings
    Then Edit High Level Source is visible
+
+  Scenario: High Level source is persisted for LaTeX problem (bug STUD-280)
+    Given I have created a LaTeX Problem
+    When I edit and compile the High Level Source
+    Then my change to the High Level Source is persisted
+    And when I view the High Level Source I see my changes
--- a/cms/djangoapps/contentstore/features/problem-editor.py
+++ b/cms/djangoapps/contentstore/features/problem-editor.py
@@ -3,6 +3,7 @@

 from lettuce import world, step
 from nose.tools import assert_equal
+from common import type_in_codemirror

 DISPLAY_NAME = "Display Name"
 MAXIMUM_ATTEMPTS = "Maximum Attempts"
@@ -41,7 +42,9 @@ def i_see_five_settings_with_values(step):

@step('I can modify the display name')
 def i_can_modify_the_display_name(step):
-    world.get_setting_entry(DISPLAY_NAME).find_by_css('.setting-input')[0].fill('modified')
+    # Verifying that the display name can be a string containing a floating point value
+    # (to confirm that we don't throw an error because it is of the wrong type).
+    world.get_setting_entry(DISPLAY_NAME).find_by_css('.setting-input')[0].fill('3.4')
    verify_modified_display_name()


@@ -133,12 +136,12 @@ def set_the_max_attempts(step, max_attempts_set, max_attempts_displayed, max_att

@step('Edit High Level Source is not visible')
 def edit_high_level_source_not_visible(step):
-    verify_high_level_source(step, False)
+    verify_high_level_source_links(step, False)


@step('Edit High Level Source is visible')
-def edit_high_level_source_visible(step):
-    verify_high_level_source(step, True)
+def edit_high_level_source_links_visible(step):
+    verify_high_level_source_links(step, True)


@step('If I press Cancel my changes are not persisted')
@@ -151,13 +154,33 @@ def cancel_does_not_save_changes(step):
@step('I have created a LaTeX Problem')
 def create_latex_problem(step):
    world.click_new_component_button(step, '.large-problem-icon')
-    # Go to advanced tab (waiting for the tab to be visible)
-    world.css_find('#ui-id-2')
+    # Go to advanced tab.
    world.css_click('#ui-id-2')
    world.click_component_from_menu("i4x://edx/templates/problem/Problem_Written_in_LaTeX", '.xmodule_CapaModule')


-def verify_high_level_source(step, visible):
+@step('I edit and compile the High Level Source')
+def edit_latex_source(step):
+    open_high_level_source()
+    type_in_codemirror(1, "hi")
+    world.css_click('.hls-compile')
+
+
+@step('my change to the High Level Source is persisted')
+def high_level_source_persisted(step):
+    def verify_text(driver):
+        return world.css_find('.problem').text == 'hi'
+
+    world.wait_for(verify_text)
+
+
+@step('I view the High Level Source I see my changes')
+def high_level_source_in_editor(step):
+    open_high_level_source()
+    assert_equal('hi', world.css_find('.source-edit-box').value)
+
+
+def verify_high_level_source_links(step, visible):
    assert_equal(visible, world.is_css_present('.launch-latex-compiler'))
    world.cancel_component(step)
    assert_equal(visible, world.is_css_present('.upload-button'))
@@ -172,7 +195,7 @@ def verify_modified_randomization():


 def verify_modified_display_name():
-    world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, 'modified', True)
+    world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, '3.4', True)


 def verify_modified_display_name_with_special_chars():
@@ -185,3 +208,8 @@ def verify_unset_display_name():

 def set_weight(weight):
    world.get_setting_entry(PROBLEM_WEIGHT).find_by_css('.setting-input')[0].fill(weight)
+
+
+def open_high_level_source():
+    world.css_click('a.edit-button')
+    world.css_click('.launch-latex-compiler > a')
--- a/cms/djangoapps/contentstore/features/section.py
+++ b/cms/djangoapps/contentstore/features/section.py
@@ -9,34 +9,34 @@ from nose.tools import assert_equal


@step('I click the new section link$')
-def i_click_new_section_link(step):
+def i_click_new_section_link(_step):
    link_css = 'a.new-courseware-section-button'
    world.css_click(link_css)


@step('I enter the section name and click save$')
-def i_save_section_name(step):
+def i_save_section_name(_step):
    save_section_name('My Section')


@step('I enter a section name with a quote and click save$')
-def i_save_section_name_with_quote(step):
+def i_save_section_name_with_quote(_step):
    save_section_name('Section with "Quote"')


@step('I have added a new section$')
-def i_have_added_new_section(step):
+def i_have_added_new_section(_step):
    add_section()


@step('I click the Edit link for the release date$')
-def i_click_the_edit_link_for_the_release_date(step):
+def i_click_the_edit_link_for_the_release_date(_step):
    button_css = 'div.section-published-date a.edit-button'
    world.css_click(button_css)


@step('I save a new section release date$')
-def i_save_a_new_section_release_date(step):
+def i_save_a_new_section_release_date(_step):
    set_date_and_time('input.start-date.date.hasDatepicker', '12/25/2013',
        'input.start-time.time.ui-timepicker-input', '00:00')
    world.browser.click_link_by_text('Save')
@@ -46,35 +46,35 @@ def i_save_a_new_section_release_date(step):


@step('I see my section on the Courseware page$')
-def i_see_my_section_on_the_courseware_page(step):
+def i_see_my_section_on_the_courseware_page(_step):
    see_my_section_on_the_courseware_page('My Section')


@step('I see my section name with a quote on the Courseware page$')
-def i_see_my_section_name_with_quote_on_the_courseware_page(step):
+def i_see_my_section_name_with_quote_on_the_courseware_page(_step):
    see_my_section_on_the_courseware_page('Section with "Quote"')


@step('I click to edit the section name$')
-def i_click_to_edit_section_name(step):
+def i_click_to_edit_section_name(_step):
    world.css_click('span.section-name-span')


@step('I see the complete section name with a quote in the editor$')
-def i_see_complete_section_name_with_quote_in_editor(step):
+def i_see_complete_section_name_with_quote_in_editor(_step):
    css = '.section-name-edit input[type=text]'
    assert world.is_css_present(css)
    assert_equal(world.browser.find_by_css(css).value, 'Section with "Quote"')


@step('the section does not exist$')
-def section_does_not_exist(step):
+def section_does_not_exist(_step):
    css = 'h3[data-name="My Section"]'
    assert world.is_css_not_present(css)


@step('I see a release date for my section$')
-def i_see_a_release_date_for_my_section(step):
+def i_see_a_release_date_for_my_section(_step):
    import re

    css = 'span.published-status'
@@ -83,26 +83,32 @@ def i_see_a_release_date_for_my_section(step):

    # e.g. 11/06/2012 at 16:25
    msg = 'Will Release:'
-    date_regex = '[01][0-9]\/[0-3][0-9]\/[12][0-9][0-9][0-9]'
-    time_regex = '[0-2][0-9]:[0-5][0-9]'
-    match_string = '%s %s at %s' % (msg, date_regex, time_regex)
+    date_regex = r'(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d\d?, \d{4}'
+    if not re.search(date_regex, status_text):
+        print status_text, date_regex
+    time_regex = r'[0-2]\d:[0-5]\d( \w{3})?'
+    if not re.search(time_regex, status_text):
+        print status_text, time_regex
+    match_string = r'%s\s+%s at %s' % (msg, date_regex, time_regex)
+    if not re.match(match_string, status_text):
+        print status_text, match_string
    assert re.match(match_string, status_text)


@step('I see a link to create a new subsection$')
-def i_see_a_link_to_create_a_new_subsection(step):
+def i_see_a_link_to_create_a_new_subsection(_step):
    css = 'a.new-subsection-item'
    assert world.is_css_present(css)


@step('the section release date picker is not visible$')
-def the_section_release_date_picker_not_visible(step):
+def the_section_release_date_picker_not_visible(_step):
    css = 'div.edit-subsection-publish-settings'
    assert not world.css_visible(css)


@step('the section release date is updated$')
-def the_section_release_date_is_updated(step):
+def the_section_release_date_is_updated(_step):
    css = 'span.published-status'
    status_text = world.css_text(css)
    assert_equal(status_text, 'Will Release: 12/25/2013 at 00:00 UTC')
--- a/cms/djangoapps/contentstore/features/video.feature
+++ b/cms/djangoapps/contentstore/features/video.feature
@@ -8,3 +8,8 @@ Feature: Video Component
  Scenario: Creating a video takes a single click
    Given I have clicked the new unit button
    Then creating a video takes a single click
+
+  Scenario: Captions are shown correctly
+    Given I have created a Video component
+    And I have hidden captions
+    Then when I view the video it does not show the captions
--- a/cms/djangoapps/contentstore/features/video.py
+++ b/cms/djangoapps/contentstore/features/video.py
@@ -16,3 +16,13 @@ def video_takes_a_single_click(step):
    assert(not world.is_css_present('.xmodule_VideoModule'))
    world.css_click("a[data-location='i4x://edx/templates/video/default']")
    assert(world.is_css_present('.xmodule_VideoModule'))
+
+
+@step('I have hidden captions')
+def set_show_captions_false(step):
+    world.css_click('a.hide-subtitles')
+
+
+@step('when I view the video it does not show the captions')
+def does_not_show_captions(step):
+    assert world.css_find('.video')[0].has_class('closed')
--- a/cms/djangoapps/contentstore/management/commands/empty_asset_trashcan.py
+++ b/cms/djangoapps/contentstore/management/commands/empty_asset_trashcan.py
@@ -0,0 +1,25 @@
+from django.core.management.base import BaseCommand, CommandError
+from xmodule.course_module import CourseDescriptor
+from xmodule.contentstore.utils import empty_asset_trashcan
+from xmodule.modulestore.django import modulestore
+from .prompt import query_yes_no
+
+
+class Command(BaseCommand):
+    help = '''Empty the trashcan. Can pass an optional course_id to limit the damage.'''
+
+    def handle(self, *args, **options):
+        if len(args) != 1 and len(args) != 0:
+            raise CommandError("empty_asset_trashcan requires one or no arguments: |<location>|")
+
+        locs = []
+
+        if len(args) == 1:
+            locs.append(CourseDescriptor.id_to_location(args[0]))
+        else:
+            courses = modulestore('direct').get_courses()
+            for course in courses:
+                locs.append(course.location)
+
+        if query_yes_no("Emptying trashcan. Confirm?", default="no"):
+            empty_asset_trashcan(locs)
--- a/cms/djangoapps/contentstore/management/commands/restore_asset_from_trashcan.py
+++ b/cms/djangoapps/contentstore/management/commands/restore_asset_from_trashcan.py
@@ -0,0 +1,13 @@
+from django.core.management.base import BaseCommand, CommandError
+from xmodule.contentstore.utils import restore_asset_from_trashcan
+
+
+class Command(BaseCommand):
+    help = '''Restore a deleted asset from the trashcan back to it's original course'''
+
+    def handle(self, *args, **options):
+        if len(args) != 1 and len(args) != 0:
+            raise CommandError("restore_asset_from_trashcan requires one argument: <location>")
+
+        restore_asset_from_trashcan(args[0])
+
--- a/cms/djangoapps/contentstore/tests/test_checklists.py
+++ b/cms/djangoapps/contentstore/tests/test_checklists.py
@@ -19,6 +19,24 @@ class ChecklistTestCase(CourseTestCase):
        modulestore = get_modulestore(self.course.location)
        return modulestore.get_item(self.course.location).checklists

+
+    def compare_checklists(self, persisted, request):
+        """
+        Handles url expansion as possible difference and descends into guts
+        :param persisted:
+        :param request:
+        """
+        self.assertEqual(persisted['short_description'], request['short_description'])
+        compare_urls = (persisted.get('action_urls_expanded') == request.get('action_urls_expanded'))
+        for pers, req in zip(persisted['items'], request['items']):
+            self.assertEqual(pers['short_description'], req['short_description'])
+        self.assertEqual(pers['long_description'], req['long_description'])
+        self.assertEqual(pers['is_checked'], req['is_checked'])
+        if compare_urls:
+            self.assertEqual(pers['action_url'], req['action_url'])
+        self.assertEqual(pers['action_text'], req['action_text'])
+        self.assertEqual(pers['action_external'], req['action_external'])
+
    def test_get_checklists(self):
        """ Tests the get checklists method. """
        checklists_url = get_url_reverse('Checklists', self.course)
@@ -31,9 +49,9 @@ class ChecklistTestCase(CourseTestCase):
        self.course.checklists = None
        modulestore = get_modulestore(self.course.location)
        modulestore.update_metadata(self.course.location, own_metadata(self.course))
-        self.assertEquals(self.get_persisted_checklists(), None)
+        self.assertEqual(self.get_persisted_checklists(), None)
        response = self.client.get(checklists_url)
-        self.assertEquals(payload, response.content)
+        self.assertEqual(payload, response.content)

    def test_update_checklists_no_index(self):
        """ No checklist index, should return all of them. """
@@ -43,7 +61,8 @@ class ChecklistTestCase(CourseTestCase):
            'name': self.course.location.name})

        returned_checklists = json.loads(self.client.get(update_url).content)
-        self.assertListEqual(self.get_persisted_checklists(), returned_checklists)
+        for pay, resp in zip(self.get_persisted_checklists(), returned_checklists):
+            self.compare_checklists(pay, resp)

    def test_update_checklists_index_ignored_on_get(self):
        """ Checklist index ignored on get. """
@@ -53,7 +72,8 @@ class ChecklistTestCase(CourseTestCase):
                                                           'checklist_index': 1})

        returned_checklists = json.loads(self.client.get(update_url).content)
-        self.assertListEqual(self.get_persisted_checklists(), returned_checklists)
+        for pay, resp in zip(self.get_persisted_checklists(), returned_checklists):
+            self.compare_checklists(pay, resp)

    def test_update_checklists_post_no_index(self):
        """ No checklist index, will error on post. """
@@ -78,13 +98,18 @@ class ChecklistTestCase(CourseTestCase):
                                                           'course': self.course.location.course,
                                                           'name': self.course.location.name,
                                                           'checklist_index': 2})
+
+        def get_first_item(checklist):
+            return checklist['items'][0]
+
        payload = self.course.checklists[2]
-        self.assertFalse(payload.get('is_checked'))
-        payload['is_checked'] = True
+        self.assertFalse(get_first_item(payload).get('is_checked'))
+        get_first_item(payload)['is_checked'] = True

        returned_checklist = json.loads(self.client.post(update_url, json.dumps(payload), "application/json").content)
-        self.assertTrue(returned_checklist.get('is_checked'))
-        self.assertEqual(self.get_persisted_checklists()[2], returned_checklist)
+        self.assertTrue(get_first_item(returned_checklist).get('is_checked'))
+        pers = self.get_persisted_checklists()
+        self.compare_checklists(pers[2], returned_checklist)

    def test_update_checklists_delete_unsupported(self):
        """ Delete operation is not supported. """
@@ -93,4 +118,4 @@ class ChecklistTestCase(CourseTestCase):
                                                           'name': self.course.location.name,
                                                           'checklist_index': 100})
        response = self.client.delete(update_url)
-        self.assertContains(response, 'Unsupported request', status_code=400)
+        self.assertContains(response, 'Unsupported request', status_code=400)
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -28,6 +28,8 @@ from xmodule.templates import update_templates
 from xmodule.modulestore.xml_exporter import export_to_xml
 from xmodule.modulestore.xml_importer import import_from_xml, perform_xlint
 from xmodule.modulestore.inheritance import own_metadata
+from xmodule.contentstore.content import StaticContent
+from xmodule.contentstore.utils import restore_asset_from_trashcan, empty_asset_trashcan

 from xmodule.capa_module import CapaDescriptor
 from xmodule.course_module import CourseDescriptor
@@ -35,8 +37,12 @@ from xmodule.seq_module import SequenceDescriptor
 from xmodule.modulestore.exceptions import ItemNotFoundError

 from contentstore.views.component import ADVANCED_COMPONENT_TYPES
+from xmodule.exceptions import NotFoundError

 from django_comment_common.utils import are_permissions_roles_seeded
+from xmodule.exceptions import InvalidVersionError
+import datetime
+from pytz import UTC

 TEST_DATA_MODULESTORE = copy.deepcopy(settings.MODULESTORE)
 TEST_DATA_MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
@@ -120,6 +126,17 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
    def test_advanced_components_require_two_clicks(self):
        self.check_components_on_page(['videoalpha'], ['Video Alpha'])

+    def test_malformed_edit_unit_request(self):
+        store = modulestore('direct')
+        import_from_xml(store, 'common/test/data/', ['simple'])
+
+        # just pick one vertical
+        descriptor = store.get_items(Location('i4x', 'edX', 'simple', 'vertical', None, None))[0]
+        location = descriptor.location._replace(name='.' + descriptor.location.name)
+
+        resp = self.client.get(reverse('edit_unit', kwargs={'location': location.url()}))
+        self.assertEqual(resp.status_code, 400)
+
    def check_edit_unit(self, test_course_name):
        import_from_xml(modulestore('direct'), 'common/test/data/', [test_course_name])

@@ -257,7 +274,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        )
        self.assertTrue(getattr(draft_problem, 'is_draft', False))

-        #now requery with depth
+        # now requery with depth
        course = modulestore('draft').get_item(
            Location(['i4x', 'edX', 'simple', 'course', '2012_Fall', None]),
            depth=None
@@ -368,6 +385,159 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        course = module_store.get_item(source_location)
        self.assertFalse(course.hide_progress_tab)

+    def test_asset_import(self):
+        '''
+        This test validates that an image asset is imported and a thumbnail was generated for a .gif
+        '''
+        content_store = contentstore()
+
+        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'], static_content_store=content_store)
+
+        course_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
+        course = module_store.get_item(course_location)
+
+        self.assertIsNotNone(course)
+
+        # make sure we have some assets in our contentstore
+        all_assets = content_store.get_all_content_for_course(course_location)
+        self.assertGreater(len(all_assets), 0)
+
+        # make sure we have some thumbnails in our contentstore
+        all_thumbnails = content_store.get_all_content_thumbnails_for_course(course_location)
+
+        #
+        # cdodge: temporarily comment out assertion on thumbnails because many environments
+        # will not have the jpeg converter installed and this test will fail
+        #
+        #
+        # self.assertGreater(len(all_thumbnails), 0)
+
+        content = None
+        try:
+            location = StaticContent.get_location_from_path('/c4x/edX/full/asset/circuits_duality.gif')
+            content = content_store.find(location)
+        except NotFoundError:
+            pass
+
+        self.assertIsNotNone(content)
+
+        #
+        # cdodge: temporarily comment out assertion on thumbnails because many environments
+        # will not have the jpeg converter installed and this test will fail
+        #
+        # self.assertIsNotNone(content.thumbnail_location)
+        #
+        # thumbnail = None
+        # try:
+        #    thumbnail = content_store.find(content.thumbnail_location)
+        # except:
+        #    pass
+        #
+        # self.assertIsNotNone(thumbnail)
+
+    def test_asset_delete_and_restore(self):
+        '''
+        This test will exercise the soft delete/restore functionality of the assets
+        '''
+        content_store = contentstore()
+        trash_store = contentstore('trashcan')
+        module_store = modulestore('direct')
+
+        import_from_xml(module_store, 'common/test/data/', ['full'], static_content_store=content_store)
+
+        # look up original (and thumbnail) in content store, should be there after import
+        location = StaticContent.get_location_from_path('/c4x/edX/full/asset/circuits_duality.gif')
+        content = content_store.find(location, throw_on_not_found=False)
+        thumbnail_location = content.thumbnail_location
+        self.assertIsNotNone(content)
+
+        #
+        # cdodge: temporarily comment out assertion on thumbnails because many environments
+        # will not have the jpeg converter installed and this test will fail
+        #
+        # self.assertIsNotNone(thumbnail_location)
+
+        # go through the website to do the delete, since the soft-delete logic is in the view
+
+        url = reverse('remove_asset', kwargs={'org': 'edX', 'course': 'full', 'name': '6.002_Spring_2012'})
+        resp = self.client.post(url, {'location': '/c4x/edX/full/asset/circuits_duality.gif'})
+        self.assertEqual(resp.status_code, 200)
+
+        asset_location = StaticContent.get_location_from_path('/c4x/edX/full/asset/circuits_duality.gif')
+
+        # now try to find it in store, but they should not be there any longer
+        content = content_store.find(asset_location, throw_on_not_found=False)
+        self.assertIsNone(content)
+
+        if thumbnail_location:
+            thumbnail = content_store.find(thumbnail_location, throw_on_not_found=False)
+            self.assertIsNone(thumbnail)
+
+        # now try to find it and the thumbnail in trashcan - should be in there
+        content = trash_store.find(asset_location, throw_on_not_found=False)
+        self.assertIsNotNone(content)
+
+        if thumbnail_location:
+            thumbnail = trash_store.find(thumbnail_location, throw_on_not_found=False)
+            self.assertIsNotNone(thumbnail)
+
+        # let's restore the asset
+        restore_asset_from_trashcan('/c4x/edX/full/asset/circuits_duality.gif')
+
+        # now try to find it in courseware store, and they should be back after restore
+        content = content_store.find(asset_location, throw_on_not_found=False)
+        self.assertIsNotNone(content)
+
+        if thumbnail_location:
+            thumbnail = content_store.find(thumbnail_location, throw_on_not_found=False)
+            self.assertIsNotNone(thumbnail)
+
+    def test_empty_trashcan(self):
+        '''
+        This test will exercise the empting of the asset trashcan
+        '''
+        content_store = contentstore()
+        trash_store = contentstore('trashcan')
+        module_store = modulestore('direct')
+
+        import_from_xml(module_store, 'common/test/data/', ['full'], static_content_store=content_store)
+
+        course_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
+
+        location = StaticContent.get_location_from_path('/c4x/edX/full/asset/circuits_duality.gif')
+        content = content_store.find(location, throw_on_not_found=False)
+        self.assertIsNotNone(content)
+
+        # go through the website to do the delete, since the soft-delete logic is in the view
+
+        url = reverse('remove_asset', kwargs={'org': 'edX', 'course': 'full', 'name': '6.002_Spring_2012'})
+        resp = self.client.post(url, {'location': '/c4x/edX/full/asset/circuits_duality.gif'})
+        self.assertEqual(resp.status_code, 200)
+
+        # make sure there's something in the trashcan
+        all_assets = trash_store.get_all_content_for_course(course_location)
+        self.assertGreater(len(all_assets), 0)
+
+        # make sure we have some thumbnails in our trashcan
+        all_thumbnails = trash_store.get_all_content_thumbnails_for_course(course_location)
+        #
+        # cdodge: temporarily comment out assertion on thumbnails because many environments
+        # will not have the jpeg converter installed and this test will fail
+        #
+        # self.assertGreater(len(all_thumbnails), 0)
+
+        # empty the trashcan
+        empty_asset_trashcan([course_location])
+
+        # make sure trashcan is empty
+        all_assets = trash_store.get_all_content_for_course(course_location)
+        self.assertEqual(len(all_assets), 0)
+
+
+        all_thumbnails = trash_store.get_all_content_thumbnails_for_course(course_location)
+        self.assertEqual(len(all_thumbnails), 0)
+
    def test_clone_course(self):

        course_data = {
@@ -404,6 +574,32 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
            resp = self.client.get(reverse('edit_unit', kwargs={'location': new_loc.url()}))
            self.assertEqual(resp.status_code, 200)

+    def test_illegal_draft_crud_ops(self):
+        draft_store = modulestore('draft')
+        direct_store = modulestore('direct')
+
+        CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
+
+        location = Location('i4x://MITx/999/chapter/neuvo')
+        self.assertRaises(InvalidVersionError, draft_store.clone_item, 'i4x://edx/templates/chapter/Empty',
+            location)
+        direct_store.clone_item('i4x://edx/templates/chapter/Empty', location)
+        self.assertRaises(InvalidVersionError, draft_store.clone_item, location,
+            location)
+
+        self.assertRaises(InvalidVersionError, draft_store.update_item, location,
+            'chapter data')
+
+        # taking advantage of update_children and other functions never checking that the ids are valid
+        self.assertRaises(InvalidVersionError, draft_store.update_children, location,
+            ['i4x://MITx/999/problem/doesntexist'])
+
+        self.assertRaises(InvalidVersionError, draft_store.update_metadata, location,
+            {'due': datetime.datetime.now(UTC)})
+
+        self.assertRaises(InvalidVersionError, draft_store.unpublish, location)
+
+
    def test_bad_contentstore_request(self):
        resp = self.client.get('http://localhost:8001/c4x/CDX/123123/asset/&images_circuits_Lab7Solution2.png')
        self.assertEqual(resp.status_code, 400)
@@ -499,7 +695,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
            on_disk = loads(grading_policy.read())
            self.assertEqual(on_disk, course.grading_policy)

-        #check for policy.json
+        # check for policy.json
        self.assertTrue(filesystem.exists('policy.json'))

        # compare what's on disk to what we have in the course module
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -54,6 +54,7 @@ class CourseDetailsTestCase(CourseTestCase):
    def test_virgin_fetch(self):
        details = CourseDetails.fetch(self.course_location)
        self.assertEqual(details.course_location, self.course_location, "Location not copied into")
+        self.assertIsNotNone(details.start_date.tzinfo)
        self.assertIsNone(details.end_date, "end date somehow initialized " + str(details.end_date))
        self.assertIsNone(details.enrollment_start, "enrollment_start date somehow initialized " + str(details.enrollment_start))
        self.assertIsNone(details.enrollment_end, "enrollment_end date somehow initialized " + str(details.enrollment_end))
@@ -67,7 +68,6 @@ class CourseDetailsTestCase(CourseTestCase):
        jsondetails = json.dumps(details, cls=CourseSettingsEncoder)
        jsondetails = json.loads(jsondetails)
        self.assertTupleEqual(Location(jsondetails['course_location']), self.course_location, "Location !=")
-        # Note, start_date is being initialized someplace. I'm not sure why b/c the default will make no sense.
        self.assertIsNone(jsondetails['end_date'], "end date somehow initialized ")
        self.assertIsNone(jsondetails['enrollment_start'], "enrollment_start date somehow initialized ")
        self.assertIsNone(jsondetails['enrollment_end'], "enrollment_end date somehow initialized ")
@@ -76,6 +76,23 @@ class CourseDetailsTestCase(CourseTestCase):
        self.assertIsNone(jsondetails['intro_video'], "intro_video somehow initialized")
        self.assertIsNone(jsondetails['effort'], "effort somehow initialized")

+    def test_ooc_encoder(self):
+        """
+        Test the encoder out of its original constrained purpose to see if it functions for general use
+        """
+        details = {'location': Location(['tag', 'org', 'course', 'category', 'name']),
+            'number': 1,
+            'string': 'string',
+            'datetime': datetime.datetime.now(UTC())}
+        jsondetails = json.dumps(details, cls=CourseSettingsEncoder)
+        jsondetails = json.loads(jsondetails)
+
+        self.assertIn('location', jsondetails)
+        self.assertIn('org', jsondetails['location'])
+        self.assertEquals('org', jsondetails['location'][1])
+        self.assertEquals(1, jsondetails['number'])
+        self.assertEqual(jsondetails['string'], 'string')
+
    def test_update_and_fetch(self):
        # # NOTE: I couldn't figure out how to validly test time setting w/ all the conversions
        jsondetails = CourseDetails.fetch(self.course_location)
@@ -116,11 +133,8 @@ class CourseDetailsViewTest(CourseTestCase):
        self.compare_details_with_encoding(json.loads(resp.content), details.__dict__, field + str(val))

    @staticmethod
-    def convert_datetime_to_iso(datetime):
-        if datetime is not None:
-            return datetime.isoformat("T")
-        else:
-            return None
+    def convert_datetime_to_iso(dt):
+        return Date().to_json(dt)

    def test_update_and_fetch(self):
        details = CourseDetails.fetch(self.course_location)
@@ -151,22 +165,12 @@ class CourseDetailsViewTest(CourseTestCase):
        self.assertEqual(details['intro_video'], encoded.get('intro_video', None), context + " intro_video not ==")
        self.assertEqual(details['effort'], encoded['effort'], context + " efforts not ==")

-    @staticmethod
-    def struct_to_datetime(struct_time):
-        return datetime.datetime(*struct_time[:6], tzinfo=UTC())
-
    def compare_date_fields(self, details, encoded, context, field):
        if details[field] is not None:
            date = Date()
            if field in encoded and encoded[field] is not None:
-                encoded_encoded = date.from_json(encoded[field])
-                dt1 = CourseDetailsViewTest.struct_to_datetime(encoded_encoded)
-
-                if isinstance(details[field], datetime.datetime):
-                    dt2 = details[field]
-                else:
-                    details_encoded = date.from_json(details[field])
-                    dt2 = CourseDetailsViewTest.struct_to_datetime(details_encoded)
+                dt1 = date.from_json(encoded[field])
+                dt2 = details[field]

                expected_delta = datetime.timedelta(0)
                self.assertEqual(dt1 - dt2, expected_delta, str(dt1) + "!=" + str(dt2) + " at " + context)
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -3,6 +3,10 @@ from django.core.urlresolvers import reverse

 from .utils import parse_json, user, registration
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from contentstore.tests.test_course_settings import CourseTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+import datetime
+from pytz import UTC


 class ContentStoreTestCase(ModuleStoreTestCase):
@@ -162,3 +166,21 @@ class AuthTestCase(ContentStoreTestCase):
        self.assertEqual(resp.status_code, 302)

        # Logged in should work.
+
+
+class ForumTestCase(CourseTestCase):
+    def setUp(self):
+        """ Creates the test course. """
+        super(ForumTestCase, self).setUp()
+        self.course = CourseFactory.create(org='testX', number='727', display_name='Forum Course')
+
+    def test_blackouts(self):
+        now = datetime.datetime.now(UTC)
+        self.course.discussion_blackouts = [(t.isoformat(), t2.isoformat()) for t, t2 in
+            [(now - datetime.timedelta(days=14), now - datetime.timedelta(days=11)),
+                (now + datetime.timedelta(days=24), now + datetime.timedelta(days=30))]]
+        self.assertTrue(self.course.forum_posts_allowed)
+        self.course.discussion_blackouts = [(t.isoformat(), t2.isoformat()) for t, t2 in
+            [(now - datetime.timedelta(days=14), now + datetime.timedelta(days=2)),
+                (now + datetime.timedelta(days=24), now + datetime.timedelta(days=30))]]
+        self.assertFalse(self.course.forum_posts_allowed)
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -6,11 +6,10 @@ from django.core.urlresolvers import reverse
 import copy
 import logging
 import re
+from xmodule.modulestore.draft import DIRECT_ONLY_CATEGORIES

 log = logging.getLogger(__name__)

-DIRECT_ONLY_CATEGORIES = ['course', 'chapter', 'sequential', 'about', 'static_tab', 'course_info']
-
 #In order to instantiate an open ended tab automatically, need to have this data
 OPEN_ENDED_PANEL = {"name": "Open Ended Panel", "type": "open_ended"}
 NOTES_PANEL = {"name": "My Notes", "type": "notes"}
@@ -229,7 +228,7 @@ def add_extra_panel_tab(tab_type, course):
    course_tabs = copy.copy(course.tabs)
    changed = False
    #Check to see if open ended panel is defined in the course
-    
+
    tab_panel = EXTRA_TAB_PANELS.get(tab_type)
    if tab_panel not in course_tabs:
        #Add panel to the tabs if it is not defined
--- a/cms/djangoapps/contentstore/views/assets.py
+++ b/cms/djangoapps/contentstore/views/assets.py
@@ -25,6 +25,8 @@ from xmodule.modulestore.django import modulestore
 from xmodule.modulestore import Location
 from xmodule.contentstore.content import StaticContent
 from xmodule.util.date_utils import get_default_time_display
+from xmodule.modulestore import InvalidLocationError
+from xmodule.exceptions import NotFoundError

 from ..utils import get_url_reverse
 from .access import get_location_and_verify_access
@@ -62,7 +64,7 @@ def asset_index(request, org, course, name):
        asset_id = asset['_id']
        display_info = {}
        display_info['displayname'] = asset['displayname']
-        display_info['uploadDate'] = get_default_time_display(asset['uploadDate'].timetuple())
+        display_info['uploadDate'] = get_default_time_display(asset['uploadDate'])

        asset_location = StaticContent.compute_location(asset_id['org'], asset_id['course'], asset_id['name'])
        display_info['url'] = StaticContent.get_url_path_from_location(asset_location)
@@ -78,10 +80,17 @@ def asset_index(request, org, course, name):
        'active_tab': 'assets',
        'context_course': course_module,
        'assets': asset_display,
-        'upload_asset_callback_url': upload_asset_callback_url
+        'upload_asset_callback_url': upload_asset_callback_url,
+        'remove_asset_callback_url': reverse('remove_asset', kwargs={
+            'org': org,
+            'course': course,
+            'name': name
+        })
    })


+@login_required
+@ensure_csrf_cookie
 def upload_asset(request, org, course, coursename):
    '''
    cdodge: this method allows for POST uploading of files into the course asset library, which will
@@ -103,6 +112,9 @@ def upload_asset(request, org, course, coursename):
        logging.error('Could not find course' + location)
        return HttpResponseBadRequest()

+    if 'file' not in request.FILES:
+        return HttpResponseBadRequest()
+
    # compute a 'filename' which is similar to the location formatting, we're using the 'filename'
    # nomenclature since we're using a FileSystem paradigm here. We're just imposing
    # the Location string formatting expectations to keep things a bit more consistent
@@ -131,7 +143,7 @@ def upload_asset(request, org, course, coursename):
    readback = contentstore().find(content.location)

    response_payload = {'displayname': content.name,
-                        'uploadDate': get_default_time_display(readback.last_modified_at.timetuple()),
+                        'uploadDate': get_default_time_display(readback.last_modified_at),
                        'url': StaticContent.get_url_path_from_location(content.location),
                        'thumb_url': StaticContent.get_url_path_from_location(thumbnail_location) if thumbnail_content is not None else None,
                        'msg': 'Upload completed'
@@ -142,6 +154,57 @@ def upload_asset(request, org, course, coursename):
    return response


+@ensure_csrf_cookie
+@login_required
+def remove_asset(request, org, course, name):
+    '''
+    This method will perform a 'soft-delete' of an asset, which is basically to copy the asset from
+    the main GridFS collection and into a Trashcan
+    '''
+    get_location_and_verify_access(request, org, course, name)
+
+    location = request.POST['location']
+
+    # make sure the location is valid
+    try:
+        loc = StaticContent.get_location_from_path(location)
+    except InvalidLocationError:
+        # return a 'Bad Request' to browser as we have a malformed Location
+        response = HttpResponse()
+        response.status_code = 400
+        return response
+
+    # also make sure the item to delete actually exists
+    try:
+        content = contentstore().find(loc)
+    except NotFoundError:
+        response = HttpResponse()
+        response.status_code = 404
+        return response
+
+    # ok, save the content into the trashcan
+    contentstore('trashcan').save(content)
+
+    # see if there is a thumbnail as well, if so move that as well
+    if content.thumbnail_location is not None:
+        try:
+            thumbnail_content = contentstore().find(content.thumbnail_location)
+            contentstore('trashcan').save(thumbnail_content)
+            # hard delete thumbnail from origin
+            contentstore().delete(thumbnail_content.get_id())
+            # remove from any caching
+            del_cached_content(thumbnail_content.location)
+        except:
+            pass  # OK if this is left dangling
+
+    # delete the original
+    contentstore().delete(content.get_id())
+    # remove from cache
+    del_cached_content(content.location)
+
+    return HttpResponse()
+
+
@ensure_csrf_cookie
@login_required
 def import_course(request, org, course, name):
@@ -227,11 +290,9 @@ def generate_export_course(request, org, course, name):
    root_dir = path(mkdtemp())

    # export out to a tempdir
-
    logging.debug('root = {0}'.format(root_dir))

    export_to_xml(modulestore('direct'), contentstore(), loc, root_dir, name, modulestore())
-    #filename = root_dir / name + '.tar.gz'

    logging.debug('tar file being generated at {0}'.format(export_file.name))
    tar_file = tarfile.open(name=export_file.name, mode='w:gz')
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -7,7 +7,7 @@ from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
 from django_future.csrf import ensure_csrf_cookie
 from django.conf import settings
-
+from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationError
 from mitxmako.shortcuts import render_to_response

 from xmodule.modulestore import Location
@@ -50,11 +50,18 @@ ADVANCED_COMPONENT_POLICY_KEY = 'advanced_modules'
@login_required
 def edit_subsection(request, location):
    # check that we have permissions to edit this item
-    course = get_course_for_item(location)
+    try:
+        course = get_course_for_item(location)
+    except InvalidLocationError:
+        return HttpResponseBadRequest()
+
    if not has_access(request.user, course.location):
        raise PermissionDenied()

-    item = modulestore().get_item(location, depth=1)
+    try:
+        item = modulestore().get_item(location, depth=1)
+    except ItemNotFoundError:
+        return HttpResponseBadRequest()

    lms_link = get_lms_link_for_item(location, course_id=course.location.course_id)
    preview_link = get_lms_link_for_item(location, course_id=course.location.course_id, preview=True)
@@ -113,11 +120,18 @@ def edit_unit(request, location):

    id: A Location URL
    """
-    course = get_course_for_item(location)
+    try:
+        course = get_course_for_item(location)
+    except InvalidLocationError:
+        return HttpResponseBadRequest()
+
    if not has_access(request.user, course.location):
        raise PermissionDenied()

-    item = modulestore().get_item(location, depth=1)
+    try:
+        item = modulestore().get_item(location, depth=1)
+    except ItemNotFoundError:
+        return HttpResponseBadRequest()

    lms_link = get_lms_link_for_item(item.location, course_id=course.location.course_id)

--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -2,7 +2,6 @@
 Views related to operations on course objects
 """
 import json
-import time

 from django.contrib.auth.decorators import login_required
 from django_future.csrf import ensure_csrf_cookie
@@ -32,6 +31,8 @@ from .component import OPEN_ENDED_COMPONENT_TYPES, \
     NOTE_COMPONENT_TYPES, ADVANCED_COMPONENT_POLICY_KEY

 from django_comment_common.utils import seed_permissions_roles
+import datetime
+from django.utils.timezone import UTC

 # TODO: should explicitly enumerate exports with __all__

@@ -130,7 +131,7 @@ def create_new_course(request):
        new_course.display_name = display_name

    # set a default start date to now
-    new_course.start = time.gmtime()
+    new_course.start = datetime.datetime.now(UTC())

    initialize_course_tabs(new_course)

@@ -357,52 +358,55 @@ def course_advanced_updates(request, org, course, name):
        # Whether or not to filter the tabs key out of the settings metadata
        filter_tabs = True

-        #Check to see if the user instantiated any advanced components. This is a hack
-        #that does the following : 
-        #   1) adds/removes the open ended panel tab to a course automatically if the user 
+        # Check to see if the user instantiated any advanced components. This is a hack
+        # that does the following :
+        #   1) adds/removes the open ended panel tab to a course automatically if the user
        #   has indicated that they want to edit the combinedopendended or peergrading module
        #   2) adds/removes the notes panel tab to a course automatically if the user has
        #   indicated that they want the notes module enabled in their course
        # TODO refactor the above into distinct advanced policy settings
        if ADVANCED_COMPONENT_POLICY_KEY in request_body:
-            #Get the course so that we can scrape current tabs
+            # Get the course so that we can scrape current tabs
            course_module = modulestore().get_item(location)

-            #Maps tab types to components 
+            # Maps tab types to components
            tab_component_map = {
-                'open_ended': OPEN_ENDED_COMPONENT_TYPES, 
+                'open_ended': OPEN_ENDED_COMPONENT_TYPES,
                'notes': NOTE_COMPONENT_TYPES,
            }

-            #Check to see if the user instantiated any notes or open ended components
+            # Check to see if the user instantiated any notes or open ended components
            for tab_type in tab_component_map.keys():
                component_types = tab_component_map.get(tab_type)
                found_ac_type = False
                for ac_type in component_types:
                    if ac_type in request_body[ADVANCED_COMPONENT_POLICY_KEY]:
-                        #Add tab to the course if needed
+                        # Add tab to the course if needed
                        changed, new_tabs = add_extra_panel_tab(tab_type, course_module)
-                        #If a tab has been added to the course, then send the metadata along to CourseMetadata.update_from_json
+                        # If a tab has been added to the course, then send the metadata along to CourseMetadata.update_from_json
                        if changed:
                            course_module.tabs = new_tabs
                            request_body.update({'tabs': new_tabs})
-                            #Indicate that tabs should not be filtered out of the metadata
+                            # Indicate that tabs should not be filtered out of the metadata
                            filter_tabs = False
-                        #Set this flag to avoid the tab removal code below.
+                        # Set this flag to avoid the tab removal code below.
                        found_ac_type = True
                        break
-                #If we did not find a module type in the advanced settings,
+                # If we did not find a module type in the advanced settings,
                # we may need to remove the tab from the course.
                if not found_ac_type:
-                    #Remove tab from the course if needed
+                    # Remove tab from the course if needed
                    changed, new_tabs = remove_extra_panel_tab(tab_type, course_module)
                    if changed:
                        course_module.tabs = new_tabs
                        request_body.update({'tabs': new_tabs})
-                        #Indicate that tabs should *not* be filtered out of the metadata
+                        # Indicate that tabs should *not* be filtered out of the metadata
                        filter_tabs = False
-
-        response_json = json.dumps(CourseMetadata.update_from_json(location,
+        try:
+            response_json = json.dumps(CourseMetadata.update_from_json(location,
                                                                   request_body,
                                                                   filter_tabs=filter_tabs))
+        except (TypeError, ValueError), e:
+            return HttpResponseBadRequest("Incorrect setting format. " + str(e), content_type="text/plain")
+
        return HttpResponse(response_json, mimetype="application/json")
--- a/cms/djangoapps/models/settings/course_details.py
+++ b/cms/djangoapps/models/settings/course_details.py
@@ -3,26 +3,26 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.inheritance import own_metadata
 import json
 from json.encoder import JSONEncoder
-import time
 from contentstore.utils import get_modulestore
 from models.settings import course_grading
 from contentstore.utils import update_item
 from xmodule.fields import Date
 import re
 import logging
+import datetime


 class CourseDetails(object):
    def __init__(self, location):
-        self.course_location = location    # a Location obj
+        self.course_location = location  # a Location obj
        self.start_date = None  # 'start'
-        self.end_date = None    # 'end'
+        self.end_date = None  # 'end'
        self.enrollment_start = None
        self.enrollment_end = None
-        self.syllabus = None    # a pdf file asset
-        self.overview = ""      # html to render as the overview
-        self.intro_video = None    # a video pointer
-        self.effort = None      # int hours/week
+        self.syllabus = None  # a pdf file asset
+        self.overview = ""  # html to render as the overview
+        self.intro_video = None  # a video pointer
+        self.effort = None  # int hours/week

    @classmethod
    def fetch(cls, course_location):
@@ -73,9 +73,9 @@ class CourseDetails(object):
        """
        Decode the json into CourseDetails and save any changed attrs to the db
        """
-        ## TODO make it an error for this to be undefined & for it to not be retrievable from modulestore
+        # TODO make it an error for this to be undefined & for it to not be retrievable from modulestore
        course_location = jsondict['course_location']
-        ## Will probably want to cache the inflight courses because every blur generates an update
+        # Will probably want to cache the inflight courses because every blur generates an update
        descriptor = get_modulestore(course_location).get_item(course_location)

        dirty = False
@@ -181,7 +181,7 @@ class CourseSettingsEncoder(json.JSONEncoder):
            return obj.__dict__
        elif isinstance(obj, Location):
            return obj.dict()
-        elif isinstance(obj, time.struct_time):
+        elif isinstance(obj, datetime.datetime):
            return Date().to_json(obj)
        else:
            return JSONEncoder.default(self, obj)
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -23,7 +23,7 @@ MODULESTORE_OPTIONS = {
    'db': 'test_xmodule',
    'collection': 'acceptance_modulestore',
    'fs_root': TEST_ROOT / "data",
-    'render_template': 'mitxmako.shortcuts.render_to_string',
+    'render_template': 'mitxmako.shortcuts.render_to_string'
 }

 MODULESTORE = {
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -112,9 +112,6 @@ TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)
 for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
    MITX_FEATURES[feature] = value

-# load segment.io key, provide a dummy if it does not exist
-SEGMENT_IO_KEY = ENV_TOKENS.get('SEGMENT_IO_KEY', '***REMOVED***')
-
 LOGGING = get_logger_config(LOG_DIR,
                            logging_env=ENV_TOKENS['LOGGING_ENV'],
                            syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
@@ -126,6 +123,13 @@ LOGGING = get_logger_config(LOG_DIR,
 with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file:
    AUTH_TOKENS = json.load(auth_file)

+# If Segment.io key specified, load it and turn on Segment.io if the feature flag is set
+# Note that this is the Studio key. There is a separate key for the LMS.
+SEGMENT_IO_KEY = AUTH_TOKENS.get('SEGMENT_IO_KEY')
+if SEGMENT_IO_KEY:
+    MITX_FEATURES['SEGMENT_IO'] = ENV_TOKENS.get('SEGMENT_IO', False)
+
+
 AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
 AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 DATABASES = AUTH_TOKENS['DATABASES']
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -25,19 +25,30 @@ Longer TODO:

 import sys
 import lms.envs.common
+from lms.envs.common import USE_TZ
 from path import path

 ############################ FEATURE CONFIGURATION #############################

 MITX_FEATURES = {
    'USE_DJANGO_PIPELINE': True,
+    
    'GITHUB_PUSH': False,
+    
    'ENABLE_DISCUSSION_SERVICE': False,
+    
    'AUTH_USE_MIT_CERTIFICATES': False,
-    'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
-    'STAFF_EMAIL': '',			# email address for staff (eg to request course creation)
+    
+    # do not display video when running automated acceptance tests
+    'STUB_VIDEO_FOR_TESTING': False,
+    
+    # email address for staff (eg to request course creation)
+    'STAFF_EMAIL': '',
+    
    'STUDIO_NPS_SURVEY': True,
-    'SEGMENT_IO': True,
+    
+    # Segment.io - must explicitly turn it on for production
+    'SEGMENT_IO': False,

    # Enable URL that shows information about the status of various services
    'ENABLE_SERVICE_STATUS': False,
@@ -183,7 +194,7 @@ STATICFILES_DIRS = [

 # Locale/Internationalization
 TIME_ZONE = 'America/New_York'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-LANGUAGE_CODE = 'en'            # http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en'  # http://www.i18nguy.com/unicode/language-identifiers.html

 USE_I18N = True
 USE_L10N = True
@@ -227,7 +238,8 @@ PIPELINE_JS = {
        ) + ['js/hesitate.js', 'js/base.js',
             'js/models/feedback.js', 'js/views/feedback.js',
             'js/models/section.js', 'js/views/section.js',
-             'js/models/metadata_model.js', 'js/views/metadata_editor_view.js'],
+             'js/models/metadata_model.js', 'js/views/metadata_editor_view.js',
+             'js/views/assets.js'],
        'output_filename': 'js/cms-application.js',
        'test_order': 0
    },
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -22,7 +22,7 @@ modulestore_options = {
    'db': 'xmodule',
    'collection': 'modulestore',
    'fs_root': GITHUB_REPO_ROOT,
-    'render_template': 'mitxmako.shortcuts.render_to_string',
+    'render_template': 'mitxmako.shortcuts.render_to_string'
 }

 MODULESTORE = {
@@ -43,10 +43,15 @@ CONTENTSTORE = {
    'OPTIONS': {
        'host': 'localhost',
        'db': 'xcontent',
+    },
+    # allow for additional options that can be keyed on a name, e.g. 'trashcan'
+    'ADDITIONAL_OPTIONS': {
+        'trashcan': {
+            'bucket': 'trash_fs'
+        }
    }
 }

-
 DATABASES = {
    'default': {
        'ENGINE': 'django.db.backends.sqlite3',
@@ -64,7 +69,7 @@ REPOS = {
    },
    'content-mit-6002x': {
        'branch': 'master',
-        #'origin': 'git@github.com:MITx/6002x-fall-2012.git',
+        # 'origin': 'git@github.com:MITx/6002x-fall-2012.git',
        'origin': 'git@github.com:MITx/content-mit-6002x.git',
    },
    '6.00x': {
@@ -163,8 +168,14 @@ MITX_FEATURES['STUDIO_NPS_SURVEY'] = False
 # Enable URL that shows information about the status of variuous services
 MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True

-# segment-io key for dev
-SEGMENT_IO_KEY = 'mty8edrrsg'
+############################# SEGMENT-IO ##################################
+
+# If there's an environment variable set, grab it and turn on Segment.io
+# Note that this is the Studio key. There is a separate key for the LMS.
+import os
+SEGMENT_IO_KEY = os.environ.get('SEGMENT_IO_KEY')
+if SEGMENT_IO_KEY:
+    MITX_FEATURES['SEGMENT_IO'] = True


 #####################################################################
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -48,7 +48,7 @@ MODULESTORE_OPTIONS = {
    'db': 'test_xmodule',
    'collection': 'test_modulestore',
    'fs_root': TEST_ROOT / "data",
-    'render_template': 'mitxmako.shortcuts.render_to_string',
+    'render_template': 'mitxmako.shortcuts.render_to_string'
 }

 MODULESTORE = {
@@ -70,7 +70,13 @@ CONTENTSTORE = {
    'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
    'OPTIONS': {
        'host': 'localhost',
-        'db': 'xcontent',
+        'db': 'test_xmodule',
+    },
+    # allow for additional options that can be keyed on a name, e.g. 'trashcan'
+    'ADDITIONAL_OPTIONS': {
+        'trashcan': {
+            'bucket': 'trash_fs'
+        }
    }
 }

@@ -121,7 +127,7 @@ CELERY_RESULT_BACKEND = 'cache'
 BROKER_TRANSPORT = 'memory'

 ################### Make tests faster
-#http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/
+# http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/
 PASSWORD_HASHERS = (
    'django.contrib.auth.hashers.SHA1PasswordHasher',
    'django.contrib.auth.hashers.MD5PasswordHasher',
--- a/cms/pydev_manage.py
+++ b/cms/pydev_manage.py
@@ -0,0 +1,11 @@
+'''
+Used for pydev eclipse. Should be innocuous for everyone else.
+Created on May 8, 2013
+
+@author: dmitchell
+'''
+#!/home/<username>/mitx_all/python/bin/python
+from django.core import management
+
+if __name__ == '__main__':
+    management.execute_from_command_line()
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -44,8 +44,17 @@ class CMS.Views.ModuleEdit extends Backbone.View
        [@metadataEditor.getDisplayName()])
      @$el.find('.component-name').html(title)

+  customMetadata: ->
+      # Hack to support metadata fields that aren't part of the metadata editor (ie, LaTeX high level source).
+      # Walk through the set of elements which have the 'data-metadata_name' attribute and
+      # build up an object to pass back to the server on the subsequent POST.
+      # Note that these values will always be sent back on POST, even if they did not actually change.
+      _metadata = {}
+      _metadata[$(el).data("metadata-name")] = el.value for el in $('[data-metadata-name]',  @$component_editor())
+      return _metadata
+
  changedMetadata: ->
-    return @metadataEditor.getModifiedMetadataValues()
+    return _.extend(@metadataEditor.getModifiedMetadataValues(), @customMetadata())

  cloneTemplate: (parent, template) ->
    $.post("/clone_item", {
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -32,8 +32,6 @@ $(document).ready(function() {

    $modal.bind('click', hideModal);
    $modalCover.bind('click', hideModal);
-    $('.uploads .upload-button').bind('click', showUploadModal);
-    $('.upload-modal .close-button').bind('click', hideModal);

    $body.on('click', '.embeddable-xml-input', function() {
        $(this).select();
@@ -145,8 +143,6 @@ $(document).ready(function() {
    $('.edit-section-start-cancel').bind('click', cancelSetSectionScheduleDate);
    $('.edit-section-start-save').bind('click', saveSetSectionScheduleDate);

-    $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu);
-
    $body.on('click', '.section-published-date .edit-button', editSectionPublishDate);
    $body.on('click', '.section-published-date .schedule-button', editSectionPublishDate);
    $body.on('click', '.edit-subsection-publish-settings .save-button', saveSetSectionScheduleDate);
@@ -398,69 +394,6 @@ function _deleteItem($el) {
    });
 }

-function showUploadModal(e) {
-    e.preventDefault();
-    $modal = $('.upload-modal').show();
-    $('.file-input').bind('change', startUpload);
-    $modalCover.show();
-}
-
-function showFileSelectionMenu(e) {
-    e.preventDefault();
-    $('.file-input').click();
-}
-
-function startUpload(e) {
-    $('.upload-modal h1').html(gettext('Uploading…'));
-    $('.upload-modal .file-name').html($('.file-input').val().replace('C:\\fakepath\\', ''));
-    $('.upload-modal .file-chooser').ajaxSubmit({
-        beforeSend: resetUploadBar,
-        uploadProgress: showUploadFeedback,
-        complete: displayFinishedUpload
-    });
-    $('.upload-modal .choose-file-button').hide();
-    $('.upload-modal .progress-bar').removeClass('loaded').show();
-}
-
-function resetUploadBar() {
-    var percentVal = '0%';
-    $('.upload-modal .progress-fill').width(percentVal);
-    $('.upload-modal .progress-fill').html(percentVal);
-}
-
-function showUploadFeedback(event, position, total, percentComplete) {
-    var percentVal = percentComplete + '%';
-    $('.upload-modal .progress-fill').width(percentVal);
-    $('.upload-modal .progress-fill').html(percentVal);
-}
-
-function displayFinishedUpload(xhr) {
-    if (xhr.status = 200) {
-        markAsLoaded();
-    }
-
-    var resp = JSON.parse(xhr.responseText);
-    $('.upload-modal .embeddable-xml-input').val(xhr.getResponseHeader('asset_url'));
-    $('.upload-modal .embeddable').show();
-    $('.upload-modal .file-name').hide();
-    $('.upload-modal .progress-fill').html(resp.msg);
-    $('.upload-modal .choose-file-button').html(gettext('Load Another File')).show();
-    $('.upload-modal .progress-fill').width('100%');
-
-    // see if this id already exists, if so, then user must have updated an existing piece of content
-    $("tr[data-id='" + resp.url + "']").remove();
-
-    var template = $('#new-asset-element').html();
-    var html = Mustache.to_html(template, resp);
-    $('table > tbody').prepend(html);
-
-    analytics.track('Uploaded a File', {
-        'course': course_location_analytics,
-        'asset_url': resp.url
-    });
-
-}
-
 function markAsLoaded() {
    $('.upload-modal .copy-button').css('display', 'inline-block');
    $('.upload-modal .progress-bar').addClass('loaded');
--- a/cms/static/js/models/feedback.js
+++ b/cms/static/js/models/feedback.js
@@ -42,6 +42,12 @@ CMS.Models.ErrorMessage = CMS.Models.SystemFeedback.extend({
    })
 });

+CMS.Models.ConfirmAssetDeleteMessage = CMS.Models.SystemFeedback.extend({
+    defaults: $.extend({}, CMS.Models.SystemFeedback.prototype.defaults, {
+        "intent": "warning"
+    })
+});
+
 CMS.Models.ConfirmationMessage = CMS.Models.SystemFeedback.extend({
    defaults: $.extend({}, CMS.Models.SystemFeedback.prototype.defaults, {
        "intent": "confirmation"
--- a/cms/static/js/views/assets.js
+++ b/cms/static/js/views/assets.js
@@ -0,0 +1,128 @@
+$(document).ready(function() {
+    $('.uploads .upload-button').bind('click', showUploadModal);
+    $('.upload-modal .close-button').bind('click', hideModal);
+    $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu);
+    $('.remove-asset-button').bind('click', removeAsset);
+});
+
+function removeAsset(e){
+    e.preventDefault();
+
+    var that = this;
+    var msg = new CMS.Models.ConfirmAssetDeleteMessage({
+        title: gettext("Delete File Confirmation"),
+        message: gettext("Are you sure you wish to delete this item. It cannot be reversed!\n\nAlso any content that links/refers to this item will no longer work (e.g. broken images and/or links)"),
+        actions: {
+            primary: {
+                text: gettext("OK"),
+                click: function(view) {
+                    // call the back-end to actually remove the asset
+                    $.post(view.model.get('remove_asset_url'),
+                        { 'location': view.model.get('asset_location') },
+                        function() {
+                            // show the post-commit confirmation
+                            $(".wrapper-alert-confirmation").addClass("is-shown").attr('aria-hidden','false');
+                            view.model.get('row_to_remove').remove();
+                            analytics.track('Deleted Asset', {
+                                'course': course_location_analytics,
+                                'id': view.model.get('asset_location')
+                            });
+                        }
+                    );
+                    view.hide();
+                }
+            },
+            secondary: [{
+                text: gettext("Cancel"),
+                click: function(view) {
+                    view.hide();
+                }
+            }]
+        },
+        remove_asset_url: $('.asset-library').data('remove-asset-callback-url'),
+        asset_location: $(this).closest('tr').data('id'),
+        row_to_remove: $(this).closest('tr')
+    });
+
+    // workaround for now. We can't spawn multiple instances of the Prompt View
+    // so for now, a bit of hackery to just make sure we have a single instance
+    // note: confirm_delete_prompt is in asset_index.html
+    if (confirm_delete_prompt === null)
+        confirm_delete_prompt = new CMS.Views.Prompt({model: msg});
+    else
+    {
+        confirm_delete_prompt.model = msg;
+        confirm_delete_prompt.show();
+    }
+
+    return;
+}
+
+function showUploadModal(e) {
+    e.preventDefault();
+    $modal = $('.upload-modal').show();
+    $('.file-input').bind('change', startUpload);
+    $modalCover.show();
+}
+
+function showFileSelectionMenu(e) {
+    e.preventDefault();
+    $('.file-input').click();
+}
+
+function startUpload(e) {
+    var files = $('.file-input').get(0).files;
+    if (files.length === 0)
+        return;
+
+    $('.upload-modal h1').html(gettext('Uploading…'));
+    $('.upload-modal .file-name').html(files[0].name);
+    $('.upload-modal .file-chooser').ajaxSubmit({
+        beforeSend: resetUploadBar,
+        uploadProgress: showUploadFeedback,
+        complete: displayFinishedUpload
+    });
+    $('.upload-modal .choose-file-button').hide();
+    $('.upload-modal .progress-bar').removeClass('loaded').show();
+}
+
+function resetUploadBar() {
+    var percentVal = '0%';
+    $('.upload-modal .progress-fill').width(percentVal);
+    $('.upload-modal .progress-fill').html(percentVal);
+}
+
+function showUploadFeedback(event, position, total, percentComplete) {
+    var percentVal = percentComplete + '%';
+    $('.upload-modal .progress-fill').width(percentVal);
+    $('.upload-modal .progress-fill').html(percentVal);
+}
+
+function displayFinishedUpload(xhr) {
+    if (xhr.status == 200) {
+        markAsLoaded();
+    }
+
+    var resp = JSON.parse(xhr.responseText);
+    $('.upload-modal .embeddable-xml-input').val(xhr.getResponseHeader('asset_url'));
+    $('.upload-modal .embeddable').show();
+    $('.upload-modal .file-name').hide();
+    $('.upload-modal .progress-fill').html(resp.msg);
+    $('.upload-modal .choose-file-button').html(gettext('Load Another File')).show();
+    $('.upload-modal .progress-fill').width('100%');
+
+    // see if this id already exists, if so, then user must have updated an existing piece of content
+    $("tr[data-id='" + resp.url + "']").remove();
+
+    var template = $('#new-asset-element').html();
+    var html = Mustache.to_html(template, resp);
+    $('table > tbody').prepend(html);
+
+    // re-bind the listeners to delete it
+    $('.remove-asset-button').bind('click', removeAsset);
+
+    analytics.track('Uploaded a File', {
+        'course': course_location_analytics,
+        'asset_url': resp.url
+    });
+}
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -14,7 +14,7 @@ body {
  color: $gray-d2;
 }

-body, input {
+body, input, button {
  font-family: 'Open Sans', sans-serif;
 }

--- a/cms/static/sass/views/_assets.scss
+++ b/cms/static/sass/views/_assets.scss
@@ -76,6 +76,10 @@ body.course.uploads {
        width: 250px;
      }

+      .delete-col {
+        width: 20px;
+      }
+
      .embeddable-xml-input {
        @include box-shadow(none);
        width: 100%;
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -1,5 +1,6 @@
 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
+<%! from django.utils.translation import ugettext as _ %>
 <%block name="bodyclass">is-signedin course uploads</%block>
 <%block name="title">Files &amp; Uploads</%block>

@@ -7,6 +8,12 @@

 <%block name="jsextra">
 <script src="${static.url('js/vendor/mustache.js')}"></script>
+<script type="text/javascript" src="${static.url('js/views/assets.js')}"></script>
+
+<script type='text/javascript'>
+  // we just want a singleton
+  confirm_delete_prompt = null;
+</script>
 </%block>

 <%block name="content">
@@ -30,6 +37,9 @@
      <td class="embed-col">
        <input type="text" class="embeddable-xml-input" value='{{url}}' readonly>
      </td>
+      <td class="delete-col">
+        <a href="#" data-tooltip="${_('Delete this asset')}" class="remove-asset-button"><span class="delete-icon"></span></a>
+      </td>
    </tr>
  </script>

@@ -56,7 +66,7 @@
      <div class="page-actions">
        <input type="text" class="asset-search-input search wip-box" placeholder="search assets" style="display:none"/>
      </div>
-      <article class="asset-library">
+      <article class="asset-library" data-remove-asset-callback-url='${remove_asset_callback_url}'>
        <table>
          <thead>
            <tr>
@@ -64,6 +74,7 @@
              <th class="name-col">Name</th>
              <th class="date-col">Date Added</th>
              <th class="embed-col">URL</th>
+              <th class="delete-col"></th>
            </tr>
          </thead>
          <tbody id="asset_table_body">
@@ -86,6 +97,9 @@
              <td class="embed-col">
                <input type="text" class="embeddable-xml-input" value="${asset['url']}" readonly>
              </td>
+              <td class="delete-col">
+                <a href="#" data-tooltip="${_('Delete this asset')}" class="remove-asset-button"><span class="delete-icon"></span></a>
+              </td>             
            </tr>
          % endfor
          </tbody>
@@ -129,3 +143,21 @@


 </%block>
+
+<%block name="view_alerts">
+<!-- alert: save confirmed with close -->
+<div class="wrapper wrapper-alert wrapper-alert-confirmation" role="status">
+  <div class="alert confirmation">
+    <i class="icon-ok"></i>
+
+    <div class="copy">
+      <h2 class="title title-3">${_('Your file has been deleted.')}</h2>
+    </div>
+
+    <a href="" rel="view" class="action action-alert-close">
+      <i class="icon-remove-sign"></i>
+      <span class="label">${_('close alert')}</span>
+    </a>
+  </div>
+</div>
+</%block>
--- a/cms/templates/edit_subsection.html
+++ b/cms/templates/edit_subsection.html
@@ -1,7 +1,7 @@
 <%inherit file="base.html" />
 <%!
   import logging
-   from xmodule.util.date_utils import get_time_struct_display
+   from xmodule.util.date_utils import get_default_time_display
 %>

 <%! from django.core.urlresolvers import reverse %>
@@ -36,11 +36,15 @@
        <div class="datepair" data-language="javascript">
          <div class="field field-start-date">
            <label for="start_date">Release Day</label>
-            <input type="text" id="start_date" name="start_date" value="${get_time_struct_display(subsection.lms.start, '%m/%d/%Y')}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
+            <input type="text" id="start_date" name="start_date" 
+                value="${subsection.lms.start.strftime('%m/%d/%Y') if subsection.lms.start else ''}" 
+                placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
          </div>
          <div class="field field-start-time">
            <label for="start_time">Release Time (<abbr title="Coordinated Universal Time">UTC</abbr>)</label>
-            <input type="text" id="start_time" name="start_time" value="${get_time_struct_display(subsection.lms.start, '%H:%M')}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+            <input type="text" id="start_time" name="start_time" 
+                value="${subsection.lms.start.strftime('%H:%M') if subsection.lms.start else ''}" 
+                placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
          </div>
        </div>
        % if subsection.lms.start != parent_item.lms.start and subsection.lms.start:
@@ -48,7 +52,7 @@
            <p class="notice">The date above differs from the release date of ${parent_item.display_name_with_default}, which is unset.
            % else:
            <p class="notice">The date above differs from the release date of ${parent_item.display_name_with_default} –
-                ${get_time_struct_display(parent_item.lms.start, '%m/%d/%Y at %H:%M UTC')}.
+                ${get_default_time_display(parent_item.lms.start)}.
            % endif
            <a href="#" class="sync-date no-spinner">Sync to ${parent_item.display_name_with_default}.</a></p>
        % endif
@@ -65,11 +69,15 @@
      <div class="datepair date-setter">
        <div class="field field-start-date">
          <label for="due_date">Due Day</label>
-          <input type="text" id="due_date" name="due_date" value="${get_time_struct_display(subsection.lms.due, '%m/%d/%Y')}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
+          <input type="text" id="due_date" name="due_date" 
+          value="${subsection.lms.due.strftime('%m/%d/%Y') if subsection.lms.due else ''}" 
+          placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
        </div>
        <div class="field field-start-time">
          <label for="due_time">Due Time (<abbr title="Coordinated Universal Time">UTC</abbr>)</label>
-          <input type="text" id="due_time" name="due_time" value="${get_time_struct_display(subsection.lms.due, '%H:%M')}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+          <input type="text" id="due_time" name="due_time" 
+            value="${subsection.lms.due.strftime('%H:%M') if subsection.lms.due else ''}" 
+            placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
        </div>
        <a href="#" class="remove-date">Remove due date</a>
      </div>
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -1,7 +1,7 @@
 <%inherit file="base.html" />
 <%!
   import logging
-   from xmodule.util.date_utils import get_time_struct_display
+   from xmodule.util import date_utils
 %>
 <%! from django.core.urlresolvers import reverse %>
 <%block name="title">Course Outline</%block>
@@ -154,14 +154,19 @@
              <h3 class="section-name" data-name="${section.display_name_with_default | h}"></h3>
              <div class="section-published-date">
                <%
-                  start_date_str = get_time_struct_display(section.lms.start, '%m/%d/%Y')
-                  start_time_str = get_time_struct_display(section.lms.start, '%H:%M')
+                  if section.lms.start is not None:
+                      start_date_str = section.lms.start.strftime('%m/%d/%Y')
+                      start_time_str = section.lms.start.strftime('%H:%M')
+                  else:
+                      start_date_str = ''
+                      start_time_str = ''
                %>
                %if section.lms.start is None:
                  <span class="published-status">This section has not been released.</span>
                  <a href="#" class="schedule-button" data-date="" data-time="" data-id="${section.location}">Schedule</a>
                %else:
-                  <span class="published-status"><strong>Will Release:</strong> ${get_time_struct_display(section.lms.start, '%m/%d/%Y at %H:%M UTC')}</span>
+                  <span class="published-status"><strong>Will Release:</strong> 
+                  ${date_utils.get_default_time_display(section.lms.start)}</span>
                  <a href="#" class="edit-button" data-date="${start_date_str}" data-time="${start_time_str}" data-id="${section.location}">Edit</a>
                %endif
              </div>
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -35,6 +35,8 @@ urlpatterns = ('',  # nopep8
        'contentstore.views.preview_dispatch', name='preview_dispatch'),
    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)/upload_asset$',
        'contentstore.views.upload_asset', name='upload_asset'),
+
+
    url(r'^manage_users/(?P<location>.*?)$', 'contentstore.views.manage_users', name='manage_users'),
    url(r'^add_user/(?P<location>.*?)$',
        'contentstore.views.add_user', name='add_user'),
@@ -71,8 +73,11 @@ urlpatterns = ('',  # nopep8
        'contentstore.views.edit_static', name='edit_static'),
    url(r'^edit_tabs/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$',
        'contentstore.views.edit_tabs', name='edit_tabs'),
+
    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$',
        'contentstore.views.asset_index', name='asset_index'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)/remove$',
+        'contentstore.views.assets.remove_asset', name='remove_asset'),

    # this is a generic method to return the data/metadata associated with a xmodule
    url(r'^module_info/(?P<module_location>.*)$',
--- a/cms/xmodule_namespace.py
+++ b/cms/xmodule_namespace.py
@@ -5,7 +5,6 @@ Namespace defining common fields used by Studio for all blocks
 import datetime

 from xblock.core import Namespace, Scope, ModelType, String
-from xmodule.fields import StringyBoolean


 class DateTuple(ModelType):
@@ -28,4 +27,3 @@ class CmsNamespace(Namespace):
    """
    published_date = DateTuple(help="Date when the module was published", scope=Scope.settings)
    published_by = String(help="Id of the user who published this module", scope=Scope.settings)
-