From 8a4503b3f44e9bebd68f778086462bc591b9bb6b Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Wed, 8 Apr 2015 09:49:40 -0400
Subject: [PATCH 1/8] Display Scope.content fields in Studio editor

But mark `data` as non-editable metadata, so that it doesn't appear
---
 common/lib/xmodule/xmodule/capa_base.py       |  6 +++++
 .../lib/xmodule/xmodule/discussion_module.py  |  6 +++++
 common/lib/xmodule/xmodule/html_module.py     | 24 +++++++++++++++++++
 common/lib/xmodule/xmodule/raw_module.py      | 12 ++++++++++
 common/lib/xmodule/xmodule/x_module.py        |  5 ++--
 5 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py
index 3c0396a7bf..f3ff1fd8dc 100644
--- a/common/lib/xmodule/xmodule/capa_base.py
+++ b/common/lib/xmodule/xmodule/capa_base.py
@@ -200,6 +200,12 @@ class CapaFields(object):
         scope=Scope.settings
     )
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(CapaFields, self).non_editable_metadata_fields
+        non_editable_fields.append(CapaFields.data)
+        return non_editable_fields
+
 
 class CapaMixin(CapaFields):
     """
diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py
index ed787fb296..4dba69314e 100644
--- a/common/lib/xmodule/xmodule/discussion_module.py
+++ b/common/lib/xmodule/xmodule/discussion_module.py
@@ -41,6 +41,12 @@ class DiscussionFields(object):
     )
     sort_key = String(scope=Scope.settings)
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(DiscussionFields, self).non_editable_metadata_fields
+        non_editable_fields.append(DiscussionFields.data)
+        return non_editable_fields
+
 
 class DiscussionModule(DiscussionFields, XModule):
     js = {
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index b57a6bd970..9662d7f31c 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -54,6 +54,12 @@ class HtmlFields(object):
         scope=Scope.settings
     )
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(HtmlFields, self).non_editable_metadata_fields
+        non_editable_fields.append(HtmlFields.data)
+        return non_editable_fields
+
 
 class HtmlModuleMixin(HtmlFields, XModule):
     """
@@ -299,6 +305,12 @@ class AboutFields(object):
         scope=Scope.content
     )
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(AboutFields, self).non_editable_metadata_fields
+        non_editable_fields.append(AboutFields.data)
+        return non_editable_fields
+
 
 @XBlock.tag("detached")
 class AboutModule(AboutFields, HtmlModuleMixin):
@@ -336,6 +348,12 @@ class StaticTabFields(object):
         help=_("HTML for the additional pages")
     )
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(StaticTabFields, self).non_editable_metadata_fields
+        non_editable_fields.append(StaticTabFields.data)
+        return non_editable_fields
+
 
 @XBlock.tag("detached")
 class StaticTabModule(StaticTabFields, HtmlModuleMixin):
@@ -370,6 +388,12 @@ class CourseInfoFields(object):
         scope=Scope.content
     )
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(CourseInfoFields, self).non_editable_metadata_fields
+        non_editable_fields.append(CourseInfoFields.data)
+        return non_editable_fields
+
 
 @XBlock.tag("detached")
 class CourseInfoModule(CourseInfoFields, HtmlModuleMixin):
diff --git a/common/lib/xmodule/xmodule/raw_module.py b/common/lib/xmodule/xmodule/raw_module.py
index 0e9087c540..7aa522cf04 100644
--- a/common/lib/xmodule/xmodule/raw_module.py
+++ b/common/lib/xmodule/xmodule/raw_module.py
@@ -15,6 +15,12 @@ class RawDescriptor(XmlDescriptor, XMLEditingDescriptor):
     """
     data = String(help="XML data for the module", default="", scope=Scope.content)
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(RawDescriptor, self).non_editable_metadata_fields
+        non_editable_fields.append(RawDescriptor.data)
+        return non_editable_fields
+
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         return {'data': etree.tostring(xml_object, pretty_print=True, encoding='unicode')}, []
@@ -44,6 +50,12 @@ class EmptyDataRawDescriptor(XmlDescriptor, XMLEditingDescriptor):
     """
     data = String(default='', scope=Scope.content)
 
+    @property
+    def non_editable_metadata_fields(self):
+        non_editable_fields = super(EmptyDataRawDescriptor, self).non_editable_metadata_fields
+        non_editable_fields.append(EmptyDataRawDescriptor.data)
+        return non_editable_fields
+
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         if len(xml_object) == 0 and len(xml_object.items()) == 0:
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index cd92cbda2d..0a36ef89b6 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -620,8 +620,9 @@ class XModuleMixin(XModuleFields, XBlockMixin):
         fields = getattr(self, 'unmixed_class', self.__class__).fields
 
         for field in fields.values():
-
-            if field.scope != Scope.settings or field in self.non_editable_metadata_fields:
+            if field in self.non_editable_metadata_fields:
+                continue
+            if field.scope not in (Scope.settings, Scope.content):
                 continue
 
             metadata_fields[field.name] = self._create_metadata_editor_info(field)

From 2159d34128952c98a87ead06fb379a5d26edd243 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Thu, 5 Mar 2015 10:56:14 -0500
Subject: [PATCH 2/8] Added a simple XBlockMixin for courseware licenses

This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
---
 .../contentstore/tests/test_contentstore.py   |  39 +++++
 .../contentstore/views/component.py           |   2 +-
 .../models/settings/course_details.py         |   6 +
 cms/envs/bok_choy.py                          |   3 +
 cms/envs/common.py                            |   3 +
 cms/static/coffee/spec/main.coffee            |   2 +
 cms/static/js/models/license.js               | 100 +++++++++++
 .../js/models/settings/course_details.js      |   1 +
 cms/static/js/spec/models/license_spec.js     |  72 ++++++++
 cms/static/js/spec/views/license_spec.js      | 157 ++++++++++++++++++
 .../js/spec/views/settings/main_spec.js       |   3 +-
 cms/static/js/views/license.js                | 139 ++++++++++++++++
 cms/static/js/views/metadata.js               |  39 ++++-
 cms/static/js/views/settings/main.js          |  20 ++-
 cms/static/sass/elements/_forms.scss          | 121 ++++++++++++--
 cms/static/sass/elements/_xblocks.scss        |  22 +++
 cms/static/sass/views/_outline.scss           |  27 +++
 cms/templates/course_outline.html             |   7 +
 cms/templates/js/license-selector.underscore  | 107 ++++++++++++
 cms/templates/settings.html                   |  22 ++-
 cms/templates/widgets/metadata-edit.html      |   8 +-
 common/lib/xmodule/xmodule/capa_base.py       |   3 +
 common/lib/xmodule/xmodule/course_module.py   |  13 +-
 .../lib/xmodule/xmodule/discussion_module.py  |   3 +
 common/lib/xmodule/xmodule/html_module.py     |  18 +-
 common/lib/xmodule/xmodule/mixin.py           |  53 ++++++
 .../xmodule/video_module/video_module.py      |  11 +-
 common/lib/xmodule/xmodule/x_module.py        |   2 +
 common/static/css/edx-cc-ie7.css              |  23 +++
 common/static/css/edx-cc.css                  |  63 +++++++
 common/static/fonts/edx-cc/edx-cc.eot         | Bin 0 -> 7000 bytes
 common/static/fonts/edx-cc/edx-cc.svg         |  22 +++
 common/static/fonts/edx-cc/edx-cc.ttf         | Bin 0 -> 6840 bytes
 common/static/fonts/edx-cc/edx-cc.woff        | Bin 0 -> 3976 bytes
 common/templates/license.html                 |  55 ++++++
 common/templates/xblock_wrapper.html          |   5 +
 .../test/acceptance/pages/lms/courseware.py   |   7 +
 .../test/acceptance/pages/studio/overview.py  |  16 ++
 .../test/acceptance/pages/studio/settings.py  |  13 ++
 .../tests/studio/test_studio_settings.py      |  51 ++++++
 common/test/data/toy/course/2012_Fall.xml     |   4 +-
 .../courseware/tests/test_video_mongo.py      |   7 +
 lms/envs/bok_choy.py                          |   3 +
 lms/envs/common.py                            |   4 +
 lms/static/sass/base/_base.scss               |  19 +++
 .../sass/course/courseware/_courseware.scss   |  49 ++++++
 lms/templates/courseware/courseware.html      |   8 +
 openedx/core/lib/xblock_utils.py              |   6 +
 48 files changed, 1333 insertions(+), 25 deletions(-)
 create mode 100644 cms/static/js/models/license.js
 create mode 100644 cms/static/js/spec/models/license_spec.js
 create mode 100644 cms/static/js/spec/views/license_spec.js
 create mode 100644 cms/static/js/views/license.js
 create mode 100644 cms/templates/js/license-selector.underscore
 create mode 100644 common/lib/xmodule/xmodule/mixin.py
 create mode 100644 common/static/css/edx-cc-ie7.css
 create mode 100644 common/static/css/edx-cc.css
 create mode 100644 common/static/fonts/edx-cc/edx-cc.eot
 create mode 100644 common/static/fonts/edx-cc/edx-cc.svg
 create mode 100644 common/static/fonts/edx-cc/edx-cc.ttf
 create mode 100644 common/static/fonts/edx-cc/edx-cc.woff
 create mode 100644 common/templates/license.html

diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 54bc6e785f..b13c341070 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -5,6 +5,7 @@ import mock
 from mock import patch
 import shutil
 import lxml.html
+from lxml import etree
 import ddt
 
 from datetime import timedelta
@@ -1836,6 +1837,44 @@ class RerunCourseTest(ContentStoreTestCase):
             self.assertEqual(len(rerun_state.message), CourseRerunState.MAX_MESSAGE_LENGTH)
 
 
+class ContentLicenseTest(ContentStoreTestCase):
+    """
+    Tests around content licenses
+    """
+    def test_course_license_export(self):
+        content_store = contentstore()
+        root_dir = path(mkdtemp_clean())
+        self.course.license = "creative-commons: BY SA"
+        self.store.update_item(self.course, None)
+        export_course_to_xml(self.store, content_store, self.course.id, root_dir, 'test_license')
+        fname = "{block}.xml".format(block=self.course.scope_ids.usage_id.block_id)
+        run_file_path = root_dir / "test_license" / "course" / fname
+        run_xml = etree.parse(run_file_path.open())
+        self.assertEqual(run_xml.getroot().get("license"), "creative-commons: BY SA")
+
+    def test_video_license_export(self):
+        content_store = contentstore()
+        root_dir = path(mkdtemp_clean())
+        video_descriptor = ItemFactory.create(
+            parent_location=self.course.location, category='video',
+            license="all-rights-reserved"
+        )
+        export_course_to_xml(self.store, content_store, self.course.id, root_dir, 'test_license')
+        fname = "{block}.xml".format(block=video_descriptor.scope_ids.usage_id.block_id)
+        video_file_path = root_dir / "test_license" / "video" / fname
+        video_xml = etree.parse(video_file_path.open())
+        self.assertEqual(video_xml.getroot().get("license"), "all-rights-reserved")
+
+    def test_license_import(self):
+        course_items = import_course_from_xml(
+            self.store, self.user.id, TEST_DATA_DIR, ['toy'], create_if_not_present=True
+        )
+        course = course_items[0]
+        self.assertEqual(course.license, "creative-commons: BY")
+        videos = self.store.get_items(course.id, qualifiers={'category': 'video'})
+        self.assertEqual(videos[0].license, "all-rights-reserved")
+
+
 class EntryPageTestCase(TestCase):
     """
     Tests entry pages that aren't specific to a course.
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 35dd95384b..a3fadaad2a 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -63,7 +63,7 @@ CONTAINER_TEMPATES = [
     "editor-mode-button", "upload-dialog", "image-modal",
     "add-xblock-component", "add-xblock-component-button", "add-xblock-component-menu",
     "add-xblock-component-menu-problem", "xblock-string-field-editor", "publish-xblock", "publish-history",
-    "unit-outline", "container-message"
+    "unit-outline", "container-message", "license-selector",
 ]
 
 
diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py
index ab96448dad..5e0b93fb84 100644
--- a/cms/djangoapps/models/settings/course_details.py
+++ b/cms/djangoapps/models/settings/course_details.py
@@ -42,6 +42,7 @@ class CourseDetails(object):
         self.overview = ""  # html to render as the overview
         self.intro_video = None  # a video pointer
         self.effort = None  # int hours/week
+        self.license = None
         self.course_image_name = ""
         self.course_image_asset_path = ""  # URL of the course image
         self.pre_requisite_courses = []  # pre-requisite courses
@@ -79,6 +80,7 @@ class CourseDetails(object):
         course_details.pre_requisite_courses = descriptor.pre_requisite_courses
         course_details.course_image_name = descriptor.course_image
         course_details.course_image_asset_path = course_image_url(descriptor)
+        course_details.license = getattr(descriptor, "license", None)
 
         for attribute in ABOUT_ATTRIBUTES:
             value = cls._fetch_about_attribute(course_key, attribute)
@@ -173,6 +175,10 @@ class CourseDetails(object):
             descriptor.pre_requisite_courses = jsondict['pre_requisite_courses']
             dirty = True
 
+        if 'license' in jsondict:
+            descriptor.license = jsondict['license']
+            dirty = True
+
         if dirty:
             module_store.update_item(descriptor, user.id)
 
diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py
index a01b334dbb..df8d0b73b1 100644
--- a/cms/envs/bok_choy.py
+++ b/cms/envs/bok_choy.py
@@ -71,6 +71,9 @@ FEATURES['ENABLE_EDXNOTES'] = True
 # Enable teams feature
 FEATURES['ENABLE_TEAMS'] = True
 
+# Enable custom content licensing
+FEATURES['LICENSING'] = True
+
 ########################### Entrance Exams #################################
 FEATURES['ENTRANCE_EXAMS'] = True
 
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 5264605db3..e826d7f460 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -50,6 +50,7 @@ from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin
 from cms.lib.xblock.authoring_mixin import AuthoringMixin
 import dealer.git
 from xmodule.modulestore.edit_info import EditInfoMixin
+from xmodule.mixin import LicenseMixin
 
 ############################ FEATURE CONFIGURATION #############################
 STUDIO_NAME = "Studio"
@@ -312,6 +313,7 @@ from xmodule.modulestore.inheritance import InheritanceMixin
 from xmodule.modulestore import prefer_xmodules
 from xmodule.x_module import XModuleMixin
 
+# These are the Mixins that should be added to every XBlock.
 # This should be moved into an XBlock Runtime/Application object
 # once the responsibility of XBlock creation is moved out of modulestore - cpennington
 XBLOCK_MIXINS = (
@@ -465,6 +467,7 @@ PIPELINE_CSS = {
     'style-main': {
         'source_filenames': [
             'sass/studio-main.css',
+            'css/edx-cc.css',
         ],
         'output_filename': 'css/studio-main.css',
     },
diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index edc8b3ac65..e2d10555d4 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -227,6 +227,7 @@ define([
     "js/spec/models/explicit_url_spec",
     "js/spec/models/xblock_info_spec",
     "js/spec/models/xblock_validation_spec",
+    "js/spec/models/license_spec",
 
     "js/spec/utils/drag_and_drop_spec",
     "js/spec/utils/handle_iframe_binding_spec",
@@ -247,6 +248,7 @@ define([
     "js/spec/views/xblock_editor_spec",
     "js/spec/views/xblock_string_field_editor_spec",
     "js/spec/views/xblock_validation_spec",
+    "js/spec/views/license_spec",
 
     "js/spec/views/utils/view_utils_spec",
 
diff --git a/cms/static/js/models/license.js b/cms/static/js/models/license.js
new file mode 100644
index 0000000000..3c237beb79
--- /dev/null
+++ b/cms/static/js/models/license.js
@@ -0,0 +1,100 @@
+define(["backbone", "underscore"], function(Backbone, _) {
+  var LicenseModel = Backbone.Model.extend({
+    defaults: {
+      "type": null,
+      "options": {},
+      "custom": false // either `false`, or a string
+    },
+
+    initialize: function(attributes) {
+      if(attributes && attributes.asString) {
+        this.setFromString(attributes.asString);
+        this.unset("asString");
+      }
+    },
+
+    toString: function() {
+      var custom = this.get("custom");
+      if (custom) {
+        return custom;
+      }
+
+      var type = this.get("type"),
+          options = this.get("options");
+
+      if (_.isEmpty(options)) {
+        return type || "";
+      }
+
+      // options are where it gets tricky
+      var optionStrings = _.map(options, function (value, key) {
+        if(_.isBoolean(value)) {
+          return value ? key : null
+        } else {
+          return key + "=" + value
+        }
+      });
+      // filter out nulls
+      optionStrings = _.filter(optionStrings, _.identity);
+      // build license string and return
+      return type + ": " + optionStrings.join(" ");
+    },
+
+    setFromString: function(string, options) {
+      if (!string) {
+        // reset to defaults
+        return this.set(this.defaults, options);
+      }
+
+      var colonIndex = string.indexOf(":"),
+          spaceIndex = string.indexOf(" ");
+
+      // a string without a colon could be a custom license, or a license
+      // type without options
+      if (colonIndex == -1) {
+        if (spaceIndex == -1) {
+          // if there's no space, it's a license type without options
+          return this.set({
+            "type": string,
+            "options": {},
+            "custom": false
+          }, options);
+        } else {
+        // if there is a space, it's a custom license
+          return this.set({
+            "type": null,
+            "options": {},
+            "custom": string
+          }, options);
+        }
+      }
+
+      // there is a colon, which indicates a license type with options.
+      var type = string.substring(0, colonIndex),
+          optionsObj = {},
+          optionsString = string.substring(colonIndex + 1);
+
+        _.each(optionsString.split(" "), function(optionString) {
+          if (_.isEmpty(optionString)) {
+            return;
+          }
+          var eqIndex = optionString.indexOf("=");
+          if(eqIndex == -1) {
+            // this is a boolean flag
+            optionsObj[optionString] = true;
+          } else {
+            // this is a key-value pair
+            var optionKey = optionString.substring(0, eqIndex);
+            var optionVal = optionString.substring(eqIndex + 1);
+            optionsObj[optionKey] = optionVal;
+          }
+        });
+
+      return this.set({
+        "type": type, "options": optionsObj, "custom": false,
+      }, options);
+    }
+  });
+
+  return LicenseModel;
+});
diff --git a/cms/static/js/models/settings/course_details.js b/cms/static/js/models/settings/course_details.js
index c3bff857fd..6f8487697e 100644
--- a/cms/static/js/models/settings/course_details.js
+++ b/cms/static/js/models/settings/course_details.js
@@ -15,6 +15,7 @@ var CourseDetails = Backbone.Model.extend({
         overview: "",
         intro_video: null,
         effort: null,	// an int or null,
+        license: null,
         course_image_name: '', // the filename
         course_image_asset_path: '', // the full URL (/c4x/org/course/num/asset/filename)
         pre_requisite_courses: [],
diff --git a/cms/static/js/spec/models/license_spec.js b/cms/static/js/spec/models/license_spec.js
new file mode 100644
index 0000000000..6e84a2f0b6
--- /dev/null
+++ b/cms/static/js/spec/models/license_spec.js
@@ -0,0 +1,72 @@
+define(["js/models/license"], function(LicenseModel) {
+  describe("License model constructor", function() {
+    it("accepts no arguments", function() {
+      var model = new LicenseModel()
+      expect(model.get("type")).toBeNull();
+      expect(model.get("options")).toEqual({});
+      expect(model.get("custom")).toBeFalsy();
+    });
+
+    it("accepts normal arguments", function() {
+      var model = new LicenseModel({
+        "type": "creative-commons",
+        "options": {"fake-boolean": true, "version": "your momma"}
+      });
+      expect(model.get("type")).toEqual("creative-commons");
+      expect(model.get("options")).toEqual({"fake-boolean": true, "version": "your momma"});
+    })
+
+    it("accepts a license string argument", function() {
+      var model = new LicenseModel({"asString": "all-rights-reserved"});
+      expect(model.get("type")).toEqual("all-rights-reserved");
+      expect(model.get("options")).toEqual({});
+      expect(model.get("custom")).toBeFalsy();
+    });
+
+    it("accepts a custom license argument", function() {
+      var model = new LicenseModel({"asString": "Mozilla Public License 2.0"})
+      expect(model.get("type")).toBeNull();
+      expect(model.get("options")).toEqual({});
+      expect(model.get("custom")).toEqual("Mozilla Public License 2.0");
+    });
+  });
+
+  describe("License model", function() {
+    beforeEach(function() {
+      this.model = new LicenseModel();
+    });
+
+    it("can parse license strings", function() {
+      this.model.setFromString("creative-commons: BY")
+      expect(this.model.get("type")).toEqual("creative-commons")
+      expect(this.model.get("options")).toEqual({"BY": true})
+      expect(this.model.get("custom")).toBeFalsy();
+    });
+
+    it("can stringify a null license", function() {
+      expect(this.model.toString()).toEqual("");
+    });
+
+    it("can stringify a simple license", function() {
+      this.model.set("type", "foobie thinger");
+      expect(this.model.toString()).toEqual("foobie thinger");
+    });
+
+    it("can stringify a license with options", function() {
+      this.model.set({
+        "type": "abc",
+        "options": {"ping": "pong", "bing": true, "buzz": true, "beep": false}}
+      );
+      expect(this.model.toString()).toEqual("abc: ping=pong bing buzz");
+    });
+
+    it("can stringify a custom license", function() {
+      this.model.set({
+        "type": "doesn't matter",
+        "options": {"ignore": "me"},
+        "custom": "this is my super cool license"
+      });
+      expect(this.model.toString()).toEqual("this is my super cool license");
+    });
+  })
+})
diff --git a/cms/static/js/spec/views/license_spec.js b/cms/static/js/spec/views/license_spec.js
new file mode 100644
index 0000000000..6476f45ed1
--- /dev/null
+++ b/cms/static/js/spec/views/license_spec.js
@@ -0,0 +1,157 @@
+define(["js/views/license", "js/models/license", "js/common_helpers/template_helpers"],
+       function(LicenseView, LicenseModel, TemplateHelpers) {
+  describe("License view", function() {
+
+    beforeEach(function() {
+      TemplateHelpers.installTemplate("license-selector", true);
+      this.model = new LicenseModel();
+      this.view = new LicenseView({model: this.model});
+    });
+
+    it("renders with no license", function() {
+      this.view.render();
+      expect(this.view.$("li[data-license=all-rights-reserved] button"))
+        .toHaveText("All Rights Reserved");
+      expect(this.view.$("li[data-license=all-rights-reserved] button"))
+        .not.toHaveClass("is-selected");
+      expect(this.view.$("li[data-license=creative-commons] button"))
+        .toHaveText("Creative Commons");
+      expect(this.view.$("li[data-license=creative-commons] button"))
+        .not.toHaveClass("is-selected");
+    });
+
+    it("renders with the right license selected", function() {
+      this.model.set("type", "all-rights-reserved");
+      expect(this.view.$("li[data-license=all-rights-reserved] button"))
+        .toHaveClass("is-selected");
+      expect(this.view.$("li[data-license=creative-commons] button"))
+        .not.toHaveClass("is-selected");
+    });
+
+    it("switches license type on click", function() {
+      var arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+      expect(this.model.get("type")).toBeNull();
+      arrBtn.click();
+      expect(this.model.get("type")).toEqual("all-rights-reserved");
+      // view has re-rendered, so get a new reference to the button
+      arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+      expect(arrBtn).toHaveClass("is-selected");
+      // now switch to creative commons
+      var ccBtn = this.view.$("li[data-license=creative-commons] button");
+      ccBtn.click();
+      expect(this.model.get("type")).toEqual("creative-commons");
+      // update references again
+      arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+      ccBtn = this.view.$("li[data-license=creative-commons] button");
+      expect(arrBtn).not.toHaveClass("is-selected");
+      expect(ccBtn).toHaveClass("is-selected");
+    });
+
+    it("sets default license options when switching license types", function() {
+      expect(this.model.get("options")).toEqual({});
+      var ccBtn = this.view.$("li[data-license=creative-commons] button");
+      ccBtn.click()
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+      );
+      var arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+      arrBtn.click()
+      expect(this.model.get("options")).toEqual({});
+    });
+
+    it("renders license options", function() {
+      this.model.set({"type": "creative-commons"})
+      expect(this.view.$("ul.license-options li[data-option=BY]"))
+        .toContainText("Attribution");
+      expect(this.view.$("ul.license-options li[data-option=NC]"))
+        .toContainText("Noncommercial");
+      expect(this.view.$("ul.license-options li[data-option=ND]"))
+        .toContainText("No Derivatives");
+      expect(this.view.$("ul.license-options li[data-option=SA]"))
+        .toContainText("Share Alike");
+      expect(this.view.$("ul.license-options li").length).toEqual(4);
+    });
+
+    it("toggles boolean options on click", function() {
+      this.view.$("li[data-license=creative-commons] button").click();
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+      );
+      // toggle NC option
+      this.view.$("li[data-option=NC]").click();
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": false, "ND": true, "SA": false}
+      );
+    });
+
+    it("doesn't toggle disabled options", function() {
+      this.view.$("li[data-license=creative-commons] button").click();
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+      );
+      var BY = this.view.$("li[data-option=BY]");
+      expect(BY).toHaveClass("is-disabled");
+      // try to toggle BY option
+      BY.click()
+      // no change
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+      );
+    });
+
+    it("doesn't allow simultaneous conflicting options", function() {
+      this.view.$("li[data-license=creative-commons] button").click();
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+      );
+      // SA and ND conflict
+      var SA = this.view.$("li[data-option=SA]");
+      expect(SA).toHaveClass("is-disabled");
+      // try to turn on SA option, fail
+      SA.click()
+      // no change
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+      );
+      // turn off ND
+      var ND = this.view.$("li[data-option=ND]");
+      expect(ND).not.toHaveClass("is-disabled");
+      ND.click()
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": false}
+      );
+      // turn on SA
+      SA = this.view.$("li[data-option=SA]");
+      expect(SA).not.toHaveClass("is-disabled");
+      SA.click()
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
+      );
+      // try to turn on ND option, fail
+      ND = this.view.$("li[data-option=ND]");
+      expect(ND).toHaveClass("is-disabled");
+      ND.click();
+      expect(this.model.get("options")).toEqual(
+        {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
+      );
+    });
+
+    it("has no preview by default", function () {
+      this.view.render();
+      expect(this.view.$("#license-preview").length).toEqual(0)
+      this.view.$("li[data-license=creative-commons] button").click();
+      expect(this.view.$("#license-preview").length).toEqual(0)
+    });
+
+    it("displays a preview if showPreview is true", function() {
+      this.view = new LicenseView({model: this.model, showPreview: true});
+      this.view.render()
+      expect(this.view.$("#license-preview").length).toEqual(1)
+      expect(this.view.$("#license-preview")).toHaveText("");
+      this.view.$("li[data-license=creative-commons] button").click();
+      expect(this.view.$("#license-preview").length).toEqual(1)
+      expect(this.view.$("#license-preview")).toContainText("Some Rights Reserved");
+    });
+
+  })
+})
diff --git a/cms/static/js/spec/views/settings/main_spec.js b/cms/static/js/spec/views/settings/main_spec.js
index e04be25c2a..f489732eab 100644
--- a/cms/static/js/spec/views/settings/main_spec.js
+++ b/cms/static/js/spec/views/settings/main_spec.js
@@ -29,7 +29,8 @@ define([
                 course_image_asset_path : '',
                 pre_requisite_courses : [],
                 entrance_exam_enabled : '',
-                entrance_exam_minimum_score_pct: '50'
+                entrance_exam_minimum_score_pct: '50',
+                license: null
             },
             mockSettingsPage = readFixtures('mock/mock-settings-page.underscore');
 
diff --git a/cms/static/js/views/license.js b/cms/static/js/views/license.js
new file mode 100644
index 0000000000..8b7a0dbfd9
--- /dev/null
+++ b/cms/static/js/views/license.js
@@ -0,0 +1,139 @@
+define(["js/views/baseview", "underscore"], function(BaseView, _) {
+  var defaultLicenseInfo = {
+    "all-rights-reserved": {
+      "name": gettext("All Rights Reserved"),
+      "tooltip": gettext("You reserve all rights for your work")
+    },
+    "creative-commons": {
+      "name": gettext("Creative Commons"),
+      "tooltip": gettext("You waive some rights for your work, such that others can use it too"),
+      "url": "//creativecommons.org/about",
+      "options": {
+        "ver": {
+          "name": gettext("Version"),
+          "type": "string",
+          "default": "4.0",
+        },
+        "BY": {
+          "name": gettext("Attribution"),
+          "type": "boolean",
+          "default": true,
+          "help": gettext("Allow others to copy, distribute, display and perform " +
+            "your copyrighted work but only if they give credit the way you request."),
+          "disabled": true,
+        },
+        "NC": {
+          "name": gettext("Noncommercial"),
+          "type": "boolean",
+          "default": true,
+          "help": gettext("Allow others to copy, distribute, display and perform " +
+            "your work - and derivative works based upon it - but for noncommercial purposes only."),
+        },
+        "ND": {
+          "name": gettext("No Derivatives"),
+          "type": "boolean",
+          "default": true,
+          "help": gettext("Allow others to copy, distribute, display and perform " +
+            "only verbatim copies of your work, not derivative works based upon it."),
+          "conflictsWith": ["SA"]
+        },
+        "SA": {
+          "name": gettext("Share Alike"),
+          "type": "boolean",
+          "default": false,
+          "help": gettext("Allow others to distribute derivative works only under " +
+            "a license identical to the license that governs your work."),
+          "conflictsWith": ["ND"]
+        }
+      },
+      "option_order": ["BY", "NC", "ND", "SA"]
+    }
+  }
+
+  var LicenseView = BaseView.extend({
+      events: {
+          "click ul.license-types li button" : "onLicenseClick",
+          "click ul.license-options li": "onOptionClick"
+      },
+
+      initialize: function(options) {
+          this.licenseInfo = options.licenseInfo || defaultLicenseInfo;
+          this.showPreview = !!options.showPreview; // coerce to boolean
+          this.template = this.loadTemplate("license-selector");
+
+          // Rerender when the model changes
+          this.listenTo(this.model, 'change', this.render);
+          this.render();
+      },
+
+      getDefaultOptionsForLicenseType: function(licenseType) {
+        if (!this.licenseInfo[licenseType]) {
+          // custom license type, no options
+          return {};
+        }
+        if (!this.licenseInfo[licenseType].options) {
+          // defined license type without options
+          return {};
+        }
+        var defaults = {};
+        _.each(this.licenseInfo[licenseType].options, function(value, key) {
+          defaults[key] = value.default;
+        })
+        return defaults;
+      },
+
+      render: function() {
+          this.$el.html(this.template({
+              model: this.model.attributes,
+              licenseString: this.model.toString() || "",
+              licenseInfo: this.licenseInfo,
+              showPreview: this.showPreview,
+              previewButton: false,
+          }));
+          return this;
+      },
+
+      onLicenseClick: function(e) {
+          var $li = $(e.srcElement || e.target).closest('li');
+          var licenseType = $li.data("license");
+          this.model.set({
+            "type": licenseType,
+            "options": this.getDefaultOptionsForLicenseType(licenseType)
+          });
+      },
+
+      onOptionClick: function(e) {
+        var licenseType = this.model.get("type"),
+            licenseOptions = $.extend({}, this.model.get("options")),
+            $li = $(e.srcElement || e.target).closest('li');
+
+        var optionKey = $li.data("option")
+        var licenseInfo = this.licenseInfo[licenseType];
+        var optionInfo = licenseInfo.options[optionKey];
+        if (optionInfo.disabled) {
+          // we're done here
+          return;
+        }
+        var currentOptionValue = licenseOptions[optionKey];
+        if (optionInfo.type === "boolean") {
+            // toggle current value
+            currentOptionValue = !currentOptionValue;
+            licenseOptions[optionKey] = currentOptionValue;
+        }
+        // check for conflicts
+        if (currentOptionValue && optionInfo.conflictsWith &&
+            _.any(optionInfo.conflictsWith, function (key) { return licenseOptions[key];})) {
+          // conflict! don't set new options
+          // need some feedback here
+          return;
+        } else {
+          this.model.set({"options": licenseOptions})
+          // Backbone has trouble identifying when objects change, so we'll
+          // fire the change event manually.
+          this.model.trigger("change change:options")
+        }
+      }
+
+  });
+  return LicenseView;
+});
diff --git a/cms/static/js/views/metadata.js b/cms/static/js/views/metadata.js
index 3159ada436..ec7c6b75f7 100644
--- a/cms/static/js/views/metadata.js
+++ b/cms/static/js/views/metadata.js
@@ -2,10 +2,11 @@ define(
     [
         "js/views/baseview", "underscore", "js/models/metadata", "js/views/abstract_editor",
         "js/models/uploads", "js/views/uploads",
+        "js/models/license", "js/views/license",
         "js/views/video/transcripts/metadata_videolist",
         "js/views/video/translations_editor"
     ],
-function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, VideoList, VideoTranslations) {
+function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, LicenseModel, LicenseView, VideoList, VideoTranslations) {
     var Metadata = {};
 
     Metadata.Editor = BaseView.extend({
@@ -550,5 +551,41 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, V
         }
     });
 
+    Metadata.License = AbstractEditor.extend({
+        template: _.template(
+            '<label class="label setting-label" for="list-license-types">' +
+                '<%- model.display_name %>' +
+            '</label>'
+        ),
+
+        initialize: function(options) {
+            this.licenseModel = new LicenseModel({"asString": this.model.getValue()});
+            this.licenseView = new LicenseView({model: this.licenseModel});
+
+            // Rerender when the license model changes
+            this.listenTo(this.licenseModel, 'change', this.setLicense);
+            this.render();
+        },
+
+        render: function() {
+            this.licenseView.undelegateEvents();
+            this.$el.html(this.template({
+                model: this.model.attributes
+            }));
+            // make the licenseView display after this template, inline
+            this.licenseView.render().$el.css("display", "inline")
+            this.$el.append(this.licenseView.el)
+            // restore event bindings
+            this.licenseView.delegateEvents();
+            return this;
+        },
+
+        setLicense: function() {
+            this.model.setValue(this.licenseModel.toString());
+            this.render()
+        }
+
+    });
+
     return Metadata;
 });
diff --git a/cms/static/js/views/settings/main.js b/cms/static/js/views/settings/main.js
index d6978987fe..ded47c14ca 100644
--- a/cms/static/js/views/settings/main.js
+++ b/cms/static/js/views/settings/main.js
@@ -1,6 +1,7 @@
 define(["js/views/validation", "codemirror", "underscore", "jquery", "jquery.ui", "js/utils/date_utils", "js/models/uploads",
-    "js/views/uploads", "js/utils/change_on_enter", "jquery.timepicker", "date"],
-    function(ValidatingView, CodeMirror, _, $, ui, DateUtils, FileUploadModel, FileUploadDialog, TriggerChangeEventOnEnter) {
+    "js/views/uploads", "js/utils/change_on_enter", "js/views/license", "js/models/license", "jquery.timepicker", "date"],
+    function(ValidatingView, CodeMirror, _, $, ui, DateUtils, FileUploadModel,
+        FileUploadDialog, TriggerChangeEventOnEnter, LicenseView, LicenseModel) {
 
 var DetailsView = ValidatingView.extend({
     // Model class is CMS.Models.Settings.CourseDetails
@@ -39,6 +40,14 @@ var DetailsView = ValidatingView.extend({
         this.listenTo(this.model, 'invalid', this.handleValidationError);
         this.listenTo(this.model, 'change', this.showNotificationBar);
         this.selectorToField = _.invert(this.fieldToSelectorMap);
+        // handle license separately, to avoid reimplementing view logic
+        this.licenseModel = new LicenseModel({"asString": this.model.get('license')});
+        this.licenseView = new LicenseView({
+            model: this.licenseModel,
+            el: this.$("#course-license-selector").get(),
+            showPreview: true
+        });
+        this.listenTo(this.licenseModel, 'change', this.handleLicenseChange);
     },
 
     render: function() {
@@ -79,6 +88,8 @@ var DetailsView = ValidatingView.extend({
         }
         this.$('#' + this.fieldToSelectorMap['entrance_exam_minimum_score_pct']).val(this.model.get('entrance_exam_minimum_score_pct'));
 
+        this.licenseView.render()
+
         return this;
     },
     fieldToSelectorMap : {
@@ -316,6 +327,11 @@ var DetailsView = ValidatingView.extend({
             }
         });
         modal.show();
+    },
+
+    handleLicenseChange: function() {
+        this.showNotificationBar()
+        this.model.set("license", this.licenseModel.toString())
     }
 });
 
diff --git a/cms/static/sass/elements/_forms.scss b/cms/static/sass/elements/_forms.scss
index ab3a02348e..5f0bea1afc 100644
--- a/cms/static/sass/elements/_forms.scss
+++ b/cms/static/sass/elements/_forms.scss
@@ -59,7 +59,7 @@ textarea.text {
 }
 
 // +Fields - Not Editable
-// ==================== 
+// ====================
 .field.is-not-editable {
 
   & label.is-focused {
@@ -72,7 +72,7 @@ textarea.text {
 }
 
 // +Fields - With Error
-// ==================== 
+// ====================
 .field.error {
 
   input, textarea {
@@ -81,7 +81,7 @@ textarea.text {
 }
 
 // +Forms - Additional UI
-// ==================== 
+// ====================
 form {
 
   // CASE: cosmetic checkbox input
@@ -172,8 +172,109 @@ form {
   }
 }
 
+// +Forms - License selector UI
+// ====================
+.license-img {
+  padding: 4px;
+}
+
+ul.license-types {
+  text-align: middle;
+  vertical-align: middle;
+  display: inline-block;
+
+  li {
+    display: inline-block;
+  }
+
+  .action.license-button {
+    @include grey-button;
+    @extend %t-action2;
+
+    display: inline-block;
+
+    text-align: center;
+
+    width: 220px;
+    height: 40px;
+
+    cursor: pointer;
+
+    &.is-selected {
+      @include blue-button;
+    }
+  }
+
+  .tip {
+    @extend %t-copy-sub2;
+  }
+}
+.wrapper-license-options {
+  margin-bottom: 10px;
+
+  .tip {
+    @extend %t-copy-sub2;
+  }
+  #list-license-options {
+    padding-bottom: 10px;
+
+    li {
+      line-height: 1.5;
+      border-bottom: 1px solid #EEE;
+      padding: ($baseline / 2) 0 ($baseline * 0.4);
+      &.is-clickable {
+        cursor: pointer;
+      }
+      &.last {
+        border-bottom: none;
+      }
+
+      .fa {
+        vertical-align: top;
+      }
+      .fa-square-o {
+        display: inline-block;
+        margin: ($baseline * 0.15) 15px 0px;
+      }
+      .fa-square-o.is-disabled {
+        color: $gray;
+      }
+      .fa-check-square-o {
+        color: $blue;
+        display: none;
+        margin: ($baseline * 0.15) 14px 0px 16px;
+      }
+      .fa-check-square-o.is-disabled {
+        color: $gray;
+      }
+      &.is-selected {
+        .fa-check-square-o {
+          display: inline-block;
+        }
+        .fa-square-o {
+          display: none;
+        }
+      }
+      .option-name {
+        @extend %t-action3;
+        @extend %t-strong;
+        display: inline-block;
+        width: 15%;
+        vertical-align: top;
+      }
+      .explanation {
+        @extend %t-action4;
+        display: inline-block;
+        width: 75%;
+        vertical-align: top;
+        color: $gray;
+      }
+    }
+  }
+}
+
 // +Form - Create New
-// ==================== 
+// ====================
 // form styling for creating a new content item (course, user, textbook)
 // TODO: refactor this into a placeholder to extend.
 .form-create {
@@ -390,8 +491,8 @@ form {
   }
 }
 
-// +Form - Inline Name Edit 
-// ==================== 
+// +Form - Inline Name Edit
+// ====================
 // form - inline xblock name edit on unit, container, outline
 // TODO: abstract this out into a Sass placeholder
 .incontext-editor.is-editable {
@@ -431,8 +532,8 @@ form {
   }
 }
 
-// +Form - Create New Wrapper 
-// ==================== 
+// +Form - Create New Wrapper
+// ====================
 .wrapper-create-element {
   height: auto;
   opacity: 1.0;
@@ -449,8 +550,8 @@ form {
   }
 }
 
-// +Form - Grandfathered 
-// ==================== 
+// +Form - Grandfathered
+// ====================
 input.search {
   padding: 6px 15px 8px 30px;
   @include box-sizing(border-box);
diff --git a/cms/static/sass/elements/_xblocks.scss b/cms/static/sass/elements/_xblocks.scss
index 4db9071be5..5bd2955234 100644
--- a/cms/static/sass/elements/_xblocks.scss
+++ b/cms/static/sass/elements/_xblocks.scss
@@ -103,6 +103,28 @@
     }
   }
 
+  .xblock-license,
+  .xmodule_display.xmodule_HtmlModule .xblock-license {
+    text-align: $bi-app-right;
+    border-top: 1px solid $gray-l3;
+    margin: 0 15px;
+    padding: 5px;
+    font-size: 80%;
+    color: $gray-l3;
+
+    a {
+      color: $gray-l3;
+
+      &:hover {
+        color: $ui-link-color;
+      }
+    }
+    span {
+      color: inherit;
+    }
+
+  }
+
   .container-paging-header {
     .meta-wrap {
       margin: $baseline ($baseline/2);
diff --git a/cms/static/sass/views/_outline.scss b/cms/static/sass/views/_outline.scss
index 1b45ed2493..4cfa1958b2 100644
--- a/cms/static/sass/views/_outline.scss
+++ b/cms/static/sass/views/_outline.scss
@@ -176,6 +176,7 @@
   // course status
   // --------------------
   .course-status {
+    float: $bi-app-left;
     margin-bottom: $baseline;
 
     .status-release {
@@ -216,6 +217,32 @@
     }
   }
 
+  // course content license
+  // --------------------
+  .course-license {
+    @extend .content-primary;
+    @include text-align(right);
+    display: block;
+    float: $bi-app-right;
+    width: auto;
+
+    .license-label,
+    .license-value,
+    .license-actions {
+      display: inline-block;
+      vertical-align: middle;
+      margin-bottom: 0;
+    }
+
+    img {
+      display: inline;
+    }
+  }
+
+  .wrapper-dnd {
+    clear: both;
+  }
+
   // outline
   // --------------------
 
diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html
index f3246a9e9f..f0a3cc1e98 100644
--- a/cms/templates/course_outline.html
+++ b/cms/templates/course_outline.html
@@ -109,6 +109,13 @@ from contentstore.utils import reverse_usage_url
                 </div>
             </div>
 
+            % if settings.FEATURES.get("LICENSING", False):
+            <div class="course-license">
+                <h2 class="license-label">${_("License:")}</h2>
+                <p class="license-value"><%include file="license.html" args="license=context_course.license" /></p>
+            </div>
+            % endif
+
             <div class="wrapper-dnd">
                 <%
                 course_locator = context_course.location
diff --git a/cms/templates/js/license-selector.underscore b/cms/templates/js/license-selector.underscore
new file mode 100644
index 0000000000..a279042934
--- /dev/null
+++ b/cms/templates/js/license-selector.underscore
@@ -0,0 +1,107 @@
+<div class="license-wrapper">
+  <label class="label setting-label" for="list-license-types">
+    <%= gettext("License Type") %>
+  </label>
+  <ul class="license-types" id="list-license-types">
+    <% var link_start_tpl = '<a href="{url}" target="_blank">'; %>
+    <% _.each(licenseInfo, function(license, licenseType) { %>
+      <li data-license="<%- licenseType %>">
+        <button name="license-<%- licenseType %>" class="action license-button
+                <% if(model.type === licenseType) { print("is-selected"); } %>"
+              name="license-<%- licenseType %>"
+            <% if (license.tooltip) { %>data-tooltip="<%- license.tooltip %>"<% } %>>
+          <%- license.name %>
+        </button>
+        <p class="tip">
+          <% if(license.url) { %>
+            <a href="<%- license.url %>" target="_blank">
+              <%= gettext("Learn more about {license_name}")
+                    .replace("{license_name}", license.name)
+              %>
+            </a>
+          <% } else { %>
+            &nbsp;
+          <% } %>
+        </p>
+      </li>
+    <% }) %>
+  </ul>
+
+<% var license = licenseInfo[model.type]; %>
+<% if(license && !_.isEmpty(license.options)) { %>
+  <div class="wrapper-license-options">
+    <label class="label setting-label" for="list-license-options">
+      <%- gettext("Options for {license_name}").replace("{license_name}", license.name) %>
+    </label>
+    <p class='tip tip-inline'>
+      <%- gettext("The following options are available for the {license_name} license.")
+            .replace("{license_name}", license.name) %>
+    </p>
+    <ul class="license-options" id="list-license-options">
+      <% _.each(license.option_order, function(optionKey) { %>
+        <% var optionInfo = license.options[optionKey]; %>
+        <% if (optionInfo.type == "boolean") { %>
+          <% var optionSelected = model.options[optionKey]; %>
+          <% var optionDisabled = optionInfo.disabled ||
+              (optionInfo.conflictsWith && _.any(optionInfo.conflictsWith, function(key) {return model.options[key];}));
+          %>
+          <li data-option="<%- optionKey %>"
+              class="action-item license-button
+                     <% if (optionSelected) { print("is-selected"); } %>
+                     <% if (optionDisabled) { print("is-disabled"); } else { print("is-clickable"); } %>"
+          >
+            <i class="fa fa-fw
+               <% if(optionSelected) { print("fa-check-square-o"); } else { print("fa-square-o"); } %>
+               <% if(optionDisabled) { print("is-disabled"); } %>
+               "></i>
+            <h4 class="option-name"><%- optionInfo.name %></h4>
+            <div class="explanation"><%- optionInfo.help %></div>
+          </li>
+        <% } // could implement other types here %>
+      <% }) %>
+    </ul>
+  </div>
+<% } %>
+
+<% if (showPreview) { %>
+  <div class="license-preview-wrapper">
+    <label class="label setting-label" for="license-preview">
+      <%= gettext("License Display") %>
+    </label>
+    <p class="tip">
+      <%= gettext("The following message will be displayed at the bottom of the courseware pages within your course.") %>
+    </p>
+    <div id="license-preview">
+    <% // keep this synchronized with the contents of common/templates/license.html %>
+    <% if (model.type === "all-rights-reserved") { %>
+      © <span class="license-text"><%= gettext("All Rights Reserved") %></span>
+    <% } else if (model.type === "creative-commons") {
+       var possible = ["by", "nc", "nd", "sa"];
+       var enabled = _.filter(possible, function(option) {
+         return model.options[option] === true || model.options[option.toUpperCase()] === true;
+       });
+       var version = model.options.ver || "4.0";
+       if (_.isEmpty(enabled)) {
+          enabled = ["zero"];
+          version = model.options.ver || "1.0";
+       }
+    %>
+      <a rel="license" href="//creativecommons.org/licenses/<%- enabled.join("-") %>/<%- version %>/">
+      <% if (previewButton) { %>
+        <img src="https://licensebuttons.net/l/<%- enabled.join("-") %>/<%- version %>/<%- typeof buttonSize == "string" ? buttonSize : "88x31" %>.png"
+             alt="<%- typeof licenseString == "string" ? licenseString : "" %>"
+             />
+      <% } else { %>
+        <i class="icon-cc"></i>
+        <% _.each(enabled, function(option) { %>
+            <i class="icon-cc-<%- option %>"></i>
+        <% }); %>
+        <span class="license-text"><%= gettext("Some Rights Reserved") %></span>
+      <% } %>
+    <% } else { %>
+      <%= typeof licenseString == "string" ? licenseString : "" %>
+    <% } %>
+    </a>
+  </div>
+<% } %>
+</div>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index ba12f9af60..21f41289b6 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -11,7 +11,7 @@
 %>
 
 <%block name="header_extras">
-% for template_name in ["basic-modal", "modal-button", "upload-dialog"]:
+% for template_name in ["basic-modal", "modal-button", "upload-dialog", "license-selector"]:
   <script type="text/template" id="${template_name}-tpl">
     <%static:include path="js/${template_name}.underscore" />
   </script>
@@ -328,6 +328,26 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
               </ol>
             </section>
           % endif
+
+          % if settings.FEATURES.get("LICENSING", False):
+            <hr class="divide" />
+
+            <section class="group-settings license">
+              <header>
+                <h2 class="title-2">${_("Course Content License")}</h2>
+                ## Translators: At the course settings, the editor is able to select the default course content license.
+                ## The course content will have this license set, some assets can override the license with their own.
+                ## In the form, the license selector for course content is described using the following string:
+                <span class="tip">${_("Select the default license for course content")}</span>
+              </header>
+
+              <ol class="list-input">
+                <li class="field text" id="field-course-license">
+                  <div id="course-license-selector"></div>
+                </li>
+              </ol>
+            </section>
+          % endif
       </form>
     </article>
     <aside class="content-supplementary" role="complementary">
diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html
index 3404bcaf21..673038f1da 100644
--- a/cms/templates/widgets/metadata-edit.html
+++ b/cms/templates/widgets/metadata-edit.html
@@ -10,9 +10,11 @@
 %>
 
 ## js templates
-<script id="metadata-editor-tpl" type="text/template">
-    <%static:include path="js/metadata-editor.underscore" />
-</script>
+% for template_name in ["metadata-editor", "license-selector"]:
+    <script id="${template_name}-tpl" type="text/template">
+        <%static:include path="js/${template_name}.underscore" />
+    </script>
+% endfor
 % for template_name in ["metadata-number-entry", "metadata-string-entry", "metadata-option-entry", "metadata-list-entry", "metadata-dict-entry", "metadata-file-uploader-entry", "metadata-file-uploader-item"]:
     <script id="${template_name}" type="text/template">
         <%static:include path="js/${template_name}.underscore" />
diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py
index f3ff1fd8dc..31cd165fe4 100644
--- a/common/lib/xmodule/xmodule/capa_base.py
+++ b/common/lib/xmodule/xmodule/capa_base.py
@@ -202,6 +202,9 @@ class CapaFields(object):
 
     @property
     def non_editable_metadata_fields(self):
+        """
+        `data` should not be editable in the Studio settings editor.
+        """
         non_editable_fields = super(CapaFields, self).non_editable_metadata_fields
         non_editable_fields.append(CapaFields.data)
         return non_editable_fields
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 7ed4abe4d1..bc9995c1a3 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -16,6 +16,7 @@ from xmodule.exceptions import UndefinedContext
 from xmodule.seq_module import SequenceDescriptor, SequenceModule
 from xmodule.graders import grader_from_conf
 from xmodule.tabs import CourseTabList
+from xmodule.mixin import LicenseMixin
 import json
 
 from xblock.fields import Scope, List, String, Dict, Boolean, Integer, Float
@@ -864,7 +865,10 @@ class CourseModule(CourseFields, SequenceModule):  # pylint: disable=abstract-me
     """
 
 
-class CourseDescriptor(CourseFields, SequenceDescriptor):
+class CourseDescriptor(CourseFields, LicenseMixin, SequenceDescriptor):
+    """
+    The descriptor for the course XModule
+    """
     module_class = CourseModule
 
     def __init__(self, *args, **kwargs):
@@ -995,10 +999,12 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
             xml_object.remove(wiki_tag)
 
         definition, children = super(CourseDescriptor, cls).definition_from_xml(xml_object, system)
-
         definition['textbooks'] = textbooks
         definition['wiki_slug'] = wiki_slug
 
+        # load license if it exists
+        definition = LicenseMixin.parse_license_from_xml(definition, xml_object)
+
         return definition, children
 
     def definition_to_xml(self, resource_fs):
@@ -1017,6 +1023,9 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
             wiki_xml_object.set('slug', self.wiki_slug)
             xml_object.append(wiki_xml_object)
 
+        # handle license specifically
+        self.add_license_to_xml(xml_object)
+
         return xml_object
 
     def has_ended(self):
diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py
index 4dba69314e..b835bc53ae 100644
--- a/common/lib/xmodule/xmodule/discussion_module.py
+++ b/common/lib/xmodule/xmodule/discussion_module.py
@@ -43,6 +43,9 @@ class DiscussionFields(object):
 
     @property
     def non_editable_metadata_fields(self):
+        """
+        `data` should not be editable in the Studio settings editor.
+        """
         non_editable_fields = super(DiscussionFields, self).non_editable_metadata_fields
         non_editable_fields.append(DiscussionFields.data)
         return non_editable_fields
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index 9662d7f31c..e7d3958ab0 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -20,6 +20,7 @@ from xmodule.x_module import XModule, DEPRECATION_VSCOMPAT_EVENT
 from xmodule.xml_module import XmlDescriptor, name_to_pathname
 from xblock.core import XBlock
 from xblock.fields import Scope, String, Boolean, List
+from xmodule.mixin import LicenseMixin
 
 log = logging.getLogger("edx.courseware")
 
@@ -56,6 +57,9 @@ class HtmlFields(object):
 
     @property
     def non_editable_metadata_fields(self):
+        """
+        `data` should not be editable in the Studio settings editor.
+        """
         non_editable_fields = super(HtmlFields, self).non_editable_metadata_fields
         non_editable_fields.append(HtmlFields.data)
         return non_editable_fields
@@ -93,7 +97,7 @@ class HtmlModule(HtmlModuleMixin):
     pass
 
 
-class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
+class HtmlDescriptor(HtmlFields, LicenseMixin, XmlDescriptor, EditingDescriptor):  # pylint: disable=abstract-method
     """
     Module for putting raw html in a course
     """
@@ -269,6 +273,9 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
 
     @property
     def non_editable_metadata_fields(self):
+        """
+        `use_latex_compiler` should not be editable in the Studio settings editor.
+        """
         non_editable_fields = super(HtmlDescriptor, self).non_editable_metadata_fields
         non_editable_fields.append(HtmlDescriptor.use_latex_compiler)
         return non_editable_fields
@@ -307,6 +314,9 @@ class AboutFields(object):
 
     @property
     def non_editable_metadata_fields(self):
+        """
+        `data` should not be editable in the Studio settings editor.
+        """
         non_editable_fields = super(AboutFields, self).non_editable_metadata_fields
         non_editable_fields.append(AboutFields.data)
         return non_editable_fields
@@ -350,6 +360,9 @@ class StaticTabFields(object):
 
     @property
     def non_editable_metadata_fields(self):
+        """
+        `data` should not be editable in the Studio settings editor.
+        """
         non_editable_fields = super(StaticTabFields, self).non_editable_metadata_fields
         non_editable_fields.append(StaticTabFields.data)
         return non_editable_fields
@@ -390,6 +403,9 @@ class CourseInfoFields(object):
 
     @property
     def non_editable_metadata_fields(self):
+        """
+        `data` should not be editable in the Studio settings editor.
+        """
         non_editable_fields = super(CourseInfoFields, self).non_editable_metadata_fields
         non_editable_fields.append(CourseInfoFields.data)
         return non_editable_fields
diff --git a/common/lib/xmodule/xmodule/mixin.py b/common/lib/xmodule/xmodule/mixin.py
new file mode 100644
index 0000000000..492b375244
--- /dev/null
+++ b/common/lib/xmodule/xmodule/mixin.py
@@ -0,0 +1,53 @@
+"""
+Reusable mixins for XBlocks and/or XModules
+"""
+
+from xblock.fields import Scope, String, XBlockMixin
+
+# Make '_' a no-op so we can scrape strings
+_ = lambda text: text
+
+
+class LicenseMixin(XBlockMixin):
+    """
+    Mixin that allows an author to indicate a license on the contents of an
+    XBlock. For example, a video could be marked as Creative Commons SA-BY
+    licensed. You can even indicate the license on an entire course.
+
+    If this mixin is not applied to an XBlock, or if the license field is
+    blank, then the content is subject to whatever legal licensing terms that
+    apply to content by default. For example, in the United States, that content
+    is exclusively owned by the creator of the content by default. Other
+    countries may have similar laws.
+    """
+    license = String(
+        display_name=_("License"),
+        help=_("A license defines how the contents of this block can be shared and reused."),
+        default=None,
+        scope=Scope.content,
+    )
+
+    @classmethod
+    def parse_license_from_xml(cls, definition, node):
+        """
+        When importing an XBlock from XML, this method will parse the license
+        information out of the XML and attach it to the block.
+        It is defined here so that classes that use this mixin can simply refer
+        to this method, rather than reimplementing it in their XML import
+        functions.
+        """
+        license = node.get('license', default=None)  # pylint: disable=redefined-builtin
+        if license:
+            definition['license'] = license
+        return definition
+
+    def add_license_to_xml(self, node):
+        """
+        When generating XML from an XBlock, this method will add the XBlock's
+        license to the XML representation before it is serialized.
+        It is defined here so that classes that use this mixin can simply refer
+        to this method, rather than reimplementing it in their XML export
+        functions.
+        """
+        if getattr(self, "license", None):
+            node.set('license', self.license)
diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/common/lib/xmodule/xmodule/video_module/video_module.py
index 1fbd185d8a..00f2a86f5f 100644
--- a/common/lib/xmodule/xmodule/video_module/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module/video_module.py
@@ -41,6 +41,7 @@ from .video_xfields import VideoFields
 from .video_handlers import VideoStudentViewHandlers, VideoStudioViewHandlers
 
 from xmodule.video_module import manage_video_subtitles_save
+from xmodule.mixin import LicenseMixin
 
 # The following import/except block for edxval is temporary measure until
 # edxval is a proper XBlock Runtime Service.
@@ -282,10 +283,12 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
             'transcript_languages': json.dumps(sorted_languages),
             'transcript_translation_url': self.runtime.handler_url(self, 'transcript', 'translation').rstrip('/?'),
             'transcript_available_translations_url': self.runtime.handler_url(self, 'transcript', 'available_translations').rstrip('/?'),
+            'license': getattr(self, "license", None),
         })
 
 
-class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandlers, TabsEditingDescriptor, EmptyDataRawDescriptor):
+class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandlers,
+                      TabsEditingDescriptor, LicenseMixin, EmptyDataRawDescriptor):
     """
     Descriptor for `VideoModule`.
     """
@@ -483,6 +486,9 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler
             except edxval_api.ValVideoNotFoundError:
                 pass
 
+        # handle license specifically
+        self.add_license_to_xml(xml)
+
         return xml
 
     def get_context(self):
@@ -642,6 +648,9 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler
                 course_id=getattr(id_generator, 'target_course_id', None)
             )
 
+        # load license if it exists
+        field_data = LicenseMixin.parse_license_from_xml(field_data, xml)
+
         return field_data
 
     def index_dictionary(self):
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 0a36ef89b6..6d7034b747 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -682,6 +682,8 @@ class XModuleMixin(XModuleFields, XBlockMixin):
             editor_type = "Dict"
         elif isinstance(field, RelativeTime):
             editor_type = "RelativeTime"
+        elif isinstance(field, String) and field.name == "license":
+            editor_type = "License"
         metadata_field_editor_info['type'] = editor_type
         metadata_field_editor_info['options'] = [] if values is None else values
 
diff --git a/common/static/css/edx-cc-ie7.css b/common/static/css/edx-cc-ie7.css
new file mode 100644
index 0000000000..f480961454
--- /dev/null
+++ b/common/static/css/edx-cc-ie7.css
@@ -0,0 +1,23 @@
+[class^="icon-cc"], [class*=" icon-cc"] {
+  font-family: 'edx-cc';
+  font-style: normal;
+  font-weight: normal;
+
+  /* fix buttons height */
+  line-height: 1em;
+
+  /* you can be more comfortable with increased icons size */
+  /* font-size: 120%; */
+}
+
+.icon-cc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
+.icon-cc-by { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
+.icon-cc-nc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
+.icon-cc-nc-eu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe803;&nbsp;'); }
+.icon-cc-nc-jp { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe804;&nbsp;'); }
+.icon-cc-sa { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe805;&nbsp;'); }
+.icon-cc-nd { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe806;&nbsp;'); }
+.icon-cc-pd { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe807;&nbsp;'); }
+.icon-cc-zero { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe808;&nbsp;'); }
+.icon-cc-share { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe809;&nbsp;'); }
+.icon-cc-remix { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
diff --git a/common/static/css/edx-cc.css b/common/static/css/edx-cc.css
new file mode 100644
index 0000000000..f33b0a18f0
--- /dev/null
+++ b/common/static/css/edx-cc.css
@@ -0,0 +1,63 @@
+@font-face {
+  font-family: 'edx-cc';
+  src: url('../fonts/edx-cc/edx-cc.eot?52318265');
+  src: url('../fonts/edx-cc/edx-cc.eot?52318265#iefix') format('embedded-opentype'),
+       url('../fonts/edx-cc/edx-cc.woff?52318265') format('woff'),
+       url('../fonts/edx-cc/edx-cc.ttf?52318265') format('truetype'),
+       url('../fonts/edx-cc/edx-cc.svg?52318265#edx-cc') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
+/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
+/*
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: 'edx-cc';
+    src: url('../fonts/edx-cc/edx-cc.svg?52318265#edx-cc') format('svg');
+  }
+}
+*/
+
+ [class^="icon-cc"]:before, [class*=" icon-cc"]:before {
+  font-family: "edx-cc";
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+  /* opacity: .8; */
+
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+
+  /* fix buttons height, for twitter bootstrap */
+  line-height: 1em;
+
+  /* Animation center compensation - margins should be symmetric */
+  /* remove if not needed */
+  margin-left: .2em;
+
+  /* you can be more comfortable with increased icons size */
+  /* font-size: 120%; */
+
+  /* Uncomment for 3D effect */
+  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+
+.icon-cc:before { content: '\e800'; } /* '' */
+.icon-cc-by:before { content: '\e801'; } /* '' */
+.icon-cc-nc:before { content: '\e802'; } /* '' */
+.icon-cc-nc-eu:before { content: '\e803'; } /* '' */
+.icon-cc-nc-jp:before { content: '\e804'; } /* '' */
+.icon-cc-sa:before { content: '\e805'; } /* '' */
+.icon-cc-nd:before { content: '\e806'; } /* '' */
+.icon-cc-pd:before { content: '\e807'; } /* '' */
+.icon-cc-zero:before { content: '\e808'; } /* '' */
+.icon-cc-share:before { content: '\e809'; } /* '' */
+.icon-cc-remix:before { content: '\e80a'; } /* '' */
diff --git a/common/static/fonts/edx-cc/edx-cc.eot b/common/static/fonts/edx-cc/edx-cc.eot
new file mode 100644
index 0000000000000000000000000000000000000000..3c652cc929a8695ebb50b59dcff96cefc074a39c
GIT binary patch
literal 7000
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
CN2yZ)

literal 0
HcmV?d00001

diff --git a/common/static/fonts/edx-cc/edx-cc.svg b/common/static/fonts/edx-cc/edx-cc.svg
new file mode 100644
index 0000000000..5539ab8b0f
--- /dev/null
+++ b/common/static/fonts/edx-cc/edx-cc.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
+<defs>
+<font id="edx-cc" horiz-adv-x="1000" >
+<font-face font-family="edx-cc" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="cc" unicode="&#xe800;" d="m474 830q198 2 340-136t146-336q2-200-136-342t-338-146q-198-2-341 137t-145 337q-4 200 135 342t339 144z m12-858q156 2 266 114t108 270-115 267-269 107q-158-2-267-114t-107-270 114-267 270-107z m-124 298q40 0 58 40l56-30q-20-36-50-52-32-20-70-20-62 0-100 38-38 36-38 104t38 106 96 38q86 0 124-66l-62-32q-10 20-24 28t-28 8q-60 0-60-82 0-38 14-58 18-22 46-22z m266 0q42 0 56 40l58-30q-18-32-50-52t-70-20q-64 0-100 38-38 36-38 104 0 64 38 106 38 38 98 38 84 0 120-66l-60-32q-10 20-24 28t-28 8q-62 0-62-82 0-36 16-58t46-22z" horiz-adv-x="960" />
+<glyph glyph-name="cc-by" unicode="&#xe801;" d="m480 526q-66 0-66 68t66 68q68 0 68-68t-68-68z m98-26q14 0 22-8 10-10 10-22l0-196-56 0 0-234-148 0 0 234-56 0 0 196q0 12 10 22 8 8 22 8l196 0z m-98 330q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m0-872q162 0 277 115t115 277q0 164-115 278t-277 114-277-114-115-278q0-162 115-277t277-115z" horiz-adv-x="960" />
+<glyph glyph-name="cc-nc" unicode="&#xe802;" d="m480 830q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m-370-350q-22-62-22-130 0-162 115-277t277-115q110 0 202 56t142 148l-178 80q-8-46-46-74-38-30-86-34l0-74-56 0 0 74q-78 0-146 58l66 66q50-44 108-44 24 0 42 12t18 36q0 18-14 30l-46 20-56 26-76 32z m506-122l242-108q14 44 14 100 0 164-115 278t-277 114q-102 0-188-48t-140-130l182-82q12 36 46 62 32 22 78 24l0 74 56 0 0-74q68-4 120-44l-62-64q-44 28-84 28-24 0-38-8-18-10-18-30 0-8 4-12l60-28 42-18z" horiz-adv-x="960" />
+<glyph glyph-name="cc-nc-eu" unicode="&#xe803;" d="m480 830q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m-370-352q-22-62-22-128 0-162 115-277t277-115q110 0 201 55t143 149l-246 108-174 0q10-36 26-56 38-40 104-40 46 0 92 20l18-90q-56-30-124-30-128 0-196 92-34 44-46 104l-52 0 0 58 44 0 0 14q0 4 1 12t1 12l-46 0 0 56 10 0z m488-112l262-116q12 48 12 100 0 164-115 278t-277 114q-102 0-189-48t-141-130l158-70q8 14 28 38 72 82 184 82 70 0 122-24l-24-92q-40 20-88 20-64 0-100-44-10-10-16-28l56-24 136 0 0-56-8 0z" horiz-adv-x="960" />
+<glyph glyph-name="cc-nc-jp" unicode="&#xe804;" d="m480 830q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m-374-364q-18-54-18-116 0-162 115-277t277-115q106 0 195 52t141 140l-152 68 0-68-126 0 0-108-118 0 0 108-124 0 0 74 124 0 0 36-12 24-112 0 0 74 54 0z m432-242l112 0-106 48-6-12 0-36z m126 100l192-86q16 58 16 112 0 164-115 278t-277 114q-106 0-194-51t-140-137l158-70-54 98 128 0 76-166 46-20 82 186 128 0-122-224 76 0 0-34z" horiz-adv-x="960" />
+<glyph glyph-name="cc-sa" unicode="&#xe805;" d="m478 604q114 0 180-74 66-72 66-186 0-110-68-184-74-74-180-74-80 0-142 50-58 48-70 138l120 0q6-86 106-86 50 0 82 42 30 44 30 118 0 76-28 116-30 40-82 40-96 0-108-86l36 0-96-94-94 94 36 0q14 90 72 138t140 48z m2 226q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m0-872q162 0 277 115t115 277q0 164-115 278t-277 114-277-114-115-278q0-162 115-277t277-115z" horiz-adv-x="960" />
+<glyph glyph-name="cc-nd" unicode="&#xe806;" d="m306 382l0 82 348 0 0-82-348 0z m0-154l0 82 348 0 0-82-348 0z m174 602q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m0-872q162 0 277 115t115 277q0 164-115 278t-277 114-277-114-115-278q0-162 115-277t277-115z" horiz-adv-x="960" />
+<glyph glyph-name="cc-pd" unicode="&#xe807;" d="m480 830q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m-370-352q-22-62-22-128 0-162 115-277t277-115q110 0 201 55t143 149l-424 188q2-54 28-96t76-42q36 0 64 26l6 6 70-84q-4-2-10-7t-8-9q-62-42-136-42-86 0-159 58t-73 188q0 32 6 62z m310-34l440-194q12 48 12 100 0 164-115 278t-277 114q-102 0-189-48t-141-130l148-66q64 102 196 102 88 0 150-54l-78-80q-8 8-14 12-22 16-52 16-52 0-80-50z" horiz-adv-x="960" />
+<glyph glyph-name="cc-zero" unicode="&#xe808;" d="m480 628q108 0 153-81t45-197q0-114-45-195t-153-81-153 81-45 195q0 116 45 197t153 81z m-86-278q0-18 4-66l106 194q14 24-6 42-12 4-18 4-86 0-86-174z m86-172q86 0 86 172 0 40-6 84l-118-204q-22-30 12-46 2-2 6-2 2 0 2-2 2 0 8-1t10-1z m0 652q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m0-872q162 0 277 115t115 277q0 164-115 278t-277 114-277-114-115-278q0-162 115-277t277-115z" horiz-adv-x="960" />
+<glyph glyph-name="cc-share" unicode="&#xe809;" d="m676 488q12 0 20-8t8-18l0-354q0-10-8-18t-20-8l-260 0q-12 0-20 8t-8 18l0 104-104 0q-10 0-18 8t-8 20l0 352q0 12 6 18 4 6 18 10l264 0q10 0 18-8t8-20l0-104 104 0z m-264 0l108 0 0 78-210 0 0-300 78 0 0 196q0 10 8 18 4 4 16 8z m238-354l0 302-210 0 0-302 210 0z m-170 696q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m0-872q162 0 277 115t115 277q0 164-115 278t-277 114-277-114-115-278q0-162 115-277t277-115z" horiz-adv-x="960" />
+<glyph glyph-name="cc-remix" unicode="&#xe80a;" d="m794 342l10-4 0-136-10-4-116-50-4-2-6 2-252 104-8 4-124-52-124 54 0 122 116 48-2 2 0 136 130 56 294-122 0-118z m-136-158l0 86-2 0 0 2-220 90 0-86 220-92 0 2z m14 112l78 32-72 30-76-32z m102-74l0 84-86-36 0-84z m-294 608q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m0-872q162 0 277 115t115 277q0 164-115 278t-277 114-277-114-115-278q0-162 115-277t277-115z" horiz-adv-x="960" />
+</font>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/common/static/fonts/edx-cc/edx-cc.ttf b/common/static/fonts/edx-cc/edx-cc.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..3bde4e7c92566e7a8c416952cf6a186ac0580051
GIT binary patch
literal 6840
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

literal 0
HcmV?d00001

diff --git a/common/static/fonts/edx-cc/edx-cc.woff b/common/static/fonts/edx-cc/edx-cc.woff
new file mode 100644
index 0000000000000000000000000000000000000000..bc6dd7a828e6b9d24951f10d73212c6c4476168f
GIT binary patch
literal 3976
zcmY*cbyQSexV<pIAT<LB(hOY!<A{iWg3_JR3=EBQO5=cZ4$|EziYTR|Fo=ZGEe(Q%
z2udjNuD;(N@13>wIcM*)zwey2?jQI29&0Ho0t5g!V9@~8-<7HPfBE12{~ua<q9_0$
zkO$SjFt|srqH67eaR;?%kV}HA>M%27leMom0^Ik28rgpU?A+~LKy4TRh*JT8+&wxu
z+1MWA1;#>cKo9AEfZIF!+ku)h=o18GCegKkhYq$F&_j_4dTxObCsKTQ>HvzM2Id10
zAh@AE5Mu`yZ$D7m2RR%BQkWkAoZYNJA0<curoW(!BG+`m_<{FQvVa`%50&J7t{4|v
zP?HAVhy?(`2E%%f8Fx1?Zvdd`1U=>;VibEEtld3r!B`jq<e(o2{Ne<O@XNKfw7EAZ
zfyJg_!>eK)VGxKM?5SN)r)6JXPiJROXaC?6I-=5+a->A7rC%4G<)=&>N9+u?h?swn
zGz9_x*U1<D=CHK1dt%8*qDTUFCpci}3Zf^WL=2IXGBRc|FreMfFJZd-VFdDO$OjV;
z0xst6Xei*iMbZqu;{Oc4+*$)iFIpvd-UMbq{9YK0MjUJ0>lyEBkU2mK@7+<QUt&2(
z+j)>^uI9TJr*%eho{h%o<J`{Pw6d{ITk<{B=T|*1Ki*Y8-p)rq8&2s#8zq&_2MLrn
ziaXkTRZ+g}Y?8PlH#0*npr?Kz5*_ByFy6i^!Ocm7t@erF37bCd8|7Y=OG246^0YnD
zb=^{VJi`S0R{Q&CY*;7p%N3qmIYn~YIN_@Il{5;dU0jN|aQB3Tipla<p~0XD3ZAe{
z?v&mf3`NqK{c5}cV{NZ5ivms~omnAP{-$&^XHvb1Re{-!`?9BnjJoJkvErbo>^Qo>
z)G;!TkG|Q9$2>Ayte-l#R|4Ydd7u}vzBbUn3ZYZZ(OI(9@;qmyqS$@!V7?x%oM+z(
zc688V4okiY<$Ob=>HUVuMyFS7k6<4kEeG{yNHa~Ogy)i)h<aIB98kSsQ&Nv{;_VCD
zOVo@m+{?%<nzsJke6reRe*GE;QJ+NmuSC^mxS{~&bvCyP(Vgg&dWE#{044R@14-c(
zVN8eS?xvdk8<k3_8~L?SiM6?vYkp!?W9sFayQLc=sU$k8lC;trQv|8(Bit_=UuF07
zmpD4#wC2WX7e;tF3P#)VrHc`dNN11ayu)NWO%*F-OKX3=8=&Rp8j&M)w_>+b#_7!7
zN3cA+4Vjlu)u$Si?c1U<@-`$OGL-j++$5nOPFTD<6))Eq0$pFXR!e;E1aUsjKNQ*w
zK9cV%#hx(lvx!a!5UWRIKGY`v@@BH(`oQ=jgE)PgZ|^uXge)c<2{rCe1zTJ6N?g3m
zVpLPVviQAcYlb=_zvYOhPb_NQ&OB+u=g}+kC!d@@Z;1^Y1?O!{hZK%U&mBs#Vw|?U
zQ+J~zh3n3hE3BPG9qvEdlOpn@#+r4K&|vF);G}bEq)%%fAe^sJlg@DxV%|NKoeqhY
zofhGOH)b?E&khlEWRapB02HDjC3p7vY+VHn^*)x-yogh*5MLAUtSK$_GdLH5oUh<+
zKgTx6zLlRmi&c3Mq@T8$^uob^tfz%A@nLA7mstTV%(lbmL~p-iHoLmi@VUQ@C!Ign
z@UvC<DPFpy7h4A{)k;&Baj{fR*bqn=oLs>;ow7YEd0(euOq<ed9e$JfCT!~0Tic<}
z%V#+Z9ORoJXSc61k<W)~8mk!ZTE3i^O0sQfg09!`8KqdY4{n<-$Hfn-{!y?K2)uXT
z-${oQOvBVrn$<211=1WQZ)qH;!<*=A!%GuBWFcN*t=W)n?avV0>gEmDS%KU-Y^&v<
z!1VX0a{6wm>+XR?!E6bsp-zT7eT;M(@DrCK#p&(W+6Si3u}}Fr#;0T-a%kY2tDdNF
ztw%oE$C%a5DWWtBUsg_24%ElO*p=oVt0vkaPL-)^l$2y@+aBbNx19I$yDmzdlZM@Q
zw7NKI&sr%=ecX^@Yv2OWYhp^%o67FS*HC>KD%lJCFvI6LDfY!%YyM|@`NO90@D^kE
z?i@>MnYu{jb~hDs<-kzc@Hbntlm%ZH@;b6`v51cO((u^hMB1>LtYlTWEw7Tj<g*pU
z0ZbxP=@;?l*Bk0Bk*Qw;GiVE3=euW6=6Lhx1uKi4&l@)EwwT=I#watRo|~|~?WYW?
zAd$Q~I-mFxzW-{E><3^;+iA5QvuDzKDDdP*P%jJnlGg^(0TtCn@5SJJ)1J~Y>JEi(
zR<~u+9g23#Pm-M(gBUm}>V6LkiB={pAZ<$({xY+B$!P<55_#vCpdI9ycPMB!kkeD%
zPW)bR*SxP)x@gmFcK)QLKdzG)*JrHnSdGAhy1`$EBBQHh9=*L=deK8JcRqtCzp#Sq
zg-&?eE1xG^i~RlWzWRALqWs>NXs>5hmxW@xS_GtDM7-eexaSY_J(FxB_&+7MyaZr=
zxjv~{4z$KB9~N``v$9w#R=KkVd$P;NY$R!|<2^2H#l1hk>lGgG^Q0n*QaR&NbyacT
z%*i?0T@S@6&{JPgIMSAvu8fA_bOWZlIoarOWy)7L182M0(ouUkS6vz$GdaGuscZzx
zbbLQP2Yxpndc*{&q<2vx!dOn&ex}W&6tP?*W-8X>D}vZu8NNDv3;qjH#39J3kWj2X
zqAyuyoaor+%~q~=Lnl3QUoz>#TRT&Huom};9fTLYeA(8r+`$D;MKAitEu1pD4I2p3
zdf-co{eJ~iRrx!Iu`hFJ4;+*!8w=HBmnW!Ka{0~ZDZ@H2)?<r`M5*H97^|<ht;iFX
zGETPLEJdE_6TfQIeaT-uJS;EpOdpkPB5dEV7n=<^2?tJ^)!PwwrD?i=VZsId1EY9y
zYQ&O;aU?%;y%;d|>P_BWm^>u{AYRnzrWT8!;ckA|f?H#pY+J9V2*uF$o*!TEbU^;x
zp3O_VY#rk`NlOcfT%VK)GWu#nGI{SDxS&{-YLasI4x9^}yds7xxOKylL7(8yTIs?u
zB_VhEp`(4uds{Keips;}-uJozH!^1@9Z}q?qQZH_4l@Fh3Ul!)sD!U#7Xt`_rlT0s
zXOg?86}?>LX!j4*bR|~}Pg_l+#$|#kf<1=(2g_1hO&eOxct0r(E2sZF8aSFmH+(V9
zWci$-U29Oiw(^6N??`Cg?34MId{?pYkeJE|?ebhpBi#L%zH83Lxgtj@9FHYTO;UaU
zQ9^ym`HdQLo^?<=_W2|RqM8Av0lOW<qV@J7^m*aKgVSi!HWLjGgT%hq?)17WkwHuI
zwmn|tB?i)Z{599tUj*U(KG(dFI@I&3&ZIW|_;Fr2Mv2h#3qFhvnRxI+F-Ujt6|VV@
zLOuhMbhPuzfwz@J8Bua2pN;cvqjFZDzg+X$F~#`MeIqf)L-Oh<oMzw=&L{BnV3ek5
zN!lW_EZu_CZ@0*2s>S5<?HA~(P-2gPAG3K`hZEoC%`_6GT(35JzFvFoYT=xSZWg^a
zH~UqM&|V}d_~Rov$oLCUUG>t(!bpfzt}Kho=-aKXm9CQgsj}^f*_~#?m5|a9WU9@_
z?2Yj)fi#QUO&<|nH+1&PiTDRKSwrWjh1~2%8XZz+&N~wsL}Cj^M%s%;nbr?TeYc%p
z_y;Gvuy3fP(hf2{_MdQq4CVw2X3Aop&E7v=IV2)4KF2J}c}e9yE%%^bS(tK(ZS<j!
zJR+P+s7d5&EB;o%cU?|HyCj;c)#Q-Z2YT;I!dC6UufqifITe+f#}5jmXwS!qx{7yJ
zZt-LVwB&s5SFq2$|3LfQ@V!W+G9l~L&Jk3`Kq<7WZ-k5V>07%v{oxNK#b(}wX*%7F
z-q|TUT)b*+l8a_FzwB#xij2`~m3FUH%+qy=@Y<Cbb8)+x%oZ0>%FDLWVP}7wvgW_5
zU=axJ5XsWtfp3$RXQ9;{l-_gpo>`b%S@0_JFR$v9%c68=A0sRMr#)lk6o(r%q*%qn
z+gT|qx}gNo4>jQup;5GUM%Z<ZZnEPIbi$3z4#O<8j=yN#g}DKInh_g5#u7#3YBw0#
z_6gPJ*4=s;>lZ)@{gt)KpWNj!&yHH6Ak8?{<I}fwFO(4>3+9e6USkN(F7$a9{Zc!=
zcj$i7$0Os)v3iZ;Xz`iP=n~(|vNDAgrg2oyT+{pMmft3aN$B4>4tO5B<aILvxX@nO
z0JBE%L@xJ6S}E#gktTd9u;!BedzzRT0Q{?|EiHi+Se(dW!q=wL{?4H@LjL#em;uLY
zq;1-3mj#!%2BR`rpO{gR@Fw#EuMc4&U>*El9M$gvJRE-(hF!iC-LR&RrM}t;0TOM9
z$HDWEuFlS&Cw>&b4)Th|ztY(ccu#;NC?q%|)FzB4+=Hk>UJ(6l83;g70Ez&~KNlf5
z!vQaF<|GGufWLS7Bx|X5%QD~>-!xbWiCk}HyIrh2CNm!4!$tpGi1-?@2gi*(UIE8)
z^>RGAOUjQ_bj>(Og`_Hs5p~*jdok#c7ohq<j6G;sGOd@*t6n4X^;mCKz3lZ!2>R*=
z)tHxh;U#^?b%{kZF~?y!k5%3!=}{u=1K}U5DGy?3@n7q-N5Z^sYdDw3R<q`1mj{IQ
z$4+w$?T<U70|_zRef?u2Sv!vdA*XL~*#^14V}2TnkMcg7@+{Y@Ns$l4qARydrAXNx
zHme5d#d_xRKf_C=-F<1wWSu6sYI<wvo!xew+phYjcyyoXl$J<Beobcpu3-RE@j94F
zaoETT63)QEX{4MxdUv%cNhE+F8EwpAY;1s6Ugj!VwZ^mRyh_orILy;2^QIG`sgHVc
z7#0wF`%M+0v~I+FPF?tEL;VnKb*r11ck1BEjS*jbrl4^3*-For)+B{f{&0m;7QdEl
z>{Xhk&;ykP8H=2;E1Q9Mi#qS9P4_de0yp$p0QBECaEVnTdxC_^@%=JvFx)EgHqq{a
z35Nv)<b4~x&X&Yox~U;|c|%^iFS$fEhK%VJ(;H-Li)G`vfSD1WNk=HkW%Pqct!8t}
zx8?P2!3+uSt~er@B<Kj`S`-8RUw-TTg)Vnaek(36Yl}6K-aHlx7K)F=%#22P;wYrU
zeFv(m0elb$gbx*$)n!{kX02q|LlTu3oiHdM!aO0{YR*DQ5r3VE^&<y0f(IvChr=p4
XL02y)DX+INXEB%o&@s-xE!_VA>(Cbi

literal 0
HcmV?d00001

diff --git a/common/templates/license.html b/common/templates/license.html
new file mode 100644
index 0000000000..b5a49a2d36
--- /dev/null
+++ b/common/templates/license.html
@@ -0,0 +1,55 @@
+<%page args="license, button=False, button_size='88x31'"/>
+## keep this synchronized with the contents of cms/templates/js/license-selector.underscore
+<%!
+from django.utils.translation import ugettext as _
+
+def parse_license(lic):
+    """
+    Returns a two-tuple: license type, and options.
+    """
+    if not lic:
+        return None, {}
+    if ":" not in lic:
+        # no options, so the entire thing is the license type
+        return lic, {}
+
+    ltype, option_str = lic.split(":", 1)
+    options = {}
+    for part in option_str.split():
+        if "=" in part:
+            key, value = part.split("=", 1)
+            options[key] = value
+        else:
+            options[part] = True
+    return ltype, options
+%>
+<% license_type, license_options = parse_license(license) %>
+% if license_type == "all-rights-reserved":
+    © <span class="license-text">${_("All Rights Reserved")}</span>
+% elif license_type == "creative-commons":
+    <%
+    possible = ["by", "nc", "nd", "sa"]
+    enabled = [opt for opt in possible
+               if license_options.get(opt) or license_options.get(opt.upper())]
+    version = license_options.get("ver", "4.0")
+    if len(enabled) == 0:
+        enabled = ["zero"]
+        version = license_options.get("ver", "1.0")
+    %>
+    <a rel="license" href="//creativecommons.org/licenses/${'-'.join(enabled)}/${version}/">
+    % if button:
+        <img src="https://licensebuttons.net/l/${'-'.join(enabled)}/${version}/${button_size}.png"
+             alt="${license}"
+             />
+        </a>
+    % else:
+        <i class="icon-cc"></i>
+        % for option in enabled:
+            <i class="icon-cc-${option}"></i>
+        % endfor
+        <span class="license-text">${_("Some Rights Reserved")}</span>
+    % endif
+    </a>
+% else:
+    ${license}
+% endif
diff --git a/common/templates/xblock_wrapper.html b/common/templates/xblock_wrapper.html
index 998d00a90a..1026337a83 100644
--- a/common/templates/xblock_wrapper.html
+++ b/common/templates/xblock_wrapper.html
@@ -5,4 +5,9 @@
   </script>
 % endif
   ${content}
+% if license:
+  <div class="xblock-license">
+    <%include file="license.html" args="license=license" />
+  </div>
+% endif
 </div>
diff --git a/common/test/acceptance/pages/lms/courseware.py b/common/test/acceptance/pages/lms/courseware.py
index 3ab89ade1f..1d05324508 100644
--- a/common/test/acceptance/pages/lms/courseware.py
+++ b/common/test/acceptance/pages/lms/courseware.py
@@ -88,6 +88,13 @@ class CoursewarePage(CoursePage):
 
         return True
 
+    @property
+    def course_license(self):
+        element = self.q(css="#content .container-footer .course-license")
+        if element.is_present():
+            return element.text[0]
+        return None
+
     def get_active_subsection_url(self):
         """
         return the url of the active subsection in the left nav
diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py
index cbff06967e..3955d5b8fd 100644
--- a/common/test/acceptance/pages/studio/overview.py
+++ b/common/test/acceptance/pages/studio/overview.py
@@ -12,6 +12,7 @@ from selenium.webdriver.common.action_chains import ActionChains
 
 from .course_page import CoursePage
 from .container import ContainerPage
+from .settings import SettingsPage
 from .utils import set_input_value_and_save, set_input_value, click_css, confirm_prompt
 
 
@@ -579,6 +580,21 @@ class CourseOutlinePage(CoursePage, CourseOutlineContainer):
         """
         return self.children(CourseOutlineChild)
 
+    @property
+    def license(self):
+        return self.q(css=".license-value").first.text[0]
+
+    def edit_course_start_date(self):
+        self.q(css=".status-release .action-edit a.action-button").click()
+        sp = SettingsPage(
+            self.browser,
+            self.course_info['course_org'],
+            self.course_info['course_num'],
+            self.course_info['course_run'],
+        )
+        sp.wait_for_page()
+        return sp
+
 
 class CourseOutlineModal(object):
     MODAL_SELECTOR = ".wrapper-modal-window"
diff --git a/common/test/acceptance/pages/studio/settings.py b/common/test/acceptance/pages/studio/settings.py
index 6f83ad9bcd..98f8d13231 100644
--- a/common/test/acceptance/pages/studio/settings.py
+++ b/common/test/acceptance/pages/studio/settings.py
@@ -1,6 +1,8 @@
+# coding: utf-8
 """
 Course Schedule and Details Settings page.
 """
+from __future__ import unicode_literals
 from bok_choy.promise import EmptyPromise
 
 from .course_page import CoursePage
@@ -70,6 +72,17 @@ class SettingsPage(CoursePage):
                 'Entrance exam minimum score percent is invisible'
             )
 
+    def set_course_license(self, license_type):
+        css_selector = (
+            "section.license ul.license-types "
+            "li[data-license={license_type}] button"
+        ).format(license_type=license_type)
+        self.wait_for_element_presence(
+            css_selector,
+            '{license_type} button is present'.format(license_type=license_type)
+        )
+        self.q(css=css_selector).click()
+
     def save_changes(self, wait_for_confirmation=True):
         """
         Clicks save button, waits for confirmation unless otherwise specified
diff --git a/common/test/acceptance/tests/studio/test_studio_settings.py b/common/test/acceptance/tests/studio/test_studio_settings.py
index 4010474b12..88c4321a4e 100644
--- a/common/test/acceptance/tests/studio/test_studio_settings.py
+++ b/common/test/acceptance/tests/studio/test_studio_settings.py
@@ -1,14 +1,19 @@
+# coding: utf-8
 """
 Acceptance tests for Studio's Setting pages
 """
+from __future__ import unicode_literals
+from nose.plugins.attrib import attr
 
 from base_studio_test import StudioCourseTest
 from bok_choy.promise import EmptyPromise
 from ...fixtures.course import XBlockFixtureDesc
 from ..helpers import create_user_partition_json
 from ...pages.studio.overview import CourseOutlinePage
+from ...pages.studio.settings import SettingsPage
 from ...pages.studio.settings_advanced import AdvancedSettingsPage
 from ...pages.studio.settings_group_configurations import GroupConfigurationsPage
+from ...pages.lms.courseware import CoursewarePage
 from unittest import skip
 from textwrap import dedent
 from xmodule.partitions.partitions import Group
@@ -397,3 +402,49 @@ class AdvancedSettingsValidationTest(StudioCourseTest):
         expected_fields = self.advanced_settings.expected_settings_names
         displayed_fields = self.advanced_settings.displayed_settings_names
         self.assertEquals(set(displayed_fields), set(expected_fields))
+
+
+@attr('shard_1')
+class ContentLicenseTest(StudioCourseTest):
+    def setUp(self):
+        super(ContentLicenseTest, self).setUp()
+        self.outline_page = CourseOutlinePage(
+            self.browser,
+            self.course_info['org'],
+            self.course_info['number'],
+            self.course_info['run']
+        )
+        self.settings_page = SettingsPage(
+            self.browser,
+            self.course_info['org'],
+            self.course_info['number'],
+            self.course_info['run']
+        )
+        self.lms_courseware = CoursewarePage(
+            self.browser,
+            self.course_id,
+        )
+        self.outline_page.visit()
+
+    def test_empty_license(self):
+        self.assertEqual(self.outline_page.license, "None")
+        self.lms_courseware.visit()
+        self.assertIsNone(self.lms_courseware.course_license)
+
+    def test_arr_license(self):
+        self.outline_page.edit_course_start_date()
+        self.settings_page.set_course_license("all-rights-reserved")
+        self.settings_page.save_changes()
+        self.outline_page.visit()
+        self.assertEqual(self.outline_page.license, "© All Rights Reserved")
+        self.lms_courseware.visit()
+        self.assertEqual(self.lms_courseware.course_license, "© All Rights Reserved")
+
+    def test_cc_license(self):
+        self.outline_page.edit_course_start_date()
+        self.settings_page.set_course_license("creative-commons")
+        self.settings_page.save_changes()
+        self.outline_page.visit()
+        self.assertEqual(self.outline_page.license, "Some Rights Reserved")
+        self.lms_courseware.visit()
+        self.assertEqual(self.lms_courseware.course_license, "Some Rights Reserved")
diff --git a/common/test/data/toy/course/2012_Fall.xml b/common/test/data/toy/course/2012_Fall.xml
index 4a98ef3cc9..ace32483db 100644
--- a/common/test/data/toy/course/2012_Fall.xml
+++ b/common/test/data/toy/course/2012_Fall.xml
@@ -1,4 +1,4 @@
-<course course_image="just_a_test.jpg">
+<course course_image="just_a_test.jpg" license="creative-commons: BY">
     <textbook title="Textbook" book_url="https://s3.amazonaws.com/edx-textbooks/guttag_computation_v3/"/>
   <chapter url_name="Overview">
     <videosequence url_name="Toy_Videos">
@@ -10,7 +10,7 @@
       <html url_name="badlink"/>
       <html url_name="with_styling"/>
       <html url_name="just_img"/>
-      <video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw" display_name="Video Resources"/>
+      <video url_name="Video_Resources" youtube_id_1_0="1bK-WdDi6Qw" display_name="Video Resources" license="all-rights-reserved"/>
     </videosequence>
     <video url_name="Welcome" youtube_id_1_0="p2Q6BrNhdh8" display_name="Welcome"/>
     <video url_name="video_123456789012" youtube_id_1_0="p2Q6BrNhdh8" display_name='Test Video'/>
diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index 438129ccac..c9b02696f3 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -37,6 +37,7 @@ class TestVideoYouTube(TestVideo):
             'ajax_url': self.item_descriptor.xmodule_runtime.ajax_url + '/save_user_state',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', False),
             'branding_info': None,
+            'license': None,
             'cdn_eval': False,
             'cdn_exp_group': None,
             'data_dir': getattr(self, 'data_dir', None),
@@ -104,6 +105,7 @@ class TestVideoNonYouTube(TestVideo):
         expected_context = {
             'ajax_url': self.item_descriptor.xmodule_runtime.ajax_url + '/save_user_state',
             'branding_info': None,
+            'license': None,
             'cdn_eval': False,
             'cdn_exp_group': None,
             'data_dir': getattr(self, 'data_dir', None),
@@ -211,6 +213,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
 
         expected_context = {
             'branding_info': None,
+            'license': None,
             'cdn_eval': False,
             'cdn_exp_group': None,
             'data_dir': getattr(self, 'data_dir', None),
@@ -330,6 +333,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
 
         initial_context = {
             'branding_info': None,
+            'license': None,
             'cdn_eval': False,
             'cdn_exp_group': None,
             'data_dir': getattr(self, 'data_dir', None),
@@ -472,6 +476,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
         # Video found for edx_video_id
         initial_context = {
             'branding_info': None,
+            'license': None,
             'cdn_eval': False,
             'cdn_exp_group': None,
             'data_dir': getattr(self, 'data_dir', None),
@@ -584,6 +589,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
         # Video found for edx_video_id
         initial_context = {
             'branding_info': None,
+            'license': None,
             'cdn_eval': False,
             'cdn_exp_group': None,
             'data_dir': getattr(self, 'data_dir', None),
@@ -705,6 +711,7 @@ class TestGetHtmlMethod(BaseTestXmodule):
                 'logo_tag': 'Video hosted by XuetangX.com',
                 'url': 'http://www.xuetangx.com'
             },
+            'license': None,
             'cdn_eval': False,
             'cdn_exp_group': None,
             'data_dir': getattr(self, 'data_dir', None),
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
index 98e230f7fa..3a1c1a450e 100644
--- a/lms/envs/bok_choy.py
+++ b/lms/envs/bok_choy.py
@@ -99,6 +99,9 @@ FEATURES['ENABLE_EDXNOTES'] = True
 # Enable teams feature
 FEATURES['ENABLE_TEAMS'] = True
 
+# Enable custom content licensing
+FEATURES['LICENSING'] = True
+
 # Unfortunately, we need to use debug mode to serve staticfiles
 DEBUG = True
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 465005d7b7..362f499e6d 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -40,6 +40,7 @@ from django.utils.translation import ugettext_lazy as _
 from .discussionsettings import *
 import dealer.git
 from xmodule.modulestore.modulestore_settings import update_module_store_settings
+from xmodule.mixin import LicenseMixin
 from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin
 
 ################################### FEATURES ###################################
@@ -673,6 +674,7 @@ from xmodule.modulestore.inheritance import InheritanceMixin
 from xmodule.modulestore import prefer_xmodules
 from xmodule.x_module import XModuleMixin
 
+# These are the Mixins that should be added to every XBlock.
 # This should be moved into an XBlock Runtime/Application object
 # once the responsibility of XBlock creation is moved out of modulestore - cpennington
 XBLOCK_MIXINS = (LmsBlockMixin, InheritanceMixin, XModuleMixin)
@@ -1274,6 +1276,8 @@ PIPELINE_CSS = {
     'style-main': {
         'source_filenames': [
             'sass/lms-main.css',
+            'css/edx-cc.css',
+            'css/edx-cc-ie7.css',
         ],
         'output_filename': 'css/lms-main.css',
     },
diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index e702149cce..15981774f7 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -137,6 +137,25 @@ a:focus {
   min-width: 760px;
   width: flex-grid(12);
 }
+.container-footer {
+  max-width: grid-width(12);
+  min-width: 760px;
+  width: flex-grid(12);
+  margin: 0 auto;
+  text-align: $bi-app-right;
+  color: $gray-l2;
+
+  span {
+    color: inherit;
+  }
+
+  a:link, a:visited {
+    color: $gray-l2;
+  }
+  a:active, a:hover {
+    color: $blue;
+  }
+}
 
 span.edx {
   text-transform: none;
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index f667844114..f52cc86fb6 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -44,6 +44,55 @@ html.video-fullscreen{
 div.course-wrapper {
   position: relative;
 
+  .course-license {
+    position: absolute;
+    margin: 5px auto;
+    bottom: 0;
+    text-align: center;
+    width: 100%;
+    color: $gray-l3;
+
+    a:link, a:visited {
+      color: $gray-l3;
+    }
+    a:active, a:hover {
+      color: $link-hover;
+    }
+  }
+
+  .xblock-license {
+    text-align: $bi-app-right;
+    border-top: 1px solid $gray-l3;
+    margin: 0 15px;
+    padding: 5px;
+    font-size: 80%;
+
+    span {
+      color: inherit;
+    }
+
+    &, a {
+      color: $gray-l3;
+
+      &:hover {
+        color: $link-hover;
+      }
+    }
+  }
+
+  .xmodule_display .xblock-license,
+  .xmodule_display .xblock-license a {
+    color: $gray-l3;
+
+    &:hover {
+      color: $link-hover;
+    }
+  }
+
+  .xmodule_VideoModule .xblock-license {
+    border: 0;
+  }
+
   section.course-content {
     @extend .content;
     padding: 40px;
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index adc046bd95..7a6c43ba01 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -174,6 +174,7 @@ ${fragment.foot_html()}
           % endif
         </nav>
       </div>
+
     </div>
 % endif
     <section class="course-content" id="course-content" role="main" aria-label=“Content”>
@@ -205,6 +206,13 @@ ${fragment.foot_html()}
     % endif
   </div>
 </div>
+<div class="container-footer">
+  % if settings.FEATURES.get("LICENSING", False) and getattr(course, "license", None):
+    <div class="course-license">
+      <%include file="../license.html" args="license=course.license" />
+    </div>
+  % endif
+</div>
 
 <nav class="nav-utilities ${"has-utility-calculator" if course.show_calculator else ""}" aria-label="${_('Course Utilities')}">
   ## Utility: Chat
diff --git a/openedx/core/lib/xblock_utils.py b/openedx/core/lib/xblock_utils.py
index 98cddb8650..2e007ef2b0 100644
--- a/openedx/core/lib/xblock_utils.py
+++ b/openedx/core/lib/xblock_utils.py
@@ -122,12 +122,18 @@ def wrap_xblock(
     if block.name:
         data['name'] = block.name
 
+    if settings.FEATURES.get("LICENSING", False):
+        license = getattr(block, "license", None)
+    else:
+        license = None
+
     template_context = {
         'content': block.display_name if display_name_only else frag.content,
         'classes': css_classes,
         'display_name': block.display_name_with_default,
         'data_attributes': u' '.join(u'data-{}="{}"'.format(markupsafe.escape(key), markupsafe.escape(value))
                                      for key, value in data.iteritems()),
+        'license': license,
     }
 
     if hasattr(frag, 'json_init_args') and frag.json_init_args is not None:

From ca2fee12599893b8d17659fa0628be99ecf6125d Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Tue, 21 Apr 2015 13:33:04 -0400
Subject: [PATCH 3/8] Move LicenseMixin into VideoFields class

---
 .../xmodule/video_module/video_module.py      |  2 +-
 .../xmodule/video_module/video_xfields.py     |  3 +-
 .../test/acceptance/pages/studio/container.py | 10 +++
 .../tests/video/test_video_license.py         | 85 +++++++++++++++++++
 4 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 common/test/acceptance/tests/video/test_video_license.py

diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/common/lib/xmodule/xmodule/video_module/video_module.py
index 00f2a86f5f..fe54bcbdb9 100644
--- a/common/lib/xmodule/xmodule/video_module/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module/video_module.py
@@ -288,7 +288,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
 
 
 class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandlers,
-                      TabsEditingDescriptor, LicenseMixin, EmptyDataRawDescriptor):
+                      TabsEditingDescriptor, EmptyDataRawDescriptor):
     """
     Descriptor for `VideoModule`.
     """
diff --git a/common/lib/xmodule/xmodule/video_module/video_xfields.py b/common/lib/xmodule/xmodule/video_module/video_xfields.py
index fa551a63f2..5bf2195b88 100644
--- a/common/lib/xmodule/xmodule/video_module/video_xfields.py
+++ b/common/lib/xmodule/xmodule/video_module/video_xfields.py
@@ -6,12 +6,13 @@ import datetime
 from xblock.fields import Scope, String, Float, Boolean, List, Dict
 
 from xmodule.fields import RelativeTime
+from xmodule.mixin import LicenseMixin
 
 # Make '_' a no-op so we can scrape strings
 _ = lambda text: text
 
 
-class VideoFields(object):
+class VideoFields(LicenseMixin):
     """Fields for `VideoModule` and `VideoDescriptor`."""
     display_name = String(
         help=_("The name students see. This name appears in the course ribbon and as a header for the video."),
diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py
index aa46ce72ca..e1b7b586b5 100644
--- a/common/test/acceptance/pages/studio/container.py
+++ b/common/test/acceptance/pages/studio/container.py
@@ -487,6 +487,16 @@ class XBlockWrapper(PageObject):
         """
         type_in_codemirror(self, index, text, find_prefix='$("{}").find'.format(self.editor_selector))
 
+    def set_license(self, license_type):
+        css_selector = (
+            "ul.license-types li[data-license={license_type}] button"
+        ).format(license_type=license_type)
+        self.wait_for_element_presence(
+            css_selector,
+            "{license_type} button is present".format(license_type=license_type)
+        )
+        self.q(css=css_selector).click()
+
     def save_settings(self):
         """
         Click on settings Save button.
diff --git a/common/test/acceptance/tests/video/test_video_license.py b/common/test/acceptance/tests/video/test_video_license.py
new file mode 100644
index 0000000000..2a1127120e
--- /dev/null
+++ b/common/test/acceptance/tests/video/test_video_license.py
@@ -0,0 +1,85 @@
+# coding: utf-8
+from __future__ import unicode_literals
+from nose.plugins.attrib import attr
+from ..studio.base_studio_test import StudioCourseTest
+
+#from ..helpers import UniqueCourseTest
+from ...pages.studio.overview import CourseOutlinePage
+from ...pages.lms.courseware import CoursewarePage
+from ...fixtures.course import XBlockFixtureDesc
+
+
+@attr('shard_1')
+class VideoLicenseTest(StudioCourseTest):
+
+    def setUp(self):
+        super(VideoLicenseTest, self).setUp()
+
+        self.lms_courseware = CoursewarePage(
+            self.browser,
+            self.course_id,
+        )
+        self.studio_course_outline = CourseOutlinePage(
+            self.browser,
+            self.course_info['org'],
+            self.course_info['number'],
+            self.course_info['run']
+        )
+
+    # used by StudioCourseTest.setUp()
+    def populate_course_fixture(self, course_fixture):
+        video_block = XBlockFixtureDesc('video', "Test Video")
+        vertical = XBlockFixtureDesc('vertical', "Test Vertical")
+        vertical.add_children(video_block)
+        sequential = XBlockFixtureDesc('sequential', "Test Section")
+        sequential.add_children(vertical)
+        chapter = XBlockFixtureDesc('chapter', "Test Chapter")
+        chapter.add_children(sequential)
+        self.course_fixture.add_children(chapter)
+
+    def test_empty_license(self):
+        self.lms_courseware.visit()
+        video = self.lms_courseware.q(css=".vert .xblock .video")
+        self.assertTrue(video.is_present())
+        video_license = self.lms_courseware.q(css=".vert .xblock.xmodule_VideoModule .xblock-license")
+        self.assertFalse(video_license.is_present())
+
+    def test_arr_license(self):
+        self.studio_course_outline.visit()
+        subsection = self.studio_course_outline.section_at(0).subsection_at(0)
+        subsection.expand_subsection()
+        unit = subsection.unit_at(0)
+        container_page = unit.go_to()
+        container_page.edit()
+        video = [xb for xb in container_page.xblocks if xb.name == "Test Video"][0]
+        video.edit().open_advanced_tab()
+        video.set_license('all-rights-reserved')
+        video.save_settings()
+        container_page.publish_action.click()
+
+        self.lms_courseware.visit()
+        video = self.lms_courseware.q(css=".vert .xblock .video")
+        self.assertTrue(video.is_present())
+        video_license = self.lms_courseware.q(css=".vert .xblock.xmodule_VideoModule .xblock-license")
+        self.assertTrue(video_license.is_present())
+        self.assertEqual(video_license.text[0], "© All Rights Reserved")
+
+    def test_cc_license(self):
+        self.studio_course_outline.visit()
+        subsection = self.studio_course_outline.section_at(0).subsection_at(0)
+        subsection.expand_subsection()
+        unit = subsection.unit_at(0)
+        container_page = unit.go_to()
+        container_page.edit()
+        video = [xb for xb in container_page.xblocks if xb.name == "Test Video"][0]
+        video.edit().open_advanced_tab()
+        video.set_license('creative-commons')
+        video.save_settings()
+        container_page.publish_action.click()
+
+        self.lms_courseware.visit()
+        video = self.lms_courseware.q(css=".vert .xblock .video")
+        self.assertTrue(video.is_present())
+        video_license = self.lms_courseware.q(css=".vert .xblock.xmodule_VideoModule .xblock-license")
+        self.assertTrue(video_license.is_present())
+        self.assertEqual(video_license.text[0], "Some Rights Reserved")

From 37ab2fc16a86072ad88a962a7cde8a046c6102a6 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Mon, 27 Apr 2015 15:37:22 -0400
Subject: [PATCH 4/8] Wrap block with license info in LMS only

---
 cms/static/js/models/license.js               | 188 ++++++------
 cms/static/js/spec/models/license_spec.js     | 134 ++++----
 cms/static/js/spec/views/license_spec.js      | 286 +++++++++---------
 cms/static/js/views/license.js                | 256 ++++++++--------
 cms/static/js/views/metadata.js               |   3 +-
 cms/templates/js/license-selector.underscore  | 195 ++++++------
 common/lib/xmodule/xmodule/capa_base.py       |   9 -
 .../lib/xmodule/xmodule/discussion_module.py  |   9 -
 common/lib/xmodule/xmodule/editing_module.py  |   9 +
 common/lib/xmodule/xmodule/html_module.py     |  36 ---
 common/lib/xmodule/xmodule/mixin.py           |  11 +
 common/lib/xmodule/xmodule/raw_module.py      |  12 -
 common/templates/license_wrapper.html         |   3 +
 common/templates/xblock_wrapper.html          |   5 -
 lms/djangoapps/courseware/module_render.py    |   4 +
 openedx/core/lib/xblock_utils.py              |   6 -
 16 files changed, 558 insertions(+), 608 deletions(-)
 create mode 100644 common/templates/license_wrapper.html

diff --git a/cms/static/js/models/license.js b/cms/static/js/models/license.js
index 3c237beb79..1d032149c9 100644
--- a/cms/static/js/models/license.js
+++ b/cms/static/js/models/license.js
@@ -1,100 +1,100 @@
 define(["backbone", "underscore"], function(Backbone, _) {
-  var LicenseModel = Backbone.Model.extend({
-    defaults: {
-      "type": null,
-      "options": {},
-      "custom": false // either `false`, or a string
-    },
-
-    initialize: function(attributes) {
-      if(attributes && attributes.asString) {
-        this.setFromString(attributes.asString);
-        this.unset("asString");
-      }
-    },
-
-    toString: function() {
-      var custom = this.get("custom");
-      if (custom) {
-        return custom;
-      }
-
-      var type = this.get("type"),
-          options = this.get("options");
-
-      if (_.isEmpty(options)) {
-        return type || "";
-      }
-
-      // options are where it gets tricky
-      var optionStrings = _.map(options, function (value, key) {
-        if(_.isBoolean(value)) {
-          return value ? key : null
-        } else {
-          return key + "=" + value
-        }
-      });
-      // filter out nulls
-      optionStrings = _.filter(optionStrings, _.identity);
-      // build license string and return
-      return type + ": " + optionStrings.join(" ");
-    },
-
-    setFromString: function(string, options) {
-      if (!string) {
-        // reset to defaults
-        return this.set(this.defaults, options);
-      }
-
-      var colonIndex = string.indexOf(":"),
-          spaceIndex = string.indexOf(" ");
-
-      // a string without a colon could be a custom license, or a license
-      // type without options
-      if (colonIndex == -1) {
-        if (spaceIndex == -1) {
-          // if there's no space, it's a license type without options
-          return this.set({
-            "type": string,
-            "options": {},
-            "custom": false
-          }, options);
-        } else {
-        // if there is a space, it's a custom license
-          return this.set({
+    var LicenseModel = Backbone.Model.extend({
+        defaults: {
             "type": null,
             "options": {},
-            "custom": string
-          }, options);
+            "custom": false // either `false`, or a string
+        },
+
+        initialize: function(attributes) {
+            if(attributes && attributes.asString) {
+                this.setFromString(attributes.asString);
+                this.unset("asString");
+            }
+        },
+
+        toString: function() {
+            var custom = this.get("custom");
+            if (custom) {
+                return custom;
+            }
+
+            var type = this.get("type"),
+                options = this.get("options");
+
+            if (_.isEmpty(options)) {
+                return type || "";
+            }
+
+            // options are where it gets tricky
+            var optionStrings = _.map(options, function (value, key) {
+                if(_.isBoolean(value)) {
+                    return value ? key : null
+                } else {
+                    return key + "=" + value
+                }
+            });
+            // filter out nulls
+            optionStrings = _.filter(optionStrings, _.identity);
+            // build license string and return
+            return type + ": " + optionStrings.join(" ");
+        },
+
+        setFromString: function(string, options) {
+            if (!string) {
+                // reset to defaults
+                return this.set(this.defaults, options);
+            }
+
+            var colonIndex = string.indexOf(":"),
+                spaceIndex = string.indexOf(" ");
+
+            // a string without a colon could be a custom license, or a license
+            // type without options
+            if (colonIndex == -1) {
+                if (spaceIndex == -1) {
+                    // if there's no space, it's a license type without options
+                    return this.set({
+                        "type": string,
+                        "options": {},
+                        "custom": false
+                    }, options);
+                } else {
+                // if there is a space, it's a custom license
+                    return this.set({
+                        "type": null,
+                        "options": {},
+                        "custom": string
+                    }, options);
+                }
+            }
+
+            // there is a colon, which indicates a license type with options.
+            var type = string.substring(0, colonIndex),
+                optionsObj = {},
+                optionsString = string.substring(colonIndex + 1);
+
+                _.each(optionsString.split(" "), function(optionString) {
+                    if (_.isEmpty(optionString)) {
+                        return;
+                    }
+                    var eqIndex = optionString.indexOf("=");
+                    if(eqIndex == -1) {
+                        // this is a boolean flag
+                        optionsObj[optionString] = true;
+                    } else {
+                        // this is a key-value pair
+                        var optionKey = optionString.substring(0, eqIndex);
+                        var optionVal = optionString.substring(eqIndex + 1);
+                        optionsObj[optionKey] = optionVal;
+                    }
+                });
+
+            return this.set({
+                "type": type, "options": optionsObj, "custom": false,
+            }, options);
         }
-      }
+    });
 
-      // there is a colon, which indicates a license type with options.
-      var type = string.substring(0, colonIndex),
-          optionsObj = {},
-          optionsString = string.substring(colonIndex + 1);
-
-        _.each(optionsString.split(" "), function(optionString) {
-          if (_.isEmpty(optionString)) {
-            return;
-          }
-          var eqIndex = optionString.indexOf("=");
-          if(eqIndex == -1) {
-            // this is a boolean flag
-            optionsObj[optionString] = true;
-          } else {
-            // this is a key-value pair
-            var optionKey = optionString.substring(0, eqIndex);
-            var optionVal = optionString.substring(eqIndex + 1);
-            optionsObj[optionKey] = optionVal;
-          }
-        });
-
-      return this.set({
-        "type": type, "options": optionsObj, "custom": false,
-      }, options);
-    }
-  });
-
-  return LicenseModel;
+    return LicenseModel;
 });
diff --git a/cms/static/js/spec/models/license_spec.js b/cms/static/js/spec/models/license_spec.js
index 6e84a2f0b6..291e0e22ca 100644
--- a/cms/static/js/spec/models/license_spec.js
+++ b/cms/static/js/spec/models/license_spec.js
@@ -1,72 +1,72 @@
 define(["js/models/license"], function(LicenseModel) {
-  describe("License model constructor", function() {
-    it("accepts no arguments", function() {
-      var model = new LicenseModel()
-      expect(model.get("type")).toBeNull();
-      expect(model.get("options")).toEqual({});
-      expect(model.get("custom")).toBeFalsy();
+    describe("License model constructor", function() {
+        it("accepts no arguments", function() {
+            var model = new LicenseModel()
+            expect(model.get("type")).toBeNull();
+            expect(model.get("options")).toEqual({});
+            expect(model.get("custom")).toBeFalsy();
+        });
+
+        it("accepts normal arguments", function() {
+            var model = new LicenseModel({
+                "type": "creative-commons",
+                "options": {"fake-boolean": true, "version": "your momma"}
+            });
+            expect(model.get("type")).toEqual("creative-commons");
+            expect(model.get("options")).toEqual({"fake-boolean": true, "version": "your momma"});
+        })
+
+        it("accepts a license string argument", function() {
+            var model = new LicenseModel({"asString": "all-rights-reserved"});
+            expect(model.get("type")).toEqual("all-rights-reserved");
+            expect(model.get("options")).toEqual({});
+            expect(model.get("custom")).toBeFalsy();
+        });
+
+        it("accepts a custom license argument", function() {
+            var model = new LicenseModel({"asString": "Mozilla Public License 2.0"})
+            expect(model.get("type")).toBeNull();
+            expect(model.get("options")).toEqual({});
+            expect(model.get("custom")).toEqual("Mozilla Public License 2.0");
+        });
     });
 
-    it("accepts normal arguments", function() {
-      var model = new LicenseModel({
-        "type": "creative-commons",
-        "options": {"fake-boolean": true, "version": "your momma"}
-      });
-      expect(model.get("type")).toEqual("creative-commons");
-      expect(model.get("options")).toEqual({"fake-boolean": true, "version": "your momma"});
+    describe("License model", function() {
+        beforeEach(function() {
+            this.model = new LicenseModel();
+        });
+
+        it("can parse license strings", function() {
+            this.model.setFromString("creative-commons: BY")
+            expect(this.model.get("type")).toEqual("creative-commons")
+            expect(this.model.get("options")).toEqual({"BY": true})
+            expect(this.model.get("custom")).toBeFalsy();
+        });
+
+        it("can stringify a null license", function() {
+            expect(this.model.toString()).toEqual("");
+        });
+
+        it("can stringify a simple license", function() {
+            this.model.set("type", "foobie thinger");
+            expect(this.model.toString()).toEqual("foobie thinger");
+        });
+
+        it("can stringify a license with options", function() {
+            this.model.set({
+                "type": "abc",
+                "options": {"ping": "pong", "bing": true, "buzz": true, "beep": false}}
+            );
+            expect(this.model.toString()).toEqual("abc: ping=pong bing buzz");
+        });
+
+        it("can stringify a custom license", function() {
+            this.model.set({
+                "type": "doesn't matter",
+                "options": {"ignore": "me"},
+                "custom": "this is my super cool license"
+            });
+            expect(this.model.toString()).toEqual("this is my super cool license");
+        });
     })
-
-    it("accepts a license string argument", function() {
-      var model = new LicenseModel({"asString": "all-rights-reserved"});
-      expect(model.get("type")).toEqual("all-rights-reserved");
-      expect(model.get("options")).toEqual({});
-      expect(model.get("custom")).toBeFalsy();
-    });
-
-    it("accepts a custom license argument", function() {
-      var model = new LicenseModel({"asString": "Mozilla Public License 2.0"})
-      expect(model.get("type")).toBeNull();
-      expect(model.get("options")).toEqual({});
-      expect(model.get("custom")).toEqual("Mozilla Public License 2.0");
-    });
-  });
-
-  describe("License model", function() {
-    beforeEach(function() {
-      this.model = new LicenseModel();
-    });
-
-    it("can parse license strings", function() {
-      this.model.setFromString("creative-commons: BY")
-      expect(this.model.get("type")).toEqual("creative-commons")
-      expect(this.model.get("options")).toEqual({"BY": true})
-      expect(this.model.get("custom")).toBeFalsy();
-    });
-
-    it("can stringify a null license", function() {
-      expect(this.model.toString()).toEqual("");
-    });
-
-    it("can stringify a simple license", function() {
-      this.model.set("type", "foobie thinger");
-      expect(this.model.toString()).toEqual("foobie thinger");
-    });
-
-    it("can stringify a license with options", function() {
-      this.model.set({
-        "type": "abc",
-        "options": {"ping": "pong", "bing": true, "buzz": true, "beep": false}}
-      );
-      expect(this.model.toString()).toEqual("abc: ping=pong bing buzz");
-    });
-
-    it("can stringify a custom license", function() {
-      this.model.set({
-        "type": "doesn't matter",
-        "options": {"ignore": "me"},
-        "custom": "this is my super cool license"
-      });
-      expect(this.model.toString()).toEqual("this is my super cool license");
-    });
-  })
 })
diff --git a/cms/static/js/spec/views/license_spec.js b/cms/static/js/spec/views/license_spec.js
index 6476f45ed1..6123b5190c 100644
--- a/cms/static/js/spec/views/license_spec.js
+++ b/cms/static/js/spec/views/license_spec.js
@@ -1,157 +1,157 @@
 define(["js/views/license", "js/models/license", "js/common_helpers/template_helpers"],
-       function(LicenseView, LicenseModel, TemplateHelpers) {
-  describe("License view", function() {
+             function(LicenseView, LicenseModel, TemplateHelpers) {
+    describe("License view", function() {
 
-    beforeEach(function() {
-      TemplateHelpers.installTemplate("license-selector", true);
-      this.model = new LicenseModel();
-      this.view = new LicenseView({model: this.model});
-    });
+        beforeEach(function() {
+            TemplateHelpers.installTemplate("license-selector", true);
+            this.model = new LicenseModel();
+            this.view = new LicenseView({model: this.model});
+        });
 
-    it("renders with no license", function() {
-      this.view.render();
-      expect(this.view.$("li[data-license=all-rights-reserved] button"))
-        .toHaveText("All Rights Reserved");
-      expect(this.view.$("li[data-license=all-rights-reserved] button"))
-        .not.toHaveClass("is-selected");
-      expect(this.view.$("li[data-license=creative-commons] button"))
-        .toHaveText("Creative Commons");
-      expect(this.view.$("li[data-license=creative-commons] button"))
-        .not.toHaveClass("is-selected");
-    });
+        it("renders with no license", function() {
+            this.view.render();
+            expect(this.view.$("li[data-license=all-rights-reserved] button"))
+                .toHaveText("All Rights Reserved");
+            expect(this.view.$("li[data-license=all-rights-reserved] button"))
+                .not.toHaveClass("is-selected");
+            expect(this.view.$("li[data-license=creative-commons] button"))
+                .toHaveText("Creative Commons");
+            expect(this.view.$("li[data-license=creative-commons] button"))
+                .not.toHaveClass("is-selected");
+        });
 
-    it("renders with the right license selected", function() {
-      this.model.set("type", "all-rights-reserved");
-      expect(this.view.$("li[data-license=all-rights-reserved] button"))
-        .toHaveClass("is-selected");
-      expect(this.view.$("li[data-license=creative-commons] button"))
-        .not.toHaveClass("is-selected");
-    });
+        it("renders with the right license selected", function() {
+            this.model.set("type", "all-rights-reserved");
+            expect(this.view.$("li[data-license=all-rights-reserved] button"))
+                .toHaveClass("is-selected");
+            expect(this.view.$("li[data-license=creative-commons] button"))
+                .not.toHaveClass("is-selected");
+        });
 
-    it("switches license type on click", function() {
-      var arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
-      expect(this.model.get("type")).toBeNull();
-      arrBtn.click();
-      expect(this.model.get("type")).toEqual("all-rights-reserved");
-      // view has re-rendered, so get a new reference to the button
-      arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
-      expect(arrBtn).toHaveClass("is-selected");
-      // now switch to creative commons
-      var ccBtn = this.view.$("li[data-license=creative-commons] button");
-      ccBtn.click();
-      expect(this.model.get("type")).toEqual("creative-commons");
-      // update references again
-      arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
-      ccBtn = this.view.$("li[data-license=creative-commons] button");
-      expect(arrBtn).not.toHaveClass("is-selected");
-      expect(ccBtn).toHaveClass("is-selected");
-    });
+        it("switches license type on click", function() {
+            var arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+            expect(this.model.get("type")).toBeNull();
+            arrBtn.click();
+            expect(this.model.get("type")).toEqual("all-rights-reserved");
+            // view has re-rendered, so get a new reference to the button
+            arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+            expect(arrBtn).toHaveClass("is-selected");
+            // now switch to creative commons
+            var ccBtn = this.view.$("li[data-license=creative-commons] button");
+            ccBtn.click();
+            expect(this.model.get("type")).toEqual("creative-commons");
+            // update references again
+            arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+            ccBtn = this.view.$("li[data-license=creative-commons] button");
+            expect(arrBtn).not.toHaveClass("is-selected");
+            expect(ccBtn).toHaveClass("is-selected");
+        });
 
-    it("sets default license options when switching license types", function() {
-      expect(this.model.get("options")).toEqual({});
-      var ccBtn = this.view.$("li[data-license=creative-commons] button");
-      ccBtn.click()
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
-      );
-      var arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
-      arrBtn.click()
-      expect(this.model.get("options")).toEqual({});
-    });
+        it("sets default license options when switching license types", function() {
+            expect(this.model.get("options")).toEqual({});
+            var ccBtn = this.view.$("li[data-license=creative-commons] button");
+            ccBtn.click()
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+            );
+            var arrBtn = this.view.$("li[data-license=all-rights-reserved] button");
+            arrBtn.click()
+            expect(this.model.get("options")).toEqual({});
+        });
 
-    it("renders license options", function() {
-      this.model.set({"type": "creative-commons"})
-      expect(this.view.$("ul.license-options li[data-option=BY]"))
-        .toContainText("Attribution");
-      expect(this.view.$("ul.license-options li[data-option=NC]"))
-        .toContainText("Noncommercial");
-      expect(this.view.$("ul.license-options li[data-option=ND]"))
-        .toContainText("No Derivatives");
-      expect(this.view.$("ul.license-options li[data-option=SA]"))
-        .toContainText("Share Alike");
-      expect(this.view.$("ul.license-options li").length).toEqual(4);
-    });
+        it("renders license options", function() {
+            this.model.set({"type": "creative-commons"})
+            expect(this.view.$("ul.license-options li[data-option=BY]"))
+                .toContainText("Attribution");
+            expect(this.view.$("ul.license-options li[data-option=NC]"))
+                .toContainText("Noncommercial");
+            expect(this.view.$("ul.license-options li[data-option=ND]"))
+                .toContainText("No Derivatives");
+            expect(this.view.$("ul.license-options li[data-option=SA]"))
+                .toContainText("Share Alike");
+            expect(this.view.$("ul.license-options li").length).toEqual(4);
+        });
 
-    it("toggles boolean options on click", function() {
-      this.view.$("li[data-license=creative-commons] button").click();
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
-      );
-      // toggle NC option
-      this.view.$("li[data-option=NC]").click();
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": false, "ND": true, "SA": false}
-      );
-    });
+        it("toggles boolean options on click", function() {
+            this.view.$("li[data-license=creative-commons] button").click();
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+            );
+            // toggle NC option
+            this.view.$("li[data-option=NC]").click();
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": false, "ND": true, "SA": false}
+            );
+        });
 
-    it("doesn't toggle disabled options", function() {
-      this.view.$("li[data-license=creative-commons] button").click();
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
-      );
-      var BY = this.view.$("li[data-option=BY]");
-      expect(BY).toHaveClass("is-disabled");
-      // try to toggle BY option
-      BY.click()
-      // no change
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
-      );
-    });
+        it("doesn't toggle disabled options", function() {
+            this.view.$("li[data-license=creative-commons] button").click();
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+            );
+            var BY = this.view.$("li[data-option=BY]");
+            expect(BY).toHaveClass("is-disabled");
+            // try to toggle BY option
+            BY.click()
+            // no change
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+            );
+        });
 
-    it("doesn't allow simultaneous conflicting options", function() {
-      this.view.$("li[data-license=creative-commons] button").click();
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
-      );
-      // SA and ND conflict
-      var SA = this.view.$("li[data-option=SA]");
-      expect(SA).toHaveClass("is-disabled");
-      // try to turn on SA option, fail
-      SA.click()
-      // no change
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
-      );
-      // turn off ND
-      var ND = this.view.$("li[data-option=ND]");
-      expect(ND).not.toHaveClass("is-disabled");
-      ND.click()
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": false}
-      );
-      // turn on SA
-      SA = this.view.$("li[data-option=SA]");
-      expect(SA).not.toHaveClass("is-disabled");
-      SA.click()
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
-      );
-      // try to turn on ND option, fail
-      ND = this.view.$("li[data-option=ND]");
-      expect(ND).toHaveClass("is-disabled");
-      ND.click();
-      expect(this.model.get("options")).toEqual(
-        {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
-      );
-    });
+        it("doesn't allow simultaneous conflicting options", function() {
+            this.view.$("li[data-license=creative-commons] button").click();
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+            );
+            // SA and ND conflict
+            var SA = this.view.$("li[data-option=SA]");
+            expect(SA).toHaveClass("is-disabled");
+            // try to turn on SA option, fail
+            SA.click()
+            // no change
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
+            );
+            // turn off ND
+            var ND = this.view.$("li[data-option=ND]");
+            expect(ND).not.toHaveClass("is-disabled");
+            ND.click()
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": false}
+            );
+            // turn on SA
+            SA = this.view.$("li[data-option=SA]");
+            expect(SA).not.toHaveClass("is-disabled");
+            SA.click()
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
+            );
+            // try to turn on ND option, fail
+            ND = this.view.$("li[data-option=ND]");
+            expect(ND).toHaveClass("is-disabled");
+            ND.click();
+            expect(this.model.get("options")).toEqual(
+                {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
+            );
+        });
 
-    it("has no preview by default", function () {
-      this.view.render();
-      expect(this.view.$("#license-preview").length).toEqual(0)
-      this.view.$("li[data-license=creative-commons] button").click();
-      expect(this.view.$("#license-preview").length).toEqual(0)
-    });
+        it("has no preview by default", function () {
+            this.view.render();
+            expect(this.view.$("#license-preview").length).toEqual(0)
+            this.view.$("li[data-license=creative-commons] button").click();
+            expect(this.view.$("#license-preview").length).toEqual(0)
+        });
 
-    it("displays a preview if showPreview is true", function() {
-      this.view = new LicenseView({model: this.model, showPreview: true});
-      this.view.render()
-      expect(this.view.$("#license-preview").length).toEqual(1)
-      expect(this.view.$("#license-preview")).toHaveText("");
-      this.view.$("li[data-license=creative-commons] button").click();
-      expect(this.view.$("#license-preview").length).toEqual(1)
-      expect(this.view.$("#license-preview")).toContainText("Some Rights Reserved");
-    });
+        it("displays a preview if showPreview is true", function() {
+            this.view = new LicenseView({model: this.model, showPreview: true});
+            this.view.render()
+            expect(this.view.$("#license-preview").length).toEqual(1)
+            expect(this.view.$("#license-preview")).toHaveText("");
+            this.view.$("li[data-license=creative-commons] button").click();
+            expect(this.view.$("#license-preview").length).toEqual(1)
+            expect(this.view.$("#license-preview")).toContainText("Some Rights Reserved");
+        });
 
-  })
+    })
 })
diff --git a/cms/static/js/views/license.js b/cms/static/js/views/license.js
index 8b7a0dbfd9..1f1dcf5484 100644
--- a/cms/static/js/views/license.js
+++ b/cms/static/js/views/license.js
@@ -1,139 +1,139 @@
 define(["js/views/baseview", "underscore"], function(BaseView, _) {
-  var defaultLicenseInfo = {
-    "all-rights-reserved": {
-      "name": gettext("All Rights Reserved"),
-      "tooltip": gettext("You reserve all rights for your work")
-    },
-    "creative-commons": {
-      "name": gettext("Creative Commons"),
-      "tooltip": gettext("You waive some rights for your work, such that others can use it too"),
-      "url": "//creativecommons.org/about",
-      "options": {
-        "ver": {
-          "name": gettext("Version"),
-          "type": "string",
-          "default": "4.0",
+    var defaultLicenseInfo = {
+        "all-rights-reserved": {
+            "name": gettext("All Rights Reserved"),
+            "tooltip": gettext("You reserve all rights for your work")
         },
-        "BY": {
-          "name": gettext("Attribution"),
-          "type": "boolean",
-          "default": true,
-          "help": gettext("Allow others to copy, distribute, display and perform " +
-            "your copyrighted work but only if they give credit the way you request."),
-          "disabled": true,
-        },
-        "NC": {
-          "name": gettext("Noncommercial"),
-          "type": "boolean",
-          "default": true,
-          "help": gettext("Allow others to copy, distribute, display and perform " +
-            "your work - and derivative works based upon it - but for noncommercial purposes only."),
-        },
-        "ND": {
-          "name": gettext("No Derivatives"),
-          "type": "boolean",
-          "default": true,
-          "help": gettext("Allow others to copy, distribute, display and perform " +
-            "only verbatim copies of your work, not derivative works based upon it."),
-          "conflictsWith": ["SA"]
-        },
-        "SA": {
-          "name": gettext("Share Alike"),
-          "type": "boolean",
-          "default": false,
-          "help": gettext("Allow others to distribute derivative works only under " +
-            "a license identical to the license that governs your work."),
-          "conflictsWith": ["ND"]
+        "creative-commons": {
+            "name": gettext("Creative Commons"),
+            "tooltip": gettext("You waive some rights for your work, such that others can use it too"),
+            "url": "//creativecommons.org/about",
+            "options": {
+                "ver": {
+                    "name": gettext("Version"),
+                    "type": "string",
+                    "default": "4.0",
+                },
+                "BY": {
+                    "name": gettext("Attribution"),
+                    "type": "boolean",
+                    "default": true,
+                    "help": gettext("Allow others to copy, distribute, display and perform " +
+                        "your copyrighted work but only if they give credit the way you request."),
+                    "disabled": true,
+                },
+                "NC": {
+                    "name": gettext("Noncommercial"),
+                    "type": "boolean",
+                    "default": true,
+                    "help": gettext("Allow others to copy, distribute, display and perform " +
+                        "your work - and derivative works based upon it - but for noncommercial purposes only."),
+                },
+                "ND": {
+                    "name": gettext("No Derivatives"),
+                    "type": "boolean",
+                    "default": true,
+                    "help": gettext("Allow others to copy, distribute, display and perform " +
+                        "only verbatim copies of your work, not derivative works based upon it."),
+                    "conflictsWith": ["SA"]
+                },
+                "SA": {
+                    "name": gettext("Share Alike"),
+                    "type": "boolean",
+                    "default": false,
+                    "help": gettext("Allow others to distribute derivative works only under " +
+                        "a license identical to the license that governs your work."),
+                    "conflictsWith": ["ND"]
+                }
+            },
+            "option_order": ["BY", "NC", "ND", "SA"]
         }
-      },
-      "option_order": ["BY", "NC", "ND", "SA"]
     }
-  }
 
-  var LicenseView = BaseView.extend({
-      events: {
-          "click ul.license-types li button" : "onLicenseClick",
-          "click ul.license-options li": "onOptionClick"
-      },
+    var LicenseView = BaseView.extend({
+        events: {
+            "click ul.license-types li button" : "onLicenseClick",
+            "click ul.license-options li": "onOptionClick"
+        },
 
-      initialize: function(options) {
-          this.licenseInfo = options.licenseInfo || defaultLicenseInfo;
-          this.showPreview = !!options.showPreview; // coerce to boolean
-          this.template = this.loadTemplate("license-selector");
+        initialize: function(options) {
+            this.licenseInfo = options.licenseInfo || defaultLicenseInfo;
+            this.showPreview = !!options.showPreview; // coerce to boolean
+            this.template = this.loadTemplate("license-selector");
 
-          // Rerender when the model changes
-          this.listenTo(this.model, 'change', this.render);
-          this.render();
-      },
+            // Rerender when the model changes
+            this.listenTo(this.model, 'change', this.render);
+            this.render();
+        },
 
-      getDefaultOptionsForLicenseType: function(licenseType) {
-        if (!this.licenseInfo[licenseType]) {
-          // custom license type, no options
-          return {};
+        getDefaultOptionsForLicenseType: function(licenseType) {
+            if (!this.licenseInfo[licenseType]) {
+                // custom license type, no options
+                return {};
+            }
+            if (!this.licenseInfo[licenseType].options) {
+                // defined license type without options
+                return {};
+            }
+            var defaults = {};
+            _.each(this.licenseInfo[licenseType].options, function(value, key) {
+                defaults[key] = value.default;
+            })
+            return defaults;
+        },
+
+        render: function() {
+            this.$el.html(this.template({
+                model: this.model.attributes,
+                licenseString: this.model.toString() || "",
+                licenseInfo: this.licenseInfo,
+                showPreview: this.showPreview,
+                previewButton: false,
+            }));
+            return this;
+        },
+
+        onLicenseClick: function(e) {
+            var $li = $(e.srcElement || e.target).closest('li');
+            var licenseType = $li.data("license");
+            this.model.set({
+                "type": licenseType,
+                "options": this.getDefaultOptionsForLicenseType(licenseType)
+            });
+        },
+
+        onOptionClick: function(e) {
+            var licenseType = this.model.get("type"),
+                licenseOptions = $.extend({}, this.model.get("options")),
+                $li = $(e.srcElement || e.target).closest('li');
+
+            var optionKey = $li.data("option")
+            var licenseInfo = this.licenseInfo[licenseType];
+            var optionInfo = licenseInfo.options[optionKey];
+            if (optionInfo.disabled) {
+                // we're done here
+                return;
+            }
+            var currentOptionValue = licenseOptions[optionKey];
+            if (optionInfo.type === "boolean") {
+                // toggle current value
+                currentOptionValue = !currentOptionValue;
+                licenseOptions[optionKey] = currentOptionValue;
+            }
+            // check for conflicts
+            if (currentOptionValue && optionInfo.conflictsWith &&
+                    _.any(optionInfo.conflictsWith, function (key) { return licenseOptions[key];})) {
+                // conflict! don't set new options
+                // need some feedback here
+                return;
+            } else {
+                this.model.set({"options": licenseOptions})
+                // Backbone has trouble identifying when objects change, so we'll
+                // fire the change event manually.
+                this.model.trigger("change change:options")
+            }
         }
-        if (!this.licenseInfo[licenseType].options) {
-          // defined license type without options
-          return {};
-        }
-        var defaults = {};
-        _.each(this.licenseInfo[licenseType].options, function(value, key) {
-          defaults[key] = value.default;
-        })
-        return defaults;
-      },
 
-      render: function() {
-          this.$el.html(this.template({
-              model: this.model.attributes,
-              licenseString: this.model.toString() || "",
-              licenseInfo: this.licenseInfo,
-              showPreview: this.showPreview,
-              previewButton: false,
-          }));
-          return this;
-      },
-
-      onLicenseClick: function(e) {
-          var $li = $(e.srcElement || e.target).closest('li');
-          var licenseType = $li.data("license");
-          this.model.set({
-            "type": licenseType,
-            "options": this.getDefaultOptionsForLicenseType(licenseType)
-          });
-      },
-
-      onOptionClick: function(e) {
-        var licenseType = this.model.get("type"),
-            licenseOptions = $.extend({}, this.model.get("options")),
-            $li = $(e.srcElement || e.target).closest('li');
-
-        var optionKey = $li.data("option")
-        var licenseInfo = this.licenseInfo[licenseType];
-        var optionInfo = licenseInfo.options[optionKey];
-        if (optionInfo.disabled) {
-          // we're done here
-          return;
-        }
-        var currentOptionValue = licenseOptions[optionKey];
-        if (optionInfo.type === "boolean") {
-            // toggle current value
-            currentOptionValue = !currentOptionValue;
-            licenseOptions[optionKey] = currentOptionValue;
-        }
-        // check for conflicts
-        if (currentOptionValue && optionInfo.conflictsWith &&
-            _.any(optionInfo.conflictsWith, function (key) { return licenseOptions[key];})) {
-          // conflict! don't set new options
-          // need some feedback here
-          return;
-        } else {
-          this.model.set({"options": licenseOptions})
-          // Backbone has trouble identifying when objects change, so we'll
-          // fire the change event manually.
-          this.model.trigger("change change:options")
-        }
-      }
-
-  });
-  return LicenseView;
+    });
+    return LicenseView;
 });
diff --git a/cms/static/js/views/metadata.js b/cms/static/js/views/metadata.js
index ec7c6b75f7..62565e58d2 100644
--- a/cms/static/js/views/metadata.js
+++ b/cms/static/js/views/metadata.js
@@ -6,7 +6,8 @@ define(
         "js/views/video/transcripts/metadata_videolist",
         "js/views/video/translations_editor"
     ],
-function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, LicenseModel, LicenseView, VideoList, VideoTranslations) {
+function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
+         LicenseModel, LicenseView, VideoList, VideoTranslations) {
     var Metadata = {};
 
     Metadata.Editor = BaseView.extend({
diff --git a/cms/templates/js/license-selector.underscore b/cms/templates/js/license-selector.underscore
index a279042934..7e5938ab50 100644
--- a/cms/templates/js/license-selector.underscore
+++ b/cms/templates/js/license-selector.underscore
@@ -1,107 +1,106 @@
 <div class="license-wrapper">
-  <label class="label setting-label" for="list-license-types">
-    <%= gettext("License Type") %>
-  </label>
-  <ul class="license-types" id="list-license-types">
-    <% var link_start_tpl = '<a href="{url}" target="_blank">'; %>
-    <% _.each(licenseInfo, function(license, licenseType) { %>
-      <li data-license="<%- licenseType %>">
-        <button name="license-<%- licenseType %>" class="action license-button
-                <% if(model.type === licenseType) { print("is-selected"); } %>"
-              name="license-<%- licenseType %>"
-            <% if (license.tooltip) { %>data-tooltip="<%- license.tooltip %>"<% } %>>
-          <%- license.name %>
-        </button>
-        <p class="tip">
-          <% if(license.url) { %>
-            <a href="<%- license.url %>" target="_blank">
-              <%= gettext("Learn more about {license_name}")
-                    .replace("{license_name}", license.name)
-              %>
-            </a>
-          <% } else { %>
-            &nbsp;
-          <% } %>
-        </p>
-      </li>
-    <% }) %>
-  </ul>
+    <label class="label setting-label" for="list-license-types">
+        <%= gettext("License Type") %>
+    </label>
+    <ul class="license-types" id="list-license-types">
+        <% var link_start_tpl = '<a href="{url}" target="_blank">'; %>
+        <% _.each(licenseInfo, function(license, licenseType) { %>
+            <li data-license="<%- licenseType %>">
+                <button name="license-<%- licenseType %>"
+                        class="action license-button <% if(model.type === licenseType) { print("is-selected"); } %>"
+                        <% if (license.tooltip) { %>data-tooltip="<%- license.tooltip %>"<% } %>>
+                    <%- license.name %>
+                </button>
+                <p class="tip">
+                    <% if(license.url) { %>
+                        <a href="<%- license.url %>" target="_blank">
+                            <%= gettext("Learn more about {license_name}")
+                                        .replace("{license_name}", license.name)
+                            %>
+                        </a>
+                    <% } else { %>
+                        &nbsp;
+                    <% } %>
+                </p>
+            </li>
+        <% }) %>
+    </ul>
 
 <% var license = licenseInfo[model.type]; %>
 <% if(license && !_.isEmpty(license.options)) { %>
-  <div class="wrapper-license-options">
-    <label class="label setting-label" for="list-license-options">
-      <%- gettext("Options for {license_name}").replace("{license_name}", license.name) %>
-    </label>
-    <p class='tip tip-inline'>
-      <%- gettext("The following options are available for the {license_name} license.")
-            .replace("{license_name}", license.name) %>
-    </p>
-    <ul class="license-options" id="list-license-options">
-      <% _.each(license.option_order, function(optionKey) { %>
-        <% var optionInfo = license.options[optionKey]; %>
-        <% if (optionInfo.type == "boolean") { %>
-          <% var optionSelected = model.options[optionKey]; %>
-          <% var optionDisabled = optionInfo.disabled ||
-              (optionInfo.conflictsWith && _.any(optionInfo.conflictsWith, function(key) {return model.options[key];}));
-          %>
-          <li data-option="<%- optionKey %>"
-              class="action-item license-button
-                     <% if (optionSelected) { print("is-selected"); } %>
-                     <% if (optionDisabled) { print("is-disabled"); } else { print("is-clickable"); } %>"
-          >
-            <i class="fa fa-fw
-               <% if(optionSelected) { print("fa-check-square-o"); } else { print("fa-square-o"); } %>
-               <% if(optionDisabled) { print("is-disabled"); } %>
-               "></i>
-            <h4 class="option-name"><%- optionInfo.name %></h4>
-            <div class="explanation"><%- optionInfo.help %></div>
-          </li>
-        <% } // could implement other types here %>
-      <% }) %>
-    </ul>
-  </div>
+    <div class="wrapper-license-options">
+        <label class="label setting-label" for="list-license-options">
+            <%- gettext("Options for {license_name}").replace("{license_name}", license.name) %>
+        </label>
+        <p class='tip tip-inline'>
+            <%- gettext("The following options are available for the {license_name} license.")
+                        .replace("{license_name}", license.name) %>
+        </p>
+        <ul class="license-options" id="list-license-options">
+            <% _.each(license.option_order, function(optionKey) { %>
+                <% var optionInfo = license.options[optionKey]; %>
+                <% if (optionInfo.type == "boolean") { %>
+                    <% var optionSelected = model.options[optionKey]; %>
+                    <% var optionDisabled = optionInfo.disabled ||
+                            (optionInfo.conflictsWith && _.any(optionInfo.conflictsWith, function(key) {return model.options[key];}));
+                    %>
+                    <li data-option="<%- optionKey %>"
+                            class="action-item license-button
+                                   <% if (optionSelected) { print("is-selected"); } %>
+                                   <% if (optionDisabled) { print("is-disabled"); } else { print("is-clickable"); } %>"
+                    >
+                        <i class="fa fa-fw
+                             <% if(optionSelected) { print("fa-check-square-o"); } else { print("fa-square-o"); } %>
+                             <% if(optionDisabled) { print("is-disabled"); } %>
+                             "></i>
+                        <h4 class="option-name"><%- optionInfo.name %></h4>
+                        <div class="explanation"><%- optionInfo.help %></div>
+                    </li>
+                <% } // could implement other types here %>
+            <% }) %>
+        </ul>
+    </div>
 <% } %>
 
 <% if (showPreview) { %>
-  <div class="license-preview-wrapper">
-    <label class="label setting-label" for="license-preview">
-      <%= gettext("License Display") %>
-    </label>
-    <p class="tip">
-      <%= gettext("The following message will be displayed at the bottom of the courseware pages within your course.") %>
-    </p>
-    <div id="license-preview">
-    <% // keep this synchronized with the contents of common/templates/license.html %>
-    <% if (model.type === "all-rights-reserved") { %>
-      © <span class="license-text"><%= gettext("All Rights Reserved") %></span>
-    <% } else if (model.type === "creative-commons") {
-       var possible = ["by", "nc", "nd", "sa"];
-       var enabled = _.filter(possible, function(option) {
-         return model.options[option] === true || model.options[option.toUpperCase()] === true;
-       });
-       var version = model.options.ver || "4.0";
-       if (_.isEmpty(enabled)) {
-          enabled = ["zero"];
-          version = model.options.ver || "1.0";
-       }
-    %>
-      <a rel="license" href="//creativecommons.org/licenses/<%- enabled.join("-") %>/<%- version %>/">
-      <% if (previewButton) { %>
-        <img src="https://licensebuttons.net/l/<%- enabled.join("-") %>/<%- version %>/<%- typeof buttonSize == "string" ? buttonSize : "88x31" %>.png"
-             alt="<%- typeof licenseString == "string" ? licenseString : "" %>"
-             />
-      <% } else { %>
-        <i class="icon-cc"></i>
-        <% _.each(enabled, function(option) { %>
-            <i class="icon-cc-<%- option %>"></i>
-        <% }); %>
-        <span class="license-text"><%= gettext("Some Rights Reserved") %></span>
-      <% } %>
-    <% } else { %>
-      <%= typeof licenseString == "string" ? licenseString : "" %>
-    <% } %>
-    </a>
-  </div>
+    <div class="license-preview-wrapper">
+        <label class="label setting-label" for="license-preview">
+            <%= gettext("License Display") %>
+        </label>
+        <p class="tip">
+            <%= gettext("The following message will be displayed at the bottom of the courseware pages within your course.") %>
+        </p>
+        <div id="license-preview">
+        <% // keep this synchronized with the contents of common/templates/license.html %>
+        <% if (model.type === "all-rights-reserved") { %>
+            © <span class="license-text"><%= gettext("All Rights Reserved") %></span>
+        <% } else if (model.type === "creative-commons") {
+             var possible = ["by", "nc", "nd", "sa"];
+             var enabled = _.filter(possible, function(option) {
+                 return model.options[option] === true || model.options[option.toUpperCase()] === true;
+             });
+             var version = model.options.ver || "4.0";
+             if (_.isEmpty(enabled)) {
+                    enabled = ["zero"];
+                    version = model.options.ver || "1.0";
+             }
+        %>
+            <a rel="license" href="//creativecommons.org/licenses/<%- enabled.join("-") %>/<%- version %>/">
+            <% if (previewButton) { %>
+                <img src="https://licensebuttons.net/l/<%- enabled.join("-") %>/<%- version %>/<%- typeof buttonSize == "string" ? buttonSize : "88x31" %>.png"
+                    alt="<%- typeof licenseString == "string" ? licenseString : "" %>"
+                    />
+            <% } else { %>
+                <i class="icon-cc"></i>
+                <% _.each(enabled, function(option) { %>
+                        <i class="icon-cc-<%- option %>"></i>
+                <% }); %>
+                <span class="license-text"><%= gettext("Some Rights Reserved") %></span>
+            <% } %>
+        <% } else { %>
+            <%= typeof licenseString == "string" ? licenseString : "" %>
+        <% } %>
+        </a>
+    </div>
 <% } %>
 </div>
diff --git a/common/lib/xmodule/xmodule/capa_base.py b/common/lib/xmodule/xmodule/capa_base.py
index 31cd165fe4..3c0396a7bf 100644
--- a/common/lib/xmodule/xmodule/capa_base.py
+++ b/common/lib/xmodule/xmodule/capa_base.py
@@ -200,15 +200,6 @@ class CapaFields(object):
         scope=Scope.settings
     )
 
-    @property
-    def non_editable_metadata_fields(self):
-        """
-        `data` should not be editable in the Studio settings editor.
-        """
-        non_editable_fields = super(CapaFields, self).non_editable_metadata_fields
-        non_editable_fields.append(CapaFields.data)
-        return non_editable_fields
-
 
 class CapaMixin(CapaFields):
     """
diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py
index b835bc53ae..ed787fb296 100644
--- a/common/lib/xmodule/xmodule/discussion_module.py
+++ b/common/lib/xmodule/xmodule/discussion_module.py
@@ -41,15 +41,6 @@ class DiscussionFields(object):
     )
     sort_key = String(scope=Scope.settings)
 
-    @property
-    def non_editable_metadata_fields(self):
-        """
-        `data` should not be editable in the Studio settings editor.
-        """
-        non_editable_fields = super(DiscussionFields, self).non_editable_metadata_fields
-        non_editable_fields.append(DiscussionFields.data)
-        return non_editable_fields
-
 
 class DiscussionModule(DiscussionFields, XModule):
     js = {
diff --git a/common/lib/xmodule/xmodule/editing_module.py b/common/lib/xmodule/xmodule/editing_module.py
index 35e3e4c6d1..466fd35155 100644
--- a/common/lib/xmodule/xmodule/editing_module.py
+++ b/common/lib/xmodule/xmodule/editing_module.py
@@ -22,6 +22,15 @@ class EditingDescriptor(EditingFields, MakoModuleDescriptor):
     """
     mako_template = "widgets/raw-edit.html"
 
+    @property
+    def non_editable_metadata_fields(self):
+        """
+        `data` should not be editable in the Studio settings editor.
+        """
+        non_editable_fields = super(EditingDescriptor, self).non_editable_metadata_fields
+        non_editable_fields.append(self.fields['data'])
+        return non_editable_fields
+
     # cdodge: a little refactoring here, since we're basically doing the same thing
     # here as with our parent class, let's call into it to get the basic fields
     # set and then add our additional fields. Trying to keep it DRY.
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index e7d3958ab0..cc3e6bea55 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -55,15 +55,6 @@ class HtmlFields(object):
         scope=Scope.settings
     )
 
-    @property
-    def non_editable_metadata_fields(self):
-        """
-        `data` should not be editable in the Studio settings editor.
-        """
-        non_editable_fields = super(HtmlFields, self).non_editable_metadata_fields
-        non_editable_fields.append(HtmlFields.data)
-        return non_editable_fields
-
 
 class HtmlModuleMixin(HtmlFields, XModule):
     """
@@ -312,15 +303,6 @@ class AboutFields(object):
         scope=Scope.content
     )
 
-    @property
-    def non_editable_metadata_fields(self):
-        """
-        `data` should not be editable in the Studio settings editor.
-        """
-        non_editable_fields = super(AboutFields, self).non_editable_metadata_fields
-        non_editable_fields.append(AboutFields.data)
-        return non_editable_fields
-
 
 @XBlock.tag("detached")
 class AboutModule(AboutFields, HtmlModuleMixin):
@@ -358,15 +340,6 @@ class StaticTabFields(object):
         help=_("HTML for the additional pages")
     )
 
-    @property
-    def non_editable_metadata_fields(self):
-        """
-        `data` should not be editable in the Studio settings editor.
-        """
-        non_editable_fields = super(StaticTabFields, self).non_editable_metadata_fields
-        non_editable_fields.append(StaticTabFields.data)
-        return non_editable_fields
-
 
 @XBlock.tag("detached")
 class StaticTabModule(StaticTabFields, HtmlModuleMixin):
@@ -401,15 +374,6 @@ class CourseInfoFields(object):
         scope=Scope.content
     )
 
-    @property
-    def non_editable_metadata_fields(self):
-        """
-        `data` should not be editable in the Studio settings editor.
-        """
-        non_editable_fields = super(CourseInfoFields, self).non_editable_metadata_fields
-        non_editable_fields.append(CourseInfoFields.data)
-        return non_editable_fields
-
 
 @XBlock.tag("detached")
 class CourseInfoModule(CourseInfoFields, HtmlModuleMixin):
diff --git a/common/lib/xmodule/xmodule/mixin.py b/common/lib/xmodule/xmodule/mixin.py
index 492b375244..7468ccb512 100644
--- a/common/lib/xmodule/xmodule/mixin.py
+++ b/common/lib/xmodule/xmodule/mixin.py
@@ -51,3 +51,14 @@ class LicenseMixin(XBlockMixin):
         """
         if getattr(self, "license", None):
             node.set('license', self.license)
+
+
+def wrap_with_license(block, view, frag, context):  # pylint: disable=unused-argument
+    """
+    In the LMS, display the custom license underneath the XBlock.
+    """
+    license = getattr(block, "license", None)  # pylint: disable=redefined-builtin
+    if license:
+        context = {"license": license}
+        frag.content += block.runtime.render_template('license_wrapper.html', context)
+    return frag
diff --git a/common/lib/xmodule/xmodule/raw_module.py b/common/lib/xmodule/xmodule/raw_module.py
index 7aa522cf04..0e9087c540 100644
--- a/common/lib/xmodule/xmodule/raw_module.py
+++ b/common/lib/xmodule/xmodule/raw_module.py
@@ -15,12 +15,6 @@ class RawDescriptor(XmlDescriptor, XMLEditingDescriptor):
     """
     data = String(help="XML data for the module", default="", scope=Scope.content)
 
-    @property
-    def non_editable_metadata_fields(self):
-        non_editable_fields = super(RawDescriptor, self).non_editable_metadata_fields
-        non_editable_fields.append(RawDescriptor.data)
-        return non_editable_fields
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         return {'data': etree.tostring(xml_object, pretty_print=True, encoding='unicode')}, []
@@ -50,12 +44,6 @@ class EmptyDataRawDescriptor(XmlDescriptor, XMLEditingDescriptor):
     """
     data = String(default='', scope=Scope.content)
 
-    @property
-    def non_editable_metadata_fields(self):
-        non_editable_fields = super(EmptyDataRawDescriptor, self).non_editable_metadata_fields
-        non_editable_fields.append(EmptyDataRawDescriptor.data)
-        return non_editable_fields
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         if len(xml_object) == 0 and len(xml_object.items()) == 0:
diff --git a/common/templates/license_wrapper.html b/common/templates/license_wrapper.html
new file mode 100644
index 0000000000..4140a39c2f
--- /dev/null
+++ b/common/templates/license_wrapper.html
@@ -0,0 +1,3 @@
+<div class="xblock-license">
+  <%include file="license.html" args="license=license" />
+</div>
diff --git a/common/templates/xblock_wrapper.html b/common/templates/xblock_wrapper.html
index 1026337a83..998d00a90a 100644
--- a/common/templates/xblock_wrapper.html
+++ b/common/templates/xblock_wrapper.html
@@ -5,9 +5,4 @@
   </script>
 % endif
   ${content}
-% if license:
-  <div class="xblock-license">
-    <%include file="license.html" args="license=license" />
-  </div>
-% endif
 </div>
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 720304ac51..ada35ac1f7 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -67,6 +67,7 @@ from openedx.core.lib.xblock_utils import (
 )
 from xmodule.lti_module import LTIModule
 from xmodule.x_module import XModuleDescriptor
+from xmodule.mixin import wrap_with_license
 from xblock_django.user_service import DjangoXBlockUserService
 from util.json_request import JsonResponse
 from util.sandboxing import can_execute_unsafe_code, get_python_lib_zip
@@ -533,6 +534,9 @@ def get_module_system_for_user(user, field_data_cache,
     # to the Fragment content coming out of the xblocks that are about to be rendered.
     block_wrappers = []
 
+    if settings.FEATURES.get("LICENSING", False):
+        block_wrappers.append(wrap_with_license)
+
     # Wrap the output display in a single div to allow for the XModule
     # javascript to be bound correctly
     if wrap_xmodule_display is True:
diff --git a/openedx/core/lib/xblock_utils.py b/openedx/core/lib/xblock_utils.py
index 2e007ef2b0..98cddb8650 100644
--- a/openedx/core/lib/xblock_utils.py
+++ b/openedx/core/lib/xblock_utils.py
@@ -122,18 +122,12 @@ def wrap_xblock(
     if block.name:
         data['name'] = block.name
 
-    if settings.FEATURES.get("LICENSING", False):
-        license = getattr(block, "license", None)
-    else:
-        license = None
-
     template_context = {
         'content': block.display_name if display_name_only else frag.content,
         'classes': css_classes,
         'display_name': block.display_name_with_default,
         'data_attributes': u' '.join(u'data-{}="{}"'.format(markupsafe.escape(key), markupsafe.escape(value))
                                      for key, value in data.iteritems()),
-        'license': license,
     }
 
     if hasattr(frag, 'json_init_args') and frag.json_init_args is not None:

From 648e8a20f79c0d7d463ac15fc0755b61cd3ca50c Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Wed, 29 Apr 2015 13:39:11 -0400
Subject: [PATCH 5/8] Creative Commons: Accessibility improvements

---
 cms/templates/js/license-selector.underscore | 41 +++++++++++++-------
 common/templates/license.html                |  4 +-
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/cms/templates/js/license-selector.underscore b/cms/templates/js/license-selector.underscore
index 7e5938ab50..f588b5eab2 100644
--- a/cms/templates/js/license-selector.underscore
+++ b/cms/templates/js/license-selector.underscore
@@ -1,8 +1,8 @@
 <div class="license-wrapper">
-    <label class="label setting-label" for="list-license-types">
+    <h3 class="label setting-label">
         <%= gettext("License Type") %>
-    </label>
-    <ul class="license-types" id="list-license-types">
+    </h3>
+    <ul class="license-types">
         <% var link_start_tpl = '<a href="{url}" target="_blank">'; %>
         <% _.each(licenseInfo, function(license, licenseType) { %>
             <li data-license="<%- licenseType %>">
@@ -29,14 +29,14 @@
 <% var license = licenseInfo[model.type]; %>
 <% if(license && !_.isEmpty(license.options)) { %>
     <div class="wrapper-license-options">
-        <label class="label setting-label" for="list-license-options">
+        <h4 class="label setting-label">
             <%- gettext("Options for {license_name}").replace("{license_name}", license.name) %>
-        </label>
+        </h4>
         <p class='tip tip-inline'>
             <%- gettext("The following options are available for the {license_name} license.")
                         .replace("{license_name}", license.name) %>
         </p>
-        <ul class="license-options" id="list-license-options">
+        <ul class="license-options">
             <% _.each(license.option_order, function(optionKey) { %>
                 <% var optionInfo = license.options[optionKey]; %>
                 <% if (optionInfo.type == "boolean") { %>
@@ -49,11 +49,26 @@
                                    <% if (optionSelected) { print("is-selected"); } %>
                                    <% if (optionDisabled) { print("is-disabled"); } else { print("is-clickable"); } %>"
                     >
-                        <i class="fa fa-fw
+                        <i aria-hidden="true"
+                          class="fa fa-fw
                              <% if(optionSelected) { print("fa-check-square-o"); } else { print("fa-square-o"); } %>
                              <% if(optionDisabled) { print("is-disabled"); } %>
                              "></i>
-                        <h4 class="option-name"><%- optionInfo.name %></h4>
+                        <h4 class="option-name">
+                            <%- optionInfo.name %>
+                            <%
+                                var states = [];
+                                if (optionSelected) {
+                                    states.push(gettext("selected"));
+                                }
+                                if (optionDisabled) {
+                                    states.push(gettext("disabled"));
+                                }
+                                if (states) {
+                            %>
+                                <span class="sr">, <%- states.join(", ") %></span>
+                            <% } %>
+                        </h4>
                         <div class="explanation"><%- optionInfo.help %></div>
                     </li>
                 <% } // could implement other types here %>
@@ -64,13 +79,13 @@
 
 <% if (showPreview) { %>
     <div class="license-preview-wrapper">
-        <label class="label setting-label" for="license-preview">
+        <h4 class="label setting-label">
             <%= gettext("License Display") %>
-        </label>
+        </h4>
         <p class="tip">
             <%= gettext("The following message will be displayed at the bottom of the courseware pages within your course.") %>
         </p>
-        <div id="license-preview">
+        <div class="license-preview">
         <% // keep this synchronized with the contents of common/templates/license.html %>
         <% if (model.type === "all-rights-reserved") { %>
             © <span class="license-text"><%= gettext("All Rights Reserved") %></span>
@@ -91,9 +106,9 @@
                     alt="<%- typeof licenseString == "string" ? licenseString : "" %>"
                     />
             <% } else { %>
-                <i class="icon-cc"></i>
+                <i aria-hidden="true" class="icon-cc"></i>
                 <% _.each(enabled, function(option) { %>
-                        <i class="icon-cc-<%- option %>"></i>
+                        <i aria-hidden="true" class="icon-cc-<%- option %>"></i>
                 <% }); %>
                 <span class="license-text"><%= gettext("Some Rights Reserved") %></span>
             <% } %>
diff --git a/common/templates/license.html b/common/templates/license.html
index b5a49a2d36..3500cb0de8 100644
--- a/common/templates/license.html
+++ b/common/templates/license.html
@@ -43,9 +43,9 @@ def parse_license(lic):
              />
         </a>
     % else:
-        <i class="icon-cc"></i>
+        <i aria-hidden="true" class="icon-cc"></i>
         % for option in enabled:
-            <i class="icon-cc-${option}"></i>
+            <i aria-hidden="true" class="icon-cc-${option}"></i>
         % endfor
         <span class="license-text">${_("Some Rights Reserved")}</span>
     % endif

From 8fbaa66d33526b622c29c95dde66e7a9ce46eee4 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Wed, 29 Apr 2015 16:10:01 -0400
Subject: [PATCH 6/8] Make courseware licenses show up in Studio XBlock
 previews

---
 cms/djangoapps/contentstore/views/preview.py |  5 +++++
 cms/static/js/views/metadata.js              | 13 ++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py
index 7305eb248a..d23c4476e1 100644
--- a/cms/djangoapps/contentstore/views/preview.py
+++ b/cms/djangoapps/contentstore/views/preview.py
@@ -17,6 +17,7 @@ from xmodule.exceptions import NotFoundError, ProcessingError
 from xmodule.library_tools import LibraryToolsService
 from xmodule.services import SettingsService
 from xmodule.modulestore.django import modulestore, ModuleI18nService
+from xmodule.mixin import wrap_with_license
 from opaque_keys.edx.keys import UsageKey
 from opaque_keys.edx.locator import LibraryUsageLocator
 from xmodule.x_module import ModuleSystem
@@ -170,6 +171,10 @@ def _preview_module_system(request, descriptor, field_data):
         _studio_wrap_xblock,
     ]
 
+    if settings.FEATURES.get("LICENSING", False):
+        # stick the license wrapper in front
+        wrappers.insert(0, wrap_with_license)
+
     descriptor.runtime._services['studio_user_permissions'] = StudioPermissionsService(request)  # pylint: disable=protected-access
 
     return PreviewModuleSystem(
diff --git a/cms/static/js/views/metadata.js b/cms/static/js/views/metadata.js
index 62565e58d2..daa6e4d207 100644
--- a/cms/static/js/views/metadata.js
+++ b/cms/static/js/views/metadata.js
@@ -553,11 +553,6 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
     });
 
     Metadata.License = AbstractEditor.extend({
-        template: _.template(
-            '<label class="label setting-label" for="list-license-types">' +
-                '<%- model.display_name %>' +
-            '</label>'
-        ),
 
         initialize: function(options) {
             this.licenseModel = new LicenseModel({"asString": this.model.getValue()});
@@ -569,13 +564,9 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
         },
 
         render: function() {
+            this.licenseView.render().$el.css("display", "inline");
             this.licenseView.undelegateEvents();
-            this.$el.html(this.template({
-                model: this.model.attributes
-            }));
-            // make the licenseView display after this template, inline
-            this.licenseView.render().$el.css("display", "inline")
-            this.$el.append(this.licenseView.el)
+            this.$el.empty().append(this.licenseView.el);
             // restore event bindings
             this.licenseView.delegateEvents();
             return this;

From a3887e951cb3cdd4984c479109c59352bca65994 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Thu, 30 Apr 2015 11:24:17 -0400
Subject: [PATCH 7/8] Courseware license (Creative Commons): FED

Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
---
 cms/envs/aws.py                               |   1 +
 cms/envs/common.py                            |   9 ++
 cms/envs/devstack.py                          |   3 +
 cms/static/js/spec/views/license_spec.js      |  12 +-
 cms/static/js/views/license.js                |  15 +--
 cms/static/js/views/settings/main.js          |  13 +-
 cms/static/sass/elements/_forms.scss          | 101 ----------------
 cms/static/sass/elements/_xblocks.scss        |  89 ++++++++++----
 cms/static/sass/views/_outline.scss           |  22 +---
 cms/static/sass/views/_settings.scss          | 113 +++++++++++++++++-
 cms/templates/course_outline.html             |   7 --
 cms/templates/js/license-selector.underscore  |  47 ++++----
 common/lib/xmodule/xmodule/html_module.py     |   3 +-
 .../xmodule/xmodule/modulestore/mongo/base.py |   2 +
 common/lib/xmodule/xmodule/seq_module.py      |   9 ++
 .../lib/xmodule/xmodule/split_test_module.py  |   3 +-
 .../xmodule/video_module/video_module.py      |   8 ++
 common/static/css/edx-cc-ie7.css              |  23 ----
 common/static/css/edx-cc.css                  |  39 +-----
 common/static/sass/_mixins.scss               |   3 +-
 common/templates/license.html                 |   2 +-
 .../test/acceptance/pages/studio/settings.py  |  42 +++++--
 .../tests/studio/test_studio_settings.py      |  42 +++++--
 .../tests/video/test_video_license.py         |  25 ++++
 lms/envs/aws.py                               |   1 +
 lms/envs/common.py                            |   1 -
 lms/static/sass/base/_base.scss               |  19 ---
 lms/static/sass/course/base/_base.scss        |  60 +++++++---
 .../sass/course/courseware/_courseware.scss   |  82 ++++++-------
 29 files changed, 428 insertions(+), 368 deletions(-)
 delete mode 100644 common/static/css/edx-cc-ie7.css

diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 44b6ea2ffb..7fdd7496a4 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -339,3 +339,4 @@ if FEATURES['ENABLE_COURSEWARE_INDEX'] or FEATURES['ENABLE_LIBRARY_INDEX']:
     SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
 
 XBLOCK_SETTINGS = ENV_TOKENS.get('XBLOCK_SETTINGS', {})
+XBLOCK_SETTINGS.setdefault("VideoDescriptor", {})["licensing_enabled"] = FEATURES.get("LICENSING", False)
diff --git a/cms/envs/common.py b/cms/envs/common.py
index e826d7f460..d10c98bcc8 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -143,6 +143,9 @@ FEATURES = {
     # Toggle course entrance exams feature
     'ENTRANCE_EXAMS': False,
 
+    # Toggle platform-wide course licensing
+    'LICENSING': False,
+
     # Enable the courseware search functionality
     'ENABLE_COURSEWARE_INDEX': False,
 
@@ -945,3 +948,9 @@ ELASTIC_FIELD_MAPPINGS = {
         "type": "date"
     }
 }
+
+XBLOCK_SETTINGS = {
+    "VideoDescriptor": {
+        "licensing_enabled": FEATURES.get("LICENSING", False)
+    }
+}
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 3aa7f47b00..1acaadd6a5 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -78,6 +78,9 @@ FEATURES['MILESTONES_APP'] = True
 ################################ ENTRANCE EXAMS ################################
 FEATURES['ENTRANCE_EXAMS'] = True
 
+################################ COURSE LICENSES ################################
+FEATURES['LICENSING'] = True
+
 ################################ SEARCH INDEX ################################
 FEATURES['ENABLE_COURSEWARE_INDEX'] = True
 FEATURES['ENABLE_LIBRARY_INDEX'] = True
diff --git a/cms/static/js/spec/views/license_spec.js b/cms/static/js/spec/views/license_spec.js
index 6123b5190c..510a33fba1 100644
--- a/cms/static/js/spec/views/license_spec.js
+++ b/cms/static/js/spec/views/license_spec.js
@@ -138,19 +138,19 @@ define(["js/views/license", "js/models/license", "js/common_helpers/template_hel
 
         it("has no preview by default", function () {
             this.view.render();
-            expect(this.view.$("#license-preview").length).toEqual(0)
+            expect(this.view.$(".license-preview").length).toEqual(0)
             this.view.$("li[data-license=creative-commons] button").click();
-            expect(this.view.$("#license-preview").length).toEqual(0)
+            expect(this.view.$(".license-preview").length).toEqual(0)
         });
 
         it("displays a preview if showPreview is true", function() {
             this.view = new LicenseView({model: this.model, showPreview: true});
             this.view.render()
-            expect(this.view.$("#license-preview").length).toEqual(1)
-            expect(this.view.$("#license-preview")).toHaveText("");
+            expect(this.view.$(".license-preview").length).toEqual(1)
+            expect(this.view.$(".license-preview")).toHaveText("");
             this.view.$("li[data-license=creative-commons] button").click();
-            expect(this.view.$("#license-preview").length).toEqual(1)
-            expect(this.view.$("#license-preview")).toContainText("Some Rights Reserved");
+            expect(this.view.$(".license-preview").length).toEqual(1)
+            expect(this.view.$(".license-preview")).toContainText("Some Rights Reserved");
         });
 
     })
diff --git a/cms/static/js/views/license.js b/cms/static/js/views/license.js
index 1f1dcf5484..013b79e8b5 100644
--- a/cms/static/js/views/license.js
+++ b/cms/static/js/views/license.js
@@ -7,7 +7,7 @@ define(["js/views/baseview", "underscore"], function(BaseView, _) {
         "creative-commons": {
             "name": gettext("Creative Commons"),
             "tooltip": gettext("You waive some rights for your work, such that others can use it too"),
-            "url": "//creativecommons.org/about",
+            "url": "https://creativecommons.org/about",
             "options": {
                 "ver": {
                     "name": gettext("Version"),
@@ -18,31 +18,27 @@ define(["js/views/baseview", "underscore"], function(BaseView, _) {
                     "name": gettext("Attribution"),
                     "type": "boolean",
                     "default": true,
-                    "help": gettext("Allow others to copy, distribute, display and perform " +
-                        "your copyrighted work but only if they give credit the way you request."),
+                    "help": gettext("Allow others to copy, distribute, display and perform your copyrighted work but only if they give credit the way you request. Currently, this option is required."),
                     "disabled": true,
                 },
                 "NC": {
                     "name": gettext("Noncommercial"),
                     "type": "boolean",
                     "default": true,
-                    "help": gettext("Allow others to copy, distribute, display and perform " +
-                        "your work - and derivative works based upon it - but for noncommercial purposes only."),
+                    "help": gettext("Allow others to copy, distribute, display and perform your work - and derivative works based upon it - but for noncommercial purposes only."),
                 },
                 "ND": {
                     "name": gettext("No Derivatives"),
                     "type": "boolean",
                     "default": true,
-                    "help": gettext("Allow others to copy, distribute, display and perform " +
-                        "only verbatim copies of your work, not derivative works based upon it."),
+                    "help": gettext("Allow others to copy, distribute, display and perform only verbatim copies of your work, not derivative works based upon it. This option is incompatible with \"Share Alike\"."),
                     "conflictsWith": ["SA"]
                 },
                 "SA": {
                     "name": gettext("Share Alike"),
                     "type": "boolean",
                     "default": false,
-                    "help": gettext("Allow others to distribute derivative works only under " +
-                        "a license identical to the license that governs your work."),
+                    "help": gettext("Allow others to distribute derivative works only under a license identical to the license that governs your work. This option is incompatible with \"No Derivatives\"."),
                     "conflictsWith": ["ND"]
                 }
             },
@@ -132,6 +128,7 @@ define(["js/views/baseview", "underscore"], function(BaseView, _) {
                 // fire the change event manually.
                 this.model.trigger("change change:options")
             }
+            e.preventDefault();
         }
 
     });
diff --git a/cms/static/js/views/settings/main.js b/cms/static/js/views/settings/main.js
index ded47c14ca..c8bb8552ca 100644
--- a/cms/static/js/views/settings/main.js
+++ b/cms/static/js/views/settings/main.js
@@ -276,12 +276,13 @@ var DetailsView = ValidatingView.extend({
         this.model.fetch({
             success: function() {
                 self.render();
-                _.each(self.codeMirrors,
-                       function(mirror) {
-                           var ele = mirror.getTextArea();
-                           var field = self.selectorToField[ele.id];
-                           mirror.setValue(self.model.get(field));
-                       });
+                _.each(self.codeMirrors, function(mirror) {
+                    var ele = mirror.getTextArea();
+                    var field = self.selectorToField[ele.id];
+                    mirror.setValue(self.model.get(field));
+                });
+                self.licenseModel.setFromString(self.model.get("license"), {silent: true});
+                self.licenseView.render()
             },
             reset: true,
             silent: true});
diff --git a/cms/static/sass/elements/_forms.scss b/cms/static/sass/elements/_forms.scss
index 5f0bea1afc..307bd31d98 100644
--- a/cms/static/sass/elements/_forms.scss
+++ b/cms/static/sass/elements/_forms.scss
@@ -172,107 +172,6 @@ form {
   }
 }
 
-// +Forms - License selector UI
-// ====================
-.license-img {
-  padding: 4px;
-}
-
-ul.license-types {
-  text-align: middle;
-  vertical-align: middle;
-  display: inline-block;
-
-  li {
-    display: inline-block;
-  }
-
-  .action.license-button {
-    @include grey-button;
-    @extend %t-action2;
-
-    display: inline-block;
-
-    text-align: center;
-
-    width: 220px;
-    height: 40px;
-
-    cursor: pointer;
-
-    &.is-selected {
-      @include blue-button;
-    }
-  }
-
-  .tip {
-    @extend %t-copy-sub2;
-  }
-}
-.wrapper-license-options {
-  margin-bottom: 10px;
-
-  .tip {
-    @extend %t-copy-sub2;
-  }
-  #list-license-options {
-    padding-bottom: 10px;
-
-    li {
-      line-height: 1.5;
-      border-bottom: 1px solid #EEE;
-      padding: ($baseline / 2) 0 ($baseline * 0.4);
-      &.is-clickable {
-        cursor: pointer;
-      }
-      &.last {
-        border-bottom: none;
-      }
-
-      .fa {
-        vertical-align: top;
-      }
-      .fa-square-o {
-        display: inline-block;
-        margin: ($baseline * 0.15) 15px 0px;
-      }
-      .fa-square-o.is-disabled {
-        color: $gray;
-      }
-      .fa-check-square-o {
-        color: $blue;
-        display: none;
-        margin: ($baseline * 0.15) 14px 0px 16px;
-      }
-      .fa-check-square-o.is-disabled {
-        color: $gray;
-      }
-      &.is-selected {
-        .fa-check-square-o {
-          display: inline-block;
-        }
-        .fa-square-o {
-          display: none;
-        }
-      }
-      .option-name {
-        @extend %t-action3;
-        @extend %t-strong;
-        display: inline-block;
-        width: 15%;
-        vertical-align: top;
-      }
-      .explanation {
-        @extend %t-action4;
-        display: inline-block;
-        width: 75%;
-        vertical-align: top;
-        color: $gray;
-      }
-    }
-  }
-}
-
 // +Form - Create New
 // ====================
 // form styling for creating a new content item (course, user, textbook)
diff --git a/cms/static/sass/elements/_xblocks.scss b/cms/static/sass/elements/_xblocks.scss
index 5bd2955234..9d110c056d 100644
--- a/cms/static/sass/elements/_xblocks.scss
+++ b/cms/static/sass/elements/_xblocks.scss
@@ -1,9 +1,22 @@
 // studio - elements - xblock rendering
 // ==========================
 
-// styling for xblocks at various levels of nesting: page level,
+// Table of Contents
+// * +Layout - Xblocks
+// * +Licensing - Xblocks
+// * +Pagination - Xblocks 
+// * +Messaging - Xblocks
+// * +Case: Page Level
+// * +Case: Nesting Level
+// * +Case: Element / Component Level
+// * +Case: Experiment Groups - Edited
+// * +Editing - Xblocks
+// * +Case - Special Xblock Type Overrides
 
-// extends - UI archetypes - xblock rendering
+
+// +Layout - Xblocks 
+// ====================
+// styling for xblocks at various levels of nesting: page level,
 .wrapper-xblock {
   margin: ($baseline/2);
   border: 1px solid $gray-l4;
@@ -45,7 +58,7 @@
     }
   }
 
-  // secondary header for meta-information and associated actions
+  // UI: secondary header for meta-information and associated actions
   .xblock-header-secondary {
     overflow: hidden;
     border-top: 1px solid $gray-l3;
@@ -103,28 +116,48 @@
     }
   }
 
+  // +Licensing - Xblocks 
+  // ====================
   .xblock-license,
-  .xmodule_display.xmodule_HtmlModule .xblock-license {
-    text-align: $bi-app-right;
+  .xmodule_display.xmodule_HtmlModule .xblock-license,
+  .xmodule_VideoModule .xblock-license {
+    @include text-align(right);
+    @extend %t-title7;
+    display: block;
+    width: auto;
     border-top: 1px solid $gray-l3;
-    margin: 0 15px;
-    padding: 5px;
-    font-size: 80%;
-    color: $gray-l3;
+    padding: ($baseline/4) 0;
+    color: $gray;
+    text-align: $bi-app-right;
+
+    .license-label,
+    .license-value,
+    .license-actions {
+      display: inline-block;
+      vertical-align: middle;
+      margin-bottom: 0;
+    }
 
     a {
-      color: $gray-l3;
+      color: $gray;
 
       &:hover {
         color: $ui-link-color;
       }
     }
-    span {
-      color: inherit;
-    }
 
+    i {
+      font-style: normal;
+    }
   }
 
+  // CASE: xblocks video
+  .xmodule_VideoModule .xblock-license {
+    border: 0;
+  }
+
+
+  // +Pagination - Xblocks 
   .container-paging-header {
     .meta-wrap {
       margin: $baseline ($baseline/2);
@@ -154,12 +187,9 @@
     }
   }
 
-
-
-  // ====================
-
   //UI: default internal xblock content styles
-
+  // ====================
+  // TO-DO: clean-up / remove this reset
   // internal headings for problems and video components
   h2 {
     @extend %t-title5;
@@ -220,6 +250,8 @@
     }
   }
 
+  // +Messaging - Xblocks
+  // ====================
   // xblock message area, for general information as well as validation
   .wrapper-xblock-message {
 
@@ -281,7 +313,8 @@
     }
   }
 
-  // CASE: page level - outer most level
+  // +Case: Page Level
+  // ====================
   &.level-page {
     margin: 0;
     box-shadow: none;
@@ -325,7 +358,9 @@
 
   }
 
-  // CASE: nesting level - element wrapper level
+  // +Case: Nesting Level
+  // ====================
+  // element wrapper level
   &.level-nesting {
     @include transition(all $tmg-f2 linear 0s);
     border: 1px solid $gray-l3;
@@ -359,7 +394,8 @@
     }
   }
 
-  // CASE: element/component level
+  // +Case: Element / Component Level
+  // ====================
   &.level-element {
     @include transition(all $tmg-f2 linear 0s);
     box-shadow: none;
@@ -416,7 +452,9 @@
     }
   }
 
-  // CASE: edited experiment groups: active and inactive
+  // +Case: Experiment Groups - Edited
+  // ====================
+  // edited experiment groups: active and inactive
   .wrapper-groups {
 
     .title {
@@ -456,8 +494,8 @@
   }
 }
 
+// +Editing - Xblocks
 // ====================
-// XBlock editing
 
 // xblock Editor tab wrapper
 .wrapper-comp-editor {
@@ -807,7 +845,10 @@
   }
 }
 
-// CASE: special xblock type overrides
+
+// +Case - Special Xblock Type Overrides
+// ====================
+// TO-DO - remove this reset styling from base _xblocks.scss file
 
 // Latex Compiler
 // make room for the launch compiler button
diff --git a/cms/static/sass/views/_outline.scss b/cms/static/sass/views/_outline.scss
index 4cfa1958b2..c30113f351 100644
--- a/cms/static/sass/views/_outline.scss
+++ b/cms/static/sass/views/_outline.scss
@@ -217,27 +217,7 @@
     }
   }
 
-  // course content license
-  // --------------------
-  .course-license {
-    @extend .content-primary;
-    @include text-align(right);
-    display: block;
-    float: $bi-app-right;
-    width: auto;
-
-    .license-label,
-    .license-value,
-    .license-actions {
-      display: inline-block;
-      vertical-align: middle;
-      margin-bottom: 0;
-    }
-
-    img {
-      display: inline;
-    }
-  }
+  // REMOVE BEFORE MERGE - removed outline styling here from cms
 
   .wrapper-dnd {
     clear: both;
diff --git a/cms/static/sass/views/_settings.scss b/cms/static/sass/views/_settings.scss
index 9f91c780f5..4ce75c5ba2 100644
--- a/cms/static/sass/views/_settings.scss
+++ b/cms/static/sass/views/_settings.scss
@@ -1,6 +1,11 @@
 // studio - views - course settings
 // ====================
+// Table of Contents
+// * +Settings - Base / All
+// * +Settings - Licenses
 
+// +Settings - Base / All
+// ====================
 .view-settings {
   @include text-align(left);
   @include direction();
@@ -104,10 +109,11 @@
       margin-top: ($baseline/4);
       color: $gray-d1;
     }
-    .tip-inline{
-    display: inline;
-    margin-left: 5px;
-  }
+
+    .tip-inline {
+      display: inline;
+      @include margin-left($baseline/4);
+    }
 
     .message-error {
       @extend %t-copy-sub1;
@@ -149,6 +155,7 @@
            }
          }
       }
+
       #heading-entrance-exam{
         font-weight: 600;
       }
@@ -156,6 +163,7 @@
       label[for="entrance-exam-enabled"] {
         font-size: 14px;
       }
+
       .field {
         margin: 0 0 ($baseline*2) 0;
 
@@ -978,3 +986,100 @@
     }
   }
 }
+
+// +Settings - Licenses
+// ====================
+.view-settings {
+
+  .license-img {
+    padding: ($baseline/5);
+  }
+
+  .license-types {
+    text-align: center;
+    vertical-align: middle;
+    display: inline-block;
+
+    .license-type {
+      display: inline-block;
+    }
+
+    .action.license-button {
+      @include grey-button;
+      @extend %t-action2;
+      display: inline-block;
+      text-align: center;
+      width: 220px;
+      height: 40px;
+      cursor: pointer;
+
+      &.is-selected {
+        @include blue-button;
+      }
+    }
+
+    .tip {
+      @extend %t-copy-sub2;
+    }
+  }
+  .wrapper-license-options {
+    margin-bottom: ($baseline/2);
+
+    .tip {
+      @extend %t-copy-sub2;
+    }
+    .license-options {
+      padding-bottom: ($baseline/2);
+
+      .license-option {
+        line-height: 1.5;
+        border-bottom: 1px solid $gray-l4;
+        padding: ($baseline/2) 0 ($baseline*0.4);
+
+        &.is-clickable {
+          cursor: pointer;
+        }
+
+        &:last-child {
+          border-bottom: none;
+        }
+
+        input[type=checkbox] {
+          vertical-align: top;
+          width: auto;
+          min-width: auto;
+          height: auto;
+          border: 0;
+          margin: ($baseline*0.15) 15px 0px;
+        }
+
+        .option-name {
+          @extend %t-action3;
+          @extend %t-strong;
+          display: inline-block;
+          width: 15%;
+          vertical-align: top;
+          cursor: pointer;
+        }
+        .explanation {
+          @extend %t-action4;
+          display: inline-block;
+          width: 75%;
+          vertical-align: top;
+          color: $gray;
+        }
+      }
+    }
+  }
+  .license-preview a {
+    color: $gray;
+
+    &:hover {
+      color: $ui-link-color;
+    }
+  }
+  .list-input.settings-list ul.license-options li {
+    // to make sure the padding is correctly overridden
+    padding: ($baseline / 2) 0 ($baseline * 0.4);
+  }
+}
\ No newline at end of file
diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html
index f0a3cc1e98..f3246a9e9f 100644
--- a/cms/templates/course_outline.html
+++ b/cms/templates/course_outline.html
@@ -109,13 +109,6 @@ from contentstore.utils import reverse_usage_url
                 </div>
             </div>
 
-            % if settings.FEATURES.get("LICENSING", False):
-            <div class="course-license">
-                <h2 class="license-label">${_("License:")}</h2>
-                <p class="license-value"><%include file="license.html" args="license=context_course.license" /></p>
-            </div>
-            % endif
-
             <div class="wrapper-dnd">
                 <%
                 course_locator = context_course.location
diff --git a/cms/templates/js/license-selector.underscore b/cms/templates/js/license-selector.underscore
index f588b5eab2..5c8c652652 100644
--- a/cms/templates/js/license-selector.underscore
+++ b/cms/templates/js/license-selector.underscore
@@ -1,13 +1,14 @@
-<div class="license-wrapper">
+<div class="wrapper-license">
     <h3 class="label setting-label">
         <%= gettext("License Type") %>
     </h3>
     <ul class="license-types">
         <% var link_start_tpl = '<a href="{url}" target="_blank">'; %>
         <% _.each(licenseInfo, function(license, licenseType) { %>
-            <li data-license="<%- licenseType %>">
+            <li class="license-type" data-license="<%- licenseType %>">
                 <button name="license-<%- licenseType %>"
                         class="action license-button <% if(model.type === licenseType) { print("is-selected"); } %>"
+                        aria-pressed="<%- (model.type === licenseType).toString() %>"
                         <% if (license.tooltip) { %>data-tooltip="<%- license.tooltip %>"<% } %>>
                     <%- license.name %>
                 </button>
@@ -45,31 +46,23 @@
                             (optionInfo.conflictsWith && _.any(optionInfo.conflictsWith, function(key) {return model.options[key];}));
                     %>
                     <li data-option="<%- optionKey %>"
-                            class="action-item license-button
-                                   <% if (optionSelected) { print("is-selected"); } %>
-                                   <% if (optionDisabled) { print("is-disabled"); } else { print("is-clickable"); } %>"
+                        class="action-item license-option
+                               <% if (optionSelected) { print("is-selected"); } %>
+                               <% if (optionDisabled) { print("is-disabled"); } else { print("is-clickable"); } %>"
                     >
-                        <i aria-hidden="true"
-                          class="fa fa-fw
-                             <% if(optionSelected) { print("fa-check-square-o"); } else { print("fa-square-o"); } %>
-                             <% if(optionDisabled) { print("is-disabled"); } %>
-                             "></i>
-                        <h4 class="option-name">
+                        <input type="checkbox"
+                               id="<%- model.type %>-<%- optionKey %>"
+                               name="<%- model.type %>-<%- optionKey %>"
+                               aria-describedby="<%- optionKey %>-explanation"
+                               <% if(optionSelected) { print('checked="checked"'); } %>
+                               <% if(optionDisabled) { print('disabled="disabled"'); } %>
+                        />
+                        <label for="<%- model.type %>-<%- optionKey %>" class="option-name">
                             <%- optionInfo.name %>
-                            <%
-                                var states = [];
-                                if (optionSelected) {
-                                    states.push(gettext("selected"));
-                                }
-                                if (optionDisabled) {
-                                    states.push(gettext("disabled"));
-                                }
-                                if (states) {
-                            %>
-                                <span class="sr">, <%- states.join(", ") %></span>
-                            <% } %>
-                        </h4>
-                        <div class="explanation"><%- optionInfo.help %></div>
+                        </label>
+                        <div id="<%- optionKey %>-explanation" class="explanation">
+                            <%- optionInfo.help %>
+                        </div>
                     </li>
                 <% } // could implement other types here %>
             <% }) %>
@@ -78,7 +71,7 @@
 <% } %>
 
 <% if (showPreview) { %>
-    <div class="license-preview-wrapper">
+    <div class="wrapper-license-preview">
         <h4 class="label setting-label">
             <%= gettext("License Display") %>
         </h4>
@@ -100,7 +93,7 @@
                     version = model.options.ver || "1.0";
              }
         %>
-            <a rel="license" href="//creativecommons.org/licenses/<%- enabled.join("-") %>/<%- version %>/">
+            <a rel="license" href="https://creativecommons.org/licenses/<%- enabled.join("-") %>/<%- version %>/">
             <% if (previewButton) { %>
                 <img src="https://licensebuttons.net/l/<%- enabled.join("-") %>/<%- version %>/<%- typeof buttonSize == "string" ? buttonSize : "88x31" %>.png"
                     alt="<%- typeof licenseString == "string" ? licenseString : "" %>"
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index cc3e6bea55..81b92f5fb6 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -20,7 +20,6 @@ from xmodule.x_module import XModule, DEPRECATION_VSCOMPAT_EVENT
 from xmodule.xml_module import XmlDescriptor, name_to_pathname
 from xblock.core import XBlock
 from xblock.fields import Scope, String, Boolean, List
-from xmodule.mixin import LicenseMixin
 
 log = logging.getLogger("edx.courseware")
 
@@ -88,7 +87,7 @@ class HtmlModule(HtmlModuleMixin):
     pass
 
 
-class HtmlDescriptor(HtmlFields, LicenseMixin, XmlDescriptor, EditingDescriptor):  # pylint: disable=abstract-method
+class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):  # pylint: disable=abstract-method
     """
     Module for putting raw html in a course
     """
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
index f005a7cded..f7cc509de8 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
@@ -49,6 +49,7 @@ from xmodule.modulestore.edit_info import EditInfoRuntimeMixin
 from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateCourseError, ReferentialIntegrityError
 from xmodule.modulestore.inheritance import InheritanceMixin, inherit_metadata, InheritanceKeyValueStore
 from xmodule.modulestore.xml import CourseLocationManager
+from xmodule.services import SettingsService
 
 log = logging.getLogger(__name__)
 
@@ -900,6 +901,7 @@ class MongoModuleStore(ModuleStoreDraftAndPublished, ModuleStoreWriteBase, Mongo
 
             if self.user_service:
                 services["user"] = self.user_service
+            services["settings"] = SettingsService()
 
             system = CachingDescriptorSystem(
                 modulestore=self,
diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py
index 137b7dd31a..7e7792c6af 100644
--- a/common/lib/xmodule/xmodule/seq_module.py
+++ b/common/lib/xmodule/xmodule/seq_module.py
@@ -181,6 +181,15 @@ class SequenceDescriptor(SequenceFields, MakoModuleDescriptor, XmlDescriptor):
             self.runtime.add_block_as_child_node(child, xml_object)
         return xml_object
 
+    @property
+    def non_editable_metadata_fields(self):
+        """
+        `is_entrance_exam` should not be editable in the Studio settings editor.
+        """
+        non_editable_fields = super(SequenceDescriptor, self).non_editable_metadata_fields
+        non_editable_fields.append(self.fields['is_entrance_exam'])
+        return non_editable_fields
+
     def index_dictionary(self):
         """
         Return dictionary prepared with module content and type for indexing.
diff --git a/common/lib/xmodule/xmodule/split_test_module.py b/common/lib/xmodule/xmodule/split_test_module.py
index 09e6c85a60..c862817f58 100644
--- a/common/lib/xmodule/xmodule/split_test_module.py
+++ b/common/lib/xmodule/xmodule/split_test_module.py
@@ -473,7 +473,8 @@ class SplitTestDescriptor(SplitTestFields, SequenceDescriptor, StudioEditableDes
         non_editable_fields = super(SplitTestDescriptor, self).non_editable_metadata_fields
         non_editable_fields.extend([
             SplitTestDescriptor.due,
-            SplitTestDescriptor.user_partitions
+            SplitTestDescriptor.user_partitions,
+            SplitTestDescriptor.group_id_to_child,
         ])
         return non_editable_fields
 
diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/common/lib/xmodule/xmodule/video_module/video_module.py
index fe54bcbdb9..8c80f79d14 100644
--- a/common/lib/xmodule/xmodule/video_module/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module/video_module.py
@@ -25,6 +25,7 @@ from pkg_resources import resource_string
 
 from django.conf import settings
 
+from xblock.core import XBlock
 from xblock.fields import ScopeIds
 from xblock.runtime import KvsFieldData
 
@@ -287,6 +288,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
         })
 
 
+@XBlock.wants("settings")
 class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandlers,
                       TabsEditingDescriptor, EmptyDataRawDescriptor):
     """
@@ -384,6 +386,12 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler
     def editable_metadata_fields(self):
         editable_fields = super(VideoDescriptor, self).editable_metadata_fields
 
+        settings_service = self.runtime.service(self, 'settings')
+        if settings_service:
+            xb_settings = settings_service.get_settings_bucket(self)
+            if not xb_settings.get("licensing_enabled", False) and "license" in editable_fields:
+                del editable_fields["license"]
+
         if self.source_visible:
             editable_fields['source']['non_editable'] = True
         else:
diff --git a/common/static/css/edx-cc-ie7.css b/common/static/css/edx-cc-ie7.css
deleted file mode 100644
index f480961454..0000000000
--- a/common/static/css/edx-cc-ie7.css
+++ /dev/null
@@ -1,23 +0,0 @@
-[class^="icon-cc"], [class*=" icon-cc"] {
-  font-family: 'edx-cc';
-  font-style: normal;
-  font-weight: normal;
-
-  /* fix buttons height */
-  line-height: 1em;
-
-  /* you can be more comfortable with increased icons size */
-  /* font-size: 120%; */
-}
-
-.icon-cc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
-.icon-cc-by { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
-.icon-cc-nc { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
-.icon-cc-nc-eu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe803;&nbsp;'); }
-.icon-cc-nc-jp { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe804;&nbsp;'); }
-.icon-cc-sa { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe805;&nbsp;'); }
-.icon-cc-nd { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe806;&nbsp;'); }
-.icon-cc-pd { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe807;&nbsp;'); }
-.icon-cc-zero { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe808;&nbsp;'); }
-.icon-cc-share { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe809;&nbsp;'); }
-.icon-cc-remix { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
diff --git a/common/static/css/edx-cc.css b/common/static/css/edx-cc.css
index f33b0a18f0..473498a935 100644
--- a/common/static/css/edx-cc.css
+++ b/common/static/css/edx-cc.css
@@ -8,46 +8,9 @@
   font-weight: normal;
   font-style: normal;
 }
-/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
-/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
-/*
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  @font-face {
-    font-family: 'edx-cc';
-    src: url('../fonts/edx-cc/edx-cc.svg?52318265#edx-cc') format('svg');
-  }
-}
-*/
 
- [class^="icon-cc"]:before, [class*=" icon-cc"]:before {
+[class^="icon-cc"]:before, [class*=" icon-cc"]:before {
   font-family: "edx-cc";
-  font-style: normal;
-  font-weight: normal;
-  speak: none;
-
-  display: inline-block;
-  text-decoration: inherit;
-  width: 1em;
-  margin-right: .2em;
-  text-align: center;
-  /* opacity: .8; */
-
-  /* For safety - reset parent styles, that can break glyph codes*/
-  font-variant: normal;
-  text-transform: none;
-
-  /* fix buttons height, for twitter bootstrap */
-  line-height: 1em;
-
-  /* Animation center compensation - margins should be symmetric */
-  /* remove if not needed */
-  margin-left: .2em;
-
-  /* you can be more comfortable with increased icons size */
-  /* font-size: 120%; */
-
-  /* Uncomment for 3D effect */
-  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
 }
 
 .icon-cc:before { content: '\e800'; } /* '' */
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 851e310398..b86ac1e2bd 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -1,4 +1,4 @@
-// studio - utilities - mixins and extends
+// common - utilities - mixins and extends
 // ====================
 
 // Table of Contents 
@@ -427,3 +427,4 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+
diff --git a/common/templates/license.html b/common/templates/license.html
index 3500cb0de8..f0670a3a24 100644
--- a/common/templates/license.html
+++ b/common/templates/license.html
@@ -36,7 +36,7 @@ def parse_license(lic):
         enabled = ["zero"]
         version = license_options.get("ver", "1.0")
     %>
-    <a rel="license" href="//creativecommons.org/licenses/${'-'.join(enabled)}/${version}/">
+    <a rel="license" href="https://creativecommons.org/licenses/${'-'.join(enabled)}/${version}/">
     % if button:
         <img src="https://licensebuttons.net/l/${'-'.join(enabled)}/${version}/${button_size}.png"
              alt="${license}"
diff --git a/common/test/acceptance/pages/studio/settings.py b/common/test/acceptance/pages/studio/settings.py
index 98f8d13231..22ee6f3e5c 100644
--- a/common/test/acceptance/pages/studio/settings.py
+++ b/common/test/acceptance/pages/studio/settings.py
@@ -19,6 +19,13 @@ class SettingsPage(CoursePage):
     def is_browser_on_page(self):
         return self.q(css='body.view-settings').present
 
+    def refresh_and_wait_for_load(self):
+        """
+        Refresh the page and wait for all resources to load.
+        """
+        self.browser.refresh()
+        self.wait_for_page()
+
     def get_elements(self, css_selector):
         self.wait_for_element_presence(
             css_selector,
@@ -72,16 +79,35 @@ class SettingsPage(CoursePage):
                 'Entrance exam minimum score percent is invisible'
             )
 
-    def set_course_license(self, license_type):
-        css_selector = (
-            "section.license ul.license-types "
-            "li[data-license={license_type}] button"
-        ).format(license_type=license_type)
+    @property
+    def course_license(self):
+        license_types_css = "section.license ul.license-types li.license-type"
         self.wait_for_element_presence(
-            css_selector,
-            '{license_type} button is present'.format(license_type=license_type)
+            license_types_css,
+            "license type buttons are present",
         )
-        self.q(css=css_selector).click()
+        selected = self.q(css=license_types_css + " button.is-selected")
+        if selected.is_present():
+            return selected.text[0]
+        return None
+
+    @course_license.setter
+    def course_license(self, license_name):
+        license_types_css = "section.license ul.license-types li.license-type"
+        self.wait_for_element_presence(
+            license_types_css,
+            "license type buttons are present",
+        )
+        button_xpath = (
+            "//section[contains(@class, 'license')]"
+            "//ul[contains(@class, 'license-types')]"
+            "//li[contains(@class, 'license-type')]"
+            "//button[contains(text(),'{license_name}')]"
+        ).format(license_name=license_name)
+        button = self.q(xpath=button_xpath)
+        if not button.present:
+            raise Exception("Invalid license name: {name}".format(name=license_name))
+        button.click()
 
     def save_changes(self, wait_for_confirmation=True):
         """
diff --git a/common/test/acceptance/tests/studio/test_studio_settings.py b/common/test/acceptance/tests/studio/test_studio_settings.py
index 88c4321a4e..2c86a6fa1f 100644
--- a/common/test/acceptance/tests/studio/test_studio_settings.py
+++ b/common/test/acceptance/tests/studio/test_studio_settings.py
@@ -424,27 +424,49 @@ class ContentLicenseTest(StudioCourseTest):
             self.browser,
             self.course_id,
         )
-        self.outline_page.visit()
+        self.settings_page.visit()
 
     def test_empty_license(self):
-        self.assertEqual(self.outline_page.license, "None")
+        """
+        When I visit the Studio settings page,
+        I see that the course license is "None" by default.
+        Then I visit the LMS courseware page,
+        and I see that there is no course license displayed.
+        """
+        self.assertIsNone(self.settings_page.course_license)
         self.lms_courseware.visit()
         self.assertIsNone(self.lms_courseware.course_license)
 
     def test_arr_license(self):
-        self.outline_page.edit_course_start_date()
-        self.settings_page.set_course_license("all-rights-reserved")
+        """
+        When I visit the Studio settings page,
+        and I set the course license to "All Rights Reserved",
+        and I refresh the page,
+        I see that the course license is "All Rights Reserved".
+        Then I visit the LMS courseware page,
+        and I see that the course license is "All Rights Reserved".
+        """
+        self.settings_page.course_license = "All Rights Reserved"
         self.settings_page.save_changes()
-        self.outline_page.visit()
-        self.assertEqual(self.outline_page.license, "© All Rights Reserved")
+        self.settings_page.refresh_and_wait_for_load()
+        self.assertEqual(self.settings_page.course_license, "All Rights Reserved")
+
         self.lms_courseware.visit()
         self.assertEqual(self.lms_courseware.course_license, "© All Rights Reserved")
 
     def test_cc_license(self):
-        self.outline_page.edit_course_start_date()
-        self.settings_page.set_course_license("creative-commons")
+        """
+        When I visit the Studio settings page,
+        and I set the course license to "Creative Commons",
+        and I refresh the page,
+        I see that the course license is "Creative Commons".
+        Then I visit the LMS courseware page,
+        and I see that the course license is "Some Rights Reserved".
+        """
+        self.settings_page.course_license = "Creative Commons"
         self.settings_page.save_changes()
-        self.outline_page.visit()
-        self.assertEqual(self.outline_page.license, "Some Rights Reserved")
+        self.settings_page.refresh_and_wait_for_load()
+        self.assertEqual(self.settings_page.course_license, "Creative Commons")
+
         self.lms_courseware.visit()
         self.assertEqual(self.lms_courseware.course_license, "Some Rights Reserved")
diff --git a/common/test/acceptance/tests/video/test_video_license.py b/common/test/acceptance/tests/video/test_video_license.py
index 2a1127120e..866f2d8177 100644
--- a/common/test/acceptance/tests/video/test_video_license.py
+++ b/common/test/acceptance/tests/video/test_video_license.py
@@ -28,6 +28,12 @@ class VideoLicenseTest(StudioCourseTest):
 
     # used by StudioCourseTest.setUp()
     def populate_course_fixture(self, course_fixture):
+        """
+        Create a course with a single chapter.
+        That chapter has a single section.
+        That section has a single vertical.
+        That vertical has a single video element.
+        """
         video_block = XBlockFixtureDesc('video', "Test Video")
         vertical = XBlockFixtureDesc('vertical', "Test Vertical")
         vertical.add_children(video_block)
@@ -38,6 +44,11 @@ class VideoLicenseTest(StudioCourseTest):
         self.course_fixture.add_children(chapter)
 
     def test_empty_license(self):
+        """
+        When I visit the LMS courseware,
+        I can see that the video is present
+        but it has no license displayed by default.
+        """
         self.lms_courseware.visit()
         video = self.lms_courseware.q(css=".vert .xblock .video")
         self.assertTrue(video.is_present())
@@ -45,6 +56,13 @@ class VideoLicenseTest(StudioCourseTest):
         self.assertFalse(video_license.is_present())
 
     def test_arr_license(self):
+        """
+        When I edit a video element in Studio,
+        I can set an "All Rights Reserved" license on that video element.
+        When I visit the LMS courseware,
+        I can see that the video is present
+        and that it has "All Rights Reserved" displayed for the license.
+        """
         self.studio_course_outline.visit()
         subsection = self.studio_course_outline.section_at(0).subsection_at(0)
         subsection.expand_subsection()
@@ -65,6 +83,13 @@ class VideoLicenseTest(StudioCourseTest):
         self.assertEqual(video_license.text[0], "© All Rights Reserved")
 
     def test_cc_license(self):
+        """
+        When I edit a video element in Studio,
+        I can set a "Creative Commons" license on that video element.
+        When I visit the LMS courseware,
+        I can see that the video is present
+        and that it has "Some Rights Reserved" displayed for the license.
+        """
         self.studio_course_outline.visit()
         subsection = self.studio_course_outline.section_at(0).subsection_at(0)
         subsection.expand_subsection()
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index de19b68f3b..c210ed1261 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -576,6 +576,7 @@ FACEBOOK_APP_SECRET = AUTH_TOKENS.get("FACEBOOK_APP_SECRET")
 FACEBOOK_APP_ID = AUTH_TOKENS.get("FACEBOOK_APP_ID")
 
 XBLOCK_SETTINGS = ENV_TOKENS.get('XBLOCK_SETTINGS', {})
+XBLOCK_SETTINGS.setdefault("VideoDescriptor", {})["licensing_enabled"] = FEATURES.get("LICENSING", False)
 
 ##### CDN EXPERIMENT/MONITORING FLAGS #####
 CDN_VIDEO_URLS = ENV_TOKENS.get('CDN_VIDEO_URLS', CDN_VIDEO_URLS)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 362f499e6d..23282b00ac 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1277,7 +1277,6 @@ PIPELINE_CSS = {
         'source_filenames': [
             'sass/lms-main.css',
             'css/edx-cc.css',
-            'css/edx-cc-ie7.css',
         ],
         'output_filename': 'css/lms-main.css',
     },
diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index 15981774f7..e702149cce 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -137,25 +137,6 @@ a:focus {
   min-width: 760px;
   width: flex-grid(12);
 }
-.container-footer {
-  max-width: grid-width(12);
-  min-width: 760px;
-  width: flex-grid(12);
-  margin: 0 auto;
-  text-align: $bi-app-right;
-  color: $gray-l2;
-
-  span {
-    color: inherit;
-  }
-
-  a:link, a:visited {
-    color: $gray-l2;
-  }
-  a:active, a:hover {
-    color: $blue;
-  }
-}
 
 span.edx {
   text-transform: none;
diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss
index 7b02e4f2a7..0c3cb3d9b1 100644
--- a/lms/static/sass/course/base/_base.scss
+++ b/lms/static/sass/course/base/_base.scss
@@ -1,6 +1,40 @@
 // lms - course - base
 // ====================
 
+// Table of Contents
+// * +Containers
+// * +Resets - Old, Body
+// * +Resets - Old, Forms
+// * +Resets - Old, Images
+// * +Resets - Old, Misc
+
+
+// +Containers 
+// ====================
+
+.content-wrapper {
+  background: none;
+  border: none;
+}
+
+.container {
+  padding: 0;
+
+  > div {
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+    border-radius: 3px;
+    border: 1px solid $outer-border-color;
+    background: $container-bg;
+    box-shadow: 0 1px 2px $shadow-l2;
+  }
+}
+
+
+// +Resets - Old, Body
+// ====================
+
 body {
   min-width: 980px;
   min-height: 100%;
@@ -26,25 +60,8 @@ a {
   }
 }
 
-.content-wrapper {
-  background: none;
-  border: none;
-}
-
-.container {
-  padding: 0;
-
-  > div {
-    display: table;
-    table-layout: fixed;
-    width: 100%;
-    border-radius: 3px;
-    border: 1px solid $outer-border-color;
-    background: $container-bg;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  }
-}
-
+// +Resets - Old, Forms
+// ====================
 form {
   label {
     display: block;
@@ -102,6 +119,8 @@ button,
 }
 
 
+// +Resets - Old, Images
+// ====================
 img {
   max-width: 100%;
 }
@@ -134,6 +153,9 @@ img {
   }
 }
 
+
+// +Resets - Old, Misc
+// ====================
 .test-class {
   border: 1px solid #f00;
 }
diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
index f52cc86fb6..9882b39f04 100644
--- a/lms/static/sass/course/courseware/_courseware.scss
+++ b/lms/static/sass/course/courseware/_courseware.scss
@@ -41,61 +41,63 @@ html.video-fullscreen{
   }
 }
 
-div.course-wrapper {
-  position: relative;
+.content-wrapper {
 
-  .course-license {
-    position: absolute;
-    margin: 5px auto;
-    bottom: 0;
-    text-align: center;
-    width: 100%;
-    color: $gray-l3;
-
-    a:link, a:visited {
-      color: $gray-l3;
-    }
-    a:active, a:hover {
-      color: $link-hover;
-    }
-  }
-
-  .xblock-license {
+  .container-footer {
+    margin: 0 auto;
+    max-width: grid-width(12);
+    min-width: 760px;
+    width: flex-grid(12);
+    color: $gray;
     text-align: $bi-app-right;
-    border-top: 1px solid $gray-l3;
-    margin: 0 15px;
-    padding: 5px;
-    font-size: 80%;
+  }
+}
+
+.content-wrapper {
+
+  .course-license, .xblock-license {
+    @include text-align(right);
+    @extend %t-title7;
+    display: block;
+    width: auto;
+    padding: ($baseline/4) 0;
 
     span {
       color: inherit;
     }
 
-    &, a {
-      color: $gray-l3;
-
-      &:hover {
-        color: $link-hover;
-      }
+    a:link, a:visited {
+      color: $gray;
     }
-  }
-
-  .xmodule_display .xblock-license,
-  .xmodule_display .xblock-license a {
-    color: $gray-l3;
-
-    &:hover {
+    a:active, a:hover {
       color: $link-hover;
     }
-  }
 
-  .xmodule_VideoModule .xblock-license {
-    border: 0;
+    .license-label,
+    .license-value,
+    .license-actions {
+      display: inline-block;
+      vertical-align: middle;
+      margin-bottom: 0;
+    }
+
+    i {
+      font-style: normal;
+    }
+
+    img {
+      display: inline;
+    }
   }
+}
+
+// TO-DO should this be content wrapper? 
+div.course-wrapper {
+  position: relative;
 
   section.course-content {
     @extend .content;
-    padding: 40px;
+    padding: ($baseline*2);
     line-height: 1.6;
 
     h1 {

From ca64c665cc6de2888b1495958e947b5068289282 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@edx.org>
Date: Thu, 14 May 2015 16:54:20 -0400
Subject: [PATCH 8/8] Default course license to All Rights Reserved

Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
---
 .../models/settings/course_details.py         |  5 +-
 cms/static/js/spec/views/license_spec.js      | 28 ++----
 cms/static/js/views/license.js                | 37 ++++---
 cms/static/sass/elements/_xblocks.scss        | 93 ++++++++++++++++++
 cms/static/sass/views/_settings.scss          | 97 -------------------
 cms/templates/js/license-selector.underscore  | 13 +--
 common/lib/xmodule/xmodule/course_module.py   |  5 +-
 common/lib/xmodule/xmodule/mixin.py           |  4 +-
 common/templates/license.html                 | 11 ++-
 .../test/acceptance/pages/lms/courseware.py   |  3 +
 .../test/acceptance/pages/studio/container.py |  3 +
 .../test/acceptance/pages/studio/overview.py  | 15 +--
 .../test/acceptance/pages/studio/settings.py  | 14 +++
 .../tests/studio/test_studio_settings.py      | 18 ++--
 .../tests/video/test_video_license.py         | 12 ++-
 lms/envs/common.py                            |  3 +
 lms/envs/devstack.py                          |  3 +
 lms/templates/courseware/courseware.html      |  7 +-
 18 files changed, 202 insertions(+), 169 deletions(-)

diff --git a/cms/djangoapps/models/settings/course_details.py b/cms/djangoapps/models/settings/course_details.py
index 5e0b93fb84..e2f8119841 100644
--- a/cms/djangoapps/models/settings/course_details.py
+++ b/cms/djangoapps/models/settings/course_details.py
@@ -42,7 +42,7 @@ class CourseDetails(object):
         self.overview = ""  # html to render as the overview
         self.intro_video = None  # a video pointer
         self.effort = None  # int hours/week
-        self.license = None
+        self.license = "all-rights-reserved"  # default course license is all rights reserved
         self.course_image_name = ""
         self.course_image_asset_path = ""  # URL of the course image
         self.pre_requisite_courses = []  # pre-requisite courses
@@ -80,7 +80,8 @@ class CourseDetails(object):
         course_details.pre_requisite_courses = descriptor.pre_requisite_courses
         course_details.course_image_name = descriptor.course_image
         course_details.course_image_asset_path = course_image_url(descriptor)
-        course_details.license = getattr(descriptor, "license", None)
+        # Default course license is "All Rights Reserved"
+        course_details.license = getattr(descriptor, "license", "all-rights-reserved")
 
         for attribute in ABOUT_ATTRIBUTES:
             value = cls._fetch_about_attribute(course_key, attribute)
diff --git a/cms/static/js/spec/views/license_spec.js b/cms/static/js/spec/views/license_spec.js
index 510a33fba1..dd56cc1928 100644
--- a/cms/static/js/spec/views/license_spec.js
+++ b/cms/static/js/spec/views/license_spec.js
@@ -106,33 +106,18 @@ define(["js/views/license", "js/models/license", "js/common_helpers/template_hel
             );
             // SA and ND conflict
             var SA = this.view.$("li[data-option=SA]");
-            expect(SA).toHaveClass("is-disabled");
-            // try to turn on SA option, fail
-            SA.click()
-            // no change
-            expect(this.model.get("options")).toEqual(
-                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
-            );
-            // turn off ND
-            var ND = this.view.$("li[data-option=ND]");
-            expect(ND).not.toHaveClass("is-disabled");
-            ND.click()
-            expect(this.model.get("options")).toEqual(
-                {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": false}
-            );
-            // turn on SA
-            SA = this.view.$("li[data-option=SA]");
-            expect(SA).not.toHaveClass("is-disabled");
+            // try to turn on SA option
             SA.click()
+            // ND should no longer be selected
             expect(this.model.get("options")).toEqual(
                 {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
             );
-            // try to turn on ND option, fail
+
+            // try to turn on ND option
             ND = this.view.$("li[data-option=ND]");
-            expect(ND).toHaveClass("is-disabled");
             ND.click();
             expect(this.model.get("options")).toEqual(
-                {"ver": "4.0", "BY": true, "NC": true, "ND": false, "SA": true}
+                {"ver": "4.0", "BY": true, "NC": true, "ND": true, "SA": false}
             );
         });
 
@@ -147,7 +132,8 @@ define(["js/views/license", "js/models/license", "js/common_helpers/template_hel
             this.view = new LicenseView({model: this.model, showPreview: true});
             this.view.render()
             expect(this.view.$(".license-preview").length).toEqual(1)
-            expect(this.view.$(".license-preview")).toHaveText("");
+	    // Expect default text to be "All Rights Reserved"
+            expect(this.view.$(".license-preview")).toContainText("All Rights Reserved");
             this.view.$("li[data-license=creative-commons] button").click();
             expect(this.view.$(".license-preview").length).toEqual(1)
             expect(this.view.$(".license-preview")).toContainText("Some Rights Reserved");
diff --git a/cms/static/js/views/license.js b/cms/static/js/views/license.js
index 013b79e8b5..3e8f9a1cdf 100644
--- a/cms/static/js/views/license.js
+++ b/cms/static/js/views/license.js
@@ -92,10 +92,17 @@ define(["js/views/baseview", "underscore"], function(BaseView, _) {
         onLicenseClick: function(e) {
             var $li = $(e.srcElement || e.target).closest('li');
             var licenseType = $li.data("license");
-            this.model.set({
-                "type": licenseType,
-                "options": this.getDefaultOptionsForLicenseType(licenseType)
-            });
+
+	    // Check that we've selected a different license type than what's currently selected
+	    if (licenseType != this.model.attributes.type) {
+		this.model.set({
+                    "type": licenseType,
+                    "options": this.getDefaultOptionsForLicenseType(licenseType)
+		});
+		// Fire the change event manually
+		this.model.trigger("change change:type")
+	    }
+	    e.preventDefault();
         },
 
         onOptionClick: function(e) {
@@ -117,17 +124,19 @@ define(["js/views/baseview", "underscore"], function(BaseView, _) {
                 licenseOptions[optionKey] = currentOptionValue;
             }
             // check for conflicts
-            if (currentOptionValue && optionInfo.conflictsWith &&
-                    _.any(optionInfo.conflictsWith, function (key) { return licenseOptions[key];})) {
-                // conflict! don't set new options
-                // need some feedback here
-                return;
-            } else {
-                this.model.set({"options": licenseOptions})
-                // Backbone has trouble identifying when objects change, so we'll
-                // fire the change event manually.
-                this.model.trigger("change change:options")
+            if (currentOptionValue && optionInfo.conflictsWith) {
+		var conflicts = optionInfo.conflictsWith;
+		for (var i=0; i<conflicts.length; i++) {
+		    // Uncheck all conflicts
+		    licenseOptions[conflicts[i]] = false;
+		    console.log(licenseOptions);
+		}
             }
+
+            this.model.set({"options": licenseOptions})
+            // Backbone has trouble identifying when objects change, so we'll
+            // fire the change event manually.
+            this.model.trigger("change change:options")
             e.preventDefault();
         }
 
diff --git a/cms/static/sass/elements/_xblocks.scss b/cms/static/sass/elements/_xblocks.scss
index 9d110c056d..15f71d4d4c 100644
--- a/cms/static/sass/elements/_xblocks.scss
+++ b/cms/static/sass/elements/_xblocks.scss
@@ -879,3 +879,96 @@ div.wrapper-comp-editor.is-inactive ~ div.launch-latex-compiler {
       font-style: italic;
     }
 }
+
+// CASE: xblock license settings
+.wrapper-license {
+
+  .license-types {
+    text-align: center;
+    vertical-align: middle;
+    display: inline-block;
+
+    .license-type {
+      display: inline-block;
+    }
+
+    .action.license-button {
+      @include grey-button;
+      @extend %t-action2;
+      display: inline-block;
+      text-align: center;
+      width: 220px;
+      height: 40px;
+      cursor: pointer;
+
+      &.is-selected {
+        @include blue-button;
+      }
+    }
+
+    .tip {
+      @extend %t-copy-sub2;
+    }
+  }
+  
+  .wrapper-license-options {
+    margin-bottom: ($baseline/2);
+
+    .tip {
+      @extend %t-copy-sub2;
+    }
+    .license-options {
+      padding-bottom: ($baseline/2);
+
+      .license-option {
+        line-height: 1.5;
+        border-bottom: 1px solid $gray-l4;
+        padding: ($baseline/2) 0 ($baseline*0.4);
+
+        &.is-clickable {
+          cursor: pointer;
+        }
+
+        &:last-child {
+          border-bottom: none;
+        }
+
+        input[type=checkbox] {
+          vertical-align: top;
+          width: auto;
+          min-width: auto;
+          height: auto;
+          border: 0;
+          margin: ($baseline*0.15) 15px 0px;
+        }
+
+        .option-name {
+          @extend %t-action3;
+          @extend %t-strong;
+          display: inline-block;
+          width: 15%;
+          vertical-align: top;
+          cursor: pointer;
+        }
+        .explanation {
+          @extend %t-action4;
+          display: inline-block;
+          width: 75%;
+          vertical-align: top;
+          color: $gray;
+        }
+      }
+    }
+  }
+  .license-preview a {
+    color: $gray;
+
+    &:hover {
+      color: $ui-link-color;
+    }
+  }
+  .list-input.settings-list ul.license-options li {
+    // to make sure the padding is correctly overridden
+    padding: ($baseline / 2) 0 ($baseline * 0.4);
+  }
+}
diff --git a/cms/static/sass/views/_settings.scss b/cms/static/sass/views/_settings.scss
index 4ce75c5ba2..b6b3ef4e02 100644
--- a/cms/static/sass/views/_settings.scss
+++ b/cms/static/sass/views/_settings.scss
@@ -985,101 +985,4 @@
       }
     }
   }
-}
-
-// +Settings - Licenses
-// ====================
-.view-settings {
-
-  .license-img {
-    padding: ($baseline/5);
-  }
-
-  .license-types {
-    text-align: center;
-    vertical-align: middle;
-    display: inline-block;
-
-    .license-type {
-      display: inline-block;
-    }
-
-    .action.license-button {
-      @include grey-button;
-      @extend %t-action2;
-      display: inline-block;
-      text-align: center;
-      width: 220px;
-      height: 40px;
-      cursor: pointer;
-
-      &.is-selected {
-        @include blue-button;
-      }
-    }
-
-    .tip {
-      @extend %t-copy-sub2;
-    }
-  }
-  .wrapper-license-options {
-    margin-bottom: ($baseline/2);
-
-    .tip {
-      @extend %t-copy-sub2;
-    }
-    .license-options {
-      padding-bottom: ($baseline/2);
-
-      .license-option {
-        line-height: 1.5;
-        border-bottom: 1px solid $gray-l4;
-        padding: ($baseline/2) 0 ($baseline*0.4);
-
-        &.is-clickable {
-          cursor: pointer;
-        }
-
-        &:last-child {
-          border-bottom: none;
-        }
-
-        input[type=checkbox] {
-          vertical-align: top;
-          width: auto;
-          min-width: auto;
-          height: auto;
-          border: 0;
-          margin: ($baseline*0.15) 15px 0px;
-        }
-
-        .option-name {
-          @extend %t-action3;
-          @extend %t-strong;
-          display: inline-block;
-          width: 15%;
-          vertical-align: top;
-          cursor: pointer;
-        }
-        .explanation {
-          @extend %t-action4;
-          display: inline-block;
-          width: 75%;
-          vertical-align: top;
-          color: $gray;
-        }
-      }
-    }
-  }
-  .license-preview a {
-    color: $gray;
-
-    &:hover {
-      color: $ui-link-color;
-    }
-  }
-  .list-input.settings-list ul.license-options li {
-    // to make sure the padding is correctly overridden
-    padding: ($baseline / 2) 0 ($baseline * 0.4);
-  }
 }
\ No newline at end of file
diff --git a/cms/templates/js/license-selector.underscore b/cms/templates/js/license-selector.underscore
index 5c8c652652..567f6d209d 100644
--- a/cms/templates/js/license-selector.underscore
+++ b/cms/templates/js/license-selector.underscore
@@ -42,9 +42,7 @@
                 <% var optionInfo = license.options[optionKey]; %>
                 <% if (optionInfo.type == "boolean") { %>
                     <% var optionSelected = model.options[optionKey]; %>
-                    <% var optionDisabled = optionInfo.disabled ||
-                            (optionInfo.conflictsWith && _.any(optionInfo.conflictsWith, function(key) {return model.options[key];}));
-                    %>
+                    <% var optionDisabled = optionInfo.disabled %>
                     <li data-option="<%- optionKey %>"
                         class="action-item license-option
                                <% if (optionSelected) { print("is-selected"); } %>
@@ -76,7 +74,7 @@
             <%= gettext("License Display") %>
         </h4>
         <p class="tip">
-            <%= gettext("The following message will be displayed at the bottom of the courseware pages within your course.") %>
+            <%= gettext("The following message will be displayed at the bottom of the courseware pages within your course:") %>
         </p>
         <div class="license-preview">
         <% // keep this synchronized with the contents of common/templates/license.html %>
@@ -99,14 +97,17 @@
                     alt="<%- typeof licenseString == "string" ? licenseString : "" %>"
                     />
             <% } else { %>
-                <i aria-hidden="true" class="icon-cc"></i>
+	        <% //<span> must come before <i> icon or else spacing gets messed up %>
+                <span class="sr">gettext("Creative Commons licensed content, with terms as follow:")&nbsp;</span><i aria-hidden="true" class="icon-cc"></i>
                 <% _.each(enabled, function(option) { %>
-                        <i aria-hidden="true" class="icon-cc-<%- option %>"></i>
+                        <span class="sr"><%- license.options[option.toUpperCase()].name %>&nbsp;</span><i aria-hidden="true" class="icon-cc-<%- option %>"></i>
                 <% }); %>
                 <span class="license-text"><%= gettext("Some Rights Reserved") %></span>
             <% } %>
         <% } else { %>
             <%= typeof licenseString == "string" ? licenseString : "" %>
+            <% // Default to ARR license %>
+            © <span class="license-text"><%= gettext("All Rights Reserved") %></span>
         <% } %>
         </a>
     </div>
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index bc9995c1a3..6a4788da7c 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -1023,8 +1023,9 @@ class CourseDescriptor(CourseFields, LicenseMixin, SequenceDescriptor):
             wiki_xml_object.set('slug', self.wiki_slug)
             xml_object.append(wiki_xml_object)
 
-        # handle license specifically
-        self.add_license_to_xml(xml_object)
+        # handle license specifically. Default the course to have a license
+        # of "All Rights Reserved", if a license is not explicitly set.
+        self.add_license_to_xml(xml_object, default="all-rights-reserved")
 
         return xml_object
 
diff --git a/common/lib/xmodule/xmodule/mixin.py b/common/lib/xmodule/xmodule/mixin.py
index 7468ccb512..361bd20688 100644
--- a/common/lib/xmodule/xmodule/mixin.py
+++ b/common/lib/xmodule/xmodule/mixin.py
@@ -41,7 +41,7 @@ class LicenseMixin(XBlockMixin):
             definition['license'] = license
         return definition
 
-    def add_license_to_xml(self, node):
+    def add_license_to_xml(self, node, default=None):
         """
         When generating XML from an XBlock, this method will add the XBlock's
         license to the XML representation before it is serialized.
@@ -49,7 +49,7 @@ class LicenseMixin(XBlockMixin):
         to this method, rather than reimplementing it in their XML export
         functions.
         """
-        if getattr(self, "license", None):
+        if getattr(self, "license", default):
             node.set('license', self.license)
 
 
diff --git a/common/templates/license.html b/common/templates/license.html
index f0670a3a24..77a129e7a1 100644
--- a/common/templates/license.html
+++ b/common/templates/license.html
@@ -29,6 +29,10 @@ def parse_license(lic):
 % elif license_type == "creative-commons":
     <%
     possible = ["by", "nc", "nd", "sa"]
+    names = {
+       "by": _("Attribution"), "nc": _("Noncommercial"),
+       "nd": _("No Derivatives"), "sa": _("Share Alike")
+    }
     enabled = [opt for opt in possible
                if license_options.get(opt) or license_options.get(opt.upper())]
     version = license_options.get("ver", "4.0")
@@ -36,16 +40,17 @@ def parse_license(lic):
         enabled = ["zero"]
         version = license_options.get("ver", "1.0")
     %>
-    <a rel="license" href="https://creativecommons.org/licenses/${'-'.join(enabled)}/${version}/">
+    <a rel="license" href="https://creativecommons.org/licenses/${'-'.join(enabled)}/${version}/" target="_blank">
     % if button:
         <img src="https://licensebuttons.net/l/${'-'.join(enabled)}/${version}/${button_size}.png"
              alt="${license}"
              />
         </a>
     % else:
-        <i aria-hidden="true" class="icon-cc"></i>
+        ## <span> must come before <i> icon or else spacing gets messed up
+        <span class="sr">${_("Creative Commons licensed content, with terms as follow:")}&nbsp;</span><i aria-hidden="true" class="icon-cc"></i>
         % for option in enabled:
-            <i aria-hidden="true" class="icon-cc-${option}"></i>
+            <span class="sr">${names[option]}&nbsp;</span><i aria-hidden="true" class="icon-cc-${option}"></i>
         % endfor
         <span class="license-text">${_("Some Rights Reserved")}</span>
     % endif
diff --git a/common/test/acceptance/pages/lms/courseware.py b/common/test/acceptance/pages/lms/courseware.py
index 1d05324508..d5d3f09185 100644
--- a/common/test/acceptance/pages/lms/courseware.py
+++ b/common/test/acceptance/pages/lms/courseware.py
@@ -90,6 +90,9 @@ class CoursewarePage(CoursePage):
 
     @property
     def course_license(self):
+        """
+        Returns the course license text, if present. Else returns None.
+        """
         element = self.q(css="#content .container-footer .course-license")
         if element.is_present():
             return element.text[0]
diff --git a/common/test/acceptance/pages/studio/container.py b/common/test/acceptance/pages/studio/container.py
index e1b7b586b5..a33b0a2d19 100644
--- a/common/test/acceptance/pages/studio/container.py
+++ b/common/test/acceptance/pages/studio/container.py
@@ -488,6 +488,9 @@ class XBlockWrapper(PageObject):
         type_in_codemirror(self, index, text, find_prefix='$("{}").find'.format(self.editor_selector))
 
     def set_license(self, license_type):
+        """
+        Uses the UI to set the course's license to the given license_type (str)
+        """
         css_selector = (
             "ul.license-types li[data-license={license_type}] button"
         ).format(license_type=license_type)
diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py
index 3955d5b8fd..387e42e614 100644
--- a/common/test/acceptance/pages/studio/overview.py
+++ b/common/test/acceptance/pages/studio/overview.py
@@ -12,7 +12,6 @@ from selenium.webdriver.common.action_chains import ActionChains
 
 from .course_page import CoursePage
 from .container import ContainerPage
-from .settings import SettingsPage
 from .utils import set_input_value_and_save, set_input_value, click_css, confirm_prompt
 
 
@@ -582,19 +581,11 @@ class CourseOutlinePage(CoursePage, CourseOutlineContainer):
 
     @property
     def license(self):
+        """
+        Returns the course license text, if present. Else returns None.
+        """
         return self.q(css=".license-value").first.text[0]
 
-    def edit_course_start_date(self):
-        self.q(css=".status-release .action-edit a.action-button").click()
-        sp = SettingsPage(
-            self.browser,
-            self.course_info['course_org'],
-            self.course_info['course_num'],
-            self.course_info['course_run'],
-        )
-        sp.wait_for_page()
-        return sp
-
 
 class CourseOutlineModal(object):
     MODAL_SELECTOR = ".wrapper-modal-window"
diff --git a/common/test/acceptance/pages/studio/settings.py b/common/test/acceptance/pages/studio/settings.py
index 22ee6f3e5c..f3c0bc0a77 100644
--- a/common/test/acceptance/pages/studio/settings.py
+++ b/common/test/acceptance/pages/studio/settings.py
@@ -81,6 +81,10 @@ class SettingsPage(CoursePage):
 
     @property
     def course_license(self):
+        """
+        Property. Returns the text of the license type for the course
+        ("All Rights Reserved" or "Creative Commons")
+        """
         license_types_css = "section.license ul.license-types li.license-type"
         self.wait_for_element_presence(
             license_types_css,
@@ -89,10 +93,20 @@ class SettingsPage(CoursePage):
         selected = self.q(css=license_types_css + " button.is-selected")
         if selected.is_present():
             return selected.text[0]
+
+        # Look for the license text that will be displayed by default,
+        # if no button is yet explicitly selected
+        license_text = self.q(css='section.license span.license-text')
+        if license_text.is_present():
+            return license_text.text[0]
         return None
 
     @course_license.setter
     def course_license(self, license_name):
+        """
+        Sets the course license to the given license_name
+        (str, "All Rights Reserved" or "Creative Commons")
+        """
         license_types_css = "section.license ul.license-types li.license-type"
         self.wait_for_element_presence(
             license_types_css,
diff --git a/common/test/acceptance/tests/studio/test_studio_settings.py b/common/test/acceptance/tests/studio/test_studio_settings.py
index 2c86a6fa1f..a51c3148c3 100644
--- a/common/test/acceptance/tests/studio/test_studio_settings.py
+++ b/common/test/acceptance/tests/studio/test_studio_settings.py
@@ -406,7 +406,11 @@ class AdvancedSettingsValidationTest(StudioCourseTest):
 
 @attr('shard_1')
 class ContentLicenseTest(StudioCourseTest):
-    def setUp(self):
+    """
+    Tests for course-level licensing (that is, setting the license,
+    for an entire course's content, to All Rights Reserved or Creative Commons)
+    """
+    def setUp(self):  # pylint: disable=arguments-differ
         super(ContentLicenseTest, self).setUp()
         self.outline_page = CourseOutlinePage(
             self.browser,
@@ -429,13 +433,13 @@ class ContentLicenseTest(StudioCourseTest):
     def test_empty_license(self):
         """
         When I visit the Studio settings page,
-        I see that the course license is "None" by default.
+        I see that the course license is "All Rights Reserved" by default.
         Then I visit the LMS courseware page,
-        and I see that there is no course license displayed.
+        and I see that the default course license is displayed.
         """
-        self.assertIsNone(self.settings_page.course_license)
+        self.assertEqual(self.settings_page.course_license, "All Rights Reserved")
         self.lms_courseware.visit()
-        self.assertIsNone(self.lms_courseware.course_license)
+        self.assertEqual(self.lms_courseware.course_license, "© All Rights Reserved")
 
     def test_arr_license(self):
         """
@@ -469,4 +473,6 @@ class ContentLicenseTest(StudioCourseTest):
         self.assertEqual(self.settings_page.course_license, "Creative Commons")
 
         self.lms_courseware.visit()
-        self.assertEqual(self.lms_courseware.course_license, "Some Rights Reserved")
+        # The course_license text will include a bunch of screen reader text to explain
+        # the selected options
+        self.assertIn("Some Rights Reserved", self.lms_courseware.course_license)
diff --git a/common/test/acceptance/tests/video/test_video_license.py b/common/test/acceptance/tests/video/test_video_license.py
index 866f2d8177..e07d49acb2 100644
--- a/common/test/acceptance/tests/video/test_video_license.py
+++ b/common/test/acceptance/tests/video/test_video_license.py
@@ -1,4 +1,7 @@
 # coding: utf-8
+"""
+Acceptance tests for licensing of the Video module
+"""
 from __future__ import unicode_literals
 from nose.plugins.attrib import attr
 from ..studio.base_studio_test import StudioCourseTest
@@ -11,8 +14,11 @@ from ...fixtures.course import XBlockFixtureDesc
 
 @attr('shard_1')
 class VideoLicenseTest(StudioCourseTest):
-
-    def setUp(self):
+    """
+    Tests for video module-level licensing (that is, setting the license,
+    for a specific video module, to All Rights Reserved or Creative Commons)
+    """
+    def setUp(self):  # pylint: disable=arguments-differ
         super(VideoLicenseTest, self).setUp()
 
         self.lms_courseware = CoursewarePage(
@@ -107,4 +113,4 @@ class VideoLicenseTest(StudioCourseTest):
         self.assertTrue(video.is_present())
         video_license = self.lms_courseware.q(css=".vert .xblock.xmodule_VideoModule .xblock-license")
         self.assertTrue(video_license.is_present())
-        self.assertEqual(video_license.text[0], "Some Rights Reserved")
+        self.assertIn("Some Rights Reserved", video_license.text[0])
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 23282b00ac..063f1ba61b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -369,6 +369,9 @@ FEATURES = {
     # enable beacons for lms onload event statistics
     'ENABLE_ONLOAD_BEACON': False,
 
+    # Toggle platform-wide course licensing
+    'LICENSING': False,
+
     # Certificates Web/HTML Views
     'CERTIFICATES_HTML_VIEW': False,
 
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 577ab95b3b..a1eb5b9f58 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -115,6 +115,9 @@ FEATURES['MILESTONES_APP'] = True
 ########################### Entrance Exams #################################
 FEATURES['ENTRANCE_EXAMS'] = True
 
+################################ COURSE LICENSES ################################
+FEATURES['LICENSING'] = True
+
 
 ########################## Courseware Search #######################
 FEATURES['ENABLE_COURSEWARE_SEARCH'] = True
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 7a6c43ba01..3aa2f8acb7 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -207,9 +207,14 @@ ${fragment.foot_html()}
   </div>
 </div>
 <div class="container-footer">
-  % if settings.FEATURES.get("LICENSING", False) and getattr(course, "license", None):
+  % if settings.FEATURES.get("LICENSING", False):
     <div class="course-license">
+    % if getattr(course, "license", None):
       <%include file="../license.html" args="license=course.license" />
+    % else:
+      ## Default course license: All Rights Reserved, if none is explicitly set.
+      <%include file="../license.html" args="license='all-rights-reserved'" />
+    % endif
     </div>
   % endif
 </div>