From 83d12cd7bd08470419ab154a91f504d0be02a126 Mon Sep 17 00:00:00 2001
From: Miles Steele <msteele@edx.org>
Date: Tue, 6 Aug 2013 14:38:44 -0400
Subject: [PATCH 01/92] add scroll to top on vertical view change

---
 .../xmodule/js/src/sequence/display.coffee    | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
index 149a38e9ec8c..26246644ea00 100644
--- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
@@ -132,34 +132,38 @@ class @Sequence
     else
       alert 'Sequence error! Cannot navigate to tab ' + new_position + 'in the current SequenceModule. Please contact the course staff.'
 
-  next: (event) =>
-    event.preventDefault()
-    new_position = @position + 1
-    Logger.log "seq_next", old: @position, new: new_position, id: @id
-
-    analytics.pageview @id
-
-    # navigation using the next arrow
-    analytics.track "Accessed Next Sequential",
-      sequence_id: @id
-      current_sequential: @position
-      target_sequential: new_position
+  next: (event) => @_change_sequential 'seq_next', event
+  previous: (event) => @_change_sequential 'seq_prev', event
 
-    @render new_position
+  # `direction` can be 'seq_prev' or 'seq_next'
+  _change_sequential: (direction, event) =>
+    # silently abort if direction is invalid.
+    return unless direction in ['seq_prev', 'seq_next']
 
-  previous: (event) =>
     event.preventDefault()
-    new_position = @position - 1
-    Logger.log "seq_prev", old: @position, new: new_position, id: @id
+    offset =
+      seq_next: 1
+      seq_prev: -1
+    new_position = @position + offset[direction]
+    Logger.log direction,
+      old: @position
+      new: new_position
+      id: @id
 
     analytics.pageview @id
 
-    # navigation using the previous arrow
-    analytics.track "Accessed Previous Sequential",
+    # navigation using the next or previous arrow button.
+    tracking_messages =
+      seq_prev: "Accessed Previous Sequential"
+      seq_next: "Accessed Next Sequential"
+    analytics.track tracking_messages[direction],
       sequence_id: @id
       current_sequential: @position
       target_sequential: new_position
 
+    # If the bottom nav is used, scroll to the top of the page on change.
+    if $(event.target).closest('nav[class="sequence-bottom"]').length > 0
+      $.scrollTo 0, 150
     @render new_position
 
   link_for: (position) ->

From 84322694cd269ac7c03e192a4c833accec3b0e87 Mon Sep 17 00:00:00 2001
From: Miles Steele <msteele@edx.org>
Date: Thu, 8 Aug 2013 11:42:29 -0400
Subject: [PATCH 02/92] add jasmine test for scroll to top

---
 .../xmodule/xmodule/js/spec/sequence/display_spec.coffee  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee
index 1944f7dc74ba..7d7b51c416f7 100644
--- a/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee
@@ -134,6 +134,7 @@ xdescribe 'Sequence', ->
     beforeEach ->
       jasmine.stubRequests()
       @sequence = new Sequence '1', 'sequence_1', @items, 'sequence', 2
+      $.scrollTo 150
       $('.sequence-nav-buttons .next a').click()
 
     it 'log the next sequence event', ->
@@ -142,10 +143,14 @@ xdescribe 'Sequence', ->
     it 'call render on the next sequence', ->
       expect($('#seq_content').html()).toEqual 'Sample Problem'
 
+    it 'scrolls to the top of the page', ->
+      expect($('body').scrollTop()).toBe 0
+
   describe 'previous', ->
     beforeEach ->
       jasmine.stubRequests()
       @sequence = new Sequence '1', 'sequence_1', @items, 'sequence', 2
+      $.scrollTo 150
       $('.sequence-nav-buttons .prev a').click()
 
     it 'log the previous sequence event', ->
@@ -154,6 +159,9 @@ xdescribe 'Sequence', ->
     it 'call render on the previous sequence', ->
       expect($('#seq_content').html()).toEqual 'Video 1'
 
+    it 'scrolls to the top of the page', ->
+      expect($('body').scrollTop()).toBe 0
+
   describe 'link_for', ->
     it 'return a link for specific position', ->
       sequence = new Sequence '1', 'sequence_1', @items, 2

From cdf0eef5ca2b028cf4cff6eb0e4543be26b7f34d Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Mon, 16 Sep 2013 15:06:51 -0400
Subject: [PATCH 03/92] Consider redirect code as succcesful

---
 cms/templates/import.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/templates/import.html b/cms/templates/import.html
index 27337bf235d3..88ccfd4e7746 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -77,7 +77,7 @@ <h2>${_("Course to import:")}</h2>
                 e.preventDefault();
                 submitBtn.hide();
                 data.submit().complete(function(result, textStatus, xhr) {
-                    if (result.status != 200) {
+                    if (result.status != 200 && result.status != 302) {
                         alert('${_("Your import has failed.")}\n\n' + JSON.parse(result.responseText)["ErrMsg"]);
                         submitBtn.show();
                         bar.hide();

From e726ef4c46f6fbcc4ea0c95367fe01dea8744d15 Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Mon, 16 Sep 2013 16:30:26 -0400
Subject: [PATCH 04/92] Link to How To Contribute wiki page

Created a CONTRIBUTING.rst which GitHub will pick up and included a
link to the How To Contribute wiki page there. Also added the same link
to the README in the "How To Contribute" section.
---
 CONTRIBUTING.rst | 6 ++++++
 README.md        | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 CONTRIBUTING.rst

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 000000000000..146e4f09fc14
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,6 @@
+How To Contribute
+=================
+
+Contributions are very welcome.
+
+Please read `How To Contribute <https://github.com/edx/edx-platform/wiki/How-To-Contribute>`_ for details.
diff --git a/README.md b/README.md
index 0261f87b46b0..a595e306c2fb 100644
--- a/README.md
+++ b/README.md
@@ -345,9 +345,9 @@ with `overview.md` to get an introduction to the architecture of the system.
 How to Contribute
 -----------------
 
-Contributions are very welcome. The easiest way is to fork this repo, and then
-make a pull request from your fork. The first time you make a pull request, you
-may be asked to sign a Contributor Agreement.
+Contributions are very welcome.
+
+Please read [How To Contribute](https://github.com/edx/edx-platform/wiki/How-To-Contribute) for details.
 
 Reporting Security Issues
 -------------------------

From ca1f4bad7d6d265be7bf8e7d45c5c617d8e6d44f Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Mon, 16 Sep 2013 16:50:08 -0400
Subject: [PATCH 05/92] Moved to a more comprehensive contributing doc.

Based on the How To Contribute wiki page (and switched to markdown so
it's a simple copy-paste).
---
 CONTRIBUTING.md  | 13 +++++++++++++
 CONTRIBUTING.rst |  6 ------
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 CONTRIBUTING.md
 delete mode 100644 CONTRIBUTING.rst

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000000..24dcf4673c6b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,13 @@
+Contributions are very welcome. The easiest way is to fork the repo and then make a pull request from your fork. Before your pull request is merged, it will be reviewed by at least one person. There may be feedback so expect comments on the pull request. Add yourself to the AUTHORS file in your first pull request.
+
+Please review:
+
+* [[Python Guidelines]]
+* [[Javascript Guidelines]]
+* [Testing](https://github.com/edx/edx-platform/blob/master/docs/internal/testing.md)
+
+Coding conventions should be followed and your commit should *increase* test coverage, not decrease it. For more involved contributions, you may want to discuss your intentions on the mailing list *before* you start coding.
+
+Before your first pull request is merged, you'll need to sign the [individual contributor agreement](http://code.edx.org/individual-contributor-agreement.pdf) and send it in. This confirms you have the authority to contribute the code in the pull request and ensures we can relicense it.
+
+If you have any questions, please ask on the [mailing list](https://groups.google.com/forum/#!forum/edx-code).
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
deleted file mode 100644
index 146e4f09fc14..000000000000
--- a/CONTRIBUTING.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-How To Contribute
-=================
-
-Contributions are very welcome.
-
-Please read `How To Contribute <https://github.com/edx/edx-platform/wiki/How-To-Contribute>`_ for details.

From 9b65a1a90d61ebe7af9ae0eb603d798a413e9a6f Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Mon, 16 Sep 2013 17:04:38 -0400
Subject: [PATCH 06/92] Link to wiki with absolute URLs

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 24dcf4673c6b..9bfd04bb935d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,8 +2,8 @@ Contributions are very welcome. The easiest way is to fork the repo and then mak
 
 Please review:
 
-* [[Python Guidelines]]
-* [[Javascript Guidelines]]
+* [Python Guidelines](https://github.com/edx/edx-platform/wiki/Python-Guidelines)
+* [Javascript Guidelines](https://github.com/edx/edx-platform/wiki/Javascript-Guidelines)
 * [Testing](https://github.com/edx/edx-platform/blob/master/docs/internal/testing.md)
 
 Coding conventions should be followed and your commit should *increase* test coverage, not decrease it. For more involved contributions, you may want to discuss your intentions on the mailing list *before* you start coding.

From a1693dced7260d366940c21a1e973d53fbec0bcb Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Mon, 16 Sep 2013 17:05:57 -0400
Subject: [PATCH 07/92] Added linebreaks.

---
 CONTRIBUTING.md | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9bfd04bb935d..d2cfdfdf9357 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,7 @@
-Contributions are very welcome. The easiest way is to fork the repo and then make a pull request from your fork. Before your pull request is merged, it will be reviewed by at least one person. There may be feedback so expect comments on the pull request. Add yourself to the AUTHORS file in your first pull request.
+Contributions are very welcome. The easiest way is to fork the repo and then
+make a pull request from your fork. Before your pull request is merged, it will
+be reviewed by at least one person. There may be feedback so expect comments on
+the pull request. Add yourself to the AUTHORS file in your first pull request.
 
 Please review:
 
@@ -6,8 +9,14 @@ Please review:
 * [Javascript Guidelines](https://github.com/edx/edx-platform/wiki/Javascript-Guidelines)
 * [Testing](https://github.com/edx/edx-platform/blob/master/docs/internal/testing.md)
 
-Coding conventions should be followed and your commit should *increase* test coverage, not decrease it. For more involved contributions, you may want to discuss your intentions on the mailing list *before* you start coding.
+Coding conventions should be followed and your commit should *increase* test
+coverage, not decrease it. For more involved contributions, you may want to
+discuss your intentions on the mailing list *before* you start coding.
 
-Before your first pull request is merged, you'll need to sign the [individual contributor agreement](http://code.edx.org/individual-contributor-agreement.pdf) and send it in. This confirms you have the authority to contribute the code in the pull request and ensures we can relicense it.
+Before your first pull request is merged, you'll need to sign the
+[individual contributor agreement](http://code.edx.org/individual-contributor-agreement.pdf)
+and send it in. This confirms you have the authority to contribute the code in
+the pull request and ensures we can relicense it.
 
-If you have any questions, please ask on the [mailing list](https://groups.google.com/forum/#!forum/edx-code).
+If you have any questions, please ask on the
+[mailing list](https://groups.google.com/forum/#!forum/edx-code).

From 0f81bdcefd7d10164949e4607063326a7ba38162 Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Mon, 16 Sep 2013 17:25:41 -0400
Subject: [PATCH 08/92] Properly handle error responses

---
 cms/templates/import.html | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/cms/templates/import.html b/cms/templates/import.html
index 88ccfd4e7746..b3caac54a338 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -77,16 +77,11 @@ <h2>${_("Course to import:")}</h2>
                 e.preventDefault();
                 submitBtn.hide();
                 data.submit().complete(function(result, textStatus, xhr) {
-                    if (result.status != 200 && result.status != 302) {
-                        alert('${_("Your import has failed.")}\n\n' + JSON.parse(result.responseText)["ErrMsg"]);
+                    if (xhr.status != 200) {
+                        alert('${_("Your import has failed.")}\n\n' + result["ErrMsg"]);
                         submitBtn.show();
                         bar.hide();
-                    } else {
-                        if (result.responseText["ImportStatus"] == 1) {
-                            bar.hide();
-                            statusBlock.show();
-                        }
-                    }
+                    } 
                 });
             });
         } else {

From 4fdf7a4849d862953a02594e362c759f88941bc2 Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Tue, 17 Sep 2013 15:55:30 -0400
Subject: [PATCH 09/92] Prompt before leaving page

---
 cms/templates/import.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cms/templates/import.html b/cms/templates/import.html
index b3caac54a338..706c56351ab4 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -78,7 +78,8 @@ <h2>${_("Course to import:")}</h2>
                 submitBtn.hide();
                 data.submit().complete(function(result, textStatus, xhr) {
                     if (xhr.status != 200) {
-                        alert('${_("Your import has failed.")}\n\n' + result["ErrMsg"]);
+                        var errMsg = result.hasOwnProperty("ErrMsg") ? result["ErrMsg"] : "" ;
+                        alert('${_("Your import has failed.")}\n\n' + errMsg);
                         submitBtn.show();
                         bar.hide();
                     } 
@@ -97,13 +98,18 @@ <h2>${_("Course to import:")}</h2>
     },
     done: function(e, data){
         bar.hide();
+        window.onbeforeunload = null;
         alert('${_("Your import was successful.")}');
         window.location = '${successful_import_redirect_url}';
     },
+    start: function(e) {
+        window.onbeforeunload = function() {
+            return "Your import is in progress; navigating " +
+                "away will abort it.";
+        }
+    },
     sequentialUploads: true
 
-
-
 });
 
 })();

From d8e9ffbb0b736c8b782d3fe72e2104fd2d37f8be Mon Sep 17 00:00:00 2001
From: Usman Khalid <usman.khalid@arbisoft.com>
Date: Thu, 19 Sep 2013 12:38:32 +0000
Subject: [PATCH 10/92] Added missing test in StaticImageBookTest

---
 lms/djangoapps/staticbook/tests.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lms/djangoapps/staticbook/tests.py b/lms/djangoapps/staticbook/tests.py
index 135150a2d1d2..143f5a46ab30 100644
--- a/lms/djangoapps/staticbook/tests.py
+++ b/lms/djangoapps/staticbook/tests.py
@@ -105,6 +105,13 @@ def test_out_of_range_book_id(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
 
+    def test_page_xss(self):
+        # The page in the URL used to go right on the page.
+        self.make_course(textbooks=[IMAGE_BOOK])
+        # It's no longer possible to use a non-integer page.
+        with self.assertRaises(NoReverseMatch):
+            self.make_url('book', book_index=0, page='xyzzy')
+
 
 class StaticPdfBookTest(StaticBookTest):
     """

From 0d0cb5650179384ef155dfa7dba419fa9b0256d1 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Thu, 19 Sep 2013 12:13:01 -0400
Subject: [PATCH 11/92] Speed up Location creation returning existing locations
 where possible

---
 common/lib/xmodule/xmodule/modulestore/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index e53b4adb5e8b..87d492c9bd89 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -169,7 +169,9 @@ def check(val, regexp):
             # names allow colons
             check(list_[4], INVALID_CHARS_NAME)
 
-        if isinstance(location, basestring):
+        if isinstance(location, Location):
+            return location
+        elif isinstance(location, basestring):
             match = URL_RE.match(location)
             if match is None:
                 log.debug('location is instance of %s but no URL match' % basestring)
@@ -195,8 +197,6 @@ def check(val, regexp):
 
             check_dict(kwargs)
             return _LocationBase.__new__(_cls, **kwargs)
-        elif isinstance(location, Location):
-            return _LocationBase.__new__(_cls, location)
         else:
             raise InvalidLocationError(location)
 

From 2c90dc73cdce480cea00f61bac26fb36b0456410 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 16 Sep 2013 13:12:16 -0400
Subject: [PATCH 12/92] Don't access kvs directly but use x_module and
 field_data mechanisms

---
 common/lib/xmodule/xmodule/modulestore/inheritance.py | 3 +--
 common/lib/xmodule/xmodule/modulestore/mongo/base.py  | 9 +++------
 common/lib/xmodule/xmodule/modulestore/mongo/draft.py | 5 +++--
 common/lib/xmodule/xmodule/x_module.py                | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/inheritance.py b/common/lib/xmodule/xmodule/modulestore/inheritance.py
index 78d584580fd3..d68c121b96ba 100644
--- a/common/lib/xmodule/xmodule/modulestore/inheritance.py
+++ b/common/lib/xmodule/xmodule/modulestore/inheritance.py
@@ -56,8 +56,7 @@ def compute_inherited_metadata(descriptor):
         parent_metadata = descriptor.xblock_kvs.inherited_settings.copy()
         # add any of descriptor's explicitly set fields to the inheriting list
         for field in InheritanceMixin.fields.values():
-            # pylint: disable = W0212
-            if descriptor._field_data.has(descriptor, field.name):
+            if field.is_set_on(descriptor):
                 # inherited_settings values are json repr
                 parent_metadata[field.name] = field.read_json(descriptor)
 
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
index f4c88387f424..44865ab58e44 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
@@ -324,16 +324,14 @@ def compute_metadata_inheritance_tree(self, location):
         for result in resultset:
             location = Location(result['_id'])
             # We need to collate between draft and non-draft
-            # i.e. draft verticals can have children which are not in non-draft versions
+            # i.e. draft verticals will have draft children but will have non-draft parents currently
             location = location.replace(revision=None)
             location_url = location.url()
             if location_url in results_by_url:
                 existing_children = results_by_url[location_url].get('definition', {}).get('children', [])
                 additional_children = result.get('definition', {}).get('children', [])
                 total_children = existing_children + additional_children
-                if 'definition' not in results_by_url[location_url]:
-                    results_by_url[location_url]['definition'] = {}
-                results_by_url[location_url]['definition']['children'] = total_children
+                results_by_url[location_url].setdefault('definition', {})['children'] = total_children
             results_by_url[location.url()] = result
             if location.category == 'course':
                 root = location.url()
@@ -643,12 +641,11 @@ def save_xmodule(self, xmodule):
         """
         # Save any changes to the xmodule to the MongoKeyValueStore
         xmodule.save()
-        # split mongo's persist_dag is more general and useful.
         self.collection.save({
                 '_id': xmodule.location.dict(),
                 'metadata': own_metadata(xmodule),
                 'definition': {
-                    'data': xmodule.xblock_kvs._data,
+                    'data': xmodule.get_explicitly_set_fields_by_scope(Scope.content),
                     'children': xmodule.children if xmodule.has_children else []
                 }
             })
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
index bed42b30a909..0f46d3fe0c91 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
@@ -15,6 +15,7 @@
 from xmodule.modulestore.mongo.base import location_to_query, namedtuple_to_son, get_course_id_no_run, MongoModuleStore
 import pymongo
 from pytz import UTC
+from xblock.fields import Scope
 
 DRAFT = 'draft'
 # Things w/ these categories should never be marked as version='draft'
@@ -237,8 +238,8 @@ def publish(self, location, published_by_id):
 
         draft.published_date = datetime.now(UTC)
         draft.published_by = published_by_id
-        super(DraftModuleStore, self).update_item(location, draft._field_data._kvs._data)
-        super(DraftModuleStore, self).update_children(location, draft._field_data._kvs._children)
+        super(DraftModuleStore, self).update_item(location, draft.get_explicitly_set_fields_by_scope(Scope.content))
+        super(DraftModuleStore, self).update_children(location, draft.children)
         super(DraftModuleStore, self).update_metadata(location, own_metadata(draft))
         self.delete_item(location)
 
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index e773c9cc5411..3b1254e77516 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -670,8 +670,8 @@ def get_explicitly_set_fields_by_scope(self, scope=Scope.content):
         """
         result = {}
         for field in self.fields.values():
-            if (field.scope == scope and self._field_data.has(self, field.name)):
-                result[field.name] = self._field_data.get(self, field.name)
+            if (field.scope == scope and field.is_set_on(self)):
+                result[field.name] = field.read_json(self)
         return result
 
     @property

From b9a7c7f752607ace786044cd3de4e4403f3f4b02 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 16 Sep 2013 13:27:29 -0400
Subject: [PATCH 13/92] Create new structure allows override of usage id and
 category

---
 .../xmodule/modulestore/split_mongo/split.py  | 17 +++++++-------
 .../tests/test_split_modulestore.py           | 23 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
index bb9aa59016e2..17976abe7879 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -378,7 +378,7 @@ def get_instance(self, course_id, location, depth=0):
         """
         return self.get_item(location, depth=depth)
 
-    def get_parent_locations(self, locator, usage_id=None):
+    def get_parent_locations(self, locator, course_id=None):
         '''
         Return the locations (Locators w/ usage_ids) for the parents of this location in this
         course. Could use get_items(location, {'children': usage_id}) but this is slightly faster.
@@ -387,7 +387,6 @@ def get_parent_locations(self, locator, usage_id=None):
         :param locator: BlockUsageLocator restricting search scope
         :param usage_id: ignored. Only included for API compatibility. Specify the usage_id within the locator.
         '''
-
         course = self._lookup_course(locator)
         items = []
         for parent_id, value in course['blocks'].iteritems():
@@ -717,7 +716,9 @@ def create_item(self, course_or_parent_locator, category, user_id, definition_lo
 
     def create_course(
         self, org, prettyid, user_id, id_root=None, fields=None,
-        master_branch='draft', versions_dict=None, root_category='course'):
+        master_branch='draft', versions_dict=None, root_category='course',
+        root_usage_id='course'
+        ):
         """
         Create a new entry in the active courses index which points to an existing or new structure. Returns
         the course root of the resulting entry (the location has the course id)
@@ -749,7 +750,7 @@ def create_course(
         provide any fields overrides, see above). if not provided, will create a mostly empty course
         structure with just a category course root xblock.
         """
-        partitioned_fields = self._partition_fields_by_scope('course', fields)
+        partitioned_fields = self._partition_fields_by_scope(root_category, fields)
         block_fields = partitioned_fields.setdefault(Scope.settings, {})
         if Scope.children in partitioned_fields:
             block_fields.update(partitioned_fields[Scope.children])
@@ -773,13 +774,13 @@ def create_course(
             self.definitions.update({'_id': definition_id}, {'$set': {"edit_info.original_version": definition_id}})
 
             draft_structure = {
-                'root': 'course',
+                'root': root_usage_id,
                 'previous_version': None,
                 'edited_by': user_id,
                 'edited_on': datetime.datetime.now(UTC),
                 'blocks': {
-                    'course': {
-                        'category': 'course',
+                    root_usage_id: {
+                        'category': root_category,
                         'definition': definition_id,
                         'fields': block_fields,
                         'edit_info': {
@@ -794,7 +795,7 @@ def create_course(
             draft_structure['original_version'] = new_id
             self.structures.update({'_id': new_id},
                 {'$set': {"original_version": new_id,
-                    'blocks.course.edit_info.update_version': new_id}})
+                    'blocks.{}.edit_info.update_version'.format(root_usage_id): new_id}})
             if versions_dict is None:
                 versions_dict = {master_branch: new_id}
             else:
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
index b299f56711e2..832fd2091e5f 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
@@ -17,6 +17,7 @@
 from pytz import UTC
 from path import path
 import re
+import random
 
 
 class SplitModuleTest(unittest.TestCase):
@@ -250,7 +251,6 @@ def test_course_successors(self):
         self.assertEqual(str(result.children[0].locator.version_guid), self.GUID_D1)
         self.assertEqual(len(result.children[0].children), 1)
 
-
 class SplitModuleItemTests(SplitModuleTest):
     '''
     Item read tests including inheritance
@@ -967,6 +967,27 @@ def test_update_course_index(self):
         course = modulestore().get_course(CourseLocator(course_id=locator.course_id, branch="published"))
         self.assertEqual(str(course.location.version_guid), self.GUID_D1)
 
+    def test_create_with_root(self):
+        """
+        Test create_course with a specified root id and category
+        """
+        user = random.getrandbits(32)
+        new_course = modulestore().create_course(
+            'test_org', 'test_transaction', user,
+            root_usage_id='top', root_category='chapter'
+        )
+        self.assertEqual(new_course.location.usage_id, 'top')
+        self.assertEqual(new_course.category, 'chapter')
+        # look at db to verify
+        db_structure = modulestore().structures.find_one({
+            '_id': new_course.location.as_object_id(new_course.location.version_guid)
+        })
+        self.assertIsNotNone(db_structure, "Didn't find course")
+        self.assertNotIn('course', db_structure['blocks'])
+        self.assertIn('top', db_structure['blocks'])
+        self.assertEqual(db_structure['blocks']['top']['category'], 'chapter')
+
+
 
 class TestInheritance(SplitModuleTest):
     """

From bf633f9c5d298ce8435999c2f9d96c8a216ff12a Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Fri, 20 Sep 2013 10:26:15 -0400
Subject: [PATCH 14/92] Perform auth checks in middleware

        Includes static server tests.
---
 common/djangoapps/contentserver/middleware.py |  14 ++-
 .../contentserver/tests/__init__.py           |   0
 common/djangoapps/contentserver/tests/test.py | 118 ++++++++++++++++++
 lms/envs/test.py                              |   7 ++
 4 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 common/djangoapps/contentserver/tests/__init__.py
 create mode 100644 common/djangoapps/contentserver/tests/test.py

diff --git a/common/djangoapps/contentserver/middleware.py b/common/djangoapps/contentserver/middleware.py
index d89e3fdd2331..0174c39fea54 100644
--- a/common/djangoapps/contentserver/middleware.py
+++ b/common/djangoapps/contentserver/middleware.py
@@ -1,4 +1,6 @@
 from django.http import HttpResponse, HttpResponseNotModified
+from django.shortcuts import redirect
+from student.models import CourseEnrollment
 
 from xmodule.contentstore.django import contentstore
 from xmodule.contentstore.content import StaticContent, XASSET_LOCATION_TAG
@@ -20,7 +22,8 @@ def process_request(self, request):
                 return response
 
             # first look in our cache so we don't have to round-trip to the DB
-            content = get_cached_content(loc)
+            #content = get_cached_content(loc)
+            content = None
             if content is None:
                 # nope, not in cache, let's fetch from DB
                 try:
@@ -41,6 +44,15 @@ def process_request(self, request):
                 # NOP here, but we may wish to add a "cache-hit" counter in the future
                 pass
 
+            # Check that user has access to content
+            if getattr(content, "locked", False):
+                if not hasattr(request, "user") or not request.user.is_authenticated():
+                    return redirect('root')
+                course_id = "/".join([loc.org, loc.course, loc.name])
+                if not CourseEnrollment.is_enrolled(request.user, course_id):
+                    return redirect('dashboard')
+
+
             # see if the last-modified at hasn't changed, if not return a 302 (Not Modified)
 
             # convert over the DB persistent last modified timestamp to a HTTP compatible
diff --git a/common/djangoapps/contentserver/tests/__init__.py b/common/djangoapps/contentserver/tests/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/common/djangoapps/contentserver/tests/test.py b/common/djangoapps/contentserver/tests/test.py
new file mode 100644
index 000000000000..d084494be397
--- /dev/null
+++ b/common/djangoapps/contentserver/tests/test.py
@@ -0,0 +1,118 @@
+"""
+Tests for StaticContentServer
+"""
+import copy
+import logging
+from uuid import uuid4
+from path import path
+from pymongo import MongoClient
+
+from django.contrib.auth.models import User
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from django.test.client import Client
+from django.test.utils import override_settings
+
+from student.models import CourseEnrollment
+
+from xmodule.contentstore.django import contentstore, _CONTENTSTORE
+from xmodule.modulestore import Location
+from xmodule.contentstore.content import StaticContent
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.tests.django_utils import (studio_store_config,
+        ModuleStoreTestCase)
+from xmodule.modulestore.xml_importer import import_from_xml
+
+log = logging.getLogger(__name__)
+
+TEST_DATA_CONTENTSTORE = copy.deepcopy(settings.CONTENTSTORE)
+TEST_DATA_CONTENTSTORE['OPTIONS']['db'] = 'test_xcontent_%s' % uuid4().hex
+
+TEST_MODULESTORE = studio_store_config(settings.TEST_ROOT / "data")
+
+
+@override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE, MODULESTORE=TEST_MODULESTORE)
+class ContentStoreToyCourseTest(ModuleStoreTestCase):
+    """
+    Tests that use the toy course.
+    """
+
+    def setUp(self):
+        """
+        Create user and login.
+        """
+
+        settings.MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
+        settings.MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data')
+
+        self.client = Client()
+
+        loc = Location('c4x', 'edX', 'toy', 'asset', 'sample_static.txt' )
+        self.loc =  loc
+
+        rel_url = StaticContent.get_url_path_from_location(loc)
+        base = "http://127.0.0.1:8000"
+
+        self.contentstore = contentstore()
+        import_from_xml(modulestore('direct'), 'common/test/data/', ['toy'],
+                static_content_store=self.contentstore, verbose=True)
+        self.url = base + rel_url
+
+    def tearDown(self):
+
+        MongoClient().drop_database(TEST_DATA_CONTENTSTORE['OPTIONS']['db'])
+        _CONTENTSTORE.clear()
+
+    def test_aunlocked_asset(self):
+        """
+        Test that unlocked assets are being served.
+        """
+        # Unlock the asset
+        self.contentstore.set_attr(self.loc, 'locked', False)
+        resp = self.client.get(self.url)
+        self.assertEqual(resp.status_code, 200)
+
+
+    def test_locked_asset(self):
+        """
+        Test that locked assets behave appropriately in case:
+            (1) User is not logged in
+            (2) User is logged in in but not registerd for the course
+            (3) User is logged in and registered
+        """
+
+        # Lock the asset
+        self.contentstore.set_attr(self.loc, 'locked', True)
+
+
+        # Case (1)
+        resp = self.client.get(self.url)
+        self.assertEqual(resp.status_code, 302)
+        self.assertTrue(resp.has_header("LOCATION"))
+
+        # Case (2)
+        #   Create user and login
+        uname = 'testuser'
+        email = 'test+courses@edx.org'
+        password = 'foo'
+        user = User.objects.create_user(uname, email, password)
+        user.is_active = True
+        user.save()
+        self.client.login(username=uname, password=password)
+        log.debug("User logged in")
+
+        resp = self.client.get(self.url)
+        log.debug("Received response %s", resp)
+        self.assertEqual(resp.status_code, 302)
+        self.assertTrue(resp.has_header("LOCATION"))
+        self.assertIn("dashboard", resp["LOCATION"])
+
+        # Case (3)
+        #   Enroll student
+        course_id = "/".join([self.loc.org, self.loc.course, self.loc.name])
+        self.assertTrue(CourseEnrollment.enroll(user, course_id))
+        self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
+
+        resp = self.client.get(self.url)
+        self.assertEqual(resp.status_code, 200)
+
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 94feffdf3ed1..45e934ec1f21 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -97,6 +97,13 @@
     }
 }
 
+CONTENTSTORE = {
+    'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
+    'OPTIONS': {
+        'host': 'localhost',
+        'db': 'xcontent',
+    }
+}
 
 DATABASES = {
     'default': {

From 7a8d463260d96900c1c11e8e428a3b960077c9ce Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Fri, 20 Sep 2013 17:22:51 -0400
Subject: [PATCH 15/92] Put static server middleware after the middleware it
 requires

---
 lms/envs/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 81b01179d7ca..466ec262f909 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -542,7 +542,6 @@
 )
 
 MIDDLEWARE_CLASSES = (
-    'contentserver.middleware.StaticContentServer',
     'request_cache.middleware.RequestCache',
     'django_comment_client.middleware.AjaxExceptionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -551,6 +550,7 @@
     # Instead of AuthenticationMiddleware, we use a cached backed version
     #'django.contrib.auth.middleware.AuthenticationMiddleware',
     'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
+    'contentserver.middleware.StaticContentServer',
 
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',

From 268b5b47aeca7315650c42dafcff086bf03904eb Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Fri, 20 Sep 2013 17:25:43 -0400
Subject: [PATCH 16/92] Remove cache workaround

---
 common/djangoapps/contentserver/middleware.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/djangoapps/contentserver/middleware.py b/common/djangoapps/contentserver/middleware.py
index 0174c39fea54..8d81929693cb 100644
--- a/common/djangoapps/contentserver/middleware.py
+++ b/common/djangoapps/contentserver/middleware.py
@@ -22,8 +22,7 @@ def process_request(self, request):
                 return response
 
             # first look in our cache so we don't have to round-trip to the DB
-            #content = get_cached_content(loc)
-            content = None
+            content = get_cached_content(loc)
             if content is None:
                 # nope, not in cache, let's fetch from DB
                 try:
@@ -47,7 +46,7 @@ def process_request(self, request):
             # Check that user has access to content
             if getattr(content, "locked", False):
                 if not hasattr(request, "user") or not request.user.is_authenticated():
-                    return redirect('root')
+                    return redirect('login')
                 course_id = "/".join([loc.org, loc.course, loc.name])
                 if not CourseEnrollment.is_enrolled(request.user, course_id):
                     return redirect('dashboard')

From 3c3edac05fa6720075662ce9a672e4c3704faf76 Mon Sep 17 00:00:00 2001
From: Usman Khalid <usman.khalid@arbisoft.com>
Date: Mon, 23 Sep 2013 12:58:14 +0000
Subject: [PATCH 17/92] Fixed tests name in staticbook

---
 lms/djangoapps/staticbook/tests.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/staticbook/tests.py b/lms/djangoapps/staticbook/tests.py
index 143f5a46ab30..999dfcb8cf31 100644
--- a/lms/djangoapps/staticbook/tests.py
+++ b/lms/djangoapps/staticbook/tests.py
@@ -105,10 +105,9 @@ def test_out_of_range_book_id(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
 
-    def test_page_xss(self):
-        # The page in the URL used to go right on the page.
+    def test_bad_page_id(self):
+        # A bad page id will cause a 404.        
         self.make_course(textbooks=[IMAGE_BOOK])
-        # It's no longer possible to use a non-integer page.
         with self.assertRaises(NoReverseMatch):
             self.make_url('book', book_index=0, page='xyzzy')
 

From c196d1895abc583b811ad79d2e67fc92f3e555c4 Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Mon, 23 Sep 2013 10:13:33 -0400
Subject: [PATCH 18/92] i18n fix

---
 cms/templates/import.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cms/templates/import.html b/cms/templates/import.html
index 706c56351ab4..2973d6ef4f63 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -104,8 +104,7 @@ <h2>${_("Course to import:")}</h2>
     },
     start: function(e) {
         window.onbeforeunload = function() {
-            return "Your import is in progress; navigating " +
-                "away will abort it.";
+            return '${_("Your import is in progress; navigating away will abort it.")}';
         }
     },
     sequentialUploads: true

From b4e6a8b209e45b641a112e569684f57049c6131a Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Mon, 23 Sep 2013 10:52:05 -0400
Subject: [PATCH 19/92] Fix order-dependency in tests

---
 common/djangoapps/contentserver/tests/test.py | 35 +++++++++++--------
 .../test/data/toy/static/another_static.txt   | 17 +++++++++
 2 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 common/test/data/toy/static/another_static.txt

diff --git a/common/djangoapps/contentserver/tests/test.py b/common/djangoapps/contentserver/tests/test.py
index d084494be397..340092b4d346 100644
--- a/common/djangoapps/contentserver/tests/test.py
+++ b/common/djangoapps/contentserver/tests/test.py
@@ -45,31 +45,42 @@ def setUp(self):
         settings.MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
         settings.MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data')
 
+        base = "http://127.0.0.1:8000"
         self.client = Client()
+        self.contentstore = contentstore()
 
+        # A locked the asset
         loc = Location('c4x', 'edX', 'toy', 'asset', 'sample_static.txt' )
-        self.loc =  loc
-
+        self.loc = loc
         rel_url = StaticContent.get_url_path_from_location(loc)
-        base = "http://127.0.0.1:8000"
+        self.url = base + rel_url
+
+        # An unlocked asset
+        loc2 = Location('c4x', 'edX', 'toy', 'asset', 'another_static.txt' )
+        self.loc2 = loc2
+        rel_url2 = StaticContent.get_url_path_from_location(loc2)
+        self.url2 = base + rel_url2
+
 
-        self.contentstore = contentstore()
         import_from_xml(modulestore('direct'), 'common/test/data/', ['toy'],
                 static_content_store=self.contentstore, verbose=True)
-        self.url = base + rel_url
+
+        self.contentstore.set_attr(self.loc, 'locked', True)
+
 
     def tearDown(self):
 
         MongoClient().drop_database(TEST_DATA_CONTENTSTORE['OPTIONS']['db'])
         _CONTENTSTORE.clear()
 
-    def test_aunlocked_asset(self):
+    def test_unlocked_asset(self):
         """
         Test that unlocked assets are being served.
         """
-        # Unlock the asset
-        self.contentstore.set_attr(self.loc, 'locked', False)
-        resp = self.client.get(self.url)
+        # Logout user
+        self.client.logout()
+
+        resp = self.client.get(self.url2)
         self.assertEqual(resp.status_code, 200)
 
 
@@ -81,10 +92,6 @@ def test_locked_asset(self):
             (3) User is logged in and registered
         """
 
-        # Lock the asset
-        self.contentstore.set_attr(self.loc, 'locked', True)
-
-
         # Case (1)
         resp = self.client.get(self.url)
         self.assertEqual(resp.status_code, 302)
@@ -110,7 +117,7 @@ def test_locked_asset(self):
         # Case (3)
         #   Enroll student
         course_id = "/".join([self.loc.org, self.loc.course, self.loc.name])
-        self.assertTrue(CourseEnrollment.enroll(user, course_id))
+        CourseEnrollment.enroll(user, course_id)
         self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
 
         resp = self.client.get(self.url)
diff --git a/common/test/data/toy/static/another_static.txt b/common/test/data/toy/static/another_static.txt
new file mode 100644
index 000000000000..83e560736d72
--- /dev/null
+++ b/common/test/data/toy/static/another_static.txt
@@ -0,0 +1,17 @@
+
+                                _      
+                               | |     
+  _____  ____ _ _ __ ___  _ __ | | ___ 
+ / _ \ \/ / _` | '_ ` _ \| '_ \| |/ _ \
+|  __/>  < (_| | | | | | | |_) | |  __/
+ \___/_/\_\__,_|_| |_| |_| .__/|_|\___|
+                         | |           
+                         |_|           
+             _        _   _      
+            | |      | | (_)     
+         ___| |_ __ _| |_ _  ___ 
+        / __| __/ _` | __| |/ __|
+        \__ \ || (_| | |_| | (__ 
+        |___/\__\__,_|\__|_|\___|
+                         
+                         

From 40d11c73cf87093b0c8d54db18487494e157fd35 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 16 Sep 2013 13:51:17 -0400
Subject: [PATCH 20/92] location mapper maturation richer exceptions, add_map
 return course_id, fix a bug, filter out unwanted kwargs in init

---
 .../xmodule/xmodule/modulestore/exceptions.py |  9 ++++++++-
 .../xmodule/modulestore/loc_mapper_store.py   | 19 ++++++++++++++-----
 .../split_mongo/caching_descriptor_system.py  |  4 +---
 .../modulestore/tests/test_location_mapper.py |  8 ++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/exceptions.py b/common/lib/xmodule/xmodule/modulestore/exceptions.py
index 508599b677aa..411078d821e9 100644
--- a/common/lib/xmodule/xmodule/modulestore/exceptions.py
+++ b/common/lib/xmodule/xmodule/modulestore/exceptions.py
@@ -28,7 +28,14 @@ class NoPathToItem(Exception):
 
 
 class DuplicateItemError(Exception):
-    pass
+    """
+    Attempted to create an item which already exists.
+    """
+    def __init__(self, element_id, store=None, collection=None):
+        super(DuplicateItemError, self).__init__()
+        self.element_id = element_id
+        self.store = store
+        self.collection = collection
 
 
 class VersionConflictError(Exception):
diff --git a/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py b/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
index 5967ee3d9d6a..4ab3a8106d6c 100644
--- a/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
+++ b/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
@@ -28,10 +28,16 @@ class LocMapperStore(object):
 
     # C0103: varnames and attrs must be >= 3 chars, but db defined by long time usage
     # pylint: disable = C0103
-    def __init__(self, host, db, collection, port=27017, user=None, password=None, **kwargs):
+    def __init__(self, host, db, collection, port=27017, user=None, password=None,
+        **kwargs):
         '''
         Constructor
         '''
+        # get rid of unwanted args
+        kwargs.pop('default_class', None)
+        kwargs.pop('fs_root', None)
+        kwargs.pop('xblock_mixins', None)
+        kwargs.pop('render_template', None)
         self.db = pymongo.database.Database(
             pymongo.MongoClient(
                 host=host,
@@ -100,6 +106,7 @@ def create_map_entry(self, course_location, course_id=None, draft_branch='draft'
             'prod_branch': prod_branch,
             'block_map': block_map or {},
         })
+        return course_id
 
     def translate_location(self, old_style_course_id, location, published=True, add_entry_if_missing=True):
         """
@@ -150,7 +157,7 @@ def translate_location(self, old_style_course_id, location, published=True, add_
             if add_entry_if_missing:
                 usage_id = self._add_to_block_map(location, location_id, entry['block_map'])
             else:
-                raise ItemNotFoundError()
+                raise ItemNotFoundError(location)
         elif isinstance(usage_id, dict):
             # name is not unique, look through for the right category
             if location.category in usage_id:
@@ -244,7 +251,7 @@ def add_block_location_translator(self, location, old_course_id=None, usage_id=N
                 if usage_id is None:
                     usage_id = map_entry['block_map'][location.name][location.category]
                 elif usage_id != map_entry['block_map'][location.name][location.category]:
-                    raise DuplicateItemError()
+                    raise DuplicateItemError(usage_id, self, 'location_map')
 
         computed_usage_id = usage_id
 
@@ -257,7 +264,7 @@ def add_block_location_translator(self, location, old_course_id=None, usage_id=N
                 alt_usage_id = self._verify_uniqueness(computed_usage_id, map_entry['block_map'])
                 if alt_usage_id != computed_usage_id:
                     if usage_id is not None:
-                        raise DuplicateItemError()
+                        raise DuplicateItemError(usage_id, self, 'location_map')
                     else:
                         # revise already set ones and add to remaining ones
                         computed_usage_id = self.update_block_location_translator(
@@ -301,7 +308,7 @@ def update_block_location_translator(self, location, usage_id, old_course_id=Non
                     usage_id = self.update_block_location_translator(location, alt_usage_id, old_course_id, True)
                     return usage_id
                 else:
-                    raise DuplicateItemError()
+                    raise DuplicateItemError(usage_id, self, 'location_map')
 
             if location.category in map_entry['block_map'].setdefault(location.name, {}):
                 map_entry['block_map'][location.name][location.category] = usage_id
@@ -335,6 +342,8 @@ def _add_to_block_map(self, location, location_id, block_map):
             # the block ids will likely be out of sync and collide from an id perspective. HOWEVER,
             # if there are few == org/course roots or their content is unrelated, this will work well.
             usage_id = self._verify_uniqueness(location.category + location.name[:3], block_map)
+        else:
+            usage_id = location.name
         block_map.setdefault(location.name, {})[location.category] = usage_id
         self.location_map.update(location_id, {'$set': {'block_map': block_map}})
         return usage_id
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
index 020ebdbbfe57..f2979723675a 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
@@ -30,13 +30,11 @@ def __init__(self, modulestore, course_entry, default_class, module_data, lazy,
         module_data: a dict mapping Location -> json that was cached from the
             underlying modulestore
         """
-        # TODO find all references to resources_fs and make handle None
         super(CachingDescriptorSystem, self).__init__(load_item=self._load_item, **kwargs)
         self.modulestore = modulestore
         self.course_entry = course_entry
         self.lazy = lazy
         self.module_data = module_data
-        # TODO see if self.course_id is needed: is already in course_entry but could be > 1 value
         # Compute inheritance
         modulestore.inherit_settings(
             course_entry.get('blocks', {}),
@@ -60,7 +58,7 @@ def _load_item(self, usage_id, course_entry_override=None):
             self.modulestore.cache_items(self, [usage_id], lazy=self.lazy)
             json_data = self.module_data.get(usage_id)
             if json_data is None:
-                raise ItemNotFoundError
+                raise ItemNotFoundError(usage_id)
 
         class_ = XModuleDescriptor.load_class(
             json_data.get('category'),
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py b/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py
index 599bd6da5ede..abe41eaaed95 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py
@@ -192,6 +192,14 @@ def test_translate_location_dwim(self):
             add_entry_if_missing=True
         )
         self.assertEqual(prob_locator.course_id, new_style_course_id)
+        # create an entry w/o a guid name
+        other_location = Location('i4x', org, course, 'chapter', 'intro')
+        locator = loc_mapper().translate_location(
+            old_style_course_id,
+            other_location,
+            add_entry_if_missing=True
+        )
+        self.assertEqual(locator.usage_id, 'intro')
 
         # add a distractor course
         loc_mapper().create_map_entry(

From bd56ee21d299858582ac175c82b9784d1f34a636 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 16 Sep 2013 13:53:54 -0400
Subject: [PATCH 21/92] split get_item uses loc_mapper to decode old style
 Locations

---
 .../lib/xmodule/xmodule/modulestore/django.py |  6 ++++++
 .../xmodule/modulestore/split_mongo/split.py  | 21 +++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/django.py b/common/lib/xmodule/xmodule/modulestore/django.py
index 93416cae17ee..d9176f6abf82 100644
--- a/common/lib/xmodule/xmodule/modulestore/django.py
+++ b/common/lib/xmodule/xmodule/modulestore/django.py
@@ -75,6 +75,9 @@ def modulestore(name='default'):
     if name not in _MODULESTORES:
         _MODULESTORES[name] = create_modulestore_instance(settings.MODULESTORE[name]['ENGINE'],
                                                           settings.MODULESTORE[name]['OPTIONS'])
+        # inject loc_mapper into newly created modulestore if it needs it
+        if name == 'split' and _loc_singleton is not None:
+            _MODULESTORES['split'].loc_mapper = _loc_singleton
 
     return _MODULESTORES[name]
 
@@ -91,6 +94,9 @@ def loc_mapper():
     if _loc_singleton is None:
         # instantiate
         _loc_singleton = LocMapperStore(settings.modulestore_options)
+    # inject into split mongo modulestore
+    if 'split' in _MODULESTORES:
+        _MODULESTORES['split'].loc_mapper = _loc_singleton
     return _loc_singleton
 
 
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
index 17976abe7879..94c325e2fe93 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -5,20 +5,21 @@
 import re
 from importlib import import_module
 from path import path
+import collections
+import copy
+from pytz import UTC
 
 from xmodule.errortracker import null_error_tracker
 from xmodule.x_module import XModuleDescriptor
 from xmodule.modulestore.locator import BlockUsageLocator, DescriptionLocator, CourseLocator, VersionTree, LocalId
-from xmodule.modulestore.exceptions import InsufficientSpecificationError, VersionConflictError
-from xmodule.modulestore import inheritance, ModuleStoreBase
+from xmodule.modulestore.exceptions import InsufficientSpecificationError, VersionConflictError, DuplicateItemError
+from xmodule.modulestore import inheritance, ModuleStoreBase, Location
 
 from ..exceptions import ItemNotFoundError
 from .definition_lazy_loader import DefinitionLazyLoader
 from .caching_descriptor_system import CachingDescriptorSystem
 from xblock.fields import Scope
 from xblock.runtime import Mixologist
-from pytz import UTC
-import collections
 
 log = logging.getLogger(__name__)
 #==============================================================================
@@ -49,14 +50,17 @@ class SplitMongoModuleStore(ModuleStoreBase):
     A Mongodb backed ModuleStore supporting versions, inheritance,
     and sharing.
     """
+    # pylint: disable=C0103
     def __init__(self, host, db, collection, fs_root, render_template,
                  port=27017, default_class=None,
                  error_tracker=null_error_tracker,
                  user=None, password=None,
                  mongo_options=None,
+                 loc_mapper=None,
                  **kwargs):
 
         super(SplitMongoModuleStore, self).__init__(**kwargs)
+        self.loc_mapper = loc_mapper
         if mongo_options is None:
             mongo_options = {}
 
@@ -320,6 +324,15 @@ def get_item(self, location, depth=0):
             descendants.
         raises InsufficientSpecificationError or ItemNotFoundError
         """
+        # intended for temporary support of some pointers being old-style
+        if isinstance(location, Location):
+            if self.loc_mapper is None:
+                raise InsufficientSpecificationError('No location mapper configured')
+            else:
+                location = self.loc_mapper.translate_location(
+                    None, location, location.revision is None,
+                    add_entry_if_missing=False
+                )
         assert isinstance(location, BlockUsageLocator)
         if not location.is_initialized():
             raise InsufficientSpecificationError("Not yet initialized: %s" % location)

From 379a147a57157dc636bf1aeaca491596b227cef8 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 16 Sep 2013 13:58:38 -0400
Subject: [PATCH 22/92] Begin transactional with_version impl Change
 create_item to optionally add the item to the head version and not create a
 new version.

---
 .../xmodule/modulestore/split_mongo/split.py  | 119 ++++++++++++------
 .../split_mongo/split_mongo_kvs.py            |   3 +-
 .../tests/test_split_modulestore.py           |  91 +++++++++++++-
 3 files changed, 170 insertions(+), 43 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
index 94c325e2fe93..49a02d817f3b 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -123,11 +123,6 @@ def cache_items(self, system, base_usage_ids, depth=0, lazy=True):
                 new_module_data
             )
 
-        # remove any which were already in module_data (not sure if there's a better way)
-        for newkey in new_module_data.iterkeys():
-            if newkey in system.module_data:
-                del new_module_data[newkey]
-
         if lazy:
             for block in new_module_data.itervalues():
                 block['definition'] = DefinitionLazyLoader(self, block['definition'])
@@ -636,45 +631,58 @@ def _generate_course_id(self, id_root):
         else:
             return id_root
 
-    # TODO Should I rewrite this to take a new xblock instance rather than to construct it? That is, require the
+    # DHM: Should I rewrite this to take a new xblock instance rather than to construct it? That is, require the
     # caller to use XModuleDescriptor.load_from_json thus reducing similar code and making the object creation and
     # validation behavior a responsibility of the model layer rather than the persistence layer.
-    def create_item(self, course_or_parent_locator, category, user_id, definition_locator=None, fields=None,
-        force=False):
+    def create_item(self, course_or_parent_locator, category, user_id,
+        usage_id=None, definition_locator=None, fields=None,
+        force=False, continue_version=False):
         """
         Add a descriptor to persistence as the last child of the optional parent_location or just as an element
         of the course (if no parent provided). Return the resulting post saved version with populated locators.
 
-        If the locator is a BlockUsageLocator, then it's assumed to be the parent. If it's a CourseLocator, then it's
+        :param course_or_parent_locator: If BlockUsageLocator, then it's assumed to be the parent.
+        If it's a CourseLocator, then it's
         merely the containing course.
 
         raises InsufficientSpecificationError if there is no course locator.
         raises VersionConflictError if course_id and version_guid given and the current version head != version_guid
             and force is not True.
-        force: fork the structure and don't update the course draftVersion if the above
+        :param force: fork the structure and don't update the course draftVersion if the above
+        :param continue_revision: for multistep transactions, continue revising the given version rather than creating
+        a new version. Setting force to True conflicts with setting this to True and will cause a VersionConflictError
 
-        The incoming definition_locator should either be None to indicate this is a brand new definition or
+        :param definition_locator: should either be None to indicate this is a brand new definition or
         a pointer to the existing definition to which this block should point or from which this was derived.
         If fields does not contain any Scope.content, then definition_locator must have a value meaning that this
         block points
         to the existing definition. If fields contains Scope.content and definition_locator is not None, then
         the Scope.content fields are assumed to be a new payload for definition_locator.
 
-        Creates a new version of the course structure, creates and inserts the new block, makes the block point
+        :param usage_id: if provided, must not already exist in the structure. Provides the block id for the
+        new item in this structure. Otherwise, one is computed using the category appended w/ a few digits.
+
+        :param continue_version: continue changing the current structure at the head of the course. Very dangerous
+        unless used in the same request as started the change! See below about version conflicts.
+
+        This method creates a new version of the course structure unless continue_version is True.
+        It creates and inserts the new block, makes the block point
         to the definition which may be new or a new version of an existing or an existing.
+
         Rules for course locator:
 
         * If the course locator specifies a course_id and either it doesn't
-          specify version_guid or the one it specifies == the current draft, it progresses the course to point
-          to the new draft and sets the active version to point to the new draft
-        * If the locator has a course_id but its version_guid != current draft, it raises VersionConflictError.
+          specify version_guid or the one it specifies == the current head of the branch,
+          it progresses the course to point
+          to the new head and sets the active version to point to the new head
+        * If the locator has a course_id but its version_guid != current head, it raises VersionConflictError.
 
         NOTE: using a version_guid will end up creating a new version of the course. Your new item won't be in
         the course id'd by version_guid but instead in one w/ a new version_guid. Ensure in this case that you get
         the new version_guid from the locator in the returned object!
         """
         # find course_index entry if applicable and structures entry
-        index_entry = self._get_index_if_valid(course_or_parent_locator, force)
+        index_entry = self._get_index_if_valid(course_or_parent_locator, force, continue_version)
         structure = self._lookup_course(course_or_parent_locator)
 
         partitioned_fields = self._partition_fields_by_scope(category, fields)
@@ -686,17 +694,21 @@ def create_item(self, course_or_parent_locator, category, user_id, definition_lo
             definition_locator, _ = self.update_definition_from_data(definition_locator, new_def_data, user_id)
 
         # copy the structure and modify the new one
-        new_structure = self._version_structure(structure, user_id)
+        if continue_version:
+            new_structure = structure
+        else:
+            new_structure = self._version_structure(structure, user_id)
+
         # generate an id
-        new_usage_id = self._generate_usage_id(new_structure['blocks'], category)
+        if usage_id is not None:
+            if usage_id in new_structure['blocks']:
+                raise DuplicateItemError(usage_id, self, 'structures')
+            else:
+                new_usage_id = usage_id
+        else:
+            new_usage_id = self._generate_usage_id(new_structure['blocks'], category)
+
         update_version_keys = ['blocks.{}.edit_info.update_version'.format(new_usage_id)]
-        if isinstance(course_or_parent_locator, BlockUsageLocator) and course_or_parent_locator.usage_id is not None:
-            parent = new_structure['blocks'][course_or_parent_locator.usage_id]
-            parent['fields'].setdefault('children', []).append(new_usage_id)
-            parent['edit_info']['edited_on'] = datetime.datetime.now(UTC)
-            parent['edit_info']['edited_by'] = user_id
-            parent['edit_info']['previous_version'] = parent['edit_info']['update_version']
-            update_version_keys.append('blocks.{}.edit_info.update_version'.format(course_or_parent_locator.usage_id))
         block_fields = partitioned_fields.get(Scope.settings, {})
         if Scope.children in partitioned_fields:
             block_fields.update(partitioned_fields[Scope.children])
@@ -710,19 +722,41 @@ def create_item(self, course_or_parent_locator, category, user_id, definition_lo
                 'previous_version': None
             }
         }
-        new_id = self.structures.insert(new_structure)
+        # if given parent, add new block as child and update parent's version
+        parent = None
+        if isinstance(course_or_parent_locator, BlockUsageLocator) and course_or_parent_locator.usage_id is not None:
+            parent = new_structure['blocks'][course_or_parent_locator.usage_id]
+            parent['fields'].setdefault('children', []).append(new_usage_id)
+            if not continue_version or parent['edit_info']['update_version'] != structure['_id']:
+                parent['edit_info']['edited_on'] = datetime.datetime.now(UTC)
+                parent['edit_info']['edited_by'] = user_id
+                parent['edit_info']['previous_version'] = parent['edit_info']['update_version']
+                update_version_keys.append(
+                    'blocks.{}.edit_info.update_version'.format(course_or_parent_locator.usage_id)
+                )
+        if continue_version:
+            new_id = structure['_id']
+            # db update
+            self.structures.update({'_id': new_id}, new_structure)
+            # clear cache so things get refetched and inheritance recomputed
+            self._clear_cache()
+        else:
+            new_id = self.structures.insert(new_structure)
+
         update_version_payload = {key: new_id for key in update_version_keys}
-        self.structures.update({'_id': new_id},
+        self.structures.update(
+            {'_id': new_id},
             {'$set': update_version_payload})
 
         # update the index entry if appropriate
         if index_entry is not None:
-            self._update_head(index_entry, course_or_parent_locator.branch, new_id)
+            if not continue_version:
+                self._update_head(index_entry, course_or_parent_locator.branch, new_id)
             course_parent = course_or_parent_locator.as_course_locator()
         else:
             course_parent = None
 
-        # fetch and return the new item--fetching is unnecessary but a good qc step
+        # reconstruct the new_item from the cache
         return self.get_item(BlockUsageLocator(course_id=course_parent,
                                                usage_id=new_usage_id,
                                                version_guid=new_id))
@@ -1245,10 +1279,9 @@ def _xblock_lists_equal(self, lista, listb):
         """
         if len(lista) != len(listb):
             return False
-        for idx in enumerate(lista):
-            if lista[idx] != listb[idx]:
-                itema = self._usage_id(lista[idx])
-                if itema != self._usage_id(listb[idx]):
+        for ele_a, ele_b in zip(lista, listb):
+            if ele_a != ele_b:
+                if self._usage_id(ele_a) != self._usage_id(ele_b):
                     return False
         return True
 
@@ -1262,22 +1295,31 @@ def _usage_id(self, xblock_or_id):
         else:
             return xblock_or_id
 
-    def _get_index_if_valid(self, locator, force=False):
+    def _get_index_if_valid(self, locator, force=False, continue_version=False):
         """
         If the locator identifies a course and points to its draft (or plausibly its draft),
         then return the index entry.
 
         raises VersionConflictError if not the right version
 
-        :param locator:
+        :param locator: a courselocator
+        :param force: if false, raises VersionConflictError if the current head of the course != the one identified
+        by locator. Cannot be True if continue_version is True
+        :param continue_version: if True, assumes this operation requires a head version and will not create a new
+        version but instead continue an existing transaction on this version. This flag cannot be True if force is True.
         """
         if locator.course_id is None or locator.branch is None:
-            return None
+            if continue_version:
+                raise InsufficientSpecificationError(
+                    "To continue a version, the locator must point to one ({}).".format(locator)
+                )
+            else:
+                return None
         else:
             index_entry = self.course_index.find_one({'_id': locator.course_id})
             if (locator.version_guid is not None
                 and index_entry['versions'][locator.branch] != locator.version_guid
-                and not force):
+                and not force) or (force and continue_version):
                 raise VersionConflictError(
                     locator,
                     CourseLocator(
@@ -1293,8 +1335,7 @@ def _version_structure(self, structure, user_id):
         :param structure:
         :param user_id:
         """
-        new_structure = structure.copy()
-        new_structure['blocks'] = new_structure['blocks'].copy()
+        new_structure = copy.deepcopy(structure)
         del new_structure['_id']
         new_structure['previous_version'] = structure['_id']
         new_structure['edited_by'] = user_id
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
index e2d8fd30a9be..bfec024a1647 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
@@ -25,7 +25,8 @@ def __init__(self, definition, fields, inherited_settings):
             Note, local fields may override and disagree w/ this b/c this says what the value
             should be if the field is undefined.
         """
-        super(SplitMongoKVS, self).__init__(copy.copy(fields), inherited_settings)
+        # deepcopy so that manipulations of fields does not pollute the source
+        super(SplitMongoKVS, self).__init__(copy.deepcopy(fields), inherited_settings)
         self._definition = definition  # either a DefinitionLazyLoader or the db id of the definition.
         # if the db id, then the definition is presumed to be loaded into _fields
 
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
index 832fd2091e5f..db4f6d2adccd 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
@@ -11,7 +11,8 @@
 
 from xblock.fields import Scope
 from xmodule.course_module import CourseDescriptor
-from xmodule.modulestore.exceptions import InsufficientSpecificationError, ItemNotFoundError, VersionConflictError
+from xmodule.modulestore.exceptions import InsufficientSpecificationError, ItemNotFoundError, VersionConflictError, \
+    DuplicateItemError
 from xmodule.modulestore.locator import CourseLocator, BlockUsageLocator, VersionTree, DescriptionLocator
 from xmodule.modulestore.inheritance import InheritanceMixin
 from pytz import UTC
@@ -492,7 +493,7 @@ class TestItemCrud(SplitModuleTest):
     """
     Test create update and delete of items
     """
-    # TODO do I need to test this case which I believe won't work:
+    # DHM do I need to test this case which I believe won't work:
     #  1) fetch a course and some of its blocks
     #  2) do a series of CRUD operations on those previously fetched elements
     # The problem here will be that the version_guid of the items will be the version at time of fetch.
@@ -604,7 +605,91 @@ def test_unique_naming(self):
         self.assertGreaterEqual(new_history['edited_on'], premod_time)
         another_history = modulestore().get_definition_history_info(another_module.definition_locator)
         self.assertEqual(another_history['previous_version'], 'problem12345_3_1')
-    # TODO check that default fields are set
+
+    def test_create_continue_version(self):
+        """
+        Test create_item using the continue_version flag
+        """
+        # start transaction w/ simple creation
+        user = random.getrandbits(32)
+        new_course = modulestore().create_course('test_org', 'test_transaction', user)
+        new_course_locator = new_course.location.as_course_locator()
+        index_history_info = modulestore().get_course_history_info(new_course.location)
+        course_block_prev_version = new_course.previous_version
+        course_block_update_version = new_course.update_version
+        self.assertIsNotNone(new_course_locator.version_guid, "Want to test a definite version")
+        versionless_course_locator = CourseLocator(
+            course_id=new_course_locator.course_id, branch=new_course_locator.branch
+        )
+
+        # positive simple case: no force, add chapter
+        new_ele = modulestore().create_item(
+            new_course.location, 'chapter', user,
+            fields={'display_name': 'chapter 1'},
+            continue_version=True
+        )
+        # version info shouldn't change
+        self.assertEqual(new_ele.update_version, course_block_update_version)
+        self.assertEqual(new_ele.update_version, new_ele.location.version_guid)
+        refetch_course = modulestore().get_course(versionless_course_locator)
+        self.assertEqual(refetch_course.location.version_guid, new_course.location.version_guid)
+        self.assertEqual(refetch_course.previous_version, course_block_prev_version)
+        self.assertEqual(refetch_course.update_version, course_block_update_version)
+        refetch_index_history_info = modulestore().get_course_history_info(refetch_course.location)
+        self.assertEqual(refetch_index_history_info, index_history_info)
+        self.assertIn(new_ele.location.usage_id, refetch_course.children)
+
+        # try to create existing item
+        with self.assertRaises(DuplicateItemError):
+            _fail = modulestore().create_item(
+                new_course.location, 'chapter', user,
+                usage_id=new_ele.location.usage_id,
+                fields={'display_name': 'chapter 2'},
+                continue_version=True
+            )
+
+        # ensure force w/ continue gives exception
+        with self.assertRaises(VersionConflictError):
+            _fail = modulestore().create_item(
+                new_course.location, 'chapter', user,
+                fields={'display_name': 'chapter 2'},
+                force=True, continue_version=True
+            )
+
+        # start a new transaction
+        new_ele = modulestore().create_item(
+            new_course.location, 'chapter', user,
+            fields={'display_name': 'chapter 2'},
+            continue_version=False
+        )
+        transaction_guid = new_ele.location.version_guid
+        # ensure trying to continue the old one gives exception
+        with self.assertRaises(VersionConflictError):
+            _fail = modulestore().create_item(
+                new_course.location, 'chapter', user,
+                fields={'display_name': 'chapter 3'},
+                continue_version=True
+            )
+
+        # add new child to old parent in continued (leave off version_guid)
+        course_module_locator = BlockUsageLocator(
+            course_id=new_course.location.course_id,
+            usage_id=new_course.location.usage_id,
+            branch=new_course.location.branch
+        )
+        new_ele = modulestore().create_item(
+            course_module_locator, 'chapter', user,
+            fields={'display_name': 'chapter 4'},
+            continue_version=True
+        )
+        self.assertNotEqual(new_ele.update_version, course_block_update_version)
+        self.assertEqual(new_ele.location.version_guid, transaction_guid)
+
+        # check children, previous_version
+        refetch_course = modulestore().get_course(versionless_course_locator)
+        self.assertIn(new_ele.location.usage_id, refetch_course.children)
+        self.assertEqual(refetch_course.previous_version, course_block_update_version)
+        self.assertEqual(refetch_course.update_version, transaction_guid)
 
     def test_update_metadata(self):
         """

From ad2da44cb1cffac8ec8b45d38bc0fde3773023c1 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Thu, 19 Sep 2013 13:06:55 -0400
Subject: [PATCH 23/92] Make Textbooks properly lazy

---
 common/lib/xmodule/xmodule/course_module.py   | 15 +++++---
 common/lib/xmodule/xmodule/util/decorators.py | 37 -------------------
 requirements/edx/base.txt                     |  1 +
 3 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 common/lib/xmodule/xmodule/util/decorators.py

diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 24e6995ae105..6d6d204eb810 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -6,10 +6,10 @@
 import requests
 from datetime import datetime
 import dateutil.parser
+from lazy import lazy
 
 from xmodule.modulestore import Location
 from xmodule.seq_module import SequenceDescriptor, SequenceModule
-from xmodule.util.decorators import lazyproperty
 from xmodule.graders import grader_from_conf
 import json
 
@@ -62,17 +62,22 @@ class Textbook(object):
     def __init__(self, title, book_url):
         self.title = title
         self.book_url = book_url
-        self.start_page = int(self.table_of_contents[0].attrib['page'])
 
+    @lazy
+    def start_page(self):
+        return int(self.table_of_contents[0].attrib['page'])
+
+    @lazy
+    def end_page(self):
         # The last page should be the last element in the table of contents,
         # but it may be nested. So recurse all the way down the last element
         last_el = self.table_of_contents[-1]
         while last_el.getchildren():
             last_el = last_el[-1]
 
-        self.end_page = int(last_el.attrib['page'])
+        return int(last_el.attrib['page'])
 
-    @lazyproperty
+    @lazy
     def table_of_contents(self):
         """
         Accesses the textbook's table of contents (default name "toc.xml") at the URL self.book_url
@@ -738,7 +743,7 @@ def _sorting_dates(self):
 
         return announcement, start, now
 
-    @lazyproperty
+    @lazy
     def grading_context(self):
         """
         This returns a dictionary with keys necessary for quickly grading
diff --git a/common/lib/xmodule/xmodule/util/decorators.py b/common/lib/xmodule/xmodule/util/decorators.py
deleted file mode 100644
index e827b74ef17a..000000000000
--- a/common/lib/xmodule/xmodule/util/decorators.py
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-def lazyproperty(fn):
-    """
-    Use this decorator for lazy generation of properties that
-    are expensive to compute. From http://stackoverflow.com/a/3013910/86828
-
-
-    Example:
-    class Test(object):
-
-        @lazyproperty
-        def a(self):
-            print 'generating "a"'
-            return range(5)
-
-    Interactive Session:
-    >>> t = Test()
-    >>> t.__dict__
-    {}
-    >>> t.a
-    generating "a"
-    [0, 1, 2, 3, 4]
-    >>> t.__dict__
-    {'_lazy_a': [0, 1, 2, 3, 4]}
-    >>> t.a
-    [0, 1, 2, 3, 4]
-    """
-
-    attr_name = '_lazy_' + fn.__name__
-
-    @property
-    def _lazyprop(self):
-        if not hasattr(self, attr_name):
-            setattr(self, attr_name, fn(self))
-        return getattr(self, attr_name)
-    return _lazyprop
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 62515f74450c..addef7b629cc 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -34,6 +34,7 @@ feedparser==5.1.3
 fs==0.4.0
 GitPython==0.3.2.RC1
 glob2==0.3
+lazy==1.1
 lxml==3.0.1
 mako==0.7.3
 Markdown==2.2.1

From cfa2b27f26ac482c6b4d30f4073f04160f781e6a Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Thu, 19 Sep 2013 13:07:10 -0400
Subject: [PATCH 24/92] Turn Locations into dicts less often

---
 common/lib/xmodule/xmodule/modulestore/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index e53b4adb5e8b..808932988ab7 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -204,7 +204,7 @@ def url(self):
         """
         Return a string containing the URL for this location
         """
-        url = "{tag}://{org}/{course}/{category}/{name}".format(**self.dict())
+        url = "{0.tag}://{0.org}/{0.course}/{0.category}/{0.name}".format(self)
         if self.revision:
             url += "@" + self.revision
         return url

From e5c90d33fc551cc6871a13c5c5d5b34b9530ae58 Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Mon, 23 Sep 2013 14:21:24 -0400
Subject: [PATCH 25/92] Fix middleware order in CMS.

   And include Don's fix for partial course_id lookup.
---
 cms/envs/common.py                            |  2 +-
 common/djangoapps/contentserver/middleware.py |  8 +++---
 common/djangoapps/contentserver/tests/test.py |  9 +++----
 common/djangoapps/student/models.py           | 25 +++++++++++++++++++
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 38913f537ab4..c79cfe7aa78d 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -140,7 +140,6 @@
 )
 
 MIDDLEWARE_CLASSES = (
-    'contentserver.middleware.StaticContentServer',
     'request_cache.middleware.RequestCache',
     'django.middleware.cache.UpdateCacheMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -150,6 +149,7 @@
 
     # Instead of AuthenticationMiddleware, we use a cache-backed version
     'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
+    'contentserver.middleware.StaticContentServer',
 
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
diff --git a/common/djangoapps/contentserver/middleware.py b/common/djangoapps/contentserver/middleware.py
index 8d81929693cb..30ab977b9683 100644
--- a/common/djangoapps/contentserver/middleware.py
+++ b/common/djangoapps/contentserver/middleware.py
@@ -46,10 +46,10 @@ def process_request(self, request):
             # Check that user has access to content
             if getattr(content, "locked", False):
                 if not hasattr(request, "user") or not request.user.is_authenticated():
-                    return redirect('login')
-                course_id = "/".join([loc.org, loc.course, loc.name])
-                if not CourseEnrollment.is_enrolled(request.user, course_id):
-                    return redirect('dashboard')
+                    return HttpResponse('Unauthorized', status=403)
+                course_partial_id = "/".join([loc.org, loc.course])
+                if not CourseEnrollment.is_enrolled_by_partial(request.user, course_partial_id):
+                    return HttpResponse('Unauthorized', status=403)
 
 
             # see if the last-modified at hasn't changed, if not return a 302 (Not Modified)
diff --git a/common/djangoapps/contentserver/tests/test.py b/common/djangoapps/contentserver/tests/test.py
index 340092b4d346..7313ba3f9b96 100644
--- a/common/djangoapps/contentserver/tests/test.py
+++ b/common/djangoapps/contentserver/tests/test.py
@@ -94,8 +94,7 @@ def test_locked_asset(self):
 
         # Case (1)
         resp = self.client.get(self.url)
-        self.assertEqual(resp.status_code, 302)
-        self.assertTrue(resp.has_header("LOCATION"))
+        self.assertEqual(resp.status_code, 403)
 
         # Case (2)
         #   Create user and login
@@ -110,13 +109,11 @@ def test_locked_asset(self):
 
         resp = self.client.get(self.url)
         log.debug("Received response %s", resp)
-        self.assertEqual(resp.status_code, 302)
-        self.assertTrue(resp.has_header("LOCATION"))
-        self.assertIn("dashboard", resp["LOCATION"])
+        self.assertEqual(resp.status_code, 403)
 
         # Case (3)
         #   Enroll student
-        course_id = "/".join([self.loc.org, self.loc.course, self.loc.name])
+        course_id = "/".join([self.loc.org, self.loc.course, '2012_Fall'])
         CourseEnrollment.enroll(user, course_id)
         self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
 
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 71cff4183b61..8cda698d8b89 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -843,6 +843,31 @@ def is_enrolled(cls, user, course_id):
         except cls.DoesNotExist:
             return False
 
+    @classmethod
+    def is_enrolled_by_partial(cls, user, course_id_partial):
+        """
+        Returns `True` if the user is enrolled in a course that starts with
+        `course_id_partial`. Otherwise, returns False.
+
+        Can be used to determine whether a student is enrolled in a course
+        whose run name is unknown.
+
+        `user` is a Django User object. If it hasn't been saved yet (no `.id`
+               attribute), this method will automatically save it before
+               adding an enrollment for it.
+
+        `course_id_partial` is a starting substring for a fully qualified
+               course_id (e.g. "edX/Test101/").
+        """
+        try:
+            return CourseEnrollment.objects.filter(
+                    user=user,
+                    course_id__startswith=course_id_partial,
+                    is_active=1
+                ).exists()
+        except cls.DoesNotExist:
+            return False
+
     @classmethod
     def enrollment_mode_for_user(cls, user, course_id):
         """

From 5347a49975e181c05235f3d4eab74b8519d76523 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Mon, 23 Sep 2013 16:50:02 -0400
Subject: [PATCH 26/92] Disable test that fails intermittently in master

---
 .../lib/xmodule/xmodule/js/spec/video/video_caption_spec.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
index e803a745e0e3..a94a35e12437 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js
@@ -645,7 +645,7 @@
         });
       });
 
-      describe('when enter key is pressed on a caption', function() {
+      xdescribe('when enter key is pressed on a caption', function() {
         beforeEach(function() {
           var e;
           spyOn(videoCaption, 'seekPlayer').andCallThrough();
@@ -663,7 +663,7 @@
           expect($('.subtitles li[data-index=0]')).toHaveClass('focused');
         });
 
-        it('calls seekPlayer', function() {
+        xit('calls seekPlayer', function() {
            expect(videoCaption.seekPlayer).toHaveBeenCalled();
         });
       });

From f8cd482621ab0b5ff1d0293578351e5952cdf6e8 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 23 Sep 2013 16:56:30 -0400
Subject: [PATCH 27/92] Replace date lib w/ simpler tzAbbr

---
 .../js/views/settings/main_settings_view.js   |  3 +-
 cms/templates/settings.html                   |  2 +-
 common/static/js/vendor/tzAbbr.js             | 59 +++++++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 common/static/js/vendor/tzAbbr.js

diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js
index 84244c6e7b8c..3d5861ca259e 100644
--- a/cms/static/js/views/settings/main_settings_view.js
+++ b/cms/static/js/views/settings/main_settings_view.js
@@ -33,8 +33,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({
             $(this).show();
         });
 
-        var dateIntrospect = new Date();
-        this.$el.find('#timezone').html("(" + dateIntrospect.getTimezone() + ")");
+        this.$el.find('#timezone').html("(" + tzAbbr() + ")");
 
         this.listenTo(this.model, 'invalid', this.handleValidationError);
         this.listenTo(this.model, 'change', this.showNotificationBar);
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index a8dc48dd18d8..eff917695629 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -14,7 +14,7 @@
   <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/timepicker/jquery.timepicker.css')}" />
   <script src="${static.url('js/vendor/timepicker/jquery.timepicker.js')}"></script>
   <script src="${static.url('js/vendor/timepicker/datepair.js')}"></script>
-  <script src="${static.url('js/vendor/date.js')}"></script>
+  <script src="${static.url('js/vendor/tzAbbr.js')}"></script>
 
   <script type="text/javascript" src="${static.url('js/models/course_relative.js')}"></script>
   <script type="text/javascript" src="${static.url('js/views/validating_view.js')}"></script>
diff --git a/common/static/js/vendor/tzAbbr.js b/common/static/js/vendor/tzAbbr.js
new file mode 100644
index 000000000000..18eb5947ee54
--- /dev/null
+++ b/common/static/js/vendor/tzAbbr.js
@@ -0,0 +1,59 @@
+/* Friendly timezone abbreviations in client-side JavaScript
+
+`tzAbbr()` or `tzAbbr(new Date(79,5,24))`
+=> "EDT", "CST", "GMT", etc.!
+
+There's no 100% reliable way to get friendly timezone names in all
+browsers using JS alone, but this tiny function scours a
+stringified date as best it can and returns `null` in the few cases
+where no friendly timezone name is found (so far, just Opera).
+
+Device tested & works in:
+* IE 6, 7, 8, and 9 (latest versions of all)
+* Firefox 3 [through] 16 (16 = latest version to date)
+* Chrome 22 (latest version to date)
+* Safari 6 (latest version to date)
+* Mobile Safari on iOS 5 & 6
+* Android 4.0.3 stock browser
+* Android 2.3.7 stock browser
+* IE Mobile 9 (WP 7.5)
+
+Known to fail in:
+* Opera 12 (desktop, latest version to date)
+
+For Opera, I've included (but commented out) a workaround spotted
+on StackOverflow that returns a GMT offset when no abbreviation is
+found. I haven't found a decent workaround.
+
+If you find any other cases where this method returns null or dodgy
+results, please say so in the comments; even if we can't find a
+workaround it'll at least help others determine if this approach is
+suitable for their project!
+*/
+var tzAbbr = function (dateInput) {
+	var dateObject = dateInput || new Date(),
+		dateString = dateObject + "",
+		tzAbbr = (
+			// Works for the majority of modern browsers
+			dateString.match(/\(([^\)]+)\)$/) ||
+			// IE outputs date strings in a different format:
+			dateString.match(/([A-Z]+) [\d]{4}$/)
+		);
+
+	if (tzAbbr) {
+		// Old Firefox uses the long timezone name (e.g., "Central
+		// Daylight Time" instead of "CDT")
+		tzAbbr = tzAbbr[1].match(/[A-Z]/g).join("");
+	}
+
+	// Uncomment these lines to return a GMT offset for browsers
+	// that don't include the user's zone abbreviation (e.g.,
+	// "GMT-0500".) I prefer to have `null` in this case, but
+	// you may not!
+	// First seen on: http://stackoverflow.com/a/12496442
+	// if (!tzAbbr && /(GMT\W*\d{4})/.test(dateString)) {
+	// 	return RegExp.$1;
+	// }
+
+	return tzAbbr;
+};
\ No newline at end of file

From 9836fd51c7646e001c97747897ff82f015e96d9c Mon Sep 17 00:00:00 2001
From: jmclaus <jmc@edx.org>
Date: Sat, 21 Sep 2013 00:20:48 +0200
Subject: [PATCH 28/92] Speed control now regains focus after a speed entry has
 been selected with the keyboard

---
 .../lib/xmodule/xmodule/js/src/video/08_video_speed_control.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js b/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
index 9db56ffc0d9b..67f62edf95b8 100644
--- a/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
+++ b/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
@@ -283,6 +283,9 @@ function () {
                 this.videoSpeedControl.currentSpeed
             );
         }
+        // When a speed entry has been selected, we want the speed control to 
+        // regain focus.
+        parentEl.parent().siblings('a').focus();
     }
 
     function reRender(params) {

From ffa49b03910891ffa8595e453971b2d2ae8c8a85 Mon Sep 17 00:00:00 2001
From: jmclaus <jmc@edx.org>
Date: Mon, 23 Sep 2013 17:37:35 +0200
Subject: [PATCH 29/92] Added tests

---
 .../js/spec/video/video_speed_control_spec.js | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
index af919e135ef6..4b650d11bec6 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
@@ -138,6 +138,28 @@
           expect(videoSpeedControl.currentSpeed).toEqual(0.75);
         });
       });
+
+      describe('make sure the speed control gets the focus afterwards', function() {
+        var focusSpy;
+
+        beforeEach(function() {
+          initialize();
+          videoSpeedControl.setSpeed(1.0);
+          focusSpy = spyOn($.fn, 'focus').andCallThrough();
+        });
+
+        it('when the speed is the same', function() {
+          $('li[data-speed="1.0"] a').click();
+          expect(focusSpy).toHaveBeenCalled();
+          expect(focusSpy.mostRecentCall.object.selector).toEqual('.parent().parent().siblings(a)');
+        });
+
+        it('when the speed is not the same', function() {
+          $('li[data-speed="0.75"] a').click();
+          expect(focusSpy).toHaveBeenCalled();
+          expect(focusSpy.mostRecentCall.object.selector).toEqual('.parent().parent().siblings(a)');
+        });
+      });
     });
 
     describe('onSpeedChange', function() {

From 2cc9679ea8f47114c1809e4a9a221eb1698e0c92 Mon Sep 17 00:00:00 2001
From: jmclaus <jmc@edx.org>
Date: Tue, 24 Sep 2013 09:12:33 +0200
Subject: [PATCH 30/92] Used Jasmine jQuery for tests instead

---
 .../xmodule/js/spec/video/video_speed_control_spec.js  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
index 4b650d11bec6..a4369005cc9d 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
@@ -140,24 +140,22 @@
       });
 
       describe('make sure the speed control gets the focus afterwards', function() {
-        var focusSpy;
+        var spyEvent;
 
         beforeEach(function() {
           initialize();
           videoSpeedControl.setSpeed(1.0);
-          focusSpy = spyOn($.fn, 'focus').andCallThrough();
+          spyEvent = spyOnEvent('.speeds > a', 'focus');
         });
 
         it('when the speed is the same', function() {
           $('li[data-speed="1.0"] a').click();
-          expect(focusSpy).toHaveBeenCalled();
-          expect(focusSpy.mostRecentCall.object.selector).toEqual('.parent().parent().siblings(a)');
+          expect(spyEvent).toHaveBeenTriggered();
         });
 
         it('when the speed is not the same', function() {
           $('li[data-speed="0.75"] a').click();
-          expect(focusSpy).toHaveBeenCalled();
-          expect(focusSpy.mostRecentCall.object.selector).toEqual('.parent().parent().siblings(a)');
+          expect(spyEvent).toHaveBeenTriggered();;
         });
       });
     });

From feb95eb86965f573e3e4a9c6814e4706b8306532 Mon Sep 17 00:00:00 2001
From: jmclaus <jmc@edx.org>
Date: Tue, 24 Sep 2013 10:30:45 +0200
Subject: [PATCH 31/92] Fixed tests

---
 .../xmodule/js/spec/video/video_speed_control_spec.js  | 10 ++++------
 .../xmodule/js/src/video/08_video_speed_control.js     |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
index a4369005cc9d..13a5705238f4 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
@@ -140,22 +140,20 @@
       });
 
       describe('make sure the speed control gets the focus afterwards', function() {
-        var spyEvent;
-
-        beforeEach(function() {
+          beforeEach(function() {
           initialize();
           videoSpeedControl.setSpeed(1.0);
-          spyEvent = spyOnEvent('.speeds > a', 'focus');
+          spyOnEvent(state.videoSpeedControl.mainAnchor, 'focus');
         });
 
         it('when the speed is the same', function() {
           $('li[data-speed="1.0"] a').click();
-          expect(spyEvent).toHaveBeenTriggered();
+          expect('focus').toHaveBeenTriggeredOn(state.videoSpeedControl.mainAnchor);
         });
 
         it('when the speed is not the same', function() {
           $('li[data-speed="0.75"] a').click();
-          expect(spyEvent).toHaveBeenTriggered();;
+          expect('focus').toHaveBeenTriggeredOn(state.videoSpeedControl.mainAnchor);
         });
       });
     });
diff --git a/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js b/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
index 67f62edf95b8..2ba8a301445d 100644
--- a/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
+++ b/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
@@ -62,6 +62,8 @@ function () {
 
         state.videoSpeedControl.el = state.el.find('div.speeds');
 
+        state.videoSpeedControl.mainAnchor = state.videoSpeedControl.el.children('a');
+
         state.videoSpeedControl.videoSpeedsEl = state.videoSpeedControl.el
             .find('.video_speeds');
 

From 3a5d7d8638f9253500d23df926019c79252263fe Mon Sep 17 00:00:00 2001
From: jmclaus <jmc@edx.org>
Date: Tue, 24 Sep 2013 12:12:10 +0200
Subject: [PATCH 32/92] Addressed PR comments

---
 .../xmodule/js/spec/video/video_speed_control_spec.js  | 10 ++++++----
 .../xmodule/js/src/video/08_video_speed_control.js     |  2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
index 13a5705238f4..2684fb738e47 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js
@@ -140,20 +140,22 @@
       });
 
       describe('make sure the speed control gets the focus afterwards', function() {
-          beforeEach(function() {
+        var anchor;
+        beforeEach(function() {
           initialize();
+          anchor= $('.speeds > a').first();
           videoSpeedControl.setSpeed(1.0);
-          spyOnEvent(state.videoSpeedControl.mainAnchor, 'focus');
+          spyOnEvent(anchor, 'focus');
         });
 
         it('when the speed is the same', function() {
           $('li[data-speed="1.0"] a').click();
-          expect('focus').toHaveBeenTriggeredOn(state.videoSpeedControl.mainAnchor);
+          expect('focus').toHaveBeenTriggeredOn(anchor);
         });
 
         it('when the speed is not the same', function() {
           $('li[data-speed="0.75"] a').click();
-          expect('focus').toHaveBeenTriggeredOn(state.videoSpeedControl.mainAnchor);
+          expect('focus').toHaveBeenTriggeredOn(anchor);
         });
       });
     });
diff --git a/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js b/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
index 2ba8a301445d..67f62edf95b8 100644
--- a/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
+++ b/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js
@@ -62,8 +62,6 @@ function () {
 
         state.videoSpeedControl.el = state.el.find('div.speeds');
 
-        state.videoSpeedControl.mainAnchor = state.videoSpeedControl.el.children('a');
-
         state.videoSpeedControl.videoSpeedsEl = state.videoSpeedControl.el
             .find('.video_speeds');
 

From 3b61d5721aec18abb33c1fcd4aa5a837869ff103 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 24 Sep 2013 09:03:36 -0400
Subject: [PATCH 33/92] Ensure location is valid before trying to fetch Prevent
 accidental wildcarding.

---
 common/lib/xmodule/xmodule/contentstore/mongo.py       |  2 ++
 .../xmodule/xmodule/modulestore/tests/test_mongo.py    | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/common/lib/xmodule/xmodule/contentstore/mongo.py
index 40c0b4bc9f93..e146e46e3207 100644
--- a/common/lib/xmodule/xmodule/contentstore/mongo.py
+++ b/common/lib/xmodule/xmodule/contentstore/mongo.py
@@ -177,6 +177,8 @@ def set_attrs(self, location, attr_dict):
 
         :param location:  a c4x asset location
         """
+        # raises exception if location is not fully specified
+        Location.ensure_fully_specified(location)
         for attr in attr_dict.iterkeys():
             if attr in ['_id', 'md5', 'uploadDate', 'length']:
                 raise AttributeError("{} is a protected attribute.".format(attr))
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
index e89aa21a167f..c2e6be279354 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
@@ -22,6 +22,7 @@
 from xmodule.modulestore.tests.test_modulestore import check_path_to_location
 from IPython.testing.nose_assert_methods import assert_in, assert_not_in
 from xmodule.exceptions import NotFoundError
+from xmodule.modulestore.exceptions import InsufficientSpecificationError
 
 log = logging.getLogger(__name__)
 
@@ -227,11 +228,11 @@ def test_contentstore_attrs(self):
             TestMongoModuleStore.content_store.set_attrs(content['_id'], {'miscel': 99})
             assert_equals(TestMongoModuleStore.content_store.get_attr(content['_id'], 'miscel'), 99)
         assert_raises(
-            AttributeError, TestMongoModuleStore.content_store.set_attr, course_content[0],
+            AttributeError, TestMongoModuleStore.content_store.set_attr, course_content[0]['_id'],
             'md5', 'ff1532598830e3feac91c2449eaa60d6'
         )
         assert_raises(
-            AttributeError, TestMongoModuleStore.content_store.set_attrs, course_content[0],
+            AttributeError, TestMongoModuleStore.content_store.set_attrs, course_content[0]['_id'],
             {'foo': 9, 'md5': 'ff1532598830e3feac91c2449eaa60d6'}
         )
         assert_raises(
@@ -253,6 +254,11 @@ def test_contentstore_attrs(self):
             Location('bogus', 'bogus', 'bogus', 'asset', 'bogus'),
             {'displayname': 'hello'}
         )
+        assert_raises(
+            InsufficientSpecificationError, TestMongoModuleStore.content_store.set_attrs,
+            Location('bogus', 'bogus', 'bogus', 'asset', None),
+            {'displayname': 'hello'}
+        )
 
 
 class TestMongoKeyValueStore(object):

From f30364906da8f2555d6596051b6d2c157dc16214 Mon Sep 17 00:00:00 2001
From: Jay Zoldak <zoldak@edx.org>
Date: Fri, 20 Sep 2013 10:38:28 -0400
Subject: [PATCH 34/92] Speed up lti acceptance test for remote webdriver.

---
 lms/djangoapps/courseware/features/lti.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/features/lti.py b/lms/djangoapps/courseware/features/lti.py
index 0e91d5ed0266..d9cc40f69073 100644
--- a/lms/djangoapps/courseware/features/lti.py
+++ b/lms/djangoapps/courseware/features/lti.py
@@ -22,7 +22,10 @@ def lti_is_not_rendered(_step):
     #inside iframe test content is not presented
     with world.browser.get_iframe('ltiLaunchFrame') as iframe:
         # iframe does not contain functions from terrain/ui_helpers.py
-        assert iframe.is_element_not_present_by_css('.result', wait_time=5)
+        world.browser.driver.implicitly_wait(1)
+        result = iframe.is_element_not_present_by_css('.result', wait_time=1)
+        world.browser.driver.implicitly_wait(world.IMPLICIT_WAIT)
+        assert result
 
 
 @step('I view the LTI and it is rendered$')

From 20ea28748bd7c96236906d3b55614eb486b3c6d5 Mon Sep 17 00:00:00 2001
From: Jay Zoldak <zoldak@edx.org>
Date: Thu, 19 Sep 2013 12:54:45 -0400
Subject: [PATCH 35/92] Speed up problems feature tests

---
 lms/djangoapps/courseware/features/problems_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/courseware/features/problems_setup.py b/lms/djangoapps/courseware/features/problems_setup.py
index 0253571b479e..3b1b983fc38c 100644
--- a/lms/djangoapps/courseware/features/problems_setup.py
+++ b/lms/djangoapps/courseware/features/problems_setup.py
@@ -144,7 +144,7 @@ def test_add_to_ten(expect,ans):
                         ]
         },
         'correct': ['section.choicetextgroup_correct'],
-        'incorrect': ['span.incorrect', 'section.choicetextgroup_incorrect'],
+        'incorrect': ['section.choicetextgroup_incorrect', 'span.incorrect'],
         'unanswered': ['span.unanswered']},
 
     'checkbox_text': {
@@ -242,7 +242,7 @@ def answer_problem(problem_type, correctness):
 def problem_has_answer(problem_type, answer_class):
     if problem_type == "drop down":
         if answer_class == 'blank':
-            assert world.browser.is_element_not_present_by_css('option[selected="true"]')
+            assert world.is_css_not_present('option[selected="true"]')
         else:
             actual = world.browser.find_by_css('option[selected="true"]').value
             expected = 'Option 2' if answer_class == 'correct' else 'Option 3'

From 002f3ef9e27a80884ea664330604397b71bc5a4d Mon Sep 17 00:00:00 2001
From: Jay Zoldak <zoldak@edx.org>
Date: Thu, 19 Sep 2013 11:51:34 -0400
Subject: [PATCH 36/92] Speed up waiting for elements not present on remote
 webdriver sessions.

---
 cms/djangoapps/contentstore/features/subsection.py | 2 +-
 common/djangoapps/terrain/browser.py               | 6 ++++--
 common/djangoapps/terrain/ui_helpers.py            | 9 +++++++--
 lms/djangoapps/courseware/features/lti.py          | 9 ++++++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/subsection.py b/cms/djangoapps/contentstore/features/subsection.py
index 6d9612d9bdd9..68e65ee7ace6 100644
--- a/cms/djangoapps/contentstore/features/subsection.py
+++ b/cms/djangoapps/contentstore/features/subsection.py
@@ -109,7 +109,7 @@ def i_see_my_subsection_name_with_quote_on_the_courseware_page(step):
 @step('the subsection does not exist$')
 def the_subsection_does_not_exist(step):
     css = 'span.subsection-name'
-    assert world.browser.is_element_not_present_by_css(css)
+    assert world.is_css_not_present(css)
 
 
 @step('I see the subsection release date is ([0-9/-]+)( [0-9:]+)?')
diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py
index e8d5b1f2e763..f40108eb3aca 100644
--- a/common/djangoapps/terrain/browser.py
+++ b/common/djangoapps/terrain/browser.py
@@ -119,6 +119,7 @@ def initial_setup(server):
         if not success:
             raise IOError("Could not acquire valid {driver} browser session.".format(driver=browser_driver))
 
+        world.absorb(0, 'IMPLICIT_WAIT')
         world.browser.driver.set_window_size(1280, 1024)
 
     elif world.LETTUCE_SELENIUM_CLIENT == 'saucelabs':
@@ -128,7 +129,7 @@ def initial_setup(server):
             url="http://{}:{}@ondemand.saucelabs.com:80/wd/hub".format(config['username'], config['access-key']),
             **make_saucelabs_desired_capabilities()
         )
-        world.browser.driver.implicitly_wait(30)
+        world.absorb(30, 'IMPLICIT_WAIT')
 
     elif world.LETTUCE_SELENIUM_CLIENT == 'grid':
         world.browser = Browser(
@@ -136,11 +137,12 @@ def initial_setup(server):
             url=settings.SELENIUM_GRID.get('URL'),
             browser=settings.SELENIUM_GRID.get('BROWSER'),
         )
-        world.browser.driver.implicitly_wait(30)
+        world.absorb(30, 'IMPLICIT_WAIT')
 
     else:
         raise Exception("Unknown selenium client '{}'".format(world.LETTUCE_SELENIUM_CLIENT))
 
+    world.browser.driver.implicitly_wait(world.IMPLICIT_WAIT)
     world.absorb(world.browser.driver.session_id, 'jobid')
 
 
diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index e4e0626779ee..75bc8bb2cb37 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -36,8 +36,13 @@ def is_css_present(css_selector, wait_time=10):
 
 @world.absorb
 def is_css_not_present(css_selector, wait_time=5):
-    return world.browser.is_element_not_present_by_css(css_selector, wait_time=wait_time)
-
+    world.browser.driver.implicitly_wait(1)
+    try:
+        return world.browser.is_element_not_present_by_css(css_selector, wait_time=wait_time)
+    except:
+        raise
+    finally:
+        world.browser.driver.implicitly_wait(world.IMPLICIT_WAIT)
 
 @world.absorb
 def css_has_text(css_selector, text, index=0):
diff --git a/lms/djangoapps/courseware/features/lti.py b/lms/djangoapps/courseware/features/lti.py
index d9cc40f69073..ef385cf2c9bb 100644
--- a/lms/djangoapps/courseware/features/lti.py
+++ b/lms/djangoapps/courseware/features/lti.py
@@ -23,9 +23,12 @@ def lti_is_not_rendered(_step):
     with world.browser.get_iframe('ltiLaunchFrame') as iframe:
         # iframe does not contain functions from terrain/ui_helpers.py
         world.browser.driver.implicitly_wait(1)
-        result = iframe.is_element_not_present_by_css('.result', wait_time=1)
-        world.browser.driver.implicitly_wait(world.IMPLICIT_WAIT)
-        assert result
+        try:
+            assert iframe.is_element_not_present_by_css('.result', wait_time=1)
+        except:
+            raise
+        finally:
+            world.browser.driver.implicitly_wait(world.IMPLICIT_WAIT)
 
 
 @step('I view the LTI and it is rendered$')

From 818f4f231ae239239cdd45b53377f3dc17321274 Mon Sep 17 00:00:00 2001
From: stroilova <olga@edx.org>
Date: Tue, 27 Aug 2013 12:45:16 -0400
Subject: [PATCH 37/92] Update event doc from wiki

    update to grid table
    Cleaned up formatting to use `` instead of :code:
    Added Instructor Events and cleaned up outline
    Added instructor events. Cleaned up outline.
    Moved out correct_map table to addendum
    Removed deprecated/undocumented events
---
 docs/data/source/index.rst                    |   2 +-
 .../internal_data_formats/tracking_logs.rst   | 695 ++++++++----------
 2 files changed, 313 insertions(+), 384 deletions(-)

diff --git a/docs/data/source/index.rst b/docs/data/source/index.rst
index 468731f255ee..d1efb4690257 100644
--- a/docs/data/source/index.rst
+++ b/docs/data/source/index.rst
@@ -5,7 +5,7 @@
 
 edX Data Documentation
 ======================
-The following documents are targetted at those who are working with various data formats consumed and produced by the edX platform -- primarily course authors and those who are conducting research on data in our system. Developer oriented discussion of architecture and strictly internal APIs should be documented elsewhere.
+The following documents are targeted at those who are working with various data formats consumed and produced by the edX platform -- primarily course authors and those who are conducting research on data in our system. Developer oriented discussion of architecture and strictly internal APIs should be documented elsewhere.
 
 Course Data Formats
 -------------------
diff --git a/docs/data/source/internal_data_formats/tracking_logs.rst b/docs/data/source/internal_data_formats/tracking_logs.rst
index 04326497d74c..7af67cbc82bd 100644
--- a/docs/data/source/internal_data_formats/tracking_logs.rst
+++ b/docs/data/source/internal_data_formats/tracking_logs.rst
@@ -1,389 +1,318 @@
-#############
-Tracking Logs
-#############
+===============
+ Tracking Logs
+===============
 
-* Tracking logs are made available as separate tar files on S3 in the course-data bucket.
-* They are represented as JSON files that catalog all user interactions with the site.
-* To avoid filename collisions the tracking logs are organized by server name, where each directory corresponds to a server where they were stored. 
+The following is an inventory of all LMS event types. 
 
-*************
-Common Fields
-*************
-
-  .. list-table::
-     :widths: 10 40 10 25
-     :header-rows: 1
-     
-     * - field
-       - details
-       - type
-       - values/format
-     * - `username`
-       - username of the user who triggered the event, empty string for anonymous events (not logged in)
-       - string
-       - 
-     * - `session`
-       - key identifying the user's session, may be undefined
-       - string
-       - 32 digits key
-     * - `time`
-       - GMT time the event was triggered
-       - string	
-       - `YYYY-MM-DDThh:mm:ss.xxxxxx`
-     * - `ip`
-       - user ip address
-       - string
-       - 
-     * - `agent`
-       - users browser agent string
-       - string
-       - 
-     * - `page`
-       - page the user was visiting when the event was generated
-       - string
-       - `$URL`
-     * - event_source
-       - event source
-       - string
-       - `browser`, `server`
-     * - `event_type`
-       - type of event triggered, values depends on `event_source`
-       - string
-       - *more details listed below*
-     * - `event`
-       - specifics of the event (dependenty of the event_type)
-       - string/json
-       - *the event string may encode a JSON record*
-       
-
-*************
-Event Sources
-*************
+This inventory is comprised of a table of Common Fields that appear in all events, a table of Student Event Types which lists all interaction with the LMS outside of the Instructor Dashboard, 
+and a table of Instructor Event Types of all interaction with the Instructor Dashboard in the LMS.
 
-The `event_source` field identifies whether the event originated in the browser (via javascript) or on the server (during the processing of a request).
-
-Server Events
+Common Fields
 =============
 
-  .. list-table::
-     :widths: 20 10 10 10 50
-     :header-rows: 1
-  
-     * - event_type
-       - event fields
-       - type
-       - values/format
-       - details
-     * - `show_answer`
-       - `problem_id`
-       - string
-       - 
-       - id of the problem being shown. Ex: `i4x://MITx/6.00x/problem/L15:L15_Problem_2`
-     * - `save_problem_check`
-       - `problem_id`
-       - string
-       - 
-       - id of the problem being shown
-     * -
-       - `success`
-       - string
-       - correct, incorrect
-       - whether the problem was correct
-     * -  	
-       - `attempts`
-       - integer
-       - number of attempts
-       -
-     * - 
-       - `correct_map`
-       - string/json
-       - 
-       - see details below
-     * - 
-       - `state`
-       - string/json
-       - 
-       - current problem state
-     * - 
-       - `answers`
-       - string/json
-       -
-       - students answers
-     * -
-       - `reset_problem`
-       - problem_id
-       - string
-       - id of the problem being shown
-
-
-`correct_map` details
----------------------
-
-  .. list-table::
-     :widths: 15 10 15 10
-     :header-rows: 1
-    
-     * - correct_map fields
-       - type
-       - values/format
-       - null allowed?
-     * - hint
-       - string
-       -
-       -
-     * - hintmode
-       - boolean
-       -
-       - yes
-     * - correctness
-       - string
-       - correct, incorrect
-       -
-     * - npoints
-       - integer
-       -
-       - yes
-     * - msg
-       - string
-       -
-       -
-     * - queuestate
-       - string/json
-       - keys: key, time
-       -
-
-
-Browser Events
-==============
-
-  .. list-table::
-     :widths: 10 10 8 12 20 10
-     :header-rows: 1
-  
-     * - event_type
-       - fields
-       - type
-       - values/format
-       - details
-       - example
-     * - `book`
-       - `type`
-       - string
-       - `gotopage`	
-       -
-       -
-     * - 
-       - `old`
-       - integer	
-       - `$PAGE`
-       - from page number
-       - `2`
-     * -
-       - `new`
-       - integer
-       - `$PAGE`
-       - to page number
-       - `25`
-     * - `book`
-       - `type`
-       - string
-       - `nextpage`
-       -
-       -
-     * - 
-       - new
-       - integer
-       - `$PAGE`
-       - next page number
-       - `10`
-     * - `page_close`
-       - *empty*
-       - string
-       -
-       - 'page' field indicates which page was being closed
-       -
-     * - play_video
-       - `id`
-       - string
-       -
-       - edX id of the video being watched
-       - `i4x-HarvardX-PH207x-video-Simple_Random_Sample`
-     * -
-       - code
-       - string
-       -
-       - youtube id of the video being watched
-       - `FU3fCJNs94Y`
-     * -
-       - `currentTime`
-       - float
-       -
-       - time the video was paused at, in seconds
-       - `1.264`
-     * -
-       - `speed`
-       - string
-       - `0.75, 1.0, 1.25, 1.50`
-       - video speed being played
-       - `"1.0"`
-     * - `pause_video`
-       - `id`
-       - string
-       -
-       - edX id of the video being watched
-       -
-     * -
-       - `code`
-       - string
-       -
-       - youtube id of the video being watched
-       -
-     * -
-       - `currentTime`
-       - float
-       -
-       - time the video was paused at
-       -
-     * - 
-       - `speed`
-       - string
-       - `0.75, 1.0, 1.25, 1.50`
-       - video speed being played
-       -
-     * - `problem_check`
-       - *none*
-       - string
-       -
-       - event field contains the values of all input fields from the problem being checked (in the style of GET parameters (`key=value&key=value`))
-       -
-     * - `problem_show`
-       - `problem`
-       - string
-       - 
-       - id of the problem being checked
-       -
-     * - `seq_goto`
-       - `id`
-       - string
-       -
-       - edX id of the sequence
-       -
-     * -	
-       - `old`
-       - integer
-       -
-       - sequence element being jumped from
-       - `3`
-     * -
-       - `new`
-       - integer
-       -
-       - sequence element being jumped to
-       - `5`
-     * - `seq_next`
-       - `id`
-       - string
-       -
-       - edX id of the sequence	
-       -
-     * -	
-       - `old`
-       - integer
-       -
-       - sequence element being jumped from
-       - `4`
-     * -
-       - `new`
-       - integer
-       -
-       - sequence element being jumped to
-       - `6`
-     * - `rubric_select`
-       - `location`
-       - string
-       -
-       - location of the rubric's problem
-       - `i4x://MITx/6.00x/problem/L15:L15_Problem_2`
-     * -
-       - `category`
-       - integer
-       - 
-       - category number of the rubric selection
-       -
-     * -
-       - `value`
-       - integer
-       -
-       - value selected within the category
-       -
-     * - `(oe / peer_grading / staff_grading)`
-         `_show_problem`
-       - `location`
-       - string
-       -
-       - the location of the problem whose prompt we're showing
-       -
-     * - `(oe / peer_grading / staff_grading)`
-         `_hide_problem`
-       - `location`
-       - string
-       - 
-       - the location of the problem whose prompt we're hiding
-       -
-     * - `oe_show_full_feedback`
-       - *empty*
-       -
-       -
-       - the page where they're showing full feedback is already recorded
-       -
-     * - `oe_show_respond_to_feedback`
-       - *empty*
-       -
-       -
-       - the page where they're showing the feedback response form is already recorded
-       -
-     * - `oe_feedback_response_selected`
-       - `value`
-       - integer
-       -
-       - the value selected in the feedback response form
-       -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+This section contains a table of fields common to all events.
+
+
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| Common Field              | Details                                                     | Type        | Values/Format                      |
++===========================+=============================================================+=============+====================================+
+| ``agent``                 | Browser agent string of the user who triggered the event.   | string      |                                    |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``event``                 | Specifics of the triggered event.                           | string/JSON |                                    |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``event_source``          | Specifies whether the triggered event originated in the     | string      | `'browser'`, `'server'`, `'task'`  |
+|                           | browser or on the server.                                   |             |                                    |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``event_type``            | The type of event triggered. Values depend on               | string      | (see below)                        |
+|                           | ``event_source``                                            |             |                                    |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``ip``                    | IP address of the user who triggered the event.             | string      |                                    |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``page``                  | Page user was visiting when the event was fired.            | string      | `'$URL'`                           |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``session``               | This key identifies the user's session. May be undefined.   | string      | 32 digits                          |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``time``                  | Gives the GMT time at which the event was fired.            | string      | `'YYYY-MM-DDThh:mm:ss.xxxxxx'`     |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+| ``username``              | The username of the user who caused the event to fire. This | string      |                                    |
+|                           | string is empty for anonymous events (i.e., user not logged |             |                                    |
+|                           | in).                                                        |             |                                    |
++---------------------------+-------------------------------------------------------------+-------------+------------------------------------+
+       
 
+Event Types
+===========
+
+There are two tables of event types -- one for student events, and one for instructor events.
+Table columns describe what each event type represents, which component it originates from, what scripting language was used to fire the event, and what ``event`` fields are associated with it.
+The ``event_source`` field from the "Common Fields" table above distinguishes between events that originated in the browser (in javascript) and events that originated on the server (during the processing of a request). 
+
+Event types with several different historical names are enumerated by forward slashes. 
+Rows identical after the second column have been combined, with the corresponding event types enumerated by commas.
+
+
+
+Student Event Types
+-------------------
+
+The Student Event Type table lists the event types logged for interaction with the LMS outside the Instructor Dashboard.
+
+
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| Event Type                        | Description                   | Component           | Language        | ``event`` Fields    | Type          | Details                                                             |
++===================================+===============================+=====================+=================+=====================+===============+=====================================================================+
+| ``seq_goto``                      | Fired when a user jumps       | Sequence            | CoffeeScript/JS | ``old``             | integer       | Index of the unit being jumped from.                                |
+|                                   | between units in              |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   | a sequence.                   |                     |                 | ``new``             | integer       | Index of the unit being jumped to.                                  |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``id``              | integer       | edX ID of the sequence.                                             |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``seq_next``                      | Fired when a user navigates   | Sequence            | CoffeeScript/JS | ``old``             | integer       | Index of the unit being navigated                                   |
+|                                   | to the next unit in a         |                     |                 |                     |               | away from.                                                          |
+|                                   | sequence.                     |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``new``             | integer       | Index of the unit being navigated to.                               |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``id``              | integer       | edX ID of the sequence.                                             |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``seq_prev``                      | Fired when a user navigates   | Sequence            | CoffeeScript/JS | ``old``             | integer       | Index of the unit being navigated away                              |
+|                                   | to the previous unit in a     |                     |                 |                     |               | from.                                                               |
+|                                   | sequence.                     |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``new``             | integer       | Index of the unit being navigated to.                               |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``id``              | integer       | edX ID of the sequence.                                             |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_check``                 | Fired when a user wants to    | Capa                | CoffeeScript/JS |                     |               | The ``event`` field contains the                                    |
+|                                   | check a problem.              |                     |                 |                     |               | values of all input fields from the problem                         |
+|                                   |                               |                     |                 |                     |               | being checked, styled as GET parameters.                            |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_reset``                 | Fired when a problem is       | Capa                | CoffeeScript/JS |                     |               |                                                                     |
+|                                   | reset.                        |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_show``                  | Fired when a problem is       | Capa                | CoffeeScript/JS | ``problem``         | string        | ID of the problem being shown (e.g.,                                |
+|                                   | shown.                        |                     |                 |                     |               | i4x://MITx/6.00x/problem/L15:L15_Problem_2).                        |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_save``                  | Fired when a problem is       | Capa                | CoffeeScript/JS |                     |               |                                                                     |
+|                                   | saved.                        |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``oe_hide_question`` /            |                               | Combined Open-Ended | CoffeeScript/JS | ``location``        | string        | The location of the question whose prompt is                        |
+| ``oe_hide_problem``               |                               |                     |                 |                     |               | being hidden.                                                       |
+| ``peer_grading_hide_question`` /  |                               | Peer Grading        |                 |                     |               |                                                                     |
+| ``peer_grading_hide_problem``     |                               |                     |                 |                     |               |                                                                     |
+| ``staff_grading_hide_question`` / |                               | Staff Grading       |                 |                     |               |                                                                     |
+| ``staff_grading_hide_problem``    |                               |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``oe_show_question`` /            |                               | Combined Open-Ended | CoffeeScript/JS | ``location``        | string        | The location of the question whose prompt is                        |
+| ``oe_show_problem``               |                               |                     |                 |                     |               | being shown.                                                        |
+| ``peer_grading_show_question`` /  |                               | Peer Grading        |                 |                     |               |                                                                     |
+| ``peer_grading_show_problem``     |                               |                     |                 |                     |               |                                                                     |
+| ``staff_grading_show_question`` / |                               | Staff Grading       |                 |                     |               |                                                                     |
+| ``staff_grading_show_problem``    |                               |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``rubric_select``                 |                               | Combined Open-Ended | CoffeeScript/JS | ``location``        | string        | The location of the question whose rubric is                        |
+|                                   |                               |                     |                 |                     |               | being selected.                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``selection``       | integer       | Value selected on rubric.                                           |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``category``        | integer       | Rubric category selected.                                           |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``oe_show_full_feedback``         |                               | Combined Open-Ended | CoffeeScript/JS |                     |               |                                                                     |
+| ``oe_show_respond_to_feedback``   |                               |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``oe_feedback_response_selected`` |                               | Combined Open-Ended | CoffeeScript/JS | ``value``           | integer       | Value selected in the feedback response form.                       |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``page_close``                    | This event type originates    | Logger              | CoffeeScript/JS |                     |               |                                                                     |
+|                                   | from within the Logger        |                     |                 |                     |               |                                                                     |
+|                                   | itself.                       |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``play_video``                    | Fired on video play.          | Video               | CoffeeScript/JS | ``id``              | string        | EdX ID of the video being watched (e.g.,                            |
+|                                   |                               |                     |                 |                     |               | i4x-HarvardX-PH207x-video-Simple_Random_Sample).                    |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``code``            | string        | YouTube ID of the video being watched (e.g.,                        |
++-----------------------------------+-------------------------------+                     |                 |                     |               | FU3fCJNs94Y).                                                       |
+| ``pause_video``                   | Fired on video pause.         |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``currentTime``     | float         | Time the video was played at, in seconds.                           |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``speed``           | string        | Video speed in use (i.e., 0.75, 1.0, 1.25, 1.50).                   |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``book``                          | Fired when a user is reading  | PDF Viewer          |  JS             | ``type``            | string        | `'gotopage'`, `'prevpage'`, `'nextpage'`                            |
+|                                   | a PDF book.                   |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``old``             | integer       | Original page number.                                               |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``new``             | integer       | Destination page number.                                            |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``showanswer`` /                  | Server-side event which       | Capa Module         | Python          | ``problem_id``      | string        | EdX ID of the problem being shown.                                  |
+| ``show_answer``                   | displays the answer to a      |                     |                 |                     |               |                                                                     |
+|                                   | problem.                      |                     |                 |                     |               |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_check_fail``            |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being checked.                                    |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'unreset'`                                             |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_check`` /               |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+| ``save_problem_check``            |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being checked.                                    |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``success``         | string        | `'correct'`, `'incorrect'`                                          |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``attempts``        | integer       |                                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``correct_map``     | string / JSON | **See the table in**                                                |
+|                                   |                               |                     |                 |                     |               | **Addendum:** ``correct_map`` **Fields and Values below**           |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_rescore_fail``          |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being rescored.                                   |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``failure``         | string        | `'unsupported'`, `'unanswered'`, `'input_error'`, `'unexpected'`    |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``problem_rescore``               |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being rescored.                                   |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``orig_score``      | integer       |                                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``orig_total``      | integer       |                                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``new_score``       | integer       |                                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``new_total``       | integer       |                                                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``correct_map``     | string / JSON | (See above.)                                                        |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``success``         | string        | `'correct'`, `'incorrect'`                                          |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``attempts``        | integer       |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``save_problem_fail``             |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being saved.                                      |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'done'`                                                |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``save_problem_success``          |                               | Capa Module         | Python          | ``state``           | string / JSON | Current problem state.                                              |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being saved.                                      |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``answers``         | dict          |                                                                     |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``reset_problem_fail``            |                               | Capa Module         | Python          | ``old_state``       | string / JSON | Current problem state.                                              |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        |  ID of the problem being reset.                                     |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``failure``         | string        | `'closed'`, `'not_done'`                                            |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``reset_problem``                 |                               | Capa Module         | Python          | ``old_state``       | string / JSON | Current problem state.                                              |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``problem_id``      | string        | ID of the problem being reset.                                      |
+|                                   |                               |                     |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                   |                               |                     |                 | ``new_state``       | string / JSON | New problem state.                                                  |
++-----------------------------------+-------------------------------+---------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+
+*Addendum:* ``correct_map`` *Fields and Values*
+-----------------------------------------------
+
+Table of ``correct_map`` field types and values for the ``problem_check`` student event type above.
+
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+| ``correct_map`` **field**                        |  **Type**                                        | **Values / Format**                              |  **Null Allowed?**                               |
++==================================================+==================================================+==================================================+==================================================+
+| ``answer_id``                                    | string                                           |                                                  |                                                  |
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+| ``correctness``                                  | string                                           | `'correct'`, `'incorrect'`                       |                                                  |
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+| ``npoints``                                      | integer                                          | Points awarded for this ``answer_id``.           | yes                                              |
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+| ``msg``                                          | string                                           | Gives extra message response.                    |                                                  |
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+| ``hint``                                         | string                                           | Gives optional hint.                             | yes                                              |
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+| ``hintmode``                                     | string                                           | None, `'on_request'`, `'always'`                 | yes                                              |
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+| ``queuestate``                                   | dict                                             | None when not queued, else `{key:' ', time:' '}` | yes                                              |
+|                                                  |                                                  | where key is a secret string and time is a       |                                                  |
+|                                                  |                                                  | string dump of a DateTime object of the form     |                                                  |
+|                                                  |                                                  | `'%Y%m%d%H%M%S'`.                                |                                                  |
++--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+--------------------------------------------------+
+ 
+
+Instructor Event Types
+----------------------
+
+
+The Instructor Event Type table lists the event types logged for course team interaction with the Instructor Dashboard in the LMS.
+
+
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| Event Type                             | Description                   | Component            | Language        | ``event`` Fields    | Type          | Details                                                             |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``list-students``,                     |                               | Instructor Dashboard | Python          |                     |               |                                                                     |
+| ``dump-grades``,                       |                               |                      |                 |                     |               |                                                                     |
+| ``dump-grades-raw``,                   |                               |                      |                 |                     |               |                                                                     |
+| ``dump-grades-csv``,                   |                               |                      |                 |                     |               |                                                                     |
+| ``dump-grades-csv-raw``,               |                               |                      |                 |                     |               |                                                                     |
+| ``dump-answer-dist-csv``,              |                               |                      |                 |                     |               |                                                                     |
+| ``dump-graded-assignments-config``     |                               |                      |                 |                     |               |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``rescore-all-submissions``,           |                               | Instructor Dashboard | Python          | ``problem``         | string        |                                                                     |
+| ``reset-all-attempts``                 |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``course``          | string        |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``delete-student-module-state``,       |                               | Instructor Dashboard | Python          | ``problem``         | string        |                                                                     |
+| ``rescore-student-submission``         |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``student``         | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``course``          | string        |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``reset-student-attempts``             |                               | Instructor Dashboard | Python          | ``old_attempts``    | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``student``         | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``problem``         | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``instructor``      | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``course``          | string        |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``get-student-progress-page``          |                               | Instructor Dashboard | Python          | ``student``         | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``instructor``      | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``course``          | string        |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``list-staff``,                        |                               | Instructor Dashboard | Python          |                     |               |                                                                     |
+| ``list-instructors``,                  |                               |                      |                 |                     |               |                                                                     |
+| ``list-beta-testers``                  |                               |                      |                 |                     |               |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``add-instructor``,                    |                               | Instructor Dashboard | Python          | ``instructor``      | string        |                                                                     |
+| ``remove-instructor``                  |                               |                      |                 |                     |               |                                                                     |
+|                                        |                               |                      |                 |                     |               |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``list-forum-admins``,                 |                               | Instructor Dashboard | Python          | ``course``          | string        |                                                                     |
+| ``list-forum-mods``,                   |                               |                      |                 |                     |               |                                                                     |
+| ``list-forum-community-TAs``           |                               |                      |                 |                     |               |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``remove-forum-admin``,                |                               | Instructor Dashboard | Python          | ``username``        | string        |                                                                     |
+| ``add-forum-admin``,                   |                               |                      |                 |                     |               |                                                                     |
+| ``remove-forum-mod``,                  |                               |                      |                 |                     |               |                                                                     |
+| ``add-forum-mod``,                     |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+| ``remove-forum-community-TA``,         |                               |                      |                 | ``course``          | string        |                                                                     |
+| ``add-forum-community-TA``             |                               |                      |                 |                     |               |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``psychometrics-histogram-generation`` |                               | Instructor Dashboard | Python          | ``problem``         | string        |                                                                     |
+|                                        |                               |                      |                 |                     |               |                                                                     |
+|                                        |                               |                      |                 |                     |               |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+
+| ``add-or-remove-user-group``           |                               | Instructor Dashboard |     Python      | ``event_name``      | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``user``            | string        |                                                                     |
+|                                        |                               |                      |                 +---------------------+---------------+---------------------------------------------------------------------+
+|                                        |                               |                      |                 | ``event``           | string        |                                                                     |
++----------------------------------------+-------------------------------+----------------------+-----------------+---------------------+---------------+---------------------------------------------------------------------+

From f898f7292026ab563bae6833cf705a9e4397be2e Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Tue, 24 Sep 2013 11:42:11 -0400
Subject: [PATCH 38/92] Added tags to acceptance tests to define multiple
 shards.

---
 .../features/advanced-settings.feature        |  1 +
 .../contentstore/features/checklists.feature  |  1 +
 .../contentstore/features/component.feature   |  1 +
 .../features/course-overview.feature          |  1 +
 .../features/course-settings.feature          |  1 +
 .../contentstore/features/course-team.feature |  1 +
 .../features/course-updates.feature           |  1 +
 .../contentstore/features/courses.feature     |  1 +
 .../features/discussion-editor.feature        |  1 +
 .../contentstore/features/grading.feature     |  1 +
 .../contentstore/features/html-editor.feature |  1 +
 .../features/problem-editor.feature           |  1 +
 .../contentstore/features/section.feature     |  1 +
 .../contentstore/features/signup.feature      |  1 +
 .../features/static-pages.feature             |  1 +
 .../contentstore/features/subsection.feature  |  1 +
 .../contentstore/features/textbooks.feature   |  1 +
 .../contentstore/features/upload.feature      |  1 +
 .../features/video-editor.feature             |  1 +
 .../contentstore/features/video.feature       |  1 +
 .../courseware/features/certificates.feature  |  1 +
 .../courseware/features/help.feature          |  1 +
 .../features/high-level-tabs.feature          |  1 +
 .../courseware/features/homepage.feature      |  1 +
 .../courseware/features/login.feature         |  1 +
 .../courseware/features/lti.feature           |  3 +-
 .../courseware/features/navigation.feature    |  1 +
 .../courseware/features/problems.feature      |  1 +
 .../courseware/features/registration.feature  |  7 +--
 .../courseware/features/signup.feature        |  1 +
 .../courseware/features/video.feature         | 53 ++++++++++---------
 .../courseware/features/word_cloud.feature    | 21 ++++----
 32 files changed, 72 insertions(+), 40 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/advanced-settings.feature b/cms/djangoapps/contentstore/features/advanced-settings.feature
index b2941ac7a5e5..4af1e69ff47f 100644
--- a/cms/djangoapps/contentstore/features/advanced-settings.feature
+++ b/cms/djangoapps/contentstore/features/advanced-settings.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Advanced (manual) course policy
   In order to specify course policy settings for which no custom user interface exists
   I want to be able to manually enter JSON key /value pairs
diff --git a/cms/djangoapps/contentstore/features/checklists.feature b/cms/djangoapps/contentstore/features/checklists.feature
index 6289df9cfccb..f6e1fbff551a 100644
--- a/cms/djangoapps/contentstore/features/checklists.feature
+++ b/cms/djangoapps/contentstore/features/checklists.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Course checklists
 
   Scenario: A course author sees checklists defined by edX
diff --git a/cms/djangoapps/contentstore/features/component.feature b/cms/djangoapps/contentstore/features/component.feature
index a30ce96ae62c..dc2eceeead02 100644
--- a/cms/djangoapps/contentstore/features/component.feature
+++ b/cms/djangoapps/contentstore/features/component.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Component Adding
     As a course author, I want to be able to add a wide variety of components
 
diff --git a/cms/djangoapps/contentstore/features/course-overview.feature b/cms/djangoapps/contentstore/features/course-overview.feature
index 2cbb22ddd70a..77848ae3e08f 100644
--- a/cms/djangoapps/contentstore/features/course-overview.feature
+++ b/cms/djangoapps/contentstore/features/course-overview.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Course Overview
     In order to quickly view the details of a course's section and set release dates and grading
     As a course author
diff --git a/cms/djangoapps/contentstore/features/course-settings.feature b/cms/djangoapps/contentstore/features/course-settings.feature
index be457de959f3..be19dc0f1276 100644
--- a/cms/djangoapps/contentstore/features/course-settings.feature
+++ b/cms/djangoapps/contentstore/features/course-settings.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Course Settings
   As a course author, I want to be able to configure my course settings.
 
diff --git a/cms/djangoapps/contentstore/features/course-team.feature b/cms/djangoapps/contentstore/features/course-team.feature
index de5bb6556a29..b5415d852eda 100644
--- a/cms/djangoapps/contentstore/features/course-team.feature
+++ b/cms/djangoapps/contentstore/features/course-team.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Course Team
     As a course author, I want to be able to add others to my team
 
diff --git a/cms/djangoapps/contentstore/features/course-updates.feature b/cms/djangoapps/contentstore/features/course-updates.feature
index bc73479c5fb7..ce9a44024836 100644
--- a/cms/djangoapps/contentstore/features/course-updates.feature
+++ b/cms/djangoapps/contentstore/features/course-updates.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Course updates
     As a course author, I want to be able to provide updates to my students
 
diff --git a/cms/djangoapps/contentstore/features/courses.feature b/cms/djangoapps/contentstore/features/courses.feature
index e762d0b8a6db..686c08188adf 100644
--- a/cms/djangoapps/contentstore/features/courses.feature
+++ b/cms/djangoapps/contentstore/features/courses.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Create Course
   In order offer a course on the edX platform
   As a course author
diff --git a/cms/djangoapps/contentstore/features/discussion-editor.feature b/cms/djangoapps/contentstore/features/discussion-editor.feature
index e4b1f5450bab..119334253314 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.feature
+++ b/cms/djangoapps/contentstore/features/discussion-editor.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Discussion Component Editor
   As a course author, I want to be able to create discussion components.
 
diff --git a/cms/djangoapps/contentstore/features/grading.feature b/cms/djangoapps/contentstore/features/grading.feature
index d741af42e26a..2876186f74e9 100644
--- a/cms/djangoapps/contentstore/features/grading.feature
+++ b/cms/djangoapps/contentstore/features/grading.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Course Grading
     As a course author, I want to be able to configure how my course is graded
 
diff --git a/cms/djangoapps/contentstore/features/html-editor.feature b/cms/djangoapps/contentstore/features/html-editor.feature
index 4419d6018b73..a242c01ffa86 100644
--- a/cms/djangoapps/contentstore/features/html-editor.feature
+++ b/cms/djangoapps/contentstore/features/html-editor.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: HTML Editor
   As a course author, I want to be able to create HTML blocks.
 
diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature
index 1296acec1c30..2945afecec5a 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.feature
+++ b/cms/djangoapps/contentstore/features/problem-editor.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: Problem Editor
   As a course author, I want to be able to create problems and edit their settings.
 
diff --git a/cms/djangoapps/contentstore/features/section.feature b/cms/djangoapps/contentstore/features/section.feature
index 6402db1bcb94..deaa2de6bd87 100644
--- a/cms/djangoapps/contentstore/features/section.feature
+++ b/cms/djangoapps/contentstore/features/section.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Create Section
   In order offer a course on the edX platform
   As a course author
diff --git a/cms/djangoapps/contentstore/features/signup.feature b/cms/djangoapps/contentstore/features/signup.feature
index c249ad61e810..6da7c55d7094 100644
--- a/cms/djangoapps/contentstore/features/signup.feature
+++ b/cms/djangoapps/contentstore/features/signup.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: Sign in
   In order to use the edX content
   As a new user
diff --git a/cms/djangoapps/contentstore/features/static-pages.feature b/cms/djangoapps/contentstore/features/static-pages.feature
index 525c0cdb83ed..b193f813620a 100644
--- a/cms/djangoapps/contentstore/features/static-pages.feature
+++ b/cms/djangoapps/contentstore/features/static-pages.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: Static Pages
     As a course author, I want to be able to add static pages
 
diff --git a/cms/djangoapps/contentstore/features/subsection.feature b/cms/djangoapps/contentstore/features/subsection.feature
index 6703c60c3be6..82d3f1e4250d 100644
--- a/cms/djangoapps/contentstore/features/subsection.feature
+++ b/cms/djangoapps/contentstore/features/subsection.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Create Subsection
   In order offer a course on the edX platform
   As a course author
diff --git a/cms/djangoapps/contentstore/features/textbooks.feature b/cms/djangoapps/contentstore/features/textbooks.feature
index 36de10daa172..4215d05de711 100644
--- a/cms/djangoapps/contentstore/features/textbooks.feature
+++ b/cms/djangoapps/contentstore/features/textbooks.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: Textbooks
 
   Scenario: No textbooks
diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature
index 1a2e25fcd35d..a0adf6b403d7 100644
--- a/cms/djangoapps/contentstore/features/upload.feature
+++ b/cms/djangoapps/contentstore/features/upload.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: Upload Files
     As a course author, I want to be able to upload files for my students
 
diff --git a/cms/djangoapps/contentstore/features/video-editor.feature b/cms/djangoapps/contentstore/features/video-editor.feature
index 966504693979..e8e2a26c9c92 100644
--- a/cms/djangoapps/contentstore/features/video-editor.feature
+++ b/cms/djangoapps/contentstore/features/video-editor.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: Video Component Editor
   As a course author, I want to be able to create video components.
 
diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature
index a6a4cec28b85..da1de109d218 100644
--- a/cms/djangoapps/contentstore/features/video.feature
+++ b/cms/djangoapps/contentstore/features/video.feature
@@ -1,3 +1,4 @@
+@shard_3
 Feature: Video Component
   As a course author, I want to be able to view my created videos in Studio.
 
diff --git a/lms/djangoapps/courseware/features/certificates.feature b/lms/djangoapps/courseware/features/certificates.feature
index fc56a10358d1..ec7c5474ad60 100644
--- a/lms/djangoapps/courseware/features/certificates.feature
+++ b/lms/djangoapps/courseware/features/certificates.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Verified certificates
     As a student,
     In order to earn a verified certificate
diff --git a/lms/djangoapps/courseware/features/help.feature b/lms/djangoapps/courseware/features/help.feature
index 61305b7cfa9a..50e311e0f7e6 100644
--- a/lms/djangoapps/courseware/features/help.feature
+++ b/lms/djangoapps/courseware/features/help.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: The help module should work
   In order to get help
   As a student
diff --git a/lms/djangoapps/courseware/features/high-level-tabs.feature b/lms/djangoapps/courseware/features/high-level-tabs.feature
index adbe5ec8a367..ea6f1c90b76b 100644
--- a/lms/djangoapps/courseware/features/high-level-tabs.feature
+++ b/lms/djangoapps/courseware/features/high-level-tabs.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: All the high level tabs should work
   In order to preview the courseware
   As a student
diff --git a/lms/djangoapps/courseware/features/homepage.feature b/lms/djangoapps/courseware/features/homepage.feature
index 140f1f8b5fda..6c1baf405177 100644
--- a/lms/djangoapps/courseware/features/homepage.feature
+++ b/lms/djangoapps/courseware/features/homepage.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Homepage for web users
   In order to get an idea what edX is about
   As a an anonymous web user
diff --git a/lms/djangoapps/courseware/features/login.feature b/lms/djangoapps/courseware/features/login.feature
index 4165a9bb9f0f..983050444984 100644
--- a/lms/djangoapps/courseware/features/login.feature
+++ b/lms/djangoapps/courseware/features/login.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Login in as a registered user
   As a registered user
   In order to access my content
diff --git a/lms/djangoapps/courseware/features/lti.feature b/lms/djangoapps/courseware/features/lti.feature
index abdcfdb70460..7d4fd56c0104 100644
--- a/lms/djangoapps/courseware/features/lti.feature
+++ b/lms/djangoapps/courseware/features/lti.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: LTI component
   As a student, I want to view LTI component in LMS.
 
@@ -14,4 +15,4 @@ Feature: LTI component
   Scenario: LTI component in LMS is rendered incorrectly
   Given the course has incorrect LTI credentials
   And the course has an LTI component filled with correct fields
-  Then I view the LTI but incorrect_signature warning is rendered
\ No newline at end of file
+  Then I view the LTI but incorrect_signature warning is rendered
diff --git a/lms/djangoapps/courseware/features/navigation.feature b/lms/djangoapps/courseware/features/navigation.feature
index 8fd8b54c1ad1..20a95648472d 100644
--- a/lms/djangoapps/courseware/features/navigation.feature
+++ b/lms/djangoapps/courseware/features/navigation.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Navigate Course
     As a student in an edX course
     In order to view the course properly
diff --git a/lms/djangoapps/courseware/features/problems.feature b/lms/djangoapps/courseware/features/problems.feature
index ad70e5a062e1..e307f617d00e 100644
--- a/lms/djangoapps/courseware/features/problems.feature
+++ b/lms/djangoapps/courseware/features/problems.feature
@@ -1,3 +1,4 @@
+@shard_1
 Feature: Answer problems
     As a student in an edX course
     In order to test my understanding of the material
diff --git a/lms/djangoapps/courseware/features/registration.feature b/lms/djangoapps/courseware/features/registration.feature
index b8115b52c543..54df31ae7d50 100644
--- a/lms/djangoapps/courseware/features/registration.feature
+++ b/lms/djangoapps/courseware/features/registration.feature
@@ -1,16 +1,17 @@
+@shard_1
 Feature: Register for a course
   As a registered user
   In order to access my class content
   I want to register for a class on the edX website
 
-  	Scenario: I can register for a course
+  Scenario: I can register for a course
     Given The course "6.002x" exists
     And I am logged in
     And I visit the courses page
     When I register for the course "6.002x"
-  	Then I should see the course numbered "6.002x" in my dashboard
+    Then I should see the course numbered "6.002x" in my dashboard
 
-    Scenario: I can unregister for a course
+  Scenario: I can unregister for a course
     Given I am registered for the course "6.002x"
     And I visit the dashboard
     Then I should see the course numbered "6.002x" in my dashboard
diff --git a/lms/djangoapps/courseware/features/signup.feature b/lms/djangoapps/courseware/features/signup.feature
index 3c9f491f7d60..ae6a2c6c5f15 100644
--- a/lms/djangoapps/courseware/features/signup.feature
+++ b/lms/djangoapps/courseware/features/signup.feature
@@ -1,3 +1,4 @@
+@shard_2
 Feature: Sign in
   In order to use the edX content
   As a new user
diff --git a/lms/djangoapps/courseware/features/video.feature b/lms/djangoapps/courseware/features/video.feature
index cf30c55cbf93..824a86806e33 100644
--- a/lms/djangoapps/courseware/features/video.feature
+++ b/lms/djangoapps/courseware/features/video.feature
@@ -1,39 +1,40 @@
+@shard_2
 Feature: Video component
   As a student, I want to view course videos in LMS.
 
   Scenario: Video component is fully rendered in the LMS in HTML5 mode
-  Given the course has a Video component in HTML5 mode
-  Then when I view the video it has rendered in HTML5 mode
-  And all sources are correct
+    Given the course has a Video component in HTML5 mode
+    Then when I view the video it has rendered in HTML5 mode
+    And all sources are correct
 
   # Firefox doesn't have HTML5 (only mp4 - fix here)
   @skip_firefox
   Scenario: Autoplay is disabled in LMS for a Video component
-  Given the course has a Video component in HTML5 mode
-  Then when I view the video it does not have autoplay enabled
+    Given the course has a Video component in HTML5 mode
+    Then when I view the video it does not have autoplay enabled
 
-# Youtube testing
-Scenario: Video component is fully rendered in the LMS in Youtube mode with HTML5 sources
-Given youtube server is up and response time is  0.4 seconds
-And the course has a Video component in Youtube_HTML5 mode
-Then when I view the video it has rendered in Youtube mode
+  # Youtube testing
+  Scenario: Video component is fully rendered in the LMS in Youtube mode with HTML5 sources
+    Given youtube server is up and response time is  0.4 seconds
+    And the course has a Video component in Youtube_HTML5 mode
+    Then when I view the video it has rendered in Youtube mode
 
-Scenario: Video component is not rendered in the LMS in Youtube mode with HTML5 sources
-Given youtube server is up and response time is 2 seconds
-And the course has a Video component in Youtube_HTML5 mode
-Then when I view the video it has rendered in HTML5 mode
+  Scenario: Video component is not rendered in the LMS in Youtube mode with HTML5 sources
+    Given youtube server is up and response time is 2 seconds
+    And the course has a Video component in Youtube_HTML5 mode
+    Then when I view the video it has rendered in HTML5 mode
 
-Scenario: Video component is rendered in the LMS in Youtube mode without HTML5 sources
-Given youtube server is up and response time is 2 seconds
-And the course has a Video component in Youtube mode
-Then when I view the video it has rendered in Youtube mode
+  Scenario: Video component is rendered in the LMS in Youtube mode without HTML5 sources
+    Given youtube server is up and response time is 2 seconds
+    And the course has a Video component in Youtube mode
+    Then when I view the video it has rendered in Youtube mode
 
-Scenario: Video component is rendered in the LMS in Youtube mode with HTML5 sources that doesn't supported by browser
-Given youtube server is up and response time is 2 seconds
-And the course has a Video component in Youtube_HTML5_Unsupported_Video mode
-Then when I view the video it has rendered in Youtube mode
+  Scenario: Video component is rendered in the LMS in Youtube mode with HTML5 sources that doesn't supported by browser
+    Given youtube server is up and response time is 2 seconds
+    And the course has a Video component in Youtube_HTML5_Unsupported_Video mode
+    Then when I view the video it has rendered in Youtube mode
 
-Scenario: Video component is rendered in the LMS in HTML5 mode with HTML5 sources that doesn't supported by browser
-Given the course has a Video component in HTML5_Unsupported_Video mode
-Then error message is shown
-And error message has correct text
+  Scenario: Video component is rendered in the LMS in HTML5 mode with HTML5 sources that doesn't supported by browser
+    Given the course has a Video component in HTML5_Unsupported_Video mode
+    Then error message is shown
+    And error message has correct text
diff --git a/lms/djangoapps/courseware/features/word_cloud.feature b/lms/djangoapps/courseware/features/word_cloud.feature
index 0d5baa46e18b..761fa64c0012 100644
--- a/lms/djangoapps/courseware/features/word_cloud.feature
+++ b/lms/djangoapps/courseware/features/word_cloud.feature
@@ -1,15 +1,16 @@
+@shard_2
 Feature: World Cloud component
-  As a student, I want to view Word Cloud component in LMS.
+    As a student, I want to view Word Cloud component in LMS.
 
   Scenario: Word Cloud component in LMS is rendered with empty result
-  Given the course has a Word Cloud component
-  Then I view the word cloud and it has rendered
-  When I press the Save button
-  Then I see the empty result
+    Given the course has a Word Cloud component
+    Then I view the word cloud and it has rendered
+    When I press the Save button
+    Then I see the empty result
 
   Scenario: Word Cloud component in LMS is rendered with result
-  Given the course has a Word Cloud component
-  Then I view the word cloud and it has rendered
-  When I fill inputs
-  And I press the Save button
-  Then I see the result with words count
\ No newline at end of file
+    Given the course has a Word Cloud component
+    Then I view the word cloud and it has rendered
+    When I fill inputs
+    And I press the Save button
+    Then I see the result with words count

From 6ebb753823382da2ff79e6de80f199a15a7f2886 Mon Sep 17 00:00:00 2001
From: Jay Zoldak <zoldak@edx.org>
Date: Thu, 19 Sep 2013 14:40:27 -0400
Subject: [PATCH 39/92] Write xunit reports for acceptance tests Refactor rake
 tasks for acceptance tests Address PR comments

---
 docs/internal/testing.md     | 15 +++++---
 jenkins/test_acceptance.sh   |  4 +-
 rakelib/acceptance_test.rake | 71 ++++++++++++++++++++++++++++++++++++
 rakelib/deprecated.rake      |  3 ++
 rakelib/tests.rake           | 54 ---------------------------
 5 files changed, 84 insertions(+), 63 deletions(-)
 create mode 100644 rakelib/acceptance_test.rake

diff --git a/docs/internal/testing.md b/docs/internal/testing.md
index 5404c16d056d..5d6c75bddb98 100644
--- a/docs/internal/testing.md
+++ b/docs/internal/testing.md
@@ -205,24 +205,27 @@ with Chrome (not Chromium) version 28.0.1500.71 with ChromeDriver
 version 2.1.210398.
 
 To run all the acceptance tests:
+    rake test:acceptance
 
-    rake test_acceptance_lms
-    rake test_acceptance_cms
+To run only for lms or cms:
+
+    rake test:acceptance:lms
+    rake test:acceptance:cms
 
 To test only a specific feature:
 
-    rake test_acceptance_lms["lms/djangoapps/courseware/features/problems.feature"]
+    rake test:acceptance:lms["lms/djangoapps/courseware/features/problems.feature"]
 
 To test only a specific scenario
 
-    rake test_acceptance_lms["lms/djangoapps/courseware/features/problems.feature -s 3"]
+    rake test:acceptance:lms["lms/djangoapps/courseware/features/problems.feature -s 3"]
 
 To start the debugger on failure, add the `--pdb` option:
 
-    rake test_acceptance_lms["lms/djangoapps/courseware/features/problems.feature --pdb"]
+    rake test:acceptance:lms["lms/djangoapps/courseware/features/problems.feature --pdb"]
 
 To run tests faster by not collecting static files, you can use
-`rake fasttest_acceptance_lms` and `rake fasttest_acceptance_cms`.
+`rake test:acceptance:lms:fast` and `rake test:acceptance:cms:fast`.
 
 Acceptance tests will run on a randomized port and can be run in the background of rake cms and lms or unit tests.
 To specify the port, change the LETTUCE_SERVER_PORT constant in cms/envs/acceptance.py and lms/envs/acceptance.py
diff --git a/jenkins/test_acceptance.sh b/jenkins/test_acceptance.sh
index 80705762312a..47da592863cd 100755
--- a/jenkins/test_acceptance.sh
+++ b/jenkins/test_acceptance.sh
@@ -44,8 +44,6 @@ if [ "$LETTUCE_SELENIUM_CLIENT" == saucelabs ]; then
 fi
 
 # Run the lms and cms acceptance tests
-# (the -v flag turns off color in the output)
-rake test_acceptance_lms["-v 3 $SKIP_TESTS"] || TESTS_FAILED=1
-rake test_acceptance_cms["-v 3 $SKIP_TESTS"] || TESTS_FAILED=1
+rake test:acceptance["$SKIP_TESTS"] || TESTS_FAILED=1
 
 [ $TESTS_FAILED == '0' ]
diff --git a/rakelib/acceptance_test.rake b/rakelib/acceptance_test.rake
new file mode 100644
index 000000000000..111ba986151d
--- /dev/null
+++ b/rakelib/acceptance_test.rake
@@ -0,0 +1,71 @@
+ACCEPTANCE_DB = 'test_root/db/test_edx.db'
+ACCEPTANCE_REPORT_DIR = report_dir_path('acceptance')
+directory ACCEPTANCE_REPORT_DIR
+
+def run_acceptance_tests(system, harvest_args)
+    # Create the acceptance report directory
+    # because if it doesn't exist then lettuce will give an IOError.
+    report_dir = report_dir_path('acceptance')
+
+    report_file = File.join(ACCEPTANCE_REPORT_DIR, "#{system}.xml")
+    report_args = "--with-xunit --xunit-file #{report_file}"
+    test_sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', '--verbosity 2', '--tag -skip', report_args, harvest_args))
+end
+
+task :setup_acceptance_db do
+    # HACK: Since the CMS depends on the existence of some database tables
+    # that are now in common but used to be in LMS (Role/Permissions for Forums)
+    # we need to create/migrate the database tables defined in the LMS.
+    # We might be able to address this by moving out the migrations from
+    # lms/django_comment_client, but then we'd have to repair all the existing
+    # migrations from the upgrade tables in the DB.
+    # But for now for either system (lms or cms), use the lms
+    # definitions to sync and migrate.
+    if File.exists?(ACCEPTANCE_DB)
+        File.delete(ACCEPTANCE_DB)
+    end
+
+    sh(django_admin('lms', 'acceptance', 'syncdb', '--noinput'))
+    sh(django_admin('lms', 'acceptance', 'migrate', '--noinput'))
+end
+
+task :prep_for_acceptance_tests => [
+    :clean_reports_dir, :clean_test_files, ACCEPTANCE_REPORT_DIR,
+    :install_prereqs, :setup_acceptance_db
+]
+
+namespace :test do
+    namespace :acceptance do
+        task :all, [:harvest_args] => [
+            :prep_for_acceptance_tests,
+            "^^lms:gather_assets:acceptance",
+            "^^cms:gather_assets:acceptance"
+        ] do |t, args|
+            run_acceptance_tests('lms', args.harvest_args)
+            run_acceptance_tests('cms', args.harvest_args)
+        end
+
+        ['lms', 'cms'].each do |system|
+            desc "Run the acceptance tests for the #{system}"
+            task system, [:harvest_args] => [
+                :prep_for_acceptance_tests,
+                "^^#{system}:gather_assets:acceptance"
+            ] do |t, args|
+                args.with_defaults(:harvest_args => '')
+                run_acceptance_tests(system, args.harvest_args)
+            end
+
+            desc "Run acceptance tests for the #{system} without collectstatic or db migrations"
+            task "#{system}:fast", [:harvest_args] => [
+                :clean_reports_dir, ACCEPTANCE_REPORT_DIR,
+            ] do |t, args|
+                args.with_defaults(:harvest_args => '')
+                run_acceptance_tests(system, args.harvest_args)
+            end
+        end
+    end
+    desc "Run the lettuce acceptance tests for lms and cms"
+    task :acceptance, [:harvest_args] do |t, args|
+      Rake::Task["test:acceptance:all"].invoke(args.harvest_args)
+    end
+end
diff --git a/rakelib/deprecated.rake b/rakelib/deprecated.rake
index 55c033226cf4..fc7d67e43c19 100644
--- a/rakelib/deprecated.rake
+++ b/rakelib/deprecated.rake
@@ -24,6 +24,8 @@ end
     deprecated("jasmine:#{system}:phantomjs", "test:js:run", system)
     deprecated("#{system}:check_settings:jasmine", "")
     deprecated("#{system}:gather_assets:jasmine", "")
+    deprecated("test_acceptance_#{system}", "test:acceptance:#{system}")
+    deprecated("fasttest_acceptance_#{system}", "test:acceptance:#{system}:fast")
 end
 
 Dir["common/lib/*"].select{|lib| File.directory?(lib)}.each do |lib|
@@ -49,3 +51,4 @@ deprecated("jasmine:common/static/coffee:phantomjs", "test:js:run", "common")
 deprecated("jasmine", "test:js")
 deprecated("jasmine:phantomjs", "test:js:run")
 deprecated("jasmine:browser", "test:js:dev")
+deprecated("test_acceptance", "test:acceptance")
diff --git a/rakelib/tests.rake b/rakelib/tests.rake
index 04a32961d721..fb6cf575bdd0 100644
--- a/rakelib/tests.rake
+++ b/rakelib/tests.rake
@@ -4,8 +4,6 @@ CLOBBER.include(REPORT_DIR, 'test_root/*_repo', 'test_root/staticfiles')
 # Create the directory to hold coverage reports, if it doesn't already exist.
 directory REPORT_DIR
 
-ACCEPTANCE_DB = 'test_root/db/test_edx.db'
-
 def test_id_dir(path)
     return File.join(".testids", path.to_s)
 end
@@ -32,38 +30,6 @@ def run_tests(system, report_dir, test_id=nil, stop_on_failure=true)
     test_sh(run_under_coverage(cmd, system))
 end
 
-def create_acceptance_db(system)
-    # HACK: Since now the CMS depends on the existence of some database tables
-    # that used to be in LMS (Role/Permissions for Forums) we need to make
-    # sure the acceptance tests create/migrate the database tables
-    # that are represented in the LMS. We might be able to address this by moving
-    # out the migrations from lms/django_comment_client, but then we'd have to
-    # repair all the existing migrations from the upgrade tables in the DB.
-    if system == :cms
-        sh(django_admin('lms', 'acceptance', 'syncdb', '--noinput'))
-        sh(django_admin('lms', 'acceptance', 'migrate', '--noinput'))
-    end
-    sh(django_admin(system, 'acceptance', 'syncdb', '--noinput'))
-    sh(django_admin(system, 'acceptance', 'migrate', '--noinput'))
-end
-
-def setup_acceptance_db(system, fasttest=false)
-    # If running under fasttest mode and the database already
-    # exists, skip the migrations.
-    if File.exists?(ACCEPTANCE_DB)
-        if not fasttest
-            File.delete(ACCEPTANCE_DB)
-            create_acceptance_db(system)
-        end
-    else
-        create_acceptance_db(system)
-    end
-end
-
-def run_acceptance_tests(system, report_dir, harvest_args)
-    test_sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', '--verbosity 2', '--tag -skip', harvest_args))
-end
-
 # Run documentation tests
 desc "Run documentation tests"
 task :test_docs do
@@ -110,26 +76,6 @@ TEST_TASK_DIRS = []
         run_tests(system, report_dir, args.test_id)
     end
 
-    # Run acceptance tests
-    desc "Run acceptance tests"
-    task "test_acceptance_#{system}", [:harvest_args] => [
-        :clean_test_files, :install_prereqs,
-        "#{system}:gather_assets:acceptance"
-    ] do |t, args|
-        setup_acceptance_db(system)
-        Rake::Task["fasttest_acceptance_#{system}"].invoke(args.harvest_args)
-    end
-
-    desc "Run acceptance tests without collectstatic or database migrations"
-    task "fasttest_acceptance_#{system}", [:harvest_args] => [
-        report_dir, :clean_reports_dir
-    ] do |t, args|
-        args.with_defaults(:harvest_args => '')
-        setup_acceptance_db(system, fasttest=true)
-        run_acceptance_tests(system, report_dir, args.harvest_args)
-    end
-
-
     task :fasttest => "fasttest_#{system}"
 
     TEST_TASK_DIRS << system

From 7669b4d7774bcb0efee03ad6e47218e6738a744c Mon Sep 17 00:00:00 2001
From: Jay Zoldak <zoldak@edx.org>
Date: Tue, 24 Sep 2013 14:21:56 -0400
Subject: [PATCH 40/92] Namespace the acceptance tests so they show up nicely
 in jenkins

Conflicts:
	cms/djangoapps/contentstore/features/advanced-settings.feature
	cms/djangoapps/contentstore/features/checklists.feature
	cms/djangoapps/contentstore/features/component.feature
	cms/djangoapps/contentstore/features/course-overview.feature
	cms/djangoapps/contentstore/features/course-settings.feature
	cms/djangoapps/contentstore/features/course-team.feature
	cms/djangoapps/contentstore/features/course-updates.feature
	cms/djangoapps/contentstore/features/courses.feature
	cms/djangoapps/contentstore/features/discussion-editor.feature
	cms/djangoapps/contentstore/features/grading.feature
	cms/djangoapps/contentstore/features/html-editor.feature
	cms/djangoapps/contentstore/features/problem-editor.feature
	cms/djangoapps/contentstore/features/section.feature
	cms/djangoapps/contentstore/features/signup.feature
	cms/djangoapps/contentstore/features/static-pages.feature
	cms/djangoapps/contentstore/features/subsection.feature
	cms/djangoapps/contentstore/features/textbooks.feature
	cms/djangoapps/contentstore/features/upload.feature
	cms/djangoapps/contentstore/features/video-editor.feature
	cms/djangoapps/contentstore/features/video.feature
	lms/djangoapps/courseware/features/certificates.feature
	lms/djangoapps/courseware/features/help.feature
	lms/djangoapps/courseware/features/high-level-tabs.feature
	lms/djangoapps/courseware/features/homepage.feature
	lms/djangoapps/courseware/features/login.feature
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/features/navigation.feature
	lms/djangoapps/courseware/features/problems.feature
	lms/djangoapps/courseware/features/registration.feature
	lms/djangoapps/courseware/features/signup.feature
	lms/djangoapps/courseware/features/video.feature
	lms/djangoapps/courseware/features/word_cloud.feature
---
 .../contentstore/features/advanced-settings.feature           | 2 +-
 cms/djangoapps/contentstore/features/checklists.feature       | 2 +-
 cms/djangoapps/contentstore/features/component.feature        | 2 +-
 cms/djangoapps/contentstore/features/course-overview.feature  | 2 +-
 cms/djangoapps/contentstore/features/course-settings.feature  | 2 +-
 cms/djangoapps/contentstore/features/course-team.feature      | 2 +-
 cms/djangoapps/contentstore/features/course-updates.feature   | 2 +-
 cms/djangoapps/contentstore/features/courses.feature          | 2 +-
 .../contentstore/features/discussion-editor.feature           | 2 +-
 cms/djangoapps/contentstore/features/grading.feature          | 2 +-
 cms/djangoapps/contentstore/features/html-editor.feature      | 2 +-
 cms/djangoapps/contentstore/features/problem-editor.feature   | 2 +-
 cms/djangoapps/contentstore/features/section.feature          | 2 +-
 cms/djangoapps/contentstore/features/signup.feature           | 2 +-
 cms/djangoapps/contentstore/features/static-pages.feature     | 2 +-
 cms/djangoapps/contentstore/features/subsection.feature       | 2 +-
 cms/djangoapps/contentstore/features/textbooks.feature        | 2 +-
 cms/djangoapps/contentstore/features/upload.feature           | 2 +-
 cms/djangoapps/contentstore/features/video-editor.feature     | 2 +-
 cms/djangoapps/contentstore/features/video.feature            | 2 +-
 lms/djangoapps/courseware/features/certificates.feature       | 2 +-
 lms/djangoapps/courseware/features/help.feature               | 2 +-
 lms/djangoapps/courseware/features/high-level-tabs.feature    | 2 +-
 lms/djangoapps/courseware/features/homepage.feature           | 2 +-
 lms/djangoapps/courseware/features/login.feature              | 2 +-
 lms/djangoapps/courseware/features/lti.feature                | 2 +-
 lms/djangoapps/courseware/features/navigation.feature         | 2 +-
 lms/djangoapps/courseware/features/openended.feature          | 2 +-
 lms/djangoapps/courseware/features/problems.feature           | 2 +-
 lms/djangoapps/courseware/features/registration.feature       | 2 +-
 lms/djangoapps/courseware/features/signup.feature             | 2 +-
 lms/djangoapps/courseware/features/video.feature              | 2 +-
 lms/djangoapps/courseware/features/word_cloud.feature         | 4 ++--
 33 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/advanced-settings.feature b/cms/djangoapps/contentstore/features/advanced-settings.feature
index 4af1e69ff47f..03e8e6ea236f 100644
--- a/cms/djangoapps/contentstore/features/advanced-settings.feature
+++ b/cms/djangoapps/contentstore/features/advanced-settings.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Advanced (manual) course policy
+Feature: CMS.Advanced (manual) course policy
   In order to specify course policy settings for which no custom user interface exists
   I want to be able to manually enter JSON key /value pairs
 
diff --git a/cms/djangoapps/contentstore/features/checklists.feature b/cms/djangoapps/contentstore/features/checklists.feature
index f6e1fbff551a..23995f5aaa9e 100644
--- a/cms/djangoapps/contentstore/features/checklists.feature
+++ b/cms/djangoapps/contentstore/features/checklists.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Course checklists
+Feature: CMS.Course checklists
 
   Scenario: A course author sees checklists defined by edX
     Given I have opened a new course in Studio
diff --git a/cms/djangoapps/contentstore/features/component.feature b/cms/djangoapps/contentstore/features/component.feature
index dc2eceeead02..9440ce7dc2f3 100644
--- a/cms/djangoapps/contentstore/features/component.feature
+++ b/cms/djangoapps/contentstore/features/component.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Component Adding
+Feature: CMS.Component Adding
     As a course author, I want to be able to add a wide variety of components
 
     @skip
diff --git a/cms/djangoapps/contentstore/features/course-overview.feature b/cms/djangoapps/contentstore/features/course-overview.feature
index 77848ae3e08f..858572d75e27 100644
--- a/cms/djangoapps/contentstore/features/course-overview.feature
+++ b/cms/djangoapps/contentstore/features/course-overview.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Course Overview
+Feature: CMS.Course Overview
     In order to quickly view the details of a course's section and set release dates and grading
     As a course author
     I want to use the course overview page
diff --git a/cms/djangoapps/contentstore/features/course-settings.feature b/cms/djangoapps/contentstore/features/course-settings.feature
index be19dc0f1276..230b1a04ad7d 100644
--- a/cms/djangoapps/contentstore/features/course-settings.feature
+++ b/cms/djangoapps/contentstore/features/course-settings.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Course Settings
+Feature: CMS.Course Settings
   As a course author, I want to be able to configure my course settings.
 
   # Safari has trouble keeps dates on refresh
diff --git a/cms/djangoapps/contentstore/features/course-team.feature b/cms/djangoapps/contentstore/features/course-team.feature
index b5415d852eda..05a59002f51c 100644
--- a/cms/djangoapps/contentstore/features/course-team.feature
+++ b/cms/djangoapps/contentstore/features/course-team.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Course Team
+Feature: CMS.Course Team
     As a course author, I want to be able to add others to my team
 
     Scenario: Admins can add other users
diff --git a/cms/djangoapps/contentstore/features/course-updates.feature b/cms/djangoapps/contentstore/features/course-updates.feature
index ce9a44024836..15257bd911ab 100644
--- a/cms/djangoapps/contentstore/features/course-updates.feature
+++ b/cms/djangoapps/contentstore/features/course-updates.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Course updates
+Feature: CMS.Course updates
     As a course author, I want to be able to provide updates to my students
 
     # Internet explorer can't select all so the update appears weirdly
diff --git a/cms/djangoapps/contentstore/features/courses.feature b/cms/djangoapps/contentstore/features/courses.feature
index 686c08188adf..c5316e0d6c40 100644
--- a/cms/djangoapps/contentstore/features/courses.feature
+++ b/cms/djangoapps/contentstore/features/courses.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Create Course
+Feature: CMS.Create Course
   In order offer a course on the edX platform
   As a course author
   I want to create courses
diff --git a/cms/djangoapps/contentstore/features/discussion-editor.feature b/cms/djangoapps/contentstore/features/discussion-editor.feature
index 119334253314..7278accf0b55 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.feature
+++ b/cms/djangoapps/contentstore/features/discussion-editor.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Discussion Component Editor
+Feature: CMS.Discussion Component Editor
   As a course author, I want to be able to create discussion components.
 
   Scenario: User can view metadata
diff --git a/cms/djangoapps/contentstore/features/grading.feature b/cms/djangoapps/contentstore/features/grading.feature
index 2876186f74e9..f3ce1823e634 100644
--- a/cms/djangoapps/contentstore/features/grading.feature
+++ b/cms/djangoapps/contentstore/features/grading.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Course Grading
+Feature: CMS.Course Grading
     As a course author, I want to be able to configure how my course is graded
 
     Scenario: Users can add grading ranges
diff --git a/cms/djangoapps/contentstore/features/html-editor.feature b/cms/djangoapps/contentstore/features/html-editor.feature
index a242c01ffa86..29dcbbbfc512 100644
--- a/cms/djangoapps/contentstore/features/html-editor.feature
+++ b/cms/djangoapps/contentstore/features/html-editor.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: HTML Editor
+Feature: CMS.HTML Editor
   As a course author, I want to be able to create HTML blocks.
 
   Scenario: User can view metadata
diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature
index 2945afecec5a..0d95b5d78507 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.feature
+++ b/cms/djangoapps/contentstore/features/problem-editor.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Problem Editor
+Feature: CMS.Problem Editor
   As a course author, I want to be able to create problems and edit their settings.
 
   Scenario: User can view metadata
diff --git a/cms/djangoapps/contentstore/features/section.feature b/cms/djangoapps/contentstore/features/section.feature
index deaa2de6bd87..16d833aed873 100644
--- a/cms/djangoapps/contentstore/features/section.feature
+++ b/cms/djangoapps/contentstore/features/section.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Create Section
+Feature: CMS.Create Section
   In order offer a course on the edX platform
   As a course author
   I want to create and edit sections
diff --git a/cms/djangoapps/contentstore/features/signup.feature b/cms/djangoapps/contentstore/features/signup.feature
index 6da7c55d7094..f1f2c1358351 100644
--- a/cms/djangoapps/contentstore/features/signup.feature
+++ b/cms/djangoapps/contentstore/features/signup.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Sign in
+Feature: CMS.Sign in
   In order to use the edX content
   As a new user
   I want to signup for a student account
diff --git a/cms/djangoapps/contentstore/features/static-pages.feature b/cms/djangoapps/contentstore/features/static-pages.feature
index b193f813620a..54d23d985de2 100644
--- a/cms/djangoapps/contentstore/features/static-pages.feature
+++ b/cms/djangoapps/contentstore/features/static-pages.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Static Pages
+Feature: CMS.Static Pages
     As a course author, I want to be able to add static pages
 
     Scenario: Users can add static pages
diff --git a/cms/djangoapps/contentstore/features/subsection.feature b/cms/djangoapps/contentstore/features/subsection.feature
index 82d3f1e4250d..2cb708ad3cfc 100644
--- a/cms/djangoapps/contentstore/features/subsection.feature
+++ b/cms/djangoapps/contentstore/features/subsection.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Create Subsection
+Feature: CMS.Create Subsection
   In order offer a course on the edX platform
   As a course author
   I want to create and edit subsections
diff --git a/cms/djangoapps/contentstore/features/textbooks.feature b/cms/djangoapps/contentstore/features/textbooks.feature
index 4215d05de711..010e4902569c 100644
--- a/cms/djangoapps/contentstore/features/textbooks.feature
+++ b/cms/djangoapps/contentstore/features/textbooks.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Textbooks
+Feature: CMS.Textbooks
 
   Scenario: No textbooks
     Given I have opened a new course in Studio
diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature
index a0adf6b403d7..fed8c65ca108 100644
--- a/cms/djangoapps/contentstore/features/upload.feature
+++ b/cms/djangoapps/contentstore/features/upload.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Upload Files
+Feature: CMS.Upload Files
     As a course author, I want to be able to upload files for my students
 
     # Uploading isn't working on safari with sauce labs
diff --git a/cms/djangoapps/contentstore/features/video-editor.feature b/cms/djangoapps/contentstore/features/video-editor.feature
index e8e2a26c9c92..d5b4a2a03b4e 100644
--- a/cms/djangoapps/contentstore/features/video-editor.feature
+++ b/cms/djangoapps/contentstore/features/video-editor.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Video Component Editor
+Feature: CMS.Video Component Editor
   As a course author, I want to be able to create video components.
 
   Scenario: User can view Video metadata
diff --git a/cms/djangoapps/contentstore/features/video.feature b/cms/djangoapps/contentstore/features/video.feature
index da1de109d218..ad6fea083be2 100644
--- a/cms/djangoapps/contentstore/features/video.feature
+++ b/cms/djangoapps/contentstore/features/video.feature
@@ -1,5 +1,5 @@
 @shard_3
-Feature: Video Component
+Feature: CMS.Video Component
   As a course author, I want to be able to view my created videos in Studio.
 
   # Video Alpha Features will work in Firefox only when Firefox is the active window
diff --git a/lms/djangoapps/courseware/features/certificates.feature b/lms/djangoapps/courseware/features/certificates.feature
index ec7c5474ad60..8ea68df5b156 100644
--- a/lms/djangoapps/courseware/features/certificates.feature
+++ b/lms/djangoapps/courseware/features/certificates.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Verified certificates
+Feature: LMS.Verified certificates
     As a student,
     In order to earn a verified certificate
     I want to sign up for a verified certificate course.
diff --git a/lms/djangoapps/courseware/features/help.feature b/lms/djangoapps/courseware/features/help.feature
index 50e311e0f7e6..db8c49900a78 100644
--- a/lms/djangoapps/courseware/features/help.feature
+++ b/lms/djangoapps/courseware/features/help.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: The help module should work
+Feature: LMS.The help module should work
   In order to get help
   As a student
   I want to be able to report a problem
diff --git a/lms/djangoapps/courseware/features/high-level-tabs.feature b/lms/djangoapps/courseware/features/high-level-tabs.feature
index ea6f1c90b76b..8b7fdd300d82 100644
--- a/lms/djangoapps/courseware/features/high-level-tabs.feature
+++ b/lms/djangoapps/courseware/features/high-level-tabs.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: All the high level tabs should work
+Feature: LMS.All the high level tabs should work
   In order to preview the courseware
   As a student
   I want to navigate through the high level tabs
diff --git a/lms/djangoapps/courseware/features/homepage.feature b/lms/djangoapps/courseware/features/homepage.feature
index 6c1baf405177..fd845b765bf0 100644
--- a/lms/djangoapps/courseware/features/homepage.feature
+++ b/lms/djangoapps/courseware/features/homepage.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Homepage for web users
+Feature: LMS.Homepage for web users
   In order to get an idea what edX is about
   As a an anonymous web user
   I want to check the information on the home page
diff --git a/lms/djangoapps/courseware/features/login.feature b/lms/djangoapps/courseware/features/login.feature
index 983050444984..7af151ed26ed 100644
--- a/lms/djangoapps/courseware/features/login.feature
+++ b/lms/djangoapps/courseware/features/login.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Login in as a registered user
+Feature: LMS.Login in as a registered user
   As a registered user
   In order to access my content
   I want to be able to login in to edX
diff --git a/lms/djangoapps/courseware/features/lti.feature b/lms/djangoapps/courseware/features/lti.feature
index 7d4fd56c0104..a7182a3daeea 100644
--- a/lms/djangoapps/courseware/features/lti.feature
+++ b/lms/djangoapps/courseware/features/lti.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: LTI component
+Feature: LMS.LTI component
   As a student, I want to view LTI component in LMS.
 
   Scenario: LTI component in LMS is not rendered
diff --git a/lms/djangoapps/courseware/features/navigation.feature b/lms/djangoapps/courseware/features/navigation.feature
index 20a95648472d..69a7a5a4a4e0 100644
--- a/lms/djangoapps/courseware/features/navigation.feature
+++ b/lms/djangoapps/courseware/features/navigation.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Navigate Course
+Feature: LMS.Navigate Course
     As a student in an edX course
     In order to view the course properly
     I want to be able to navigate through the content
diff --git a/lms/djangoapps/courseware/features/openended.feature b/lms/djangoapps/courseware/features/openended.feature
index 1ab496144fe3..0ebf848aeccd 100644
--- a/lms/djangoapps/courseware/features/openended.feature
+++ b/lms/djangoapps/courseware/features/openended.feature
@@ -1,4 +1,4 @@
-Feature: Open ended grading
+Feature: LMS.Open ended grading
   As a student in an edX course
   In order to complete the courseware questions
   I want the machine learning grading to be functional
diff --git a/lms/djangoapps/courseware/features/problems.feature b/lms/djangoapps/courseware/features/problems.feature
index e307f617d00e..2f15619a9496 100644
--- a/lms/djangoapps/courseware/features/problems.feature
+++ b/lms/djangoapps/courseware/features/problems.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Answer problems
+Feature: LMS.Answer problems
     As a student in an edX course
     In order to test my understanding of the material
     I want to answer problems
diff --git a/lms/djangoapps/courseware/features/registration.feature b/lms/djangoapps/courseware/features/registration.feature
index 54df31ae7d50..c779462db355 100644
--- a/lms/djangoapps/courseware/features/registration.feature
+++ b/lms/djangoapps/courseware/features/registration.feature
@@ -1,5 +1,5 @@
 @shard_1
-Feature: Register for a course
+Feature: LMS.Register for a course
   As a registered user
   In order to access my class content
   I want to register for a class on the edX website
diff --git a/lms/djangoapps/courseware/features/signup.feature b/lms/djangoapps/courseware/features/signup.feature
index ae6a2c6c5f15..b04a950bef8b 100644
--- a/lms/djangoapps/courseware/features/signup.feature
+++ b/lms/djangoapps/courseware/features/signup.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Sign in
+Feature: LMS.Sign in
   In order to use the edX content
   As a new user
   I want to signup for a student account
diff --git a/lms/djangoapps/courseware/features/video.feature b/lms/djangoapps/courseware/features/video.feature
index 824a86806e33..001481a6a5c1 100644
--- a/lms/djangoapps/courseware/features/video.feature
+++ b/lms/djangoapps/courseware/features/video.feature
@@ -1,5 +1,5 @@
 @shard_2
-Feature: Video component
+Feature: LMS.Video component
   As a student, I want to view course videos in LMS.
 
   Scenario: Video component is fully rendered in the LMS in HTML5 mode
diff --git a/lms/djangoapps/courseware/features/word_cloud.feature b/lms/djangoapps/courseware/features/word_cloud.feature
index 761fa64c0012..f80765e72bde 100644
--- a/lms/djangoapps/courseware/features/word_cloud.feature
+++ b/lms/djangoapps/courseware/features/word_cloud.feature
@@ -1,6 +1,6 @@
 @shard_2
-Feature: World Cloud component
-    As a student, I want to view Word Cloud component in LMS.
+Feature: LMS.World Cloud component
+  As a student, I want to view Word Cloud component in LMS.
 
   Scenario: Word Cloud component in LMS is rendered with empty result
     Given the course has a Word Cloud component

From 1a0b752a812b04b85be38bdd9feeaab4c61732c5 Mon Sep 17 00:00:00 2001
From: Julian Arni <julian@edx.org>
Date: Tue, 24 Sep 2013 11:17:11 -0400
Subject: [PATCH 41/92] Review fixes

---
 common/djangoapps/contentserver/middleware.py |  14 +--
 common/djangoapps/contentserver/tests/test.py | 110 ++++++++++--------
 common/djangoapps/student/models.py           |   8 +-
 common/djangoapps/student/tests/tests.py      |  11 ++
 4 files changed, 83 insertions(+), 60 deletions(-)

diff --git a/common/djangoapps/contentserver/middleware.py b/common/djangoapps/contentserver/middleware.py
index 30ab977b9683..b9c14cd537aa 100644
--- a/common/djangoapps/contentserver/middleware.py
+++ b/common/djangoapps/contentserver/middleware.py
@@ -1,5 +1,5 @@
-from django.http import HttpResponse, HttpResponseNotModified
-from django.shortcuts import redirect
+from django.http import (HttpResponse, HttpResponseNotModified,
+    HttpResponseForbidden)
 from student.models import CourseEnrollment
 
 from xmodule.contentstore.django import contentstore
@@ -46,13 +46,11 @@ def process_request(self, request):
             # Check that user has access to content
             if getattr(content, "locked", False):
                 if not hasattr(request, "user") or not request.user.is_authenticated():
-                    return HttpResponse('Unauthorized', status=403)
+                    return HttpResponseForbidden('Unauthorized')
                 course_partial_id = "/".join([loc.org, loc.course])
-                if not CourseEnrollment.is_enrolled_by_partial(request.user, course_partial_id):
-                    return HttpResponse('Unauthorized', status=403)
-
-
-            # see if the last-modified at hasn't changed, if not return a 302 (Not Modified)
+                if not request.user.is_staff and not CourseEnrollment.is_enrolled_by_partial(
+                        request.user, course_partial_id):
+                    return HttpResponseForbidden('Unauthorized')
 
             # convert over the DB persistent last modified timestamp to a HTTP compatible
             # timestamp, so we can simply compare the strings
diff --git a/common/djangoapps/contentserver/tests/test.py b/common/djangoapps/contentserver/tests/test.py
index 7313ba3f9b96..94a614c85ab7 100644
--- a/common/djangoapps/contentserver/tests/test.py
+++ b/common/djangoapps/contentserver/tests/test.py
@@ -9,7 +9,6 @@
 
 from django.contrib.auth.models import User
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.test.client import Client
 from django.test.utils import override_settings
 
@@ -20,7 +19,7 @@
 from xmodule.contentstore.content import StaticContent
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.django_utils import (studio_store_config,
-        ModuleStoreTestCase)
+    ModuleStoreTestCase)
 from xmodule.modulestore.xml_importer import import_from_xml
 
 log = logging.getLogger(__name__)
@@ -45,28 +44,39 @@ def setUp(self):
         settings.MODULESTORE['default']['OPTIONS']['fs_root'] = path('common/test/data')
         settings.MODULESTORE['direct']['OPTIONS']['fs_root'] = path('common/test/data')
 
-        base = "http://127.0.0.1:8000"
         self.client = Client()
         self.contentstore = contentstore()
 
-        # A locked the asset
-        loc = Location('c4x', 'edX', 'toy', 'asset', 'sample_static.txt' )
-        self.loc = loc
-        rel_url = StaticContent.get_url_path_from_location(loc)
-        self.url = base + rel_url
+        # A locked asset
+        self.loc_locked = Location('c4x', 'edX', 'toy', 'asset', 'sample_static.txt')
+        self.url_locked = StaticContent.get_url_path_from_location(self.loc_locked)
 
         # An unlocked asset
-        loc2 = Location('c4x', 'edX', 'toy', 'asset', 'another_static.txt' )
-        self.loc2 = loc2
-        rel_url2 = StaticContent.get_url_path_from_location(loc2)
-        self.url2 = base + rel_url2
-
+        self.loc_unlocked = Location('c4x', 'edX', 'toy', 'asset', 'another_static.txt')
+        self.url_unlocked = StaticContent.get_url_path_from_location(self.loc_unlocked)
 
         import_from_xml(modulestore('direct'), 'common/test/data/', ['toy'],
                 static_content_store=self.contentstore, verbose=True)
 
-        self.contentstore.set_attr(self.loc, 'locked', True)
+        self.contentstore.set_attr(self.loc_locked, 'locked', True)
 
+        # Create user
+        self.usr = 'testuser'
+        self.pwd = 'foo'
+        email = 'test+courses@edx.org'
+        self.user = User.objects.create_user(self.usr, email, self.pwd)
+        self.user.is_active = True
+        self.user.save()
+
+        # Create staff user
+        self.staff_usr = 'stafftestuser'
+        self.staff_pwd = 'foo'
+        staff_email = 'stafftest+courses@edx.org'
+        self.staff_user = User.objects.create_user(self.staff_usr, staff_email,
+                self.staff_pwd)
+        self.staff_user.is_active = True
+        self.staff_user.is_staff = True
+        self.staff_user.save()
 
     def tearDown(self):
 
@@ -77,46 +87,50 @@ def test_unlocked_asset(self):
         """
         Test that unlocked assets are being served.
         """
-        # Logout user
         self.client.logout()
+        resp = self.client.get(self.url_unlocked)
+        self.assertEqual(resp.status_code, 200) #pylint: disable=E1103
 
-        resp = self.client.get(self.url2)
-        self.assertEqual(resp.status_code, 200)
+    def test_locked_asset_not_logged_in(self):
+        """
+        Test that locked assets behave appropriately in case the user is not
+        logged in.
+        """
+        self.client.logout()
+        resp = self.client.get(self.url_locked)
+        self.assertEqual(resp.status_code, 403) #pylint: disable=E1103
 
+    def test_locked_asset_not_registered(self):
+        """
+        Test that locked assets behave appropriately in case user is logged in
+        in but not registered for the course.
+        """
+        self.client.login(username=self.usr, password=self.pwd)
+        resp = self.client.get(self.url_locked)
+        self.assertEqual(resp.status_code, 403) #pylint: disable=E1103
 
-    def test_locked_asset(self):
+    def test_locked_asset_registered(self):
         """
-        Test that locked assets behave appropriately in case:
-            (1) User is not logged in
-            (2) User is logged in in but not registerd for the course
-            (3) User is logged in and registered
+        Test that locked assets behave appropriately in case user is logged in
+        and registered for the course.
         """
+        #pylint: disable=E1101
+        course_id = "/".join([self.loc_locked.org, self.loc_locked.course, '2012_Fall'])
+        CourseEnrollment.enroll(self.user, course_id)
+        self.assertTrue(CourseEnrollment.is_enrolled(self.user, course_id))
 
-        # Case (1)
-        resp = self.client.get(self.url)
-        self.assertEqual(resp.status_code, 403)
+        self.client.login(username=self.usr, password=self.pwd)
+        resp = self.client.get(self.url_locked)
+        self.assertEqual(resp.status_code, 200) #pylint: disable=E1103
 
-        # Case (2)
-        #   Create user and login
-        uname = 'testuser'
-        email = 'test+courses@edx.org'
-        password = 'foo'
-        user = User.objects.create_user(uname, email, password)
-        user.is_active = True
-        user.save()
-        self.client.login(username=uname, password=password)
-        log.debug("User logged in")
-
-        resp = self.client.get(self.url)
-        log.debug("Received response %s", resp)
-        self.assertEqual(resp.status_code, 403)
-
-        # Case (3)
-        #   Enroll student
-        course_id = "/".join([self.loc.org, self.loc.course, '2012_Fall'])
-        CourseEnrollment.enroll(user, course_id)
-        self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
-
-        resp = self.client.get(self.url)
-        self.assertEqual(resp.status_code, 200)
+    def test_locked_asset_staff(self):
+        """
+        Test that locked assets behave appropriately in case user is staff.
+        """
+        #pylint: disable=E1101
+        course_id = "/".join([self.loc_locked.org, self.loc_locked.course, '2012_Fall'])
+
+        self.client.login(username=self.staff_usr, password=self.staff_pwd)
+        resp = self.client.get(self.url_locked)
+        self.assertEqual(resp.status_code, 200) #pylint: disable=E1103
 
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 8cda698d8b89..da16a2fda227 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -861,10 +861,10 @@ def is_enrolled_by_partial(cls, user, course_id_partial):
         """
         try:
             return CourseEnrollment.objects.filter(
-                    user=user,
-                    course_id__startswith=course_id_partial,
-                    is_active=1
-                ).exists()
+                user=user,
+                course_id__startswith=course_id_partial,
+                is_active=1
+            ).exists()
         except cls.DoesNotExist:
             return False
 
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index 397816ec00ab..a6466ee9f96c 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -213,23 +213,34 @@ class EnrollInCourseTest(TestCase):
     def test_enrollment(self):
         user = User.objects.create_user("joe", "joe@joe.com", "password")
         course_id = "edX/Test101/2013"
+        course_id_partial = "edX/Test101"
 
         # Test basic enrollment
         self.assertFalse(CourseEnrollment.is_enrolled(user, course_id))
+        self.assertFalse(CourseEnrollment.is_enrolled_by_partial(user,
+            course_id_partial))
         CourseEnrollment.enroll(user, course_id)
         self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
+        self.assertTrue(CourseEnrollment.is_enrolled_by_partial(user,
+            course_id_partial))
 
         # Enrolling them again should be harmless
         CourseEnrollment.enroll(user, course_id)
         self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
+        self.assertTrue(CourseEnrollment.is_enrolled_by_partial(user,
+            course_id_partial))
 
         # Now unenroll the user
         CourseEnrollment.unenroll(user, course_id)
         self.assertFalse(CourseEnrollment.is_enrolled(user, course_id))
+        self.assertFalse(CourseEnrollment.is_enrolled_by_partial(user,
+            course_id_partial))
 
         # Unenrolling them again should also be harmless
         CourseEnrollment.unenroll(user, course_id)
         self.assertFalse(CourseEnrollment.is_enrolled(user, course_id))
+        self.assertFalse(CourseEnrollment.is_enrolled_by_partial(user,
+            course_id_partial))
 
         # The enrollment record should still exist, just be inactive
         enrollment_record = CourseEnrollment.objects.get(

From 1b5903935e1e8c9fe030ad3d3de9f71471447b8f Mon Sep 17 00:00:00 2001
From: Nick Parlante <nick.parlante@cs.stanford.edu>
Date: Mon, 23 Sep 2013 12:40:41 -0700
Subject: [PATCH 42/92] Add "Download CSV of all student anonymized IDs" button
 to instructor dashboard

This is a recurrent ops problem, so we wanted to make it available
on the instructor dashboard.
---
 lms/djangoapps/instructor/views/legacy.py          | 11 ++++++++++-
 lms/templates/courseware/instructor_dashboard.html |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index 2efc7e134421..df467b8637e8 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -50,7 +50,7 @@
 from instructor_task.views import get_task_completion_info
 from mitxmako.shortcuts import render_to_response
 from psychometrics import psychoanalyze
-from student.models import CourseEnrollment, CourseEnrollmentAllowed
+from student.models import CourseEnrollment, CourseEnrollmentAllowed, unique_id_for_user
 from student.views import course_from_id
 import track.views
 from mitxmako.shortcuts import render_to_string
@@ -584,6 +584,15 @@ def getdat(u):
             datatable['title'] = 'Student state for problem %s' % problem_to_dump
             return return_csv('student_state_from_%s.csv' % problem_to_dump, datatable)
 
+    elif 'Download CSV of all student anonymized IDs' in action:
+        students = User.objects.filter(
+            courseenrollment__course_id=course_id,
+        ).order_by('id')
+
+        datatable = {'header': ['User ID', 'Anonymized user ID']}
+        datatable['data'] = [[s.id, unique_id_for_user(s)] for s in students]
+        return return_csv(course_id.replace('/', '-')+'-anon-ids.csv', datatable)
+
     #----------------------------------------
     # Group management
 
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index effa5852d8b8..7f41c82c9dea 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -416,6 +416,9 @@ <H2>${_("Student-specific grade inspection and adjustment")}</h2>
         <input type="text" name="problem_to_dump" size="40">
         <input type="submit" name="action" value="Download CSV of all responses to problem">
     </p>
+    <p>
+    <input type="submit" name="action" value="Download CSV of all student anonymized IDs">
+    </p>
     <hr width="40%" style="align:left">
 %endif
 

From d1a82f2ac5fa32de531f1e0750ec0f96ca7ba91c Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Fri, 20 Sep 2013 15:31:50 -0400
Subject: [PATCH 43/92] Import/export static content properties Even though xml
 based courses will ignore.

---
 common/lib/xmodule/xmodule/contentstore/mongo.py | 10 +++++++++-
 .../xmodule/xmodule/modulestore/xml_exporter.py  |  8 ++++++--
 .../xmodule/xmodule/modulestore/xml_importer.py  | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/common/lib/xmodule/xmodule/contentstore/mongo.py
index 40c0b4bc9f93..0322b394ca73 100644
--- a/common/lib/xmodule/xmodule/contentstore/mongo.py
+++ b/common/lib/xmodule/xmodule/contentstore/mongo.py
@@ -12,6 +12,7 @@
 from xmodule.exceptions import NotFoundError
 from fs.osfs import OSFS
 import os
+import json
 
 
 class MongoContentStore(ContentStore):
@@ -103,12 +104,19 @@ def export(self, location, output_directory):
         with disk_fs.open(content.name, 'wb') as asset_file:
             asset_file.write(content.data)
 
-    def export_all_for_course(self, course_location, output_directory):
+    def export_all_for_course(self, course_location, output_directory, policy_file):
+        policy = {}
         assets = self.get_all_content_for_course(course_location)
 
         for asset in assets:
             asset_location = Location(asset['_id'])
             self.export(asset_location, output_directory)
+            for attr, value in asset.iteritems():
+                if attr not in ['_id', 'md5', 'uploadDate', 'length', 'chunkSize']:
+                    policy.setdefault(asset_location.url(), {})[attr] = value
+
+        with open(policy_file, 'w') as f:
+            json.dump(policy, f)
 
     def get_all_content_thumbnails_for_course(self, location):
         return self._get_all_content_for_course(location, get_thumbnails=True)
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
index c9d6e96761d9..a54d188b61d9 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_exporter.py
@@ -55,8 +55,13 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
     with export_fs.open('course.xml', 'w') as course_xml:
         course_xml.write(xml)
 
+    policies_dir = export_fs.makeopendir('policies')
     # export the static assets
-    contentstore.export_all_for_course(course_location, root_dir + '/' + course_dir + '/static/')
+    contentstore.export_all_for_course(
+        course_location,
+        root_dir + '/' + course_dir + '/static/',
+        root_dir + '/' + course_dir + '/policies/assets.json',
+    )
 
     # export the static tabs
     export_extra_content(export_fs, modulestore, course_location, 'static_tab', 'tabs', '.html')
@@ -71,7 +76,6 @@ def export_to_xml(modulestore, contentstore, course_location, root_dir, course_d
     export_extra_content(export_fs, modulestore, course_location, 'about', 'about', '.html')
 
     # export the grading policy
-    policies_dir = export_fs.makeopendir('policies')
     course_run_policy_dir = policies_dir.makeopendir(course.location.name)
     with course_run_policy_dir.open('grading_policy.json', 'w') as grading_policy:
         grading_policy.write(dumps(course.grading_policy, cls=EdxJSONEncoder))
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index 632619e9f70e..ad3cbce9df96 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -2,6 +2,7 @@
 import os
 import mimetypes
 from path import path
+import json
 
 from xblock.fields import Scope
 
@@ -22,6 +23,11 @@ def import_static_content(modules, course_loc, course_data_path, static_content_
 
     # now import all static assets
     static_dir = course_data_path / subpath
+    try:
+        with open(course_data_path / 'policies/assets.json') as f:
+            policy = json.load(f)
+    except (IOError, ValueError) as err:
+        policy = {}
 
     verbose = True
 
@@ -46,10 +52,16 @@ def import_static_content(modules, course_loc, course_data_path, static_content_
             if fullname_with_subpath.startswith('/'):
                 fullname_with_subpath = fullname_with_subpath[1:]
             content_loc = StaticContent.compute_location(target_location_namespace.org, target_location_namespace.course, fullname_with_subpath)
-            mime_type = mimetypes.guess_type(filename)[0]
 
 
-            content = StaticContent(content_loc, filename, mime_type, data, import_path=fullname_with_subpath)
+            policy_ele = policy.get(content_loc.url(), {})
+            displayname = policy_ele.get('displayname', filename)
+            locked = policy_ele.get('locked', False)
+            mime_type = policy_ele.get('contentType', mimetypes.guess_type(filename)[0])
+            content = StaticContent(
+                content_loc, displayname, mime_type, data,
+                import_path=fullname_with_subpath, locked=locked
+            )
 
             # first let's save a thumbnail so we can get back a thumbnail location
             (thumbnail_content, thumbnail_location) = static_content_store.generate_thumbnail(content)

From 8e7fc1537fc5df134dcd6ab538bf1ea3c3556725 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 23 Sep 2013 11:19:59 -0400
Subject: [PATCH 44/92] Test asset import/export roundtrip w/ lock setting.

---
 .../contentstore/tests/test_contentstore.py   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 32928bb2fdcf..6f40ac0e539e 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -170,6 +170,16 @@ def check_edit_unit(self, test_course_name):
             resp = self.client.get(reverse('edit_unit', kwargs={'location': descriptor.location.url()}))
             self.assertEqual(resp.status_code, 200)
 
+    def lockAnAsset(self, content_store, course_location):
+        """
+        Lock an arbitrary asset in the course
+        :param course_location:
+        """
+        course_assets = content_store.get_all_content_for_course(course_location)
+        self.assertGreater(len(course_assets), 0, "No assets to lock")
+        content_store.set_attr(course_assets[0]['_id'], 'locked', True)
+        return course_assets[0]['_id']
+
     def test_edit_unit_toy(self):
         self.check_edit_unit('toy')
 
@@ -952,6 +962,11 @@ def test_export_course(self, mock_get):
 
         self.assertIn(private_location_no_draft.url(), sequential.children)
 
+        locked_asset = self.lockAnAsset(content_store, location)
+        locked_asset_attrs = content_store.get_attrs(locked_asset)
+        # the later import will reupload
+        del locked_asset_attrs['uploadDate']
+
         print 'Exporting to tempdir = {0}'.format(root_dir)
 
         # export out to a tempdir
@@ -1034,6 +1049,10 @@ def test_export_course(self, mock_get):
 
         self.assertGreater(len(course.textbooks), 0)
 
+        new_attrs = content_store.get_attrs(locked_asset)
+        for key, value in locked_asset_attrs.iteritems():
+            self.assertEqual(value, new_attrs[key])
+
         shutil.rmtree(root_dir)
 
     def test_export_course_with_metadata_only_video(self):

From 20e4d585c85361d6742cc40a9a84ec9afbaf5683 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 24 Sep 2013 16:30:24 -0400
Subject: [PATCH 45/92] Add documentation and comments.

---
 common/lib/xmodule/xmodule/contentstore/mongo.py    | 13 +++++++++++--
 .../lib/xmodule/xmodule/modulestore/xml_importer.py |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/common/lib/xmodule/xmodule/contentstore/mongo.py
index 0322b394ca73..dcc58b343185 100644
--- a/common/lib/xmodule/xmodule/contentstore/mongo.py
+++ b/common/lib/xmodule/xmodule/contentstore/mongo.py
@@ -104,7 +104,16 @@ def export(self, location, output_directory):
         with disk_fs.open(content.name, 'wb') as asset_file:
             asset_file.write(content.data)
 
-    def export_all_for_course(self, course_location, output_directory, policy_file):
+    def export_all_for_course(self, course_location, output_directory, assets_policy_file):
+        """
+        Export all of this course's assets to the output_directory. Export all of the assets'
+        attributes to the policy file.
+
+        :param course_location: the Location of type 'course'
+        :param output_directory: the directory under which to put all the asset files
+        :param assets_policy_file: the filename for the policy file which should be in the same
+        directory as the other policy files.
+        """
         policy = {}
         assets = self.get_all_content_for_course(course_location)
 
@@ -115,7 +124,7 @@ def export_all_for_course(self, course_location, output_directory, policy_file):
                 if attr not in ['_id', 'md5', 'uploadDate', 'length', 'chunkSize']:
                     policy.setdefault(asset_location.url(), {})[attr] = value
 
-        with open(policy_file, 'w') as f:
+        with open(assets_policy_file, 'w') as f:
             json.dump(policy, f)
 
     def get_all_content_thumbnails_for_course(self, location):
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index ad3cbce9df96..64caad048122 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -27,6 +27,8 @@ def import_static_content(modules, course_loc, course_data_path, static_content_
         with open(course_data_path / 'policies/assets.json') as f:
             policy = json.load(f)
     except (IOError, ValueError) as err:
+        # xml backed courses won't have this file, only exported courses; so, its absence is not
+        # really an exception.
         policy = {}
 
     verbose = True

From 4ee9ef61cf43f10c5d7c81f93974c02dad122262 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Tue, 24 Sep 2013 14:11:00 -0400
Subject: [PATCH 46/92] Clean up some old pep8/pylint violations

Also, deletes some unused code.
---
 common/djangoapps/course_modes/views.py    | 27 +++++--
 lms/djangoapps/verify_student/models.py    | 32 ++++----
 lms/djangoapps/verify_student/ssencrypt.py | 35 +++++++--
 lms/djangoapps/verify_student/urls.py      |  7 --
 lms/djangoapps/verify_student/views.py     | 89 +++++-----------------
 5 files changed, 86 insertions(+), 104 deletions(-)

diff --git a/common/djangoapps/course_modes/views.py b/common/djangoapps/course_modes/views.py
index cf4dadd1a0c6..02934f365096 100644
--- a/common/djangoapps/course_modes/views.py
+++ b/common/djangoapps/course_modes/views.py
@@ -1,12 +1,15 @@
+"""
+Views for the course_mode module
+"""
+
 import decimal
 from django.core.urlresolvers import reverse
 from django.http import (
-    HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, Http404
+    HttpResponseBadRequest,  Http404
 )
 from django.shortcuts import redirect
 from django.views.generic.base import View
 from django.utils.translation import ugettext as _
-from django.utils.http import urlencode
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 
@@ -18,10 +21,19 @@
 from student.views import course_from_id
 from verify_student.models import SoftwareSecurePhotoVerification
 
-class ChooseModeView(View):
 
+class ChooseModeView(View):
+    """
+    View used when the user is asked to pick a mode
+
+    When a get request is used, shows the selection page.
+    When a post request is used, assumes that it is a form submission
+        from the selection page, parses the response, and then sends user
+        to the next step in the flow
+    """
     @method_decorator(login_required)
     def get(self, request, course_id, error=None):
+        """ Displays the course mode choice page """
         if CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == 'verified':
             return redirect(reverse('dashboard'))
         modes = CourseMode.modes_for_course_dict(course_id)
@@ -34,8 +46,8 @@ def get(self, request, course_id, error=None):
             "course_id": course_id,
             "modes": modes,
             "course_name": course.display_name_with_default,
-            "course_org" : course.display_org_with_default,
-            "course_num" : course.display_number_with_default,
+            "course_org": course.display_org_with_default,
+            "course_num": course.display_number_with_default,
             "chosen_price": chosen_price,
             "error": error,
         }
@@ -48,6 +60,7 @@ def get(self, request, course_id, error=None):
 
     @method_decorator(login_required)
     def post(self, request, course_id):
+        """ Takes the form submission from the page and parses it """
         user = request.user
 
         # This is a bit redundant with logic in student.views.change_enrollement,
@@ -102,6 +115,10 @@ def post(self, request, course_id):
             )
 
     def get_requested_mode(self, user_choice):
+        """
+        Given the text of `user_choice`, return the
+        corresponding course mode slug
+        """
         choices = {
             "Select Audit": "audit",
             "Select Certificate": "verified"
diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py
index 5a1821de5417..80e05d09b13a 100644
--- a/lms/djangoapps/verify_student/models.py
+++ b/lms/djangoapps/verify_student/models.py
@@ -26,12 +26,11 @@
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from model_utils.models import StatusModel
 from model_utils import Choices
 
 from verify_student.ssencrypt import (
-    random_aes_key, decode_and_decrypt, encrypt_and_encode,
+    random_aes_key, encrypt_and_encode,
     generate_signed_message, rsa_encrypt
 )
 
@@ -57,15 +56,18 @@ def refund_user(self, user_id):
     distracting boilerplate when looking at a Model that needs to go through a
     workflow process.
     """
-    def decorator_func(fn):
-        @functools.wraps(fn)
+    def decorator_func(func):
+        """
+        Decorator function that gets returned
+        """
+        @functools.wraps(func)
         def with_status_check(obj, *args, **kwargs):
             if obj.status not in valid_start_statuses:
                 exception_msg = (
                     u"Error calling {} {}: status is '{}', must be one of: {}"
-                ).format(fn, obj, obj.status, valid_start_statuses)
+                ).format(func, obj, obj.status, valid_start_statuses)
                 raise VerificationException(exception_msg)
-            return fn(obj, *args, **kwargs)
+            return func(obj, *args, **kwargs)
 
         return with_status_check
 
@@ -367,7 +369,7 @@ def system_error(self,
         Status should be moved to `must_retry`.
         """
         if self.status in ["approved", "denied"]:
-            return # If we were already approved or denied, just leave it.
+            return  # If we were already approved or denied, just leave it.
 
         self.error_msg = error_msg
         self.error_code = error_code
@@ -408,7 +410,7 @@ class SoftwareSecurePhotoVerification(PhotoVerification):
     # encode that. The result is saved here. Actual expected length is 344.
     photo_id_key = models.TextField(max_length=1024)
 
-    IMAGE_LINK_DURATION = 5 * 60 * 60 * 24 # 5 days in seconds
+    IMAGE_LINK_DURATION = 5 * 60 * 60 * 24  # 5 days in seconds
 
     @status_before_must_be("created")
     def upload_face_image(self, img_data):
@@ -444,8 +446,8 @@ def submit(self):
                 self.status = "must_retry"
                 self.error_msg = response.text
                 self.save()
-        except Exception as e:
-            log.exception(e)
+        except Exception as error:
+            log.exception(error)
 
     def image_url(self, name):
         """
@@ -466,7 +468,7 @@ def _generate_key(self, prefix):
         bucket = conn.get_bucket(settings.VERIFY_STUDENT["SOFTWARE_SECURE"]["S3_BUCKET"])
 
         key = Key(bucket)
-        key.key = "{}/{}".format(prefix, self.receipt_id);
+        key.key = "{}/{}".format(prefix, self.receipt_id)
 
         return key
 
@@ -507,7 +509,7 @@ def create_request(self):
             "Content-Type": "application/json",
             "Date": formatdate(timeval=None, localtime=False, usegmt=True)
         }
-        message, _, authorization = generate_signed_message(
+        _message, _sig, authorization = generate_signed_message(
             "POST", headers, body, access_key, secret_key
         )
         headers['Authorization'] = authorization
@@ -515,16 +517,18 @@ def create_request(self):
         return headers, body
 
     def request_message_txt(self):
+        """ This is the body of the request we send across """
         headers, body = self.create_request()
 
         header_txt = "\n".join(
-            "{}: {}".format(h, v) for h,v in sorted(headers.items())
+            "{}: {}".format(h, v) for h, v in sorted(headers.items())
         )
         body_txt = json.dumps(body, indent=2, sort_keys=True, ensure_ascii=False).encode('utf-8')
 
         return header_txt + "\n\n" + body_txt
 
     def send_request(self):
+        """ sends the request across to the endpoint """
         headers, body = self.create_request()
         response = requests.post(
             settings.VERIFY_STUDENT["SOFTWARE_SECURE"]["API_URL"],
@@ -538,4 +542,4 @@ def send_request(self):
         log.debug("Return code: {}".format(response.status_code))
         log.debug("Return message:\n\n{}\n\n".format(response.text))
 
-        return response
\ No newline at end of file
+        return response
diff --git a/lms/djangoapps/verify_student/ssencrypt.py b/lms/djangoapps/verify_student/ssencrypt.py
index aefb4292a0c0..bbf32d7a8be3 100644
--- a/lms/djangoapps/verify_student/ssencrypt.py
+++ b/lms/djangoapps/verify_student/ssencrypt.py
@@ -22,16 +22,11 @@
 according to a certain pass phrase. Only OpenSSL-compatible pass phrases are
 supported.
 """
-from collections import OrderedDict
-from email.utils import formatdate
 from hashlib import md5, sha256
-from uuid import uuid4
 import base64
 import binascii
-import json
 import hmac
 import logging
-import sys
 
 from Crypto import Random
 from Crypto.Cipher import AES, PKCS1_OAEP
@@ -39,12 +34,17 @@
 
 log = logging.getLogger(__name__)
 
+
 def encrypt_and_encode(data, key):
+    """ Encrypts and endcodes `data` using `key' """
     return base64.urlsafe_b64encode(aes_encrypt(data, key))
 
+
 def decode_and_decrypt(encoded_data, key):
+    """ Decrypts and decodes `data` using `key' """
     return aes_decrypt(base64.urlsafe_b64decode(encoded_data), key)
 
+
 def aes_encrypt(data, key):
     """
     Return a version of the `data` that has been encrypted to
@@ -53,11 +53,16 @@ def aes_encrypt(data, key):
     padded_data = pad(data)
     return cipher.encrypt(padded_data)
 
+
 def aes_decrypt(encrypted_data, key):
+    """
+    Decrypt `encrypted_data` using `key`
+    """
     cipher = aes_cipher_from_key(key)
     padded_data = cipher.decrypt(encrypted_data)
     return unpad(padded_data)
 
+
 def aes_cipher_from_key(key):
     """
     Given an AES key, return a Cipher object that has `encrypt()` and
@@ -66,6 +71,7 @@ def aes_cipher_from_key(key):
     """
     return AES.new(key, AES.MODE_CBC, generate_aes_iv(key))
 
+
 def generate_aes_iv(key):
     """
     Return the initialization vector Software Secure expects for a given AES
@@ -73,17 +79,23 @@ def generate_aes_iv(key):
     """
     return md5(key + md5(key).hexdigest()).hexdigest()[:AES.block_size]
 
+
 def random_aes_key():
     return Random.new().read(32)
 
+
 def pad(data):
+    """ Pad the given `data` such that it fits into the proper AES block size """
     bytes_to_pad = AES.block_size - len(data) % AES.block_size
     return data + (bytes_to_pad * chr(bytes_to_pad))
 
+
 def unpad(padded_data):
+    """  remove all padding from `padded_data` """
     num_padded_bytes = ord(padded_data[-1])
     return padded_data[:-num_padded_bytes]
 
+
 def rsa_encrypt(data, rsa_pub_key_str):
     """
     `rsa_pub_key` is a string with the public key
@@ -93,11 +105,16 @@ def rsa_encrypt(data, rsa_pub_key_str):
     encrypted_data = cipher.encrypt(data)
     return encrypted_data
 
+
 def rsa_decrypt(data, rsa_priv_key_str):
+    """
+    When given some `data` and an RSA private key, decrypt the data
+    """
     key = RSA.importKey(rsa_priv_key_str)
     cipher = PKCS1_OAEP.new(key)
     return cipher.decrypt(data)
 
+
 def has_valid_signature(method, headers_dict, body_dict, access_key, secret_key):
     """
     Given a message (either request or response), say whether it has a valid
@@ -123,6 +140,7 @@ def has_valid_signature(method, headers_dict, body_dict, access_key, secret_key)
 
     return True
 
+
 def generate_signed_message(method, headers_dict, body_dict, access_key, secret_key):
     """
     Returns a (message, signature) pair.
@@ -137,6 +155,7 @@ def generate_signed_message(method, headers_dict, body_dict, access_key, secret_
     message += '\n'
     return message, signature, authorization_header
 
+
 def signing_format_message(method, headers_dict, body_dict):
     """
     Given a dictionary of headers and a dictionary of the JSON for the body,
@@ -149,6 +168,7 @@ def signing_format_message(method, headers_dict, body_dict):
 
     return message
 
+
 def header_string(headers_dict):
     """Given a dictionary of headers, return a canonical string representation."""
     header_list = []
@@ -160,7 +180,8 @@ def header_string(headers_dict):
     if 'Content-MD5' in headers_dict:
         header_list.append(headers_dict['Content-MD5'] + "\n")
 
-    return "".join(header_list) # Note that trailing \n's are important
+    return "".join(header_list)  # Note that trailing \n's are important
+
 
 def body_string(body_dict, prefix=""):
     """
@@ -183,5 +204,5 @@ def body_string(body_dict, prefix=""):
                 value = "null"
             body_list.append(u"{}{}:{}\n".format(prefix, key, value).encode('utf-8'))
 
-    return "".join(body_list) # Note that trailing \n's are important
+    return "".join(body_list)  # Note that trailing \n's are important
 
diff --git a/lms/djangoapps/verify_student/urls.py b/lms/djangoapps/verify_student/urls.py
index 52c55ad452d4..15c2cc5f6b29 100644
--- a/lms/djangoapps/verify_student/urls.py
+++ b/lms/djangoapps/verify_student/urls.py
@@ -35,11 +35,4 @@
         name="verify_student_results_callback",
     ),
 
-    url(
-        r'^show_verification_page/(?P<course_id>[^/]+/[^/]+/[^/]+)$',
-        views.show_verification_page,
-        name="verify_student/show_verification_page"
-    ),
-
-
 )
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 329e7efa102f..b220ff6a97d1 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -1,5 +1,5 @@
 """
-
+Views for the verification flow
 
 """
 import json
@@ -37,6 +37,12 @@ class VerifyView(View):
     @method_decorator(login_required)
     def get(self, request, course_id):
         """
+        Displays the main verification view, which contains three separate steps:
+            - Taking the standard face photo
+            - Taking the id photo
+            - Confirming that the photos and payment price are correct
+              before proceeding to payment
+
         """
         # If the user has already been verified within the given time period,
         # redirect straight to the payment -- no need to verify again.
@@ -69,8 +75,8 @@ def get(self, request, course_id):
             "user_full_name": request.user.profile.name,
             "course_id": course_id,
             "course_name": course.display_name_with_default,
-            "course_org" : course.display_org_with_default,
-            "course_num" : course.display_number_with_default,
+            "course_org": course.display_org_with_default,
+            "course_num": course.display_number_with_default,
             "purchase_endpoint": get_purchase_endpoint(),
             "suggested_prices": [
                 decimal.Decimal(price)
@@ -106,8 +112,8 @@ def get(self, request, course_id):
         context = {
             "course_id": course_id,
             "course_name": course.display_name_with_default,
-            "course_org" : course.display_org_with_default,
-            "course_num" : course.display_number_with_default,
+            "course_org": course.display_org_with_default,
+            "course_num": course.display_number_with_default,
             "purchase_endpoint": get_purchase_endpoint(),
             "currency": verify_mode.currency.upper(),
             "chosen_price": chosen_price,
@@ -162,8 +168,9 @@ def create_order(request):
 
     return HttpResponse(json.dumps(params), content_type="text/json")
 
+
 @require_POST
-@csrf_exempt # SS does its own message signing, and their API won't have a cookie value
+@csrf_exempt  # SS does its own message signing, and their API won't have a cookie value
 def results_callback(request):
     """
     Software Secure will call this callback to tell us whether a user is
@@ -194,7 +201,7 @@ def results_callback(request):
         settings.VERIFY_STUDENT["SOFTWARE_SECURE"]["API_SECRET_KEY"]
     )
 
-    _, access_key_and_sig = headers["Authorization"].split(" ")
+    _response, access_key_and_sig = headers["Authorization"].split(" ")
     access_key = access_key_and_sig.split(":")[0]
 
     # This is what we should be doing...
@@ -234,10 +241,11 @@ def results_callback(request):
 
     return HttpResponse("OK!")
 
+
 @login_required
 def show_requirements(request, course_id):
     """
-    Show the requirements necessary for
+    Show the requirements necessary for the verification flow.
     """
     if CourseEnrollment.enrollment_mode_for_user(request.user, course_id) == 'verified':
         return redirect(reverse('dashboard'))
@@ -246,69 +254,8 @@ def show_requirements(request, course_id):
     context = {
         "course_id": course_id,
         "course_name": course.display_name_with_default,
-        "course_org" : course.display_org_with_default,
-        "course_num" : course.display_number_with_default,
+        "course_org": course.display_org_with_default,
+        "course_num": course.display_number_with_default,
         "is_not_active": not request.user.is_active,
     }
     return render_to_response("verify_student/show_requirements.html", context)
-
-
-def show_verification_page(request):
-    pass
-
-def enroll(user, course_id, mode_slug):
-    """
-    Enroll the user in a course for a certain mode.
-
-    This is the view you send folks to when they click on the enroll button.
-    This does NOT cover changing enrollment modes -- it's intended for new
-    enrollments only, and will just redirect to the dashboard if it detects
-    that an enrollment already exists.
-    """
-    # If the user is already enrolled, jump to the dashboard. Yeah, we could
-    # do upgrades here, but this method is complicated enough.
-    if CourseEnrollment.is_enrolled(user, course_id):
-        return HttpResponseRedirect(reverse('dashboard'))
-
-    available_modes = CourseModes.modes_for_course(course_id)
-
-    # If they haven't chosen a mode...
-    if not mode_slug:
-        # Does this course support multiple modes of Enrollment? If so, redirect
-        # to a page that lets them choose which mode they want.
-        if len(available_modes) > 1:
-            return HttpResponseRedirect(
-                reverse('choose_enroll_mode', kwargs={'course_id': course_id})
-            )
-        # Otherwise, we use the only mode that's supported...
-        else:
-            mode_slug = available_modes[0].slug
-
-    # If the mode is one of the simple, non-payment ones, do the enrollment and
-    # send them to their dashboard.
-    if mode_slug in ("honor", "audit"):
-        CourseEnrollment.enroll(user, course_id, mode=mode_slug)
-        return HttpResponseRedirect(reverse('dashboard'))
-
-    if mode_slug == "verify":
-        if SoftwareSecurePhotoVerification.has_submitted_recent_request(user):
-            # Capture payment info
-            # Create an order
-            # Create a VerifiedCertificate order item
-            return HttpResponse.Redirect(reverse('verified'))
-
-    # There's always at least one mode available (default is "honor"). If they
-    # haven't specified a mode, we just assume it's
-    if not mode:
-        mode = available_modes[0]
-
-    elif len(available_modes) == 1:
-        if mode != available_modes[0]:
-            raise Exception()
-
-        mode = available_modes[0]
-
-    if mode == "honor":
-        CourseEnrollment.enroll(user, course_id)
-        return HttpResponseRedirect(reverse('dashboard'))
-

From f1ccf1c06b12acd4c74db693363c1fc6abd1f2a0 Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzolucioni@gmail.com>
Date: Mon, 9 Sep 2013 14:52:54 -0400
Subject: [PATCH 47/92] Integrate split testing and LMS tabs experiments

---
 lms/djangoapps/courseware/tabs.py             | 99 ++++++++++++-------
 lms/djangoapps/courseware/tests/test_tabs.py  | 57 +++++------
 lms/djangoapps/courseware/views.py            |  1 +
 lms/envs/common.py                            | 16 ++-
 lms/envs/dev.py                               |  2 +-
 .../course/layout/_courseware_header.scss     | 11 +++
 .../courseware/course_navigation.html         | 11 ++-
 lms/templates/courseware/welcome-back.html    | 34 ++++++-
 lms/templates/dashboard.html                  |  8 +-
 lms/templates/widgets/segment-io.html         | 16 ++-
 lms/urls.py                                   |  1 +
 requirements/edx/github.txt                   |  1 +
 12 files changed, 184 insertions(+), 73 deletions(-)

diff --git a/lms/djangoapps/courseware/tabs.py b/lms/djangoapps/courseware/tabs.py
index ce49e5a2013e..6579e631d6de 100644
--- a/lms/djangoapps/courseware/tabs.py
+++ b/lms/djangoapps/courseware/tabs.py
@@ -25,6 +25,8 @@
 
 from open_ended_grading import open_ended_notifications
 
+import waffle
+
 log = logging.getLogger(__name__)
 
 
@@ -55,32 +57,46 @@ def CourseTab(name, link, is_active, has_img=False, img=""):
 
 
 #####  Generators for various tabs.
-
-def _courseware(tab, user, course, active_page):
+def _courseware(tab, user, course, active_page, request):
+    """
+    This returns a tab containing the course content.
+    """
     link = reverse('courseware', args=[course.id])
-    return [CourseTab('Courseware', link, active_page == "courseware")]
+    if waffle.flag_is_active(request, 'merge_course_tabs'):
+        return [CourseTab('Course Content', link, active_page == "courseware")]
+    else:
+        return [CourseTab('Courseware', link, active_page == "courseware")]
 
 
-def _course_info(tab, user, course, active_page):
+def _course_info(tab, user, course, active_page, request):
+    """
+    This returns a tab containing information about the course.
+    """
     link = reverse('info', args=[course.id])
     return [CourseTab(tab['name'], link, active_page == "info")]
 
 
-def _progress(tab, user, course, active_page):
+def _progress(tab, user, course, active_page, request):
+    """
+    This returns a tab containing information about the authenticated user's progress.
+    """
     if user.is_authenticated():
         link = reverse('progress', args=[course.id])
         return [CourseTab(tab['name'], link, active_page == "progress")]
     return []
 
 
-def _wiki(tab, user, course, active_page):
+def _wiki(tab, user, course, active_page, request):
+    """
+    This returns a tab containing the course wiki.
+    """
     if settings.WIKI_ENABLED:
         link = reverse('course_wiki', args=[course.id])
         return [CourseTab(tab['name'], link, active_page == 'wiki')]
     return []
 
 
-def _discussion(tab, user, course, active_page):
+def _discussion(tab, user, course, active_page, request):
     """
     This tab format only supports the new Berkeley discussion forums.
     """
@@ -91,25 +107,25 @@ def _discussion(tab, user, course, active_page):
     return []
 
 
-def _external_discussion(tab, user, course, active_page):
+def _external_discussion(tab, user, course, active_page, request):
     """
     This returns a tab that links to an external discussion service
     """
     return [CourseTab('Discussion', tab['link'], active_page == 'discussion')]
 
 
-def _external_link(tab, user, course, active_page):
+def _external_link(tab, user, course, active_page, request):
     # external links are never active
     return [CourseTab(tab['name'], tab['link'], False)]
 
 
-def _static_tab(tab, user, course, active_page):
+def _static_tab(tab, user, course, active_page, request):
     link = reverse('static_tab', args=[course.id, tab['url_slug']])
     active_str = 'static_tab_{0}'.format(tab['url_slug'])
     return [CourseTab(tab['name'], link, active_page == active_str)]
 
 
-def _textbooks(tab, user, course, active_page):
+def _textbooks(tab, user, course, active_page, request):
     """
     Generates one tab per textbook.  Only displays if user is authenticated.
     """
@@ -120,7 +136,8 @@ def _textbooks(tab, user, course, active_page):
                 for index, textbook in enumerate(course.textbooks)]
     return []
 
-def _pdf_textbooks(tab, user, course, active_page):
+
+def _pdf_textbooks(tab, user, course, active_page, request):
     """
     Generates one tab per textbook.  Only displays if user is authenticated.
     """
@@ -131,7 +148,8 @@ def _pdf_textbooks(tab, user, course, active_page):
                 for index, textbook in enumerate(course.pdf_textbooks)]
     return []
 
-def _html_textbooks(tab, user, course, active_page):
+
+def _html_textbooks(tab, user, course, active_page, request):
     """
     Generates one tab per textbook.  Only displays if user is authenticated.
     """
@@ -142,7 +160,8 @@ def _html_textbooks(tab, user, course, active_page):
                 for index, textbook in enumerate(course.html_textbooks)]
     return []
 
-def _staff_grading(tab, user, course, active_page):
+
+def _staff_grading(tab, user, course, active_page, request):
     if has_access(user, course, 'staff'):
         link = reverse('staff_grading', args=[course.id])
 
@@ -157,14 +176,13 @@ def _staff_grading(tab, user, course, active_page):
     return []
 
 
-def _syllabus(tab, user, course, active_page):
+def _syllabus(tab, user, course, active_page, request):
     """Display the syllabus tab"""
     link = reverse('syllabus', args=[course.id])
     return [CourseTab('Syllabus', link, active_page == 'syllabus')]
 
 
-def _peer_grading(tab, user, course, active_page):
-
+def _peer_grading(tab, user, course, active_page, request):
     if user.is_authenticated():
         link = reverse('peer_grading', args=[course.id])
         tab_name = "Peer grading"
@@ -178,7 +196,7 @@ def _peer_grading(tab, user, course, active_page):
     return []
 
 
-def _combined_open_ended_grading(tab, user, course, active_page):
+def _combined_open_ended_grading(tab, user, course, active_page, request):
     if user.is_authenticated():
         link = reverse('open_ended_notifications', args=[course.id])
         tab_name = "Open Ended Panel"
@@ -191,15 +209,15 @@ def _combined_open_ended_grading(tab, user, course, active_page):
         return tab
     return []
 
-def _notes_tab(tab, user, course, active_page):
+
+def _notes_tab(tab, user, course, active_page, request):
     if user.is_authenticated() and settings.MITX_FEATURES.get('ENABLE_STUDENT_NOTES'):
         link = reverse('notes', args=[course.id])
         return [CourseTab(tab['name'], link, active_page == 'notes')]
     return []
 
-#### Validators
-
 
+#### Validators
 def key_checker(expected_keys):
     """
     Returns a function that checks that specified keys are present in a dict
@@ -263,12 +281,15 @@ def validate_tabs(course):
 
     if len(tabs) < 2:
         raise InvalidTabsException("Expected at least two tabs.  tabs: '{0}'".format(tabs))
+
     if tabs[0]['type'] != 'courseware':
         raise InvalidTabsException(
             "Expected first tab to have type 'courseware'.  tabs: '{0}'".format(tabs))
+
     if tabs[1]['type'] != 'course_info':
         raise InvalidTabsException(
             "Expected second tab to have type 'course_info'.  tabs: '{0}'".format(tabs))
+
     for t in tabs:
         if t['type'] not in VALID_TAB_TYPES:
             raise InvalidTabsException("Unknown tab type {0}. Known types: {1}"
@@ -280,12 +301,12 @@ def validate_tabs(course):
     # are actually unique (otherwise, will break active tag code)
 
 
-def get_course_tabs(user, course, active_page):
+def get_course_tabs(user, course, active_page, request):
     """
     Return the tabs to show a particular user, as a list of CourseTab items.
     """
     if not hasattr(course, 'tabs') or not course.tabs:
-        return get_default_tabs(user, course, active_page)
+        return get_default_tabs(user, course, active_page, request)
 
     # TODO (vshnayder): There needs to be a place to call this right after course
     # load, but not from inside xmodule, since that doesn't (and probably
@@ -293,12 +314,18 @@ def get_course_tabs(user, course, active_page):
     validate_tabs(course)
 
     tabs = []
-    for tab in course.tabs:
+
+    if waffle.flag_is_active(request, 'merge_course_tabs'):
+        course_tabs = [tab for tab in course.tabs if tab['type'] != "course_info"]
+    else:
+        course_tabs = course.tabs
+
+    for tab in course_tabs:
         # expect handlers to return lists--handles things that are turned off
         # via feature flags, and things like 'textbook' which might generate
         # multiple tabs.
         gen = VALID_TAB_TYPES[tab['type']].generator
-        tabs.extend(gen(tab, user, course, active_page))
+        tabs.extend(gen(tab, user, course, active_page, request))
 
     # Instructor tab is special--automatically added if user is staff for the course
     if has_access(user, course, 'staff'):
@@ -314,7 +341,7 @@ def get_discussion_link(course):
     Return the URL for the discussion tab for the given `course`.
 
     If they have a discussion link specified, use that even if we disable
-    discussions. Disabling discsussions is mostly a server safety feature at
+    discussions. Disabling discussions is mostly a server safety feature at
     this point, and we don't need to worry about external sites. Otherwise,
     if the course has a discussion tab or uses the default tabs, return the
     discussion view URL. Otherwise, return None to indicate the lack of a
@@ -330,28 +357,33 @@ def get_discussion_link(course):
         return reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id])
 
 
-def get_default_tabs(user, course, active_page):
-
+def get_default_tabs(user, course, active_page, request):
+    """
+    Return the default set of tabs.
+    """
     # When calling the various _tab methods, can omit the 'type':'blah' from the
     # first arg, since that's only used for dispatch
     tabs = []
-    tabs.extend(_courseware({''}, user, course, active_page))
-    tabs.extend(_course_info({'name': 'Course Info'}, user, course, active_page))
+
+    tabs.extend(_courseware({''}, user, course, active_page, request))
+
+    if not waffle.flag_is_active(request, 'merge_course_tabs'):
+        tabs.extend(_course_info({'name': 'Course Info'}, user, course, active_page, request))
 
     if hasattr(course, 'syllabus_present') and course.syllabus_present:
         link = reverse('syllabus', args=[course.id])
         tabs.append(CourseTab('Syllabus', link, active_page == 'syllabus'))
 
-    tabs.extend(_textbooks({}, user, course, active_page))
+    tabs.extend(_textbooks({}, user, course, active_page, request))
 
     discussion_link = get_discussion_link(course)
     if discussion_link:
         tabs.append(CourseTab('Discussion', discussion_link, active_page == 'discussion'))
 
-    tabs.extend(_wiki({'name': 'Wiki', 'type': 'wiki'}, user, course, active_page))
+    tabs.extend(_wiki({'name': 'Wiki', 'type': 'wiki'}, user, course, active_page, request))
 
     if user.is_authenticated() and not course.hide_progress_tab:
-        tabs.extend(_progress({'name': 'Progress'}, user, course, active_page))
+        tabs.extend(_progress({'name': 'Progress'}, user, course, active_page, request))
 
     if has_access(user, course, 'staff'):
         link = reverse('instructor_dashboard', args=[course.id])
@@ -376,7 +408,6 @@ def get_static_tab_by_slug(course, tab_slug):
 
 
 def get_static_tab_contents(request, course, tab):
-
     loc = Location(course.location.tag, course.location.org, course.location.course, 'static_tab', tab['url_slug'])
     field_data_cache = FieldDataCache.cache_for_descriptor_descendents(course.id,
         request.user, modulestore().get_instance(course.id, loc), depth=0)
diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py
index 5de7a39f63d0..54264121d155 100644
--- a/lms/djangoapps/courseware/tests/test_tabs.py
+++ b/lms/djangoapps/courseware/tests/test_tabs.py
@@ -11,6 +11,7 @@
 from xmodule.modulestore.tests.factories import CourseFactory
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
 
+FAKE_REQUEST = None
 
 class ProgressTestCase(TestCase):
 
@@ -29,20 +30,20 @@ def setUp(self):
     def test_progress(self):
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser0, self.course,
-                                        self.active_page0), [])
+                                        self.active_page0, FAKE_REQUEST), [])
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page1)[0].name, 'same')
+                                        self.active_page1, FAKE_REQUEST)[0].name, 'same')
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page1)[0].link,
+                                        self.active_page1, FAKE_REQUEST)[0].link,
                          reverse('progress', args=[self.course.id]))
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page0)[0].is_active, False)
+                                        self.active_page0, FAKE_REQUEST)[0].is_active, False)
 
         self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page1)[0].is_active, True)
+                                        self.active_page1, FAKE_REQUEST)[0].is_active, True)
 
 
 class WikiTestCase(TestCase):
@@ -60,26 +61,26 @@ def setUp(self):
     def test_wiki_enabled(self):
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1)[0].name,
+                                    self.course, self.active_page1, FAKE_REQUEST)[0].name,
                          'same')
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1)[0].link,
+                                    self.course, self.active_page1, FAKE_REQUEST)[0].link,
                          reverse('course_wiki', args=[self.course.id]))
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1)[0].is_active,
+                                    self.course, self.active_page1, FAKE_REQUEST)[0].is_active,
                          True)
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page0)[0].is_active,
+                                    self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
                          False)
 
     @override_settings(WIKI_ENABLED=False)
     def test_wiki_enabled_false(self):
 
         self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1), [])
+                                    self.course, self.active_page1, FAKE_REQUEST), [])
 
 
 class ExternalLinkTestCase(TestCase):
@@ -95,19 +96,19 @@ def setUp(self):
     def test_external_link(self):
 
         self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page0)[0].name,
+                                             self.course, self.active_page0, FAKE_REQUEST)[0].name,
                          'same')
 
         self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page0)[0].link,
+                                             self.course, self.active_page0, FAKE_REQUEST)[0].link,
                          'blink')
 
         self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page0)[0].is_active,
+                                             self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
                          False)
 
         self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page00)[0].is_active,
+                                             self.course, self.active_page00, FAKE_REQUEST)[0].is_active,
                          False)
 
 
@@ -125,20 +126,20 @@ def setUp(self):
     def test_static_tab(self):
 
         self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page1)[0].name,
+                                          self.course, self.active_page1, FAKE_REQUEST)[0].name,
                          'same')
 
         self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page1)[0].link,
+                                          self.course, self.active_page1, FAKE_REQUEST)[0].link,
                          reverse('static_tab', args=[self.course.id,
                                                      self.tabby['url_slug']]))
 
         self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page1)[0].is_active,
+                                          self.course, self.active_page1, FAKE_REQUEST)[0].is_active,
                          True)
 
         self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page0)[0].is_active,
+                                          self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
                          False)
 
 
@@ -166,45 +167,45 @@ def setUp(self):
     def test_textbooks1(self):
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page0)[0].name,
+                                         self.course, self.active_page0, FAKE_REQUEST)[0].name,
                          'Algebra')
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page0)[0].link,
+                                         self.course, self.active_page0, FAKE_REQUEST)[0].link,
                          reverse('book', args=[self.course.id, 0]))
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page0)[0].is_active,
+                                         self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
                          True)
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_pageX)[0].is_active,
+                                         self.course, self.active_pageX, FAKE_REQUEST)[0].is_active,
                          False)
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page1)[1].name,
+                                         self.course, self.active_page1, FAKE_REQUEST)[1].name,
                          'Topology')
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page1)[1].link,
+                                         self.course, self.active_page1, FAKE_REQUEST)[1].link,
                          reverse('book', args=[self.course.id, 1]))
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page1)[1].is_active,
+                                         self.course, self.active_page1, FAKE_REQUEST)[1].is_active,
                          True)
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_pageX)[1].is_active,
+                                         self.course, self.active_pageX, FAKE_REQUEST)[1].is_active,
                          False)
 
     @override_settings(MITX_FEATURES={'ENABLE_TEXTBOOK': False})
     def test_textbooks0(self):
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_pageX), [])
+                                         self.course, self.active_pageX, FAKE_REQUEST), [])
 
         self.assertEqual(tabs._textbooks(self.tab, self.mockuser0,
-                                         self.course, self.active_pageX), [])
+                                         self.course, self.active_pageX, FAKE_REQUEST), [])
 
 
 class KeyCheckerTestCase(TestCase):
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 695d7ea55dd2..66c91f1b9bea 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -728,6 +728,7 @@ def submission_history(request, course_id, student_username, location):
     Right now this only works for problems because that's all
     StudentModuleHistory records.
     """
+
     course = get_course_with_access(request.user, course_id, 'load')
     staff_access = has_access(request.user, course, 'staff')
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 466ec262f909..47f0083957ae 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -80,7 +80,7 @@
 
     'ENABLE_PSYCHOMETRICS': False,  # real-time psychometrics (eg item response theory analysis in instructor dashboard)
 
-    'ENABLE_DJANGO_ADMIN_SITE': False,  # set true to enable django's admin site, even on prod (e.g. for course ops)
+    'ENABLE_DJANGO_ADMIN_SITE': True,  # set true to enable django's admin site, even on prod (e.g. for course ops)
     'ENABLE_SQL_TRACKING_LOGS': False,
     'ENABLE_LMS_MIGRATION': False,
     'ENABLE_MANUAL_GIT_RELOAD': False,
@@ -523,6 +523,14 @@
 ################################# Jasmine ###################################
 JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
 
+################################# Waffle ###################################
+
+# Name prepended to cookies set by Waffle
+WAFFLE_COOKIE = "waffle_flag_%s"
+
+# Two weeks (in sec)
+WAFFLE_MAX_AGE = 1209600
+
 ################################# Middleware ###################################
 # List of finder classes that know how to find static files in
 # various locations.
@@ -570,6 +578,9 @@
 
     # catches any uncaught RateLimitExceptions and returns a 403 instead of a 500
     'ratelimitbackend.middleware.RateLimitMiddleware',
+    
+    # For A/B testing
+    'waffle.middleware.WaffleMiddleware',
 )
 
 ############################### Pipeline #######################################
@@ -832,6 +843,9 @@
     # Foldit integration
     'foldit',
 
+    # For A/B testing
+    'waffle',
+
     # For testing
     'django.contrib.admin',  # only used in DEBUG mode
     'django_nose',
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 1ec5030f7ad4..c596208b3f5b 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -255,7 +255,7 @@
 
 ##### segment-io  ######
 
-# If there's an environment variable set, grab it and turn on segment io
+# If there's an environment variable set, grab it and turn on Segment.io
 SEGMENT_IO_LMS_KEY = os.environ.get('SEGMENT_IO_LMS_KEY')
 if SEGMENT_IO_LMS_KEY:
     MITX_FEATURES['SEGMENT_IO_LMS'] = True
diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss
index 77a80b481c46..95765fc93c19 100644
--- a/lms/static/sass/course/layout/_courseware_header.scss
+++ b/lms/static/sass/course/layout/_courseware_header.scss
@@ -23,6 +23,17 @@ nav.course-material {
       list-style: none;
       margin-right: 6px;
 
+      &.prominent {
+        margin-right: 16px;
+        background: rgba(255, 255, 255, .5);
+        border-radius: 3px; 
+      }
+
+      &.prominent + li {
+          padding-left: 15px;
+          border-left: 1px solid #333;
+      }
+
       a {
         border-radius: 3px;
         color: #555;
diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html
index 303a12f14238..8cd5368ad05f 100644
--- a/lms/templates/courseware/course_navigation.html
+++ b/lms/templates/courseware/course_navigation.html
@@ -13,19 +13,24 @@
 %>
 <%! from courseware.tabs import get_course_tabs %>
 <%! from django.utils.translation import ugettext as _ %>
+<% import waffle %>
 
 <nav class="${active_page} course-material">
   <div class="inner-wrapper">
     <ol class="course-tabs">
-      % for tab in get_course_tabs(user, course, active_page):
+      % for tab in get_course_tabs(user, course, active_page, request):
+        % if waffle.flag_is_active(request, 'visual_treatment') or waffle.flag_is_active(request, 'merge_course_tabs'):
+          <li class="${"prominent" if tab.name in ("Courseware", "Course Content") else ""}">
+        % else:
           <li>
+        % endif
              <a href="${tab.link | h}" class="${url_class(tab.is_active)}">
                  ${tab.name | h}
                  % if tab.is_active == True:
-                  <span class="sr">, current location</span>
+                   <span class="sr">, current location</span>
                  %endif
                  % if tab.has_img == True:
-                    <img src="${tab.img}"/>
+                   <img src="${tab.img}"/>
                  %endif
              </a>
           </li>
diff --git a/lms/templates/courseware/welcome-back.html b/lms/templates/courseware/welcome-back.html
index b9f46814031c..be7d8cf4de73 100644
--- a/lms/templates/courseware/welcome-back.html
+++ b/lms/templates/courseware/welcome-back.html
@@ -1,4 +1,8 @@
-<%! from django.utils.translation import ugettext as _ %>
+<%!
+from django.utils.translation import ugettext as _ 
+import waffle 
+%>
+
 <h2>${chapter_module.display_name_with_default}</h2>
 
 <p>${_("You were most recently in {section_link}.  If you\'re done with that, choose another section on the left.").format(
@@ -7,3 +11,31 @@ <h2>${chapter_module.display_name_with_default}</h2>
 	        section_name=prev_section.display_name_with_default,
 	    )
     )}</p>
+
+% if waffle.flag_is_active(request, 'merge_course_tabs'):
+  <%! from courseware.courses import get_course_info_section %>
+
+  <section class="container">
+    <div class="info-wrapper">
+      % if user.is_authenticated():
+      <section class="updates">
+        <h1>${_("Course Updates &amp; News")}</h1>
+        ${get_course_info_section(request, course, 'updates')}
+      </section>
+      <section aria-label="${_('Handout Navigation')}" class="handouts">
+        <h1>${course.info_sidebar_name}</h1>
+        ${get_course_info_section(request, course, 'handouts')}
+      </section>
+      % else:
+      <section class="updates">
+        <h1>${_("Course Updates &amp; News")}</h1>
+        ${get_course_info_section(request, course, 'guest_updates')}
+      </section>
+      <section aria-label="${_('Handout Navigation')}" class="handouts">
+        <h1>${_("Course Handouts")}</h1>
+        ${get_course_info_section(request, course, 'guest_handouts')}
+      </section>
+      % endif
+    </div>
+  </section>
+% endif
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 0a5892e3ea02..679e59ca7032 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -5,8 +5,11 @@
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
   from certificates.models import CertificateStatuses
+  
   from xmodule.modulestore import MONGO_MODULESTORE_TYPE
   from xmodule.modulestore.django import modulestore
+
+  import waffle
 %>
 <%inherit file="main.html" />
 
@@ -163,7 +166,10 @@ <h2>${_("Current Courses")}</h2>
         <li class="course-item">
           <article class="course ${enrollment.mode}">
             <%
-              course_target = reverse('info', args=[course.id])
+              if waffle.flag_is_active(request, 'merge_course_tabs'):
+                course_target = reverse('courseware', args=[course.id])
+              else:
+                course_target = reverse('info', args=[course.id])
             %>
 
             % if course.id in show_courseware_links_for:
diff --git a/lms/templates/widgets/segment-io.html b/lms/templates/widgets/segment-io.html
index b34ee7a35274..a34d513c8dda 100644
--- a/lms/templates/widgets/segment-io.html
+++ b/lms/templates/widgets/segment-io.html
@@ -1,14 +1,22 @@
 % if settings.MITX_FEATURES.get('SEGMENT_IO_LMS'):
 <!-- begin Segment.io -->
+<%! from django.core.urlresolvers import reverse %>
+<%! import waffle %>
+
+<% active_flags = " + ".join(waffle.get_flags(request)) %>
+
+<!-- <script src="${ reverse('wafflejs') }"></script> -->
 <script type="text/javascript">
   var analytics=analytics||[];analytics.load=function(e){var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=("https:"===document.location.protocol?"https://":"http://")+"d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/"+e+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);var r=function(e){return function(){analytics.push([e].concat(Array.prototype.slice.call(arguments,0)))}},i=["identify","track","trackLink","trackForm","trackClick","trackSubmit","pageview","ab","alias","ready"];for(var s=0;s<i.length;s++)analytics[i[s]]=r(i[s])};
   analytics.load("${ settings.SEGMENT_IO_LMS_KEY }");
 
   % if user.is_authenticated():
-  analytics.identify("${ user.id }", {
-      email     : "${ user.email }",
-      username  : "${ user.username }"
-  });
+
+    analytics.identify("${ user.id }", {
+      email          : "${ user.email }",
+      username       : "${ user.username }",
+      "Active Flags" : "${ active_flags }",
+    });
 
   % endif
 </script>
diff --git a/lms/urls.py b/lms/urls.py
index ddb30f1155fb..e624ac9f3431 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -59,6 +59,7 @@
 
     url(r'^user_api/', include('user_api.urls')),
 
+    url(r'^', include('waffle.urls')),
 )
 
 # if settings.MITX_FEATURES.get("MULTIPLE_ENROLLMENT_ROLES"):
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index 5c8c7d79e180..add9bda1d1c9 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -18,3 +18,4 @@
 -e git+https://github.com/edx/codejail.git@0a1b468#egg=codejail
 -e git+https://github.com/edx/diff-cover.git@v0.2.3#egg=diff_cover
 -e git+https://github.com/edx/js-test-tool.git@v0.0.7#egg=js_test_tool
+-e git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle

From e7e03f10fb57b25bf165559f5fef45821a3116f8 Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzolucioni@gmail.com>
Date: Wed, 18 Sep 2013 13:24:35 -0400
Subject: [PATCH 48/92] Refactor tab tests

---
 lms/djangoapps/courseware/tests/test_tabs.py | 243 ++++++++++---------
 lms/templates/courseware/welcome-back.html   |   2 +-
 lms/templates/widgets/segment-io.html        |   1 -
 3 files changed, 131 insertions(+), 115 deletions(-)

diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py
index 54264121d155..4274ebf85d92 100644
--- a/lms/djangoapps/courseware/tests/test_tabs.py
+++ b/lms/djangoapps/courseware/tests/test_tabs.py
@@ -13,37 +13,36 @@
 
 FAKE_REQUEST = None
 
+def tab_constructor(active_page, course, user, tab={'name': 'same'}, generator=tabs._progress):
+    return generator(tab, user, course, active_page, FAKE_REQUEST)
+
 class ProgressTestCase(TestCase):
 
     def setUp(self):
 
-        self.mockuser1 = MagicMock()
-        self.mockuser0 = MagicMock()
+        self.user = MagicMock()
+        self.anonymous_user = MagicMock()
         self.course = MagicMock()
-        self.mockuser1.is_authenticated.return_value = True
-        self.mockuser0.is_authenticated.return_value = False
+        self.user.is_authenticated.return_value = True
+        self.anonymous_user.is_authenticated.return_value = False
         self.course.id = 'edX/toy/2012_Fall'
         self.tab = {'name': 'same'}
-        self.active_page1 = 'progress'
-        self.active_page0 = 'stagnation'
+        self.progress_page = 'progress'
+        self.stagnation_page = 'stagnation'
 
     def test_progress(self):
 
-        self.assertEqual(tabs._progress(self.tab, self.mockuser0, self.course,
-                                        self.active_page0, FAKE_REQUEST), [])
-
-        self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page1, FAKE_REQUEST)[0].name, 'same')
-
-        self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page1, FAKE_REQUEST)[0].link,
-                         reverse('progress', args=[self.course.id]))
+        self.assertEqual(tab_constructor(self.stagnation_page, self.course, self.anonymous_user), [])
 
-        self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page0, FAKE_REQUEST)[0].is_active, False)
-
-        self.assertEqual(tabs._progress(self.tab, self.mockuser1, self.course,
-                                        self.active_page1, FAKE_REQUEST)[0].is_active, True)
+        self.assertEqual(tab_constructor(self.progress_page, self.course, self.user)[0].name, 'same')
+        
+        tab_list = tab_constructor(self.progress_page, self.course, self.user)
+        expected_link = reverse('progress', args=[self.course.id])
+        self.assertEqual(tab_list[0].link, expected_link)
+        
+        self.assertEqual(tab_constructor(self.stagnation_page, self.course, self.user)[0].is_active, False)
+        
+        self.assertEqual(tab_constructor(self.progress_page, self.course, self.user)[0].is_active, True)
 
 
 class WikiTestCase(TestCase):
@@ -54,33 +53,30 @@ def setUp(self):
         self.course = MagicMock()
         self.course.id = 'edX/toy/2012_Fall'
         self.tab = {'name': 'same'}
-        self.active_page1 = 'wiki'
-        self.active_page0 = 'miki'
+        self.wiki_page = 'wiki'
+        self.miki_page = 'miki'
 
     @override_settings(WIKI_ENABLED=True)
     def test_wiki_enabled(self):
 
-        self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1, FAKE_REQUEST)[0].name,
-                         'same')
+        tab_list = tab_constructor(self.wiki_page, self.course, self.user, generator=tabs._wiki)
+        self.assertEqual(tab_list[0].name, 'same')
 
-        self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1, FAKE_REQUEST)[0].link,
-                         reverse('course_wiki', args=[self.course.id]))
+        tab_list = tab_constructor(self.wiki_page, self.course, self.user, generator=tabs._wiki)
+        expected_link = reverse('course_wiki', args=[self.course.id])
+        self.assertEqual(tab_list[0].link, expected_link)
 
-        self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1, FAKE_REQUEST)[0].is_active,
-                         True)
+        tab_list = tab_constructor(self.wiki_page, self.course, self.user, generator=tabs._wiki)
+        self.assertEqual(tab_list[0].is_active, True)
 
-        self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
-                         False)
+        tab_list = tab_constructor(self.miki_page, self.course, self.user, generator=tabs._wiki)
+        self.assertEqual(tab_list[0].is_active, False)
 
     @override_settings(WIKI_ENABLED=False)
     def test_wiki_enabled_false(self):
 
-        self.assertEqual(tabs._wiki(self.tab, self.user,
-                                    self.course, self.active_page1, FAKE_REQUEST), [])
+        tab_list = tab_constructor(self.wiki_page, self.course, self.user, generator=tabs._wiki)
+        self.assertEqual(tab_list, [])
 
 
 class ExternalLinkTestCase(TestCase):
@@ -90,26 +86,30 @@ def setUp(self):
         self.user = MagicMock()
         self.course = MagicMock()
         self.tabby = {'name': 'same', 'link': 'blink'}
-        self.active_page0 = None
-        self.active_page00 = True
+        self.no_page = None
+        self.true = True
 
     def test_external_link(self):
 
-        self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page0, FAKE_REQUEST)[0].name,
-                         'same')
+        tab_list = tab_constructor(
+            self.no_page, self.course, self.user, tab=self.tabby, generator=tabs._external_link
+        )
+        self.assertEqual(tab_list[0].name, 'same')
 
-        self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page0, FAKE_REQUEST)[0].link,
-                         'blink')
+        tab_list = tab_constructor(
+            self.no_page, self.course, self.user, tab=self.tabby, generator=tabs._external_link
+        )
+        self.assertEqual(tab_list[0].link, 'blink')
 
-        self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
-                         False)
+        tab_list = tab_constructor(
+            self.no_page, self.course, self.user, tab=self.tabby, generator=tabs._external_link
+        )
+        self.assertEqual(tab_list[0].is_active, False)
 
-        self.assertEqual(tabs._external_link(self.tabby, self.user,
-                                             self.course, self.active_page00, FAKE_REQUEST)[0].is_active,
-                         False)
+        tab_list = tab_constructor(
+            self.true, self.course, self.user, tab=self.tabby, generator=tabs._external_link
+        )
+        self.assertEqual(tab_list[0].is_active, False)
 
 
 class StaticTabTestCase(TestCase):
@@ -120,107 +120,124 @@ def setUp(self):
         self.course = MagicMock()
         self.tabby = {'name': 'same', 'url_slug': 'schmug'}
         self.course.id = 'edX/toy/2012_Fall'
-        self.active_page1 = 'static_tab_schmug'
-        self.active_page0 = 'static_tab_schlug'
+        self.schmug = 'static_tab_schmug'
+        self.schlug = 'static_tab_schlug'
 
     def test_static_tab(self):
 
-        self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page1, FAKE_REQUEST)[0].name,
-                         'same')
-
-        self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page1, FAKE_REQUEST)[0].link,
-                         reverse('static_tab', args=[self.course.id,
-                                                     self.tabby['url_slug']]))
+        tab_list = tab_constructor(
+            self.schmug, self.course, self.user, tab=self.tabby, generator=tabs._static_tab
+        )
+        self.assertEqual(tab_list[0].name, 'same')
 
-        self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page1, FAKE_REQUEST)[0].is_active,
-                         True)
+        tab_list = tab_constructor(
+            self.schmug, self.course, self.user, tab=self.tabby, generator=tabs._static_tab
+        )
+        expected_link = reverse('static_tab', args=[self.course.id,self.tabby['url_slug']])
+        self.assertEqual(tab_list[0].link, expected_link)
 
-        self.assertEqual(tabs._static_tab(self.tabby, self.user,
-                                          self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
-                         False)
+        tab_list = tab_constructor(
+            self.schmug, self.course, self.user, tab=self.tabby, generator=tabs._static_tab
+        )
+        self.assertEqual(tab_list[0].is_active, True)
 
+        tab_list = tab_constructor(
+            self.schlug, self.course, self.user, tab=self.tabby, generator=tabs._static_tab
+        )
+        self.assertEqual(tab_list[0].is_active, False)
 
 class TextbooksTestCase(TestCase):
 
     def setUp(self):
 
-        self.mockuser1 = MagicMock()
-        self.mockuser0 = MagicMock()
+        self.user = MagicMock()
+        self.anonymous_user = MagicMock()
         self.course = MagicMock()
         self.tab = MagicMock()
         A = MagicMock()
         T = MagicMock()
-        self.mockuser1.is_authenticated.return_value = True
-        self.mockuser0.is_authenticated.return_value = False
-        self.course.id = 'edX/toy/2012_Fall'
-        self.active_page0 = 'textbook/0'
-        self.active_page1 = 'textbook/1'
-        self.active_pageX = 'you_shouldnt_be_seein_this'
         A.title = 'Algebra'
         T.title = 'Topology'
         self.course.textbooks = [A, T]
+        self.user.is_authenticated.return_value = True
+        self.anonymous_user.is_authenticated.return_value = False
+        self.course.id = 'edX/toy/2012_Fall'
+        self.textbook_0 = 'textbook/0'
+        self.textbook_1 = 'textbook/1'
+        self.prohibited_page = 'you_shouldnt_be_seein_this'
 
     @override_settings(MITX_FEATURES={'ENABLE_TEXTBOOK': True})
     def test_textbooks1(self):
 
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page0, FAKE_REQUEST)[0].name,
-                         'Algebra')
-
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page0, FAKE_REQUEST)[0].link,
-                         reverse('book', args=[self.course.id, 0]))
-
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page0, FAKE_REQUEST)[0].is_active,
-                         True)
-
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_pageX, FAKE_REQUEST)[0].is_active,
-                         False)
-
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page1, FAKE_REQUEST)[1].name,
-                         'Topology')
-
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page1, FAKE_REQUEST)[1].link,
-                         reverse('book', args=[self.course.id, 1]))
-
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_page1, FAKE_REQUEST)[1].is_active,
-                         True)
-
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_pageX, FAKE_REQUEST)[1].is_active,
-                         False)
+        tab_list = tab_constructor(
+            self.textbook_0, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list[0].name, 'Algebra')
+
+        tab_list = tab_constructor(
+            self.textbook_0, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        expected_link = reverse('book', args=[self.course.id, 0])
+        self.assertEqual(tab_list[0].link, expected_link)
+
+        tab_list = tab_constructor(
+            self.textbook_0, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list[0].is_active, True)
+
+        tab_list = tab_constructor(
+            self.prohibited_page, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list[0].is_active, False)
+
+        tab_list = tab_constructor(
+            self.textbook_1, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list[1].name, 'Topology')
+
+        tab_list = tab_constructor(
+            self.textbook_1, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        expected_link = reverse('book', args=[self.course.id, 1])
+        self.assertEqual(tab_list[1].link, expected_link)
+
+        tab_list = tab_constructor(
+            self.textbook_1, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list[1].is_active, True)
+
+        tab_list = tab_constructor(
+            self.prohibited_page, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list[1].is_active, False)
 
     @override_settings(MITX_FEATURES={'ENABLE_TEXTBOOK': False})
     def test_textbooks0(self):
 
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser1,
-                                         self.course, self.active_pageX, FAKE_REQUEST), [])
+        tab_list = tab_constructor(
+            self.prohibited_page, self.course, self.user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list, [])
 
-        self.assertEqual(tabs._textbooks(self.tab, self.mockuser0,
-                                         self.course, self.active_pageX, FAKE_REQUEST), [])
+        tab_list = tab_constructor(
+            self.prohibited_page, self.course, self.anonymous_user, tab=self.tab, generator=tabs._textbooks
+        )
+        self.assertEqual(tab_list, [])
 
 
 class KeyCheckerTestCase(TestCase):
 
     def setUp(self):
 
-        self.expected_keys1 = ['a', 'b']
-        self.expected_keys0 = ['a', 'v', 'g']
+        self.valid_keys = ['a', 'b']
+        self.invalid_keys = ['a', 'v', 'g']
         self.dictio = {'a': 1, 'b': 2, 'c': 3}
 
     def test_key_checker(self):
 
-        self.assertIsNone(tabs.key_checker(self.expected_keys1)(self.dictio))
+        self.assertIsNone(tabs.key_checker(self.valid_keys)(self.dictio))
         self.assertRaises(tabs.InvalidTabsException,
-                          tabs.key_checker(self.expected_keys0), self.dictio)
+                          tabs.key_checker(self.invalid_keys), self.dictio)
 
 
 class NullValidatorTestCase(TestCase):
diff --git a/lms/templates/courseware/welcome-back.html b/lms/templates/courseware/welcome-back.html
index be7d8cf4de73..0128755be229 100644
--- a/lms/templates/courseware/welcome-back.html
+++ b/lms/templates/courseware/welcome-back.html
@@ -1,6 +1,6 @@
 <%!
 from django.utils.translation import ugettext as _ 
-import waffle 
+import waffle
 %>
 
 <h2>${chapter_module.display_name_with_default}</h2>
diff --git a/lms/templates/widgets/segment-io.html b/lms/templates/widgets/segment-io.html
index a34d513c8dda..87dc0eebe074 100644
--- a/lms/templates/widgets/segment-io.html
+++ b/lms/templates/widgets/segment-io.html
@@ -5,7 +5,6 @@
 
 <% active_flags = " + ".join(waffle.get_flags(request)) %>
 
-<!-- <script src="${ reverse('wafflejs') }"></script> -->
 <script type="text/javascript">
   var analytics=analytics||[];analytics.load=function(e){var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=("https:"===document.location.protocol?"https://":"http://")+"d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/"+e+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);var r=function(e){return function(){analytics.push([e].concat(Array.prototype.slice.call(arguments,0)))}},i=["identify","track","trackLink","trackForm","trackClick","trackSubmit","pageview","ab","alias","ready"];for(var s=0;s<i.length;s++)analytics[i[s]]=r(i[s])};
   analytics.load("${ settings.SEGMENT_IO_LMS_KEY }");

From 8b4489233ef7fdceadee53f0a5e72dc605ce4449 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera@edx.org>
Date: Wed, 25 Sep 2013 14:53:46 +0300
Subject: [PATCH 49/92] Fix for bug BLD-359: Unnecessary focus outline around
 Video Player.

---
 common/lib/xmodule/xmodule/css/video/display.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/common/lib/xmodule/xmodule/css/video/display.scss
index 2dce290a965c..1a1ca14fbda3 100644
--- a/common/lib/xmodule/xmodule/css/video/display.scss
+++ b/common/lib/xmodule/xmodule/css/video/display.scss
@@ -10,6 +10,11 @@ div.video {
   padding: 12px;
   border-radius: 5px;
 
+  &:focus, &:active, &:hover {
+    outline: 0;
+    border: 0;
+  }
+
   div.tc-wrapper {
     position: relative;
     @include clearfix;

From cd696e76e9ec8236622b3db8f9e522cee0e6c7ae Mon Sep 17 00:00:00 2001
From: Usman Khalid <usman.khalid@arbisoft.com>
Date: Wed, 25 Sep 2013 18:34:01 +0500
Subject: [PATCH 50/92] PdfViewer: Added missing link to compatibility.js

---
 lms/templates/static_pdfbook.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/templates/static_pdfbook.html b/lms/templates/static_pdfbook.html
index 4e9f604a0c2d..d1ec14c1a67c 100644
--- a/lms/templates/static_pdfbook.html
+++ b/lms/templates/static_pdfbook.html
@@ -13,6 +13,7 @@
 <%static:js group='courseware'/>
 <link rel="stylesheet" href="/static/css/pdfviewer.css"/>
 <script type="text/javascript" src="/static/js/vendor/pdfjs/pdf.js"></script>
+<script type="text/javascript" src="/static/js/vendor/pdfjs/compatibility.js"></script>
 <script type="text/javascript" src="/static/js/pdfviewer.js"></script>
 </%block>
 

From cae6e82bf72cd26e71f99d8a348f17c5f2036a34 Mon Sep 17 00:00:00 2001
From: Jay Zoldak <zoldak@edx.org>
Date: Wed, 25 Sep 2013 09:46:18 -0400
Subject: [PATCH 51/92] Knock 10 more seconds off the acceptance tests.

---
 .../contentstore/features/discussion-editor.py       |  6 ++++--
 cms/djangoapps/contentstore/features/video.py        | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py
index 15a7c4b9abf9..d68860ff49b6 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.py
+++ b/cms/djangoapps/contentstore/features/discussion-editor.py
@@ -26,6 +26,8 @@ def i_see_only_the_settings_and_values(step):
 
 @step('creating a discussion takes a single click')
 def discussion_takes_a_single_click(step):
-    assert(not world.is_css_present('.xmodule_DiscussionModule'))
+    component_css = '.xmodule_DiscussionModule'
+    assert world.is_css_not_present(component_css)
+
     world.css_click("a[data-category='discussion']")
-    assert(world.is_css_present('.xmodule_DiscussionModule'))
+    assert world.is_css_present(component_css)
diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py
index 5a5d99e4d38b..59c5f2bab9e1 100644
--- a/cms/djangoapps/contentstore/features/video.py
+++ b/cms/djangoapps/contentstore/features/video.py
@@ -6,8 +6,6 @@
 from contentstore.utils import get_modulestore
 
 
-############### ACTIONS ####################
-
 @step('I have created a Video component$')
 def i_created_a_video_component(step):
     world.create_component_instance(
@@ -19,7 +17,7 @@ def i_created_a_video_component(step):
 
 
 @step('I have created a Video component with subtitles$')
-def i_created_a_video_component(step):
+def i_created_a_video_component_subtitles(step):
     step.given('I have created a Video component')
 
     # Store the current URL so we can return here
@@ -46,9 +44,11 @@ def does_not_autoplay(_step, video_type):
 
 @step('creating a video takes a single click$')
 def video_takes_a_single_click(_step):
-    assert(not world.is_css_present('.xmodule_VideoModule'))
+    component_css = '.xmodule_VideoModule'
+    assert world.is_css_not_present(component_css)
+
     world.css_click("a[data-category='video']")
-    assert(world.is_css_present('.xmodule_VideoModule'))
+    assert world.is_css_present(component_css)
 
 
 @step('I edit the component$')
@@ -93,7 +93,7 @@ def xml_only_video(step):
     # Create a new Video component, but ensure that it doesn't have
     # metadata. This allows us to test that we are correctly parsing
     # out XML
-    video = world.ItemFactory.create(
+    world.ItemFactory.create(
         parent_location=parent_location,
         category='video',
         data='<video youtube="1.00:%s"></video>' % youtube_id

From 2b549222859766d61fbe58d29daff978e70dd972 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Wed, 25 Sep 2013 12:34:12 -0400
Subject: [PATCH 52/92] Fix intermittent failure in OpenID test

---
 .../external_auth/tests/test_openid_provider.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/common/djangoapps/external_auth/tests/test_openid_provider.py b/common/djangoapps/external_auth/tests/test_openid_provider.py
index 2024da469f46..808fb60bed70 100644
--- a/common/djangoapps/external_auth/tests/test_openid_provider.py
+++ b/common/djangoapps/external_auth/tests/test_openid_provider.py
@@ -273,3 +273,20 @@ def test_begin_login(self):
             self.assertEqual(resp.status_code, code,
                              "got code {0} for url '{1}'. Expected code {2}"
                              .format(resp.status_code, url, code))
+
+    @classmethod
+    def tearDownClass(cls):
+        """
+        Workaround for a runtime error that occurs
+        intermittently when the server thread doesn't shut down
+        within 2 seconds.
+
+        Since the server is running in a Django thread and will
+        be terminated when the test suite terminates,
+        this shouldn't cause a resource allocation issue.
+        """
+        try:
+            super(OpenIdProviderLiveServerTest, cls).tearDownClass()
+        except RuntimeError:
+            print "Warning: Could not shut down test server."
+            pass

From ef26e8baa3a8096c69edf0d0486085069e248781 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Wed, 25 Sep 2013 10:06:05 -0400
Subject: [PATCH 53/92] Just write the loc name as the key in the policy file

---
 common/lib/xmodule/xmodule/contentstore/mongo.py       | 2 +-
 common/lib/xmodule/xmodule/modulestore/xml_importer.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/common/lib/xmodule/xmodule/contentstore/mongo.py
index 2c717e51c691..1e788c0a473c 100644
--- a/common/lib/xmodule/xmodule/contentstore/mongo.py
+++ b/common/lib/xmodule/xmodule/contentstore/mongo.py
@@ -122,7 +122,7 @@ def export_all_for_course(self, course_location, output_directory, assets_policy
             self.export(asset_location, output_directory)
             for attr, value in asset.iteritems():
                 if attr not in ['_id', 'md5', 'uploadDate', 'length', 'chunkSize']:
-                    policy.setdefault(asset_location.url(), {})[attr] = value
+                    policy.setdefault(asset_location.name, {})[attr] = value
 
         with open(assets_policy_file, 'w') as f:
             json.dump(policy, f)
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index 64caad048122..1494e5fecb6a 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -56,7 +56,7 @@ def import_static_content(modules, course_loc, course_data_path, static_content_
             content_loc = StaticContent.compute_location(target_location_namespace.org, target_location_namespace.course, fullname_with_subpath)
 
 
-            policy_ele = policy.get(content_loc.url(), {})
+            policy_ele = policy.get(content_loc.name, {})
             displayname = policy_ele.get('displayname', filename)
             locked = policy_ele.get('locked', False)
             mime_type = policy_ele.get('contentType', mimetypes.guess_type(filename)[0])

From f932881424e48577c7bd6fe8b2dd70787d1506eb Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Wed, 25 Sep 2013 14:07:55 -0400
Subject: [PATCH 54/92] Test importing exported course over a new course

---
 .../contentstore/tests/test_contentstore.py   | 55 ++++++++++++++-----
 1 file changed, 42 insertions(+), 13 deletions(-)

diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 6f40ac0e539e..288e6443f7dc 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -999,13 +999,33 @@ def test_export_course(self, mock_get):
 
         # remove old course
         delete_course(module_store, content_store, location, commit=True)
+        # reimport over old course
+        stub_location = Location(['i4x', 'edX', 'toy', None, None])
+        course_location = course.location
+        self.check_import(
+            module_store, root_dir, draft_store, content_store, stub_location, course_location,
+            locked_asset, locked_asset_attrs
+        )
+        # import to different course id
+        stub_location = Location(['i4x', 'anotherX', 'anotherToy', None, None])
+        course_location = stub_location.replace(category='course', name='Someday')
+        self.check_import(
+            module_store, root_dir, draft_store, content_store, stub_location, course_location,
+            locked_asset, locked_asset_attrs
+        )
+
+        shutil.rmtree(root_dir)
 
+    def check_import(self, module_store, root_dir, draft_store, content_store, stub_location, course_location,
+        locked_asset, locked_asset_attrs):
         # reimport
         import_from_xml(
-            module_store, root_dir, ['test_export'], draft_store=draft_store, static_content_store=content_store
+            module_store, root_dir, ['test_export'], draft_store=draft_store,
+            static_content_store=content_store,
+            target_location_namespace=course_location
         )
 
-        items = module_store.get_items(Location(['i4x', 'edX', 'toy', 'vertical', None]))
+        items = module_store.get_items(stub_location.replace(category='vertical', name=None))
         self.assertGreater(len(items), 0)
         for descriptor in items:
             # don't try to look at private verticals. Right now we're running
@@ -1016,11 +1036,13 @@ def test_export_course(self, mock_get):
                 self.assertEqual(resp.status_code, 200)
 
         # verify that we have the content in the draft store as well
-        vertical = draft_store.get_item(Location(['i4x', 'edX', 'toy',
-                                                  'vertical', 'vertical_test', None]), depth=1)
+        vertical = draft_store.get_item(
+            stub_location.replace(category='vertical', name='vertical_test', revision=None),
+            depth=1
+        )
 
         self.assertTrue(getattr(vertical, 'is_draft', False))
-        self.assertNotIn('index_in_children_list', child.xml_attributes)
+        self.assertNotIn('index_in_children_list', vertical.xml_attributes)
         self.assertNotIn('parent_sequential_url', vertical.xml_attributes)
 
         for child in vertical.get_children():
@@ -1033,27 +1055,34 @@ def test_export_course(self, mock_get):
                 self.assertNotIn('parent_sequential_url', child.data)
 
         # make sure that we don't have a sequential that is in draft mode
-        sequential = draft_store.get_item(Location(['i4x', 'edX', 'toy',
-                                                    'sequential', 'vertical_sequential', None]))
+        sequential = draft_store.get_item(
+            stub_location.replace(category='sequential', name='vertical_sequential', revision=None)
+        )
 
         self.assertFalse(getattr(sequential, 'is_draft', False))
 
         # verify that we have the private vertical
-        test_private_vertical = draft_store.get_item(Location(['i4x', 'edX', 'toy',
-                                                               'vertical', 'a_private_vertical', None]))
+        test_private_vertical = draft_store.get_item(
+            stub_location.replace(category='vertical', name='a_private_vertical', revision=None)
+        )
 
         self.assertTrue(getattr(test_private_vertical, 'is_draft', False))
 
         # make sure the textbook survived the export/import
-        course = module_store.get_item(Location(['i4x', 'edX', 'toy', 'course', '2012_Fall', None]))
+        course = module_store.get_item(course_location)
 
         self.assertGreater(len(course.textbooks), 0)
 
+        locked_asset['course'] = stub_location.course
+        locked_asset['org'] = stub_location.org
         new_attrs = content_store.get_attrs(locked_asset)
         for key, value in locked_asset_attrs.iteritems():
-            self.assertEqual(value, new_attrs[key])
-
-        shutil.rmtree(root_dir)
+            if key == '_id':
+                self.assertEqual(value['name'], new_attrs[key]['name'])
+            elif key == 'filename':
+                pass
+            else:
+                self.assertEqual(value, new_attrs[key])
 
     def test_export_course_with_metadata_only_video(self):
         module_store = modulestore('direct')

From 982d22df38d2c9de9aa8c1095b5626665127f7e7 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 25 Sep 2013 15:57:25 -0400
Subject: [PATCH 55/92] edx.org/LMS: revises graphic-based login and
 registration banner text to render with system text

---
 lms/static/images/bg-banner-account.png   | Bin 0 -> 18076 bytes
 lms/static/sass/base/_variables.scss      |   8 +++--
 lms/static/sass/multicourse/_account.scss |  42 +++++++++++++++++++---
 lms/templates/login.html                  |   5 ++-
 lms/templates/register.html               |   5 ++-
 5 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 lms/static/images/bg-banner-account.png

diff --git a/lms/static/images/bg-banner-account.png b/lms/static/images/bg-banner-account.png
new file mode 100644
index 0000000000000000000000000000000000000000..13aa7fd9a6e241272d898cd10b3c927baa7a48c0
GIT binary patch
literal 18076
zcmV)2K+M01P)<h;3K|Lk000e1NJLTq00Y1P004Oi0{{R3!6mqf0001BP)t-s|NsBo
z`2EWB`?u}+^Zoz$|Nr>?|Lgq!`u_j@{{HT^V4>jfiP-FH&E@mRi2wikc(%x9ufh2L
z`+~;SVw|@2-?~nSm-+DD`up^u%HZ$t?`CRjl$49s-QP5JzQ4e|{^_2-002ezNkl<Z
zcmeF34R71JnuJOEo#9MvhY0t$HhQr8|9|EcDaCc-=ERFzV7s|_^g-E@)ketUc}b~F
z{}(uYKAipxoRpk;vM&qvzx(sp$%Ae;=-c4wN0%rw0*X>{&NWB^5u=R&$XH(}@~%`d
zehF4cj`aW=ToD8!atTTRA<7bj4ZfhrMMNzn1EAK!!7Ca-ukl!1Yxv6c{(#pXgRz0&
zm>^pKl{)v|zyJN*?CzG28Og~u0+N$sJGCg)Ty55Iz06!n6}SR`o*N{h=G@~!(kJ5!
z+fB(ApU>xu)4z)c^1>zg#}xR?kSvg6$tCAfHy23+CsWFZ$Yqz~U4BaV#$S+H*#zb^
zivZU3TY+KJvVNhIASjU^3+!8gHFzbk$OukigUymj!AedkAD@qZ|IgolRk!ZGKR`;!
ziUA}=tuO%Dk!x6pAuyH8SmP=%BF3`qi2qc9zi{)+fb;3;^qT}8bS1X)6!>&LgM?nv
zB99QR5kUcK1`o)ndABQdzW5-3iA{UFVG3MxnMzy20wLWAj9yE{aJ_`Y0SLYp7<UOw
z%i07st^$iwVqS>|jI~JF?E<;AI6Qy<>u~)3{rNd3rJjyqI|;FZDR5Y_J+=e^Ip+Xs
z$@xZLVf8n1$rR%w_&EjsV(9B;U!I<xPU-gv+-#h_y>O0B23SX2EUU6KFgw7wQgd1K
ztsupi+$Pz^=HLci&{SCxw*-#O<`q$I1m+Z2tH5jWN;mr@+zV{WHv&u6Xa|(1!N6;Q
zqZ>Ap6U*WG`M9g0<MUs~YPWXWC8y+wKtzp@gs4Ht5w+5WJwsU-r9$OZ;6Q+sSaU@L
z{&N%fOW?7(oQA+ozb}D(dir+dOfi5Fzr)nBki(34`AtW}&^K2_^oY>r>>c;|ZV+05
zrob`)cCCkL;g!GwqGXVHc)_?o{k_1`;7wr3Kha=qe}2h;nhETS(enOyJnnOtsWb16
zhvKI4oKrH^i!j7hvJrJ9WOPd=Ac;BO3Ov!s-y8(vV_0j{&nWO0O^a;{XSd%L!P0p%
zcv+u*7y%A{>FMgs;PBKdsNvD5o{7!ec+m;lbjKzpHnf3N;9MbEQ>ppx;8tMJQA#L=
zz(54w0*b(00RI#?B|FJ!3*&(%BtU^8gHF93mZEuIdz01NTC2Omt~ni#4dT!Eq!+Xr
z9FPTQZ76xX`BPvKLDlU-67d1GMtn+vzi>-w_&WstjS;MNnI-h;ayfT05OqX|VG_9v
zDg^-~*6NuEkd%m*Fbuv62<Q$FGp%Z1nj07`_*P&-s2Qk3;Fx>fA_34X-lke<CtJdc
zz@Cg&6R!fZFWLM2{g@+^dh$X_9d&=qZFgh>NW=!V8hwlN`Esf{R+2z)1wdf!E0kR+
znfy@TlB0f=(4P;d)YAEBa!&2H37p(6Gl6C6g6OC@*J+VKZohajO<JqxnEJ+=hTvfH
zIBq=FZ2;>XfiV*pQS00we?~AjjOY&3JQLVlcj<;T-tYWf1zrt{2;K?oDVr&PPP^}a
ze?J7#wtH-FGpM}J`T3X>o4$1lynSBXlGYc1Oo@iE;G2<vIUu-JGxY;|BkHcqt@Op`
zLbiv$|JxF}C400;&Fw~fZy=@1w+Y=9opmS*ThPqh)!-WHBLp)yIzfOULj+$V;7tWB
zZ0MFDg@lgC3pF5l6&|u)K1g%?$t4Fud;_32cuLA`2#b=qR;ED@(iWVyyRGh|GDn>M
zYo|Wa7c+jH%%F40$0LGqg|dB@<P!iACwj@>z^t9Op}%;ax-t%`UnTUXqopM&H!g1J
zQJh*^b(fu*-wK@E(|PR!n~a$LQc>%a1>>DvS(t4NN*sg&B)Y*16nbA^{#sy?5(1*x
zg_=vwgh)>RFcA?DW`gC4E`BVq>~)S|FbO5a3MsFop)S>$dOkcK_jSKN9`<_?y$yS9
zD243Nd)-GUUchUC^?|^_Txw@WuX$I3ANgB%yIQ{l{)__q^zG^C+cKS7YJOZ`zcfR8
zy%pFp+h%agVy`-Bwv+&AWXHlVEX)@`FdXL}mk3e)eSyJWCom}qj$xS<qe#vnKoj)2
zu~qJ+I#;3d3byIJ1Re~7u|+0hLTM8im(+SQ7kx`G`EcAHj#(E&sn070M0d_*pBa}}
z!4}^iCh!0Y$|WNRMlHJ>{K(&N)K?$)6XJHB_AXpna(a|)5H@WeY4-^%%WF6IH2b3J
z9?Il8{lx<F2#;FX5xf$*fTzX#69eLFK1^U}^Rt#*YsfJ(IC>WrR=o+>vvRMDfDiy~
z1RlJTz+)vujWN@f7z1JxP#RUu?szO!$#U5(0w0<KrjnDJl^XWP{VqGOeO69>C9pma
znDg!zh{&^oenj9w`r?yuep)0O^OIV7oHmx0Y$sX16WBmPZ<i6m=ix7sR%IY;eNrQr
za&h#4C{7STD9$swPiMa7fdt-Q<RNa26tQlE29`h)nxj{%y=36_w1f8&c&-xbU`<ZH
zC`?K0Rzp1=_e0<Ha^zADJKLQ`cXw)uX@5NK*4zX(d#?iPfdsCl<WK}-Z153*M~~%8
z;Lk=oZTfyY4GWzf#M=!hT+R#4cLFCRHMV{^J^gpi)z*wcOm!(h7Dp~<ddL?#KyU{4
zGWXZ1`#>Lf!yE!HRGM{@8JK!fWS#K~LxgN_AYGs6dM|-tTgi&3F~EESn~74g%i?Bc
zOSCUdhI1~5J`ba8ICYg{&H)C0>U+I-dL)5I&o@UX@-7GTzP%gs_@zl-d?uVuvw$9P
zcTUYtk7B3f^Xc?7IqR*!>+rO#OALwB)9Np2iPVe@N7)q$H~uOh;5_`jJe_`kuX#9u
zF|;kKxSVlZroq!s)UhupTBJll8z3}zFM+48a$>w7r6h6+Y^S;u%$1O4eIj=!)_gcb
zV(OqdRIbMo(goJ$Z5nv+U;-=FNZoD%<9&Ir0`GEs3H*uhSbSRTT_X76Ss6dxcb@WY
zk6PW8&`LI>)`lz<Qsk1Wx&&G1rDTCv1ioCt6t4tu8UKulI6rX%4<|6W+6WJWHv+D+
z-GXfnUrm=yOs;~wFR(ln){IPfJt78}y3IE2p1&WW$t%fe?qfL|OLLOZg-h%Y0jW1{
z@{W~XkRK2@Q1h@i2k!J8)H}+qd?oN7E~Fptz;?H!(F6Xrak{{Mz+d;)(rWMQr>_1w
zy~0-zthx5&>94H;fLyW(<@Nc=K1JjpE&-pHb1Luy;4Kngz(oHHYAtzE*=r5C6PmyJ
z5g>)1@H)MBT2F=LS1=+NA+`>scKrU=zL54b*KWg23$Yk%wW)IxkGs1syj5XIw!5r5
zIKf5;h#HkK{QX$q7@gq!CGek)KXkX*$<y|3YcXZh@HF@Of&0I1=V|YhcWj+6z7sfk
zMWH&(jhurNwZgi~1V$&g67HO;iX<#@`D^`vC|uqXm>&oX$`a-n^pLn#gh6O6t!n_H
z@N3@lcT8_k2ZzFDa~`*Re`uHG<aJJ-8;ZO;l%{6LU^&LUz`o7k4+SP8Kn3I1)O%(p
zB7N~^;s>i=wJoaE-25|upDw9Aa*FZsA?-S?_4lQ@-3gpL5m$i`VGGbkoki@@43Q09
z6S$M(F474>u<P9f<_7{xA|=$kDV!?<W{lUh0}}bT!1AvR?x}Zx5y|_%4wZfMHFxgQ
zT`9><3#xgS*W2X=4!iqN`*eK<I`DwNAP`gx9yRzA3}Ss@x8~$Fm2WeECr@(oV*+pH
z4#vjiht<=&3G7sJ^$KKdu#^m{F9Jh?t^y+hO9Edm42XD>yALNY=WIza6&^FR-TjTt
zZ}8y?`f9KIie%Z%a6TT($hT5r|7<r)R<b-u$-#Qa%?m2W>U)8u2-%7nknZ6M2AjNy
z8hp^+L3|1P8IsyluhH<Qz~}i+`WT<K?A@9R;kYlMZ>TxTR_~Hu2`r7kDlmB!81!g<
z5b9KbcRZHB*4#}|h|OSYZq<-{Bg37+de`79$s1~ROFfn6;V;FAeE4hc)-=UU+riDb
z91qol<AL%U(o`37J)1lD!p{JXTrwZ`caXmLBk^1wpf#V*$v$7?bQ8emmi)*W+@3aj
zC#Tkv73o(3r*svVHYD4+l1qVsx+_&ASAnJJ@}&o(Teu3Wt<if44Bdf&2^lr#WsaLC
zNw)obya)W&w+)Or<>zDWDFCvUQWk^PpI>R)NLJY&_h?SL<DR}lGka}Et^P-Wi3vNR
z?DEI{ehK`iGXu4yhp;cFr}Jg${GQII&BCo8`_OG9Yv{W&hObgWce^j4uc!}oEKYx^
z6|$BRhSpK6tH1<%K$l<#6^PB-4-@#UcN_}=OPC>CbJ<3(I)#pjgnRUn!PCc$25Xeh
zxhAWV(XEmX-wV<ZSIKF?#xQty*va+zSVMk`oQA++t(DeC0!I*0ODPe-FM<DG<H3(h
zdnkn67I_zUzrE&kNe^cDcH?-?v+kzd<DEWmN>-1WV@422O|}OS>IK5BzynYW1{k3T
z@g43G_+C5@Aj(#cDR2(R5Gf2O-B!@stY6{Dy}&8i<$0IKRtK%-#8RKXm(=7mrZFeG
zw^%ZG=W^Ty{3}qa=2%l0x`S^G4n`@vdx7hhz<)fOA{v?5?Q~k7qZ$rBqVVGI(;I<p
z|KpwH%lr>JkkaPvU_QRln+2p>Ue}l!^{Xwc7EIYhu$0<ED!VK~e1uiH(HcWa2`}ga
zFyc3Y3!A9KKolXNRuhncx8h0$Yzr1{3TW6Z$xgfH0?XZQNXbblayc#rC!?*GHTBfo
zJ?;kYkH=6TO>R0G!}VH+f4Nexz~ts@4v2A4Bl2!nKeqQv;6D&2wXJfVPh*@;XFZg_
zvrKO1%WH$rvv-{QPr>_iI*ro%%2RS`mXgT#1)hE2Dhsl$DX=6Da|tl-ib(J=073>S
z0iyM=!2e?J4wMtel`a6wc6a-n3#@_?g2U|WzW-bP>XvW_LzvmWwrW!~oJ`1K3_Ex0
zerZXTWT}8}G@3aJV_no>Xhd#RU-0~MEx{!(!8y;HDIf-EXd*$G<oN|%Z+lw;ScY1I
zU$;{8VXPqa(<)%Kxjy~~*e(F8ii|Oe@4IOKl3yRZ`$~WxafNX?D4+L^TbP-DX&5RS
zQvM*g_KKO1sOhsT2S2S1VD%iqoM}kVE5KJ>I|r<wLm|<k8XGbfodd8~4}K1~6qv%>
z<wpBe!0@?Wj$YUFMFBGn=H(f%8!hqHaL`%AeRhmw0TO{UPy79LU?y@p<3_ANdf5?i
zsPjxoGskK7x;KcBA1}A1b+bGft~<eN0q)aX&Va?{Uj^*@pA26J@FT1#%)T96C&-+B
zg|7<^_?N{r%IooPJm$~YU!ERsLA#htSHzzHCSaj~h?o|gXH~NbSPC@gMkxmFB6f2y
z_di2_y$NloM*ZE_fW0mk&UXMC2$vzasK8E`ISqBE_Se^)S@r`V(q$`at$p2Z5<Mj+
z^tbKm+51^U5U$THXb={FXAr|Md|rX!4*@tfxf<f}KHt8WFa%3_<ZHym6gGr0o|JQI
zR{tdVOf2Dp;65;QOrPd(b^4O%U!f77HK9{)LerQMj3ioERI!K)n&xs|59~74E&{s>
ziVdR$;GrlKJ--gv)~^oO$`V`5x?Q``2X1>cs|)@BIOW9M=K0l0#tc<xkgOpn!{&8M
zKvS>>2(`R>{p;ICATz+Gw>efZknIxiJP(RH6<9?y_OhFQ9dJF}1rLu3{8f@O*w^BF
z4!xz8e-Xb&y+?bMdnNzl$%mX{>K4>(@)~e!9{OQ8-~<mnh!6rQPq8q_l<QtNrgj<q
z0Wj(tnmjebb@W~n`ciMV?4?)cc?iJ8po;4>SgAe$L<fva61z>AUtV8){eEgMytj&d
z)C|l^ud+EAsk^7m_ZcE;z<cAGDgoG{@$AFU_E`n??+$osfam$X-^kz<*a@dczDDAD
z?!|QEln|ZbU+X>RlE}6s@M96q>64U%;|IUi3UJO2n4bYAlR98Q8=Fybg=U7sVQ7QH
zum;#!-50DJ9I$!K<PE@z+mQzNsshKt{xKpjy#bg2=Rqwl@~|bjN94_Rl3c2!&2F~^
znJu;EFp~qH3&stZ6@68ba@>z)ajv4R1UKBUzNM@xT=D#Q1s0XH0uLW6@O&qO>-Den
z$k#}e-}dDX$?GBi!G^Fo{vo$D`R^=w=dzW49QHaK56dyPZZm!a+zb=&`c@N<v#o#$
zUp4r*w*)CrLu9?Y+uP5$_AKfPnM76V8*vM;;$~v&8HHZO0sCLh0prF@Xr($}zyXu!
zfIZ`GM60diX1kwK%I8LLLIMkYR^@i)l4%)<sbII8Gn0wT4RAY~P$d!2!J;=WBem*V
zBj;Z{Qv*EzlHh80^zZcF=8>#U59!!e@^!zbe202&rZN-UEn^u&{O~NxveseW*Y1<R
zi^z4Sxqcmwfj56xlDy6VhR$=_ym(E0o()PuYf1k;4zoigD55mg<7v^QXvl>q>|<bB
zDYjvp*@zDAE@buC<tVfPRsf<%>}a9t^;~cN3UI(e!V4n-b!G`^sD7DA<}91-b~mJy
zvHs#JOv$RR-G)Fi4c*%q)=H2Xr0l04url#I_#tZn?m6FIN@R4vv&5g<k&9vI`jGzH
zJVN(~Sdsf)e~&*w&y*eSlB#>p;ot+#jkQ0VJHtov-UiY+PP;;UNGxOn+X!>@Yjce#
zaTYv!hCW&U@V`I*x0yqs7>@q;IxX=(>To=TIB2n}h&bT>K}Gc+0X8)SVNe58oMWve
z?)BVm)o>-0GR)!<l%BLW+HtpumIpO4&9w&aMz?t}G6gc00kdCzDnl*6{-R1vGYb&|
z!8N$)*KPrx#(3<2=lf~<=zj&kk1*lreEr-1+;tbB^DBwhSB{PuQI**)^B(Tb1YshU
z{~fLoAHDD>Yc6UqiIp!%Le9%_`*OaL^^fZJ@40WbZpZ823y0%0iP&{qbnK8i2Vnd&
zz<~jzYLd3o52{=c+IFW_y#{Qgf)a~qC2(?~`ig{UPAnvmm|~7q72F#j>wHUZdu#_L
zKZ&SS+Rs1-tV-%ENKJSTJ}<x)c01rHhM~u)0hamafG6)Mq_2?2%7too<?HU2pUt{#
zhOY~#7rlBIsgQLxW@f(sDNKh0m*s=uQ_2|tQw#ga48MXz`1@d0umkp5HYfr2`{(zC
zgqjg2FTCf!*7rkA0LG0)3>N0R_o~Xz0Gq1b0&MC5<{>`C)DN3l16+OptN|G7)>no8
znCAV&#0)15=Q>Z@*1>Ja!S-vDbJ^@bOCW2_E}GIAFhyV@n%HyS?`02IYP_V*?bd8R
zFTjJJ7~>G>Kg}b~&^OY!5F8!Xd}sNfza?NrmAg*6DIsz?(lOl~`{LqfC0>5ekzAL)
zrghR$6fH5ZB_*^X><wrbX%%Y~eD3Sgcsedi+hyx0)1Ycniwnd)1`4&ouN<2LF1QB#
zVVcGj;L%`&7826#%cM{*#Qtf+3{Zar3=#$q)?q5iVgF3#l8_QQVebcT*IP!R|Hq&V
z!*)AlV;XilA>u`?fr$tFm|J{rbb+Jy8-S<zr{&kDQ4YgbnM(Nx^PvN7e(&yNMbZ@`
z5nh0A5<ZaYE*+o6PhoC_oatg6VqVKLa5hY+wAuo;Zvxax_`4JKakKyZ`Devn%tXXY
zwWz3u;6I>~FC6l{X|yQpGTH%4Th3(m8DMD3N5E<|P*a)DBVZ<qq7-3KDy{(=NVr)Q
z)@Y(4<;`0`ASKwFI6jiK+vr6bBqe~!=5f2Vl;@}YrnDCcK;rMv00Ug}sbBr**V<0k
zeMRukn$N>yF~gThZh!-C+mD^;F5%1sf6O-vaI1Mtser7~?+%2~_4<ch?&N{q--F>?
zh9NR*YfCz6fZg!vd(GeeH~%x{g7j6po&{8#VqJ!gQ_G-Ky}Brjn8U$^^XR}o1&rH(
z1&pbkY=zYVs2SC61EzuiX*$QLaD-2<Pa9)lW+Bgl>D}PT*q#MmFr{L{u-Qnex+QU)
z8!e4pCww1p6MO~O-)j!o8UM5ZKLCH7FfHM?BW7mJ=kSilV;iXAAGhpA4!y(1I~BMW
z6=tWr7W0FX*Bot0Gqhq169E%FSa(<jGjJNm5d5bLJ}L@G7egooMzMNL>kuQRek*|}
zJBAMhI4=FDT6H);KL?DDfDwS5Z!81Qh*66X3N^sd+mC=1N`mHqBeTz*e3|gRmt=~o
zMp^}LXS6B{L+V~<za0Fu+ss5Zcu49x@+86b*DJ8}SbRWK;Q4NbvtRk|06#(}*48VO
z6|ko@en0o?gF`tLEQf2n?P}6-IWCJc{KYV^`<Roz|A+Sxoo~;F%Ohm=@;7drZ(Mg?
zfvuA`D97Uvt6XaZ77ex{Vi6!@&JyNCtoWM<6tz}T^@k9ULZt(?@H@MR9yA{~#}Iix
zLI5HpW?4v0rMTa3zT6iDT$4y~O)LZpRkZge3I|Sg4TJV=g`(^u>Ac1|;ZJ6QDoodi
zirH$o-7ux${I#V2G>?5_bIx4HumVw(#Lv>M@P@TNe&Ac-zE8mThk*03CLgn=tH8OD
z=?B0y^oUf$<LPjSzyHC`*EtOqmY_><z}jxRVqLKH2#YwWwr+`i1usicK+82?z}W<y
z3V3Ew9R|?`-OhkbKL;GD<{1fdYj<<|^!8fwG`3btOS366ZJ?!+6r!!IjD);>spJPH
zfM>we3vz2u*lqyU4}i7PZ4Yfp!yUiF@BsWZQjo|@0KP6L(l%8`x&t^bzIo2A9O7M3
z(%aWRNS}&%a}O<u2y?=%3QUg{&a;$7^6_*y16K2>HBeFkt6`ibSVUE9jVLXcnF!yd
zqEXg0XwhD_=h3Sp92OMR8v6ynP^Arn8e~wGls3CzetX;3M)a7dJg5K1lyN_0OUN`q
zs>uLl_xkOx*MW%vwT1ewECd52?dC-!(=}$I;?Wq@pJFQIr+|m?0r-oADILAV8#na5
zNa8(bHMapD_+EOMYtlao>E>_2Uqs^d8x@!lfI!L6lvQ~IR>1*Sq(J9sFoW+GbG@jr
z&#o*~K!(ABtsk+DPkXLcH?)@XU^8ec%I4N{dn;L8ohdO40?Y$RdEN~<r84Zkz3$1R
zJO?!?RjaQX6_n(F*)zHK8B7`PfGL+%(m?zWL!Sd}@732ITlICnHRI=_SYDqWfWHdh
zfP1L9^m~l@dxzg`!0p0OVW&p^Kd(p^q^oc?A|ID@B^c|Y0gNxufNQ{t0>3D$YO{BO
z%>%RtPcfTkiXvumv@v85Kq&?kz1rNFIN!{BHrP-zlcLvt6}Qs>&x0r{vdrynYJ<+x
z>$h*4#KN8g(*I1aA=vr~Uuq)f?QZin`pH-UlT^8E=?Y2Q8j-We3OF9j=CMuA7{^BV
zcKdmlAAr9~O7_KnSMhcHcd!2N_Uw&?no{;OyZ=1wHg7bcwYKr|HQ?1RfE<NL%X^FU
z9k4-RB5LPbS4Uv57E$xwEJ)u?t9=N1OV|~ESgjv`L4;q0nb)LYAaMa$uK}CkG7T^&
zgO+hO7J^w(1^@LrF<;-Lfx9YLAP_P7sf1L&ITx^`#1$|=Ys_3)2!`tIRY*13)5frR
z+jy8U4^8mR4D$o<R|yk+FUf1d4NCsJ1)Y~$1=z*Y<@fV`T`{@V-*hVw$#nxfTyOHu
zb23c<q(bIGBBJXcR&jh{4p`?|R6E^PD&t{}B{)C@Y^qo?y4Ad}op$+URIgOC^N1<W
z@5>5pEy1?|_hDgbm5?EW#GUrBup~k^FRyz|JV!xK8S8-6GgKUK9Lm#v3#Ocmv_hhX
zq;zIO6RfzsmChyL*7>cG%D;ZgUBM5)UnX%&Pv?8MM0`kONq2X3Uv8`*(yXa3Dr6sv
z`ln&vUF$lS<>1q^ZvqA*01HT=v0UDZOd~Wk6B8>af!#cvn=`Kht6(klQNh#kcswnh
z`cDh4{VF8L7FZ3WEo7SQ%I~LuK|-q-K!)jgJGb>)mRPW@QZswfdCWOFyt@t<MB;8Y
z0)-{kk*$FHj=K)HrkN!19=r5w(xQ#;JhuZe6Xd+%)m4TE;I9-iA3Prm@WQ^4+8w~h
zTQje``m*aK|D`s9ri?s$r~7yzn^ytZTzm*2u!YhDsmdb7AgwDY#Z<dv^*PeB3$7Hk
zs89S@vq05?yb?xLnz>iebLMqPV=e*~jkp#P*6=F1BDMr$H6ularvQwaL?-xzj;CQI
z+yP^r_TOGNlv#;{G{>#I%Q}+R0}=+6j<;pjHo22ZRX}GITQ`ywDI!h#ERnhARuT56
z55Qk3NXNDKt~netOTOO*KHglw5Y?AC{ab(;pOeW$n_!vN-0;f~`ynPMf?#u=yHOm@
zAYu>`X@UhNu?nX?4AZo%zte*839D2%c@i?XUqE}J8{7zkCK^&r722vi00j+ej3|`~
zd<EflXNe4jh0OZ&?b}{KWL>Xxmn6EW-Q$fqL#AQ7pM)uZuYf@y9=x8;mx7^IpBW2a
zGLJK%BH9!~<~Un=W_jo8g5B&Y`T_Xs0dD_qJ^VlzxHlJz(T2WGyfNY50~~^p`h2e?
z-K)UhjS4Ja5p^+<rC;V8#A7bF4PmtzTHX(?fKSK6;qUt8|5Xl0!ob#DMo|TbIhxPK
z@DAHaM`lYV?Glvw8SBgr!ahu;Buxva-P3-PGQ%KPs2E);OWRBbZNVW`(&k&8sRiUj
z?DpG~n_GAo0nFNw`MLzhZyXd;Epyu~qz`0CoO){yN{8K=(Rck0HUAahN8Cp~9-Z%1
zJNkHkB4p0TZr0y?Wtjiw8jD2aL;GmntH2<BtiZ(-&}{D+#>oK#i$KIYTGIf_FnQIP
z%}(P~XIHlZ><rOhIAWcL`r;{RLD3!qR>6a^h?`b3Pz$Mm`E$jZW>00<zr5_mf|TMp
z2qtXy-*!SMQ}X)Q1RJ>j>)U>C)tmippe0pc1so4%hJd{4b)674eK4rXIEtx9T<;is
z*IaFz6N1O#bH7b+`VaFUoQ{?7aXJ1_g_k?;;(3`ZeHiTU!SKH)7%@b1ys<YPuLItw
zz(OFKsr4v^$pKHNQz4}&S}{_KDV8x59cy7rtJIG85X})dNmDkcm9=S6Xirgv4)NwT
zHr*<=QvzXqrWgu(3W<_r7@l70{;_Ra4xpc!WZI8I${-M;L`z9Y^Yrr9x94#fxBJbI
zGzs<N7@7H(Ib*E-+F?d3$w5_tqQf|AE56OQNhf?u=eQE~bAO1}`TurHormA--<cq*
z<C^z1{f9f1G4a??<wSpSxB$HH-x3@jgu}Yc&d&z1KwM?v;ZW=x@p&A7zrFqKw^BUH
za<V3^W^%wf$239}g64+DsS^G!sR<!DkM6e)^r;q5&ml}@aKHXN7#QLquz99Y3x@G>
zErV*5zt@*PUtR~NqhL*Gcc+^3Flx%_tV&Us$l>X==4HDTB?uB8tAWQNZMcrT2+syp
z*gT&1Jy4y;SsLJY+3xS*zD~@#m9`_<<}Lj<dBpiO4SnXulA}fKX_sy8^@6?FA`>wo
zq$_K0`_}~LRG7|ybN&=CZdYJkYTMvot6)``Hh;&eLtpc7aKKPCQ{M+l)Zl^#qiTSX
zd7YF5!ivt$^H@8_Cxuzj9wAL3fyCpr&a@2(#}oC&`;0Zt*Vi^i1%9K<ZPHY8N@m%<
zJkQBGDY2B9OUknUR<n)$4>Xb1vciRV+GFe70*)E7{>4NqX07R?0Bh#kfY+XI%}u`3
z=6Rp~qdbyH=I$8hVc#X1#6BQ(zvbO;q`=I?KG5VU7UX{maC|gZz_{Cl#*cubX@4qf
zb!v+l+;41fcUahGJ&Ru#l42->12(0BDlpjGScYM5CC@Qpu=q>*VRRb6>?btx;)fOS
zUQ>(N9z;)e>$7a8ar3=S(HIjN;X*<SNo*_Z@$6Uqg;c=2`Sw>GqZUv!FMxdrz}}~a
zm3XfySQNeC-~M-qoJX-P?M6ObyYHFeafmd&&F|aO%WHb%Yi02z4*7G1!M;{TC*J%s
zFI~O2$M3eileTs{Lnsp6>FuhGv@H3!-YAhwJU`ql!Hsd3tgV}VG#2X-m3iEF1wNeA
zR9K3dD#Q?l&OjewzG7k04G+EkR=}oErS|j!XvMEYd8YHstT~>{q!Tj2q0{E5%j4E^
zECha%HtsYNU~3Ky+t)f`)kqNpnZSbGH=k=+2${uf>2uAbx1y~_&C{Fe3Zet<g2&-L
z*jqI?`u8nk<ihU*@Rtiyb}siSBbknU%Xa3bK9=&|?*Pa964wPwNbM<)nYZRqvSR6e
zj|reMryG8;R$#(I)uI+}JQOilPcf0{&3Dc^mST&FgOY>=X6IY<dBro&+9XxYCan(n
z&XzI2X9}ul&pY-I+%j0db%U4hpbR=Ejn=bJHv>R;$M%f|jnx(ms|(Y-|Mu6OQGXLz
zm{=?gyO-_T$U<7%-tP?dMpWY)1gykVlaSbEob~#7nITNB&pxKXo!0c{-h8f2g?)PD
zYb7VbvE2iln2t+oE%2r=dlJ*#(v4PyTg64xV*23OZTJ_P&H68grG5S_!k)DPFCfY>
z+>?M^l%_Iz0sby31%)a!mB9p5Ggoiz4e)fwig>C%6RBThQ^2%9J(qw~-v!SQGjTUA
z81+%(lcQTqavU-iV;<@($tkBLn$bouqEl@wZ)Y(kpjGBP?)Fp8SO~!85L`su@vW$-
zqWvp10LO)HPqVoBN!p1mn<)-l#t%I|z0^FtrANM2n4Dt5-EE|E;B6%_yIyit{CODE
znY&kJp9|*q0*AkHoy*N;&ofMJjX~ohU<IvpofkFbiczr0=v%*!;_4IvqmGlPnb`4Y
zfT5@Xm*cytWGTk1!}mTv>v)2ytqb_AM@8XOVl3Mru+rTO(f|V*wKFZ4GL_6oV;xx@
z5^~gF39W@PZ+roRB$lK|nP9!>v{TKY*~}yeTL8WtMW3B*Dh}8y@Mg2!zP-IYd!8<`
z-#=ZZzWVn3w%xpKBHPV2@~+ztdii~QdD?E$BVRB8?=b9(7Tyz({mA`0sU%-Nab(W%
z8OVLWEc4bPL?(Z=@m)8ZB|a;_AQ34%DdQb1Ad7Zs29fXo`}6N<q=^+ZQ7gkV08*Cf
z(%hs3U|R#N@dH@?4!_6x!~4*%^>cgL8-ws*C{#G$u4f!21dD-OQeSthlG5h&bwA{!
z$pz1#v#vU)x=GfX0!%2#Y2NMM1T3Jy)PQy!h$bTTF=x|$JkFYBXunsgT-RE?UdG45
z{Q{MzKHGbmWB=;X+o9d_vrBf-yLjJzyP47>UoCFwekEo1df6oYr7gH>tN0l0Y|x8u
zuq3K&;%5B~;D=+o<KcmcNW7Jc3XIbq?UN4%<;4mdiXG~`lcuSN<5elX09efAc&N<)
zGnWcAYXaI2RTN{<<q&>P!}L8?I2f-11E#`g-L@Af4j3{_4rulhNSD1}d%l;Tf-(J>
ziQS~4_|TCH{_8n`DJ_cWdAAV)1aNK{_}OBsV7X#k)31a1!)8+p@6$ezt~@=}rt@{d
zz52#$YeM+TpJ(6ucy+hiNB!OJYFSQ?e61j`@&2+uu<w2qY2f|&o%kuq2XPlaZ*gQX
zY2=tnzBy=izBWZDa#|{5q?~v=?|$t(Rr}z`Y!$39J^b%&@@u{jn9yfniKxZa(FLX;
zptc4Gz<_#*{`>F4vcxu#hNbB817MM03;1zJ03O%H4zsBSU@=Y;3$?Az&qKwtfj=>a
zJDWeuvh3>g=P8C9u-)&+l>9vgRcnE)GnvigDzjezbG8v@y6*%l(YLqFMV_Bp0e*Vk
z)bs0?|M9l=)_p%W;Ldf8e^xW^p3@^=a2V@e1!gd+U~^cG9&kJUvmnPPP)<BL-ynQo
z!Og)hYqx1y5;B>=v@SUQH1H^^wso6KmSEPP>GAtiqeTU#;`JA__`68c`_5xsHCzBe
zZ328Bi%N0xYA7bxmyzJs2^E;J7!2ko7s%)t01}~AwvrX>(>+tYX!J6sOtM`OK5q;A
zQunPJQ_PRvPf9EVv7nXLwSg>h3$N>aYxUK0uCdSCw@n|O8a!<-)jnQ(^TWf~GI^YL
zRlIk;fi+s(f%)}4>5<<fbfwV_Wj;901~jKnvIIeLZKR_wa_<Qc*LquYIrd#P7sXnE
zRjtfZ&7dYwRKI3w?KX;PMk-7LF&2$DV**%~(=v<-ft&QBju=p(owvcG5k+yf?++Ei
z0O;&a24g!(ZQPjB(39sn^J++}DRh0a89=IUlC`hep7+la6G)(cc5^E4%ZbcZy?ut%
zwl$bv8@6vXulwh!x67SdqEK(1UYcJ&UcY)e<V_o`YWUw;-}ln*xAe&G5oU7fOC>6;
zNG-6R0zSqfWAfrQ-{2=J8RCl<+t%o^*s>gtP^z8@yR?`Z2o<Q;UzUOZeDw3&qPQ|w
zq8{^TVJWo1Tfye<3a6y0f<i+xU&P;Jbh;j>1}_@40X78`$lFaaC3-aFDd}eLBN=5L
z1W*Tz>E*Su+wY%eWGV?WTm6ciy<V*6odfTtR?W~`)9P=X!}a>|ya}S$o3@YBb8Qv7
z-;c`_TE=M`z8!x}yY{<Qb^pDP9{GI$^U&nB`WyFA`!vT2J%Fx&sd{@RNB?S3CEHIW
zbUoaQYm{Iql#nR8*vVVar&?lFt!P__FWOX|0i%eHqYL$&X|*gg#OV-d1T{qsCKrHJ
zMcg#Ktg0EIioAJxo)QH;ib8H*_d+d54w#4(9bDea2r|Vni%5(08a#&JwcGpl=6WOE
z>WzV_SI^VtOjIJP*6GbJ=dOMuLnxjD@cyOwje+c^=mYPfE$#X1x2eF7WRT~kZO@U3
zpU&4jW_X_$?9J~)k((75S0$JPY>B4@h8_conRp2vN^E0SOsy?x{==t}ls3?Xayp*W
zs9i8j9dU`yuQ}kp<p%9^NLtk6wu+I2T1W%f*XL>hp<o{l<4_4a3l(cJSf@!o&p-ky
zN3@Xe^$UMV0*C^DrY2Wu%X(YW*}J_>@4k&zwHX*bW4RXKX}CFua_|Zqx`*?TmbrcA
z_Nlf3oUeD6y&CVIcH7;~0Y}m!ze#dtMzo&SMT<G{Q^0MU+mM(bnutW1c~>wzBwQls
ze7Qnt=2Ql6L%Uyhv5t4eaG8q*d~x(*7dNqY*r($>jT(SA0}P8|@r%a`aQ54Wh-v7d
z!BNAEjLHsEFm3*<b<wP#hc!0tt6-J{oda+idH4M}UbjMOo7@T0YrZbH4L<p(RqLQS
z-Z!T^j;$5^R<+ee@^I^p3qv%ay?NbB@5hetwAt-<XTQ(Q?{jppdjox+9{Fu@yxv4U
zGvzzW9TN#jOghhS!1D}0cK<?>Dm+mGNvu$e4%ln2XK-mn5%V?sWn+if79lQ%a<0G%
z)%q77rol<i)0;Q9+p4WtSg4A4u%+nfa4Z&rU8qq#@v<U*kg~0QHv&bE(T|T6#3pG$
z)uZq*P5YO)=vB1zn>XnXfX~;9yyF|Fyn(xQyiIQq-8@&o&(p2l+J|_xme}UD30_mt
z)?&MhkDJc**Bj;D1&+4#^K*LS_XtxAK40XJes&*XCUd}ub?qs+<4;DhE-SDHC|cAZ
zp+~8X(T4B~GegwON^xlz{b~H;vQCxspwx!{GFJ0y>b3jms}ZB;ELJ4W@`iUkTJ6(%
z#1t2|JA*ar&aF0Q2}27D0hFoscBfQ0IACMjCVEp8>Ze$7y0`UCeayM@eQtb*kl2gt
z+mjbr2Yf^D#w+kNUi0k*_<85Q58SV_jehmM@%5&3O?u=v376&g!7o3b`$6{myGRsW
zalx7Ma04(dzgiSEp}K(RDRfX)#AhebM6}S1B^VzM1}UoA?gtKN2Mj>nr8s(pNqw`_
zp}5$HGd>~&YxUa}E{jEgMz|H;j#q^`W!iqfUFU2<u@H(JYX}tq7))uX^%pQ@p@PuQ
zCu_8d=-EGo-nK7v7dg*yrN{@der!LVEAZQ9Xm7gqyWKh9n1|Ur*RAo~_-<;_?~+F{
z)1}~}W&)1*24fXV{(^{+N#+_!GU$y0+|wu%x6|6N9*J$8i}gTTK!w2$URX(`vvizV
zieK(R1xzU0{jVMCVbP*etQFb#-Q>{q90RnNx<C~u)JinL72NE1)iG6bQJk~v>#kQw
zRZ&q;HoK=0gyI~%*4JliJT+47N^f*l&wM?Bw6&qn1I<HwXx~lu-Yf8Rytw;ptlc(h
z{ND98ztNC(zP}ORN9amF+>Pn5EZL9W8p=`;g{sIbnjEmqgUBEWcPlW#&jDLRouKM9
zU_XLW>=k5M1Vy#IDkt9t%PX*|n6yceJ|%Qk2;8r!x1dkUay%SQ)E-tHfSN8v5N8$B
z;-6CFdA}PRw}CXYlwn`jFStuh*=KJI$g1#Y4eZ0Vui>j-@O{0!(z~W#2Re^a`7rba
z-L>30;L33tu1atl7pr`$)YeAtd8ui9+e)SMo8*z~TK)dQtKnFuu&yco5WM&E0&rU<
zFwBWR22F9x=YXxJ0#-A*0Bq`kQ}rsU1qJNJC3em}orW<0+w5*deFz$+q7HqXyJe?S
z(Vn&)vuaVPX4+L_n>REVCvQX>vZ+9OO7@8x&lM4*zP?F7X?R;Y;PaL?u_D(sdHj0p
zYt-1QxZpMp?SQ=m_doBcSDAbs)^MFM8ql5U^KSp1b}aJy^no8~mvSBQN;q;zw@R=B
zR*%e@9dJr9*Pn^^f}2r~^=J%XQQrYue5rY7w@smj8T_EBiH~aeZ<<*UN1$SiB76dz
zWsPYMC@bJG=6q;d5nMnqa2k^;ByC@IV=8Ll*V-4-;46?egS@@IOeBFM`o0)L)_$ww
zdS6@=qr%Yx-b`b>e3`icetK=!daqxP*Y-Y<@|v%YKzseI@t*Kg5Z>+Dk%l*tevdqo
z+qWxbUY2zm+aqrRHW4<+$PB=-Vix(I^3@*e@y4(jid{tkFRN|UAf&`w9Aewq=SY~T
zNZ-4oh%ToRhdN+UEuvTfTe}N{>QH}bas9%LDBS$~TvgKm7CVPa*}r;2c>DS^WvD`p
zrfWXTb#8ops+C)Mdv?KfC~6vR#{0Pe_%iba;LQqnZ9n_Jq;cJCqX5_Mc)B@fyZMa(
zKSCz|Y9W+4FGp`eXWVE)(?pPRf*KN4ghbML(EQ0n4&GE73O@p#tEV{Q8ZZHs62DrG
zbY+HkZ-Lt37<yII)QS`lp+A<;46Whfr<k524p$VhpS+2wLFb9Zpdy*$)AK+zT>-07
z1|N+2YyUi_qHwWFsK-=c&2L|s-`ldA&D5;LWUGxEy^(bk>*h;O^^MbI@$G(l0p9I=
z9g^4J=S#hw-w5y{fwcX|o|H3`=Y6hzIM+m!Z0C~-CeWMGzfyMfGV9vF3&1YoTCkWE
z^W&)$(L(E058{@zNGrcu{BUSiqe;=gCn_aC+eII^!c~*G0v3e>9tVE`Ma;I}UbkY!
zE_cmT+52GBj#)`F2ml4nz{77Fcn-dycNm8@W7(%WZ*K!`onT+Ea1*dkl^n<G`r9rc
z)%JNbou8gB^+q0me>cF)<i#_t&FaJ-o7+$^oF_r^ycwoQ`e%SW9|1>;w#6=^MhCd4
ziJ_HJM=IuYO~jADHJA38s^;X-OS}og=$e2VEnfdAFcq6@X%*dO-%4i&Rjmg_D9-S8
zTl`#8qlsEi)L)nA7kw|MTZO!F>)l|7INVGH+-7S;#`Zo>OpsgwkCD}H%~Nlx?_BRy
z<M|HYM;>9##XqP12S4lls=;G=sZ`elU=cOFN(r~>E{iTFSs|+Q=Cds8KgEgC{s3}1
z)|{mM3h0rLJ9%PDbqH-UOOc+sMrdP2SQKc#2sm$RLwC0uN<7z#J+5HEcU-4Ky#?RP
zI@<P_YX@(4g3r9iRqz<sqWseu+abO@-hd9iZR?!oce*7wJ@UxSTmeRcGI13Q_JFvI
zb-`V)e)KCcJK&-wP3Ia@wJ5V9I314mF1x6k9prFmVr%?C&xxx~vDcl3Y>C)>CKfkq
zup%;SO&~o(#X6W3i!yJ@d3vq`Si8-b4DMZnum8}tZm=y^Xne1rj+^b?r8(e$d6BWz
z*%-xI>ugKgoxK6}Cu`!$@2*{BuG2hx&g6~OvuBqcdE`D~Mv~35rO?Wr8#AxW&J!SE
zEw=z`7q~K%R(RVGajBc!9U*Hpi(;I<|L@R+U&KuGkG6C5X%SIC&Y8#dZ*s^YCc@40
z3^_-)wXxj#)iXthsaC=bQw1g_rh2jP_y5{E!{#_~CJ1Lnf=P_H1H(D5T~6Kq|CcX4
zokc<xj^pxuacEe;z%KssRF9+?0r!16#g_mxh8_nxDOSlO6JQJ$)gr+4h2Y)X^F9{`
znH|y#{~a%YFP)&fht4;M%}ZsS*h2<K4e++G{HMV$0amte2{88n=ALfXp~N4o?uc&7
zy@cnxzYK;M3xe_D@FxPy$hwp|x%V-sI;UTUdFW%-g5h2~`u>|C9V*;^jlHOv`}A?*
z4F=B}PF}0f7_%M5*#RbsBsg2Kh7Eo+b+ZC@1M@g)e$xc|b$pkj?GoQi@RwSbF41%g
zfc+IeB4#_l4spdU!)B5T7q0N7XozGN8(#@Bj*z;63jg~IX=l*Cch7$jr$XKR6SF@s
zJw0fv01oDR#jdw$9qFsCPB5uEiX}B*D0UkN<|OO}>Up0B(Z-f4=cNOLb=`rA4sOBg
zn1UV%=CQzN0dUCp20sR>6VGSmDYZCPWnk-<j+?UZXWM}<UHp<=ats(vp!lV%87xIS
zOYfy<yfj=W16;{FoVVFHyiy?&V3&c0C%hHSVx{hXxE*4AePCEZ2(mkI?7}pLSUCIF
zjmag544XL)@;Ch!&+7b$+8e(pSYSS6A;o%QZsttu#5ZqufHB+~GQjF<Ai#|Pdfh~R
z!$3L0JHsQE6M!#W0B4S!+1{LB`$|>#c3H6_x0znT%B=$&S^$%u?|(UvPj=)`<)1q^
zuod_6M+xwjRrYkB-IcPSDi))V<2a<GvD5%lUD7%RB(Ct=0Jvy>n>oH4eH*@<*s2m3
zCcqnVjG+sOQo(bvQUJJ_VAd-vpgxPWNAAGP6dCv-!Glwq#tYy}zYL&n$G6vFli-HR
zzU1fxa}b8kTVoXh@T=uF$Gxhz<X6oM0N;tluDl<5Li`+!j@^|I_bN`jsR|<DG^9{I
zuM0jaP0}y;GVbW<_65FzMrxj8asj}W;myN7h@lBEUA9tSFP4)^=iSd&4h()d6Z}m7
z#d7St8eQbK2KdsY;{Y%DWelAO?hf#Jo0mCLy>#0l0gkmi--#_#Ugd7L)bHf?AD(6V
zHw42t?e`7ff8+n2o?@jZC%)_AsZ0zzv{SWsn1tnF+6Ykpu0={6V9U|-0xl<x$O7QH
z^$UstA}x5Lo7Up*fK<@S4QVC7Iket{2Jl3F3Gd6!=d4!&zH|YM4b_>rP<UTdx`SWH
z#9+Cm26Lnpmg)$rnKGiSiNi&o;tuai#Onnq2^y{QuBzud4EV-c-$C$!>-u-eXOdx1
z^NHnra=mGNm@Q4gqLJVXaJTad`{f*UKBMbYCM^?PDgZFV(20!J3ISA-)KIj5!;nu?
zjx?W|hO_jmHvxR<;+GCgeT(9<Z~lgDm~tsmK^CM0={yUfjS}#6fLo4f$f!cM)IW|C
zA;QfFpaC!xYuR_skM*i7T9Pm*j_*59UY?Q;qE(3BtM1c0vtr*3k{&v59vbvOFc~I_
z9z*-hTn|EL73?_>-y6gppaWpY9U0xyGpIhz-9Q8Q0{GG|0VcUSza1@DB?92SmITF1
zfGudpVbqo+1g0iigKwI)#jPA^zkvY99t8jUL+q*bO-zzyr|25(H3S_~FpH)kjZ+d-
zXvE%r^34qk_Ho44??x|(^s-(MJTH$y3j>zYWBnZ|4x=^z9uj)1j{GX9X9(>AzYDB-
znwO>Jy&2&)z?Uv={fOX}g6DR(R<OSb^r$GRn4!uvcpZLs#;<S0+N4pI@ds{V_5^+d
zQLIGVzQ=QbjS;l!h&Hec<2nuTZ@*xDB)g<mRE&QaYkm<tYdN`OS+Af#_}I*S@Q$iL
zOb-mhT5krNDGrFy3xMg!{vzO=-U{E5%LVX>E`Wh=Lw#3TaR2Qkz`-Czr&BY4HlRx;
z8wmH@Q2h~l{qg+#43I0>DH3-|FR7Pg0GRkn*E^`yDk?l+*%7@_=*fN#L3FlYEfA)g
zVgmO};~|m`0VtN&0^{xsF!^QeQOf39N6)4IUI1Tu<Fq*bvhIHGi0%&#?4U6w3>u_w
z0gM|s9^09O2Es(DuK?w^({OjELbJ8Zt8>-!xL}*&0p$_2g*4E8zeV#U8@OR*^Ot6e
zv0vJ+Q9Mfv*254|Ml>;o&XjUh4Fs4LOqD%W`)Q6i&voJc<-q5<^frE3+1^Du4~p-0
zF<7RrLU7qLehEnI9pRc_VpzguzT%;GKX|$#GXrX85?H9`f1z+M>EB;TK0n2(D*P3<
z-v#*6evPMT!KgeS!8N{^sRJF=HKj_g&5dBJ6djmRH}9C%XQppZEqalRbvf{bZB=cQ
z#kY82m-8ck0{j&OtDrtUGTRClodh;kv2OxQVhOVPeM%E1(G3~p*Y2NwM0<xKpu=+{
zCJe-mdLPTn1^S{&P<_&kTj!M>#OX6|;m9u;g@MiufWfPh&JE3@JC_bTIKNE4%BtgM
z;(GynnJ)JkTi;-fF@j#=3rMlSmTqfq!Bme7OFv<KRP{nU3wi{yb8K(85@j`u+(Wco
zDmx;z<Nf>avMp=o&-S+E9GW+hU-3O#zq#|Ol(6_Oc@V7!gg1e<iRsHVzr5@KSJ%=)
z2j2PhdzuDJ^Q|;r0RNHn*5Y_CS7Xgl2LWCum(xG;<7NexNwe;j3V;!;9s#z}f1OQ6
z(;O4l9LsV!!|`_&$uA(psPDW^BVSL{67hA81NjXq#|M+{ocUPr8%QV+biTt-<4b_q
zU)5>@59D{w{8A;pZG<m?FM5G*);F-kX(PEn-3?xNEWNhxKq6(%GL5+g*m{x*|K&<_
z)ptagxP83HuMDGC0u9o|2I%{J#=4`WZNIl09JnLD1E~aW%K`uc5pJ+r*)ynK0r1Z6
zq5o<)c3okub-iBnGT)=VZNOPqSK||4me+gHdlyYz0^el}%&J=jz-8R)xJul8akpe%
z;=z9bu=uQYc*E|n?FnhE96q!0OP9onT0#p(<^?P`^LtB#By>(-Xow?5Er6HA_<07u
z4SI{(qsxIWdVc|M|J5zHgqH%4K5rEh9)$FA(AKzvO!Ww`1m~B3@ou|yO55(vcCL5h
ztwBQq9zk?uIDNuz#6CQ-hVL=R$(_Q|{-R=m{;TY!$^^FoX1H7dJU`<<to^sbm-JS;
z+Q1jM4Rt*L+u4mfyD^J{px}?{Z}9p?cvSLx9P5eMmyJ`;@!AI~>M(9hhytG3jA475
zUt!I?Pc1p<3BM2%EDr#O9bi1@lwf=jtX8g!q2=Wb@$==t7r-Y|Sy9<(&1@sGu-;l?
z91M;J8CRGr@g<b*e7xfL@E#Hjgyla9p`*!y5_-`AT|WyO-X=A^L9qjvc*Xt-fKT{!
zg6j%i0vzxmzzYFs2A26CZ366#;KvH!WnG^qum9!jSLfrumjnNq;Fia&_kVU-44VxG
z-1E;Hz1-1gO<-i&9PKR>xluWTGm;({q<y?Z!npjjM7(AfPzne>h;cQs<TO;z>-2cm
z0w%#jqLG#%bReOuB|0H^pathEgP(fdo?2HAHq)O8@#VmOZrn_GYvoy)39vh54x0PY
zVu`PUy<Y=NZUG1=ZpcTWSRec$j>`{sGS2Iy7B+glkbzIw8{S6I{h2ul!3n($d>TQM
zbv9+y<=_%fS}Is<0!+B`rGb4|>+`lSe$M>9(Sqks+zWjrYSeLa8{YmPhR{ZO3Gh*X
zkwdI?ZO{v#a9Iejo-&sK{y<>@n`vFb5crU!c#f0}a`LP6-+^OCn|u&>&{qgnMNT9*
zB)&I-$t8P}-AqF*{&*TdE&&Gapm#+(xZVCeGhb@H9Qcm_xNW>t0WSn%P0VU?$+BN_
zZUHbC3P%k<1-wKJcB+pDSOyFRO+&PvaePP|vEmlg3LmU{=JWE%^eU%}SsX`61{mD2
zE`ilXbl-AZh^ZNbx^!Tscm-du4hgx>56{fssPQcsZfg3R<G@#&_x0Z9%x#74E|#^w
zC>AQuSpl#a*M<l%*{MX!CPyC?LbGALOeuuG2Z$RmyQOHp8n`FF?7bqsIht+_B#B8u
zaLNR~80~##Iwk2P$cJ$x3jD&ZkMT3<J<s2$1L*nB0{9v(BE0oGi=fhJ-EC@wZ7+8}
z09>mLu$_rqeV9bYDY5cDYYe;=7%~GUfas>`^STz6D*{6vLbD%h2N;yWb;)nRFr#Ak
zQ>T{;cTA>)d1Dy}F!^0t)xYETTKGIo(>Psi;6JJ?@Zh@zy0z$C2ZoEk&597Z*0}@!
z_W(yTUFK9jD~1$|a)N2XWLbY~hWl9JN)K)|gN3@y0$ogyQ};Eme0OlY5MWv`H)(<c
zJJb#HO|RMSysei5e`0`}k@K7It&qj>UV}uUvHLB6xoyj*UAK=>KnIl7N=e0XFSKya
z9m8iFmjo{)xE(>mf-x}F?rY{OSANZxl3!dxcuj)AFUuEb%Cz+zUmEb4oZV?#r!SX2
zU8mI%T&Mu}oZM4}c|?@+7%unmZ4Rs-*M}8Pqvtfyek+ZDIuooS*ejdAkBzcl$C{^`
z{3<8R;#ks4fEg$g-B2Jrq(?aLcx&q}EFUDkmHl!#(}VyT{9X?H856A<06V$8>y+N}
zNE+<!b-NY7Z*<`BaRApW#~YgCoTS0IjG?sGK=TbsP6s93za&^ng6qnJI^k+vaE<G}
zXQ#8X&BCRb{APgP#4p_!p9|p6KBHB}mwGF@6~fxET2=1f3b1@Az_AK%H2~k*OQWxv
zj>#K(>&dDk<vNHC4S<yZ<I6KG_^4YlR<>X#mjd-ZNDNqkIr)7#@8m1|PFR5NX8`!p
ziS-g)>izIi<_=68-UTr4{z!l`R6CP~ybTQvKjk1&E!}XsHGkU#PpP~pM+c?_gT)rW
zWei>LO9!5v*<}RFKly#@z|lNT6Z{wJ1@LF#m)lmumnHdx_dVXbTQK{b-wANYsC^v3
z!fpPhuJb&O%eV=S7G#G{=D}Vnq~)=$`>liM^0H(p0p^PunijlFB$y(|9wUR=)u(-)
zoZsaIzpqvfa-F9+Yh5o2K7;?Bb~xkk9r!xDB`xm<SYNyPK7bJw9DZEV<a6c_0BA_#
zFu?cI{19TpfR~Y@M<-HbTkQl3mV#f#&`h~{$#1sctW*s9&NJ|B`R^~go~O!x*UN!F
z1HUKD-uJMZvm#@r#faK_0Jhh<uK?IP9hgt&S7Vp}?1*EgNr7G@7;iLeq>Qm@!Hb5(
z=I^Nl1Q#A$MbLQ6V_mkuUT1=OORfrgg4LdQ^{_%s{~fWkH38p^;mUtModaL~TjLvl
zSH)DXZ29^Wk`mtwupH>A`h(vCFn%tW5m)@F94Lxh`O9fsXXj*n7-Rk54W%)?#xGy3
zGByb=Ex2q24_rtpyRoR9UzRRBc=<wYzay7Z&HkCW-uT6Of$)g{2D;Sy;3c%RIAcYP
zAFzJoymD=Pb7G_YzQ~pGyE25cKzPIWVW{zag!u)rSH-$t5X@TOY`|1bnymSy)y~KH
v*?l|BaNq}zqS0P|<E%Lu-@<-L@VfpVjbWnnN2oU800000NkvXXu0mjfkd8YF

literal 0
HcmV?d00001

diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss
index 128c3f38505c..9d8820e36971 100644
--- a/lms/static/sass/base/_variables.scss
+++ b/lms/static/sass/base/_variables.scss
@@ -215,6 +215,10 @@ $action-secondary-active-focused-shadow: $m-pink-d2;
 $action-secondary-disabled-bg: $m-gray-d3;
 $action-secondary-disabled-fg: $white;
 
+// HEADER: graphic-based page titles
+$header-graphic-super-color: $m-blue-d1;
+$header-graphic-sub-color: $m-gray-d2;
+
 // ====================
 
 // MISC: visual horizontal rules
@@ -279,8 +283,8 @@ $footer_margin: ($baseline/4) 0 ($baseline*1.5) 0;
 // IMAGES: backgrounds
 $homepage-bg-image: '../images/homepage-bg.jpg';
 
-$login-banner-image: url(../images/bg-banner-login.png);
-$register-banner-image: url(../images/bg-banner-register.png);
+$login-banner-image: url(../images/bg-banner-account.png);
+$register-banner-image: url(../images/bg-banner-account.png);
 
 $video-thumb-url: '../images/courses/video-thumb.jpg';
 
diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss
index 53ab63a92aed..f1cda256548f 100644
--- a/lms/static/sass/multicourse/_account.scss
+++ b/lms/static/sass/multicourse/_account.scss
@@ -117,11 +117,43 @@
   .introduction {
     padding: ($baseline*2) $baseline 0 $baseline;
 
-    header h1 {
-      @extend %heading-2;
-      margin-bottom: $baseline;
-      padding-bottom: $baseline;
-      text-align: left;
+    header {
+      position: relative;
+
+      // CASE: normal typographical headings
+      h1 {
+        @extend %heading-2;
+        margin-bottom: $baseline;
+        padding-bottom: $baseline;
+        text-align: left;
+      }
+
+      // CASE: marketing/imageery-based headings
+      .title {
+        position: absolute;
+        top: ($baseline*2.5);
+        left:($baseline*1.5);
+
+        .title-super, .title-sub {
+          @extend %t-weight1;
+          display: block;
+          letter-spacing: 0;
+        }
+
+        .title-super {
+          @include font-size(26);
+          @include line-height(18);
+          text-transform: uppercase;
+          color: $header-graphic-super-color;
+        }
+
+        .title-sub {
+          @include font-size(20);
+          margin-left: ($baseline*2);
+          text-transform: lowercase;
+          color: $header-graphic-sub-color;
+        }
+      }
     }
   }
 }
diff --git a/lms/templates/login.html b/lms/templates/login.html
index f20ff1affe46..938b1cc9c835 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -94,7 +94,10 @@
 
 <section class="introduction">
   <header>
-    <h1 class="sr">${_("Please log in to access your account and courses")}</h1>
+    <h1 class="title">
+      <span class="title-super">${_("Please log in")}</span>
+      <span class="title-sub">${_("to access your account and courses")}</span>
+    </h1>
   </header>
 </section>
 
diff --git a/lms/templates/register.html b/lms/templates/register.html
index 834f99fbf00a..3c14b72458e0 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -90,7 +90,10 @@
 
 <section class="introduction">
   <header>
-    <h1 class="sr">${_("Welcome! Register below to create your {platform_name} account").format(platform_name=settings.PLATFORM_NAME)}</h1>
+    <h1 class="title">
+      <span class="title-super">${_("Welcome!")}</span>
+      <span class="title-sub">${_("Register below to create your {platform_name} account").format(platform_name=settings.PLATFORM_NAME)}</span>
+    </h1>
   </header>
 </section>
 

From 37d906e4db6c616d4c39f9702fcd655d2e5f8aa4 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Tue, 24 Sep 2013 17:03:28 -0400
Subject: [PATCH 56/92] Add the ability to set expiration dates on course
 modes.

---
 ...o__add_field_coursemode_expiration_date.py | 36 +++++++++++++++++++
 common/djangoapps/course_modes/models.py      | 14 ++++++--
 .../course_modes/tests/test_models.py         | 25 +++++++++++--
 common/djangoapps/student/views.py            |  4 ++-
 4 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 common/djangoapps/course_modes/migrations/0004_auto__add_field_coursemode_expiration_date.py

diff --git a/common/djangoapps/course_modes/migrations/0004_auto__add_field_coursemode_expiration_date.py b/common/djangoapps/course_modes/migrations/0004_auto__add_field_coursemode_expiration_date.py
new file mode 100644
index 000000000000..afd8207388f8
--- /dev/null
+++ b/common/djangoapps/course_modes/migrations/0004_auto__add_field_coursemode_expiration_date.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'CourseMode.expiration_date'
+        db.add_column('course_modes_coursemode', 'expiration_date',
+                      self.gf('django.db.models.fields.DateField')(default=None, null=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'CourseMode.expiration_date'
+        db.delete_column('course_modes_coursemode', 'expiration_date')
+
+
+    models = {
+        'course_modes.coursemode': {
+            'Meta': {'unique_together': "(('course_id', 'mode_slug', 'currency'),)", 'object_name': 'CourseMode'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'currency': ('django.db.models.fields.CharField', [], {'default': "'usd'", 'max_length': '8'}),
+            'expiration_date': ('django.db.models.fields.DateField', [], {'default': 'None', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'min_price': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'mode_display_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'mode_slug': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'suggested_prices': ('django.db.models.fields.CommaSeparatedIntegerField', [], {'default': "''", 'max_length': '255', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['course_modes']
\ No newline at end of file
diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py
index 50399fcc646d..cc25031935ff 100644
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -1,9 +1,13 @@
 """
 Add and create new modes for running courses on this particular LMS
 """
+import pytz
+from datetime import datetime
+
 from django.db import models
 from collections import namedtuple
 from django.utils.translation import ugettext as _
+from django.db.models import Q
 
 Mode = namedtuple('Mode', ['slug', 'name', 'min_price', 'suggested_prices', 'currency'])
 
@@ -32,6 +36,9 @@ class CourseMode(models.Model):
     # the currency these prices are in, using lower case ISO currency codes
     currency = models.CharField(default="usd", max_length=8)
 
+    # turn this mode off after the given expiration date
+    expiration_date = models.DateField(default=None, null=True)
+
     DEFAULT_MODE = Mode('honor', _('Honor Code Certificate'), 0, '', 'usd')
     DEFAULT_MODE_SLUG = 'honor'
 
@@ -42,11 +49,14 @@ class Meta:
     @classmethod
     def modes_for_course(cls, course_id):
         """
-        Returns a list of the modes for a given course id
+        Returns a list of the non-expired modes for a given course id
 
         If no modes have been set in the table, returns the default mode
         """
-        found_course_modes = cls.objects.filter(course_id=course_id)
+        now = datetime.now(pytz.UTC)
+        found_course_modes = cls.objects.filter(Q(course_id=course_id) &
+                                                Q(expiration_date__isnull=True) |
+                                                Q(expiration_date__gte=now))
         modes = ([Mode(mode.mode_slug, mode.mode_display_name, mode.min_price, mode.suggested_prices, mode.currency)
                   for mode in found_course_modes])
         if not modes:
diff --git a/common/djangoapps/course_modes/tests/test_models.py b/common/djangoapps/course_modes/tests/test_models.py
index 1fba5ca19795..72aa3f2464c8 100644
--- a/common/djangoapps/course_modes/tests/test_models.py
+++ b/common/djangoapps/course_modes/tests/test_models.py
@@ -5,6 +5,9 @@
 Replace this with more appropriate tests for your application.
 """
 
+from datetime import datetime, timedelta
+import pytz
+
 from django.test import TestCase
 from course_modes.models import CourseMode, Mode
 
@@ -22,7 +25,7 @@ def create_mode(self, mode_slug, mode_name, min_price=0, suggested_prices='', cu
         """
         Create a new course mode
         """
-        CourseMode.objects.get_or_create(
+        return CourseMode.objects.get_or_create(
             course_id=self.course_id,
             mode_display_name=mode_name,
             mode_slug=mode_slug,
@@ -46,7 +49,13 @@ def test_nodes_for_course_single(self):
 
         self.create_mode('verified', 'Verified Certificate')
         modes = CourseMode.modes_for_course(self.course_id)
-        self.assertEqual([Mode(u'verified', u'Verified Certificate', 0, '', 'usd')], modes)
+        mode = Mode(u'verified', u'Verified Certificate', 0, '', 'usd')
+        self.assertEqual([mode], modes)
+
+        modes_dict = CourseMode.modes_for_course_dict(self.course_id)
+        self.assertEqual(modes_dict['verified'], mode)
+        self.assertEqual(CourseMode.mode_for_course(self.course_id, 'verified'),
+                         mode)
 
     def test_modes_for_course_multiple(self):
         """
@@ -63,3 +72,15 @@ def test_modes_for_course_multiple(self):
         self.assertEqual(mode1, CourseMode.mode_for_course(self.course_id, u'honor'))
         self.assertEqual(mode2, CourseMode.mode_for_course(self.course_id, u'verified'))
         self.assertIsNone(CourseMode.mode_for_course(self.course_id, 'DNE'))
+
+    def test_modes_for_course_expired(self):
+        expired_mode, _status = self.create_mode('verified', 'Verified Certificate')
+        expired_mode.expiration_date = datetime.now(pytz.UTC) + timedelta(days=-1)
+        expired_mode.save()
+        modes = CourseMode.modes_for_course(self.course_id)
+        self.assertEqual([CourseMode.DEFAULT_MODE], modes)
+
+        mode1 = Mode(u'honor', u'Honor Code Certificate', 0, '', 'usd')
+        self.create_mode(mode1.slug, mode1.name, mode1.min_price, mode1.suggested_prices)
+        modes = CourseMode.modes_for_course(self.course_id)
+        self.assertEqual([mode1], modes)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index c3a18c56642b..486e32c465fc 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -391,6 +391,8 @@ def change_enrollment(request):
                 reverse("course_modes_choose", kwargs={'course_id': course_id})
             )
 
+        current_mode = available_modes[0]
+
         org, course_num, run = course_id.split("/")
         dog_stats_api.increment(
             "common.student.enrollment",
@@ -399,7 +401,7 @@ def change_enrollment(request):
                   "run:{0}".format(run)]
         )
 
-        CourseEnrollment.enroll(user, course.id)
+        CourseEnrollment.enroll(user, course.id, mode=current_mode.slug)
 
         return HttpResponse()
 

From ac0e65ab2a6144df6ea8ded052ecc98929dfc15e Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzolucioni@gmail.com>
Date: Wed, 25 Sep 2013 00:25:09 -0400
Subject: [PATCH 57/92] Update CHANGELOG

---
 CHANGELOG.rst                | 2 ++
 lms/templates/dashboard.html | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 65ed2519be9b..9a12d0ff0aa8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,8 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+LMS: Add split testing functionality for internal use.
+
 LMS: Improved accessibility of parts of forum navigation sidebar.
 
 LMS: enhanced accessibility labeling and aria support for the discussion forum new post dropdown as well as response and comment area labeling.
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 679e59ca7032..a0add2ef007d 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -167,9 +167,9 @@ <h2>${_("Current Courses")}</h2>
           <article class="course ${enrollment.mode}">
             <%
               if waffle.flag_is_active(request, 'merge_course_tabs'):
-                course_target = reverse('courseware', args=[course.id])
+                  course_target = reverse('courseware', args=[course.id])
               else:
-                course_target = reverse('info', args=[course.id])
+                  course_target = reverse('info', args=[course.id])
             %>
 
             % if course.id in show_courseware_links_for:

From d225b85d1a9da216e7801e27f8df246e5f565e0c Mon Sep 17 00:00:00 2001
From: Nick Parlante <nick.parlante@cs.stanford.edu>
Date: Tue, 24 Sep 2013 12:59:19 -0700
Subject: [PATCH 58/92] Port get-anonymized-id feature to new instructor
 dashboard

---
 lms/djangoapps/instructor/tests/test_api.py   | 13 ++++
 .../instructor/tests/test_legacy_anon_csv.py  | 71 +++++++++++++++++++
 lms/djangoapps/instructor/views/api.py        | 34 +++++++++
 lms/djangoapps/instructor/views/api_urls.py   |  2 +
 .../instructor/views/instructor_dashboard.py  |  1 +
 lms/djangoapps/instructor/views/legacy.py     |  2 +-
 .../instructor_dashboard/data_download.coffee |  6 ++
 .../instructor_dashboard_2/data_download.html |  2 +
 .../instructor_dashboard_2.html               | 13 ++++
 9 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 lms/djangoapps/instructor/tests/test_legacy_anon_csv.py

diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index cd0b230423cb..c5b1b21b52e7 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -446,6 +446,19 @@ def test_get_students_features(self):
             self.assertEqual(student_json['username'], student.username)
             self.assertEqual(student_json['email'], student.email)
 
+    def test_get_anon_ids(self):
+        """
+        Test the CSV output for the anonymized user ids.
+        """
+        url = reverse('get_anon_ids', kwargs={'course_id': self.course.id})
+        with patch('instructor.views.api.unique_id_for_user') as mock_unique:
+            mock_unique.return_value = '42'
+            response = self.client.get(url, {})
+        self.assertEqual(response['Content-Type'], 'text/csv')
+        body = response.content.replace('\r', '')
+        self.assertTrue(body.startswith('"User ID","Anonymized user ID"\n"2","42"\n'))
+        self.assertTrue(body.endswith('"7","42"\n'))
+
     def test_get_students_features_csv(self):
         """
         Test that some minimum of information is formatted
diff --git a/lms/djangoapps/instructor/tests/test_legacy_anon_csv.py b/lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
new file mode 100644
index 000000000000..947b72f29854
--- /dev/null
+++ b/lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
@@ -0,0 +1,71 @@
+"""
+Unit tests for instructor dashboard
+
+Based on (and depends on) unit tests for courseware.
+
+Notes for running by hand:
+
+./manage.py lms --settings test test lms/djangoapps/instructor
+"""
+
+from django.test.utils import override_settings
+
+# Need access to internal func to put users in the right group
+from django.contrib.auth.models import Group, User
+
+from django.core.urlresolvers import reverse
+
+from courseware.access import _course_staff_group_name
+from courseware.tests.helpers import LoginEnrollmentTestCase
+from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.django import modulestore, clear_existing_modulestores
+import xmodule.modulestore.django
+
+from mock import patch
+
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+class TestInstructorDashboardAnonCSV(ModuleStoreTestCase, LoginEnrollmentTestCase):
+    '''
+    Check for download of csv
+    '''
+
+    # Note -- I copied this setUp from a similar test
+    def setUp(self):
+        clear_existing_modulestores()
+        self.toy = modulestore().get_course("edX/toy/2012_Fall")
+
+        # Create two accounts
+        self.student = 'view@test.com'
+        self.instructor = 'view2@test.com'
+        self.password = 'foo'
+        self.create_account('u1', self.student, self.password)
+        self.create_account('u2', self.instructor, self.password)
+        self.activate_user(self.student)
+        self.activate_user(self.instructor)
+
+        def make_instructor(course):
+            """ Create an instructor for the course. """
+            group_name = _course_staff_group_name(course.location)
+            group = Group.objects.create(name=group_name)
+            group.user_set.add(User.objects.get(email=self.instructor))
+
+        make_instructor(self.toy)
+
+        self.logout()
+        self.login(self.instructor, self.password)
+        self.enroll(self.toy)
+
+    def test_download_anon_csv(self):
+        course = self.toy
+        url = reverse('instructor_dashboard', kwargs={'course_id': course.id})
+
+        with patch('instructor.views.legacy.unique_id_for_user') as mock_unique:
+            mock_unique.return_value = 42
+            response = self.client.post(url, {'action': 'Download CSV of all student anonymized IDs'})
+
+        self.assertEqual(response['Content-Type'], 'text/csv')
+        body = response.content.replace('\r', '')
+        self.assertEqual(body, '"User ID","Anonymized user ID"\n"2","42"\n')
+
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 6c68b7fed65d..8a552feb66f0 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -28,6 +28,7 @@
                                           FORUM_ROLE_COMMUNITY_TA)
 
 from courseware.models import StudentModule
+from student.models import unique_id_for_user
 import instructor_task.api
 from instructor_task.api_helper import AlreadyRunningError
 import instructor.enrollment as enrollment
@@ -37,6 +38,7 @@
 import analytics.basic
 import analytics.distributions
 import analytics.csvs
+import csv
 
 log = logging.getLogger(__name__)
 
@@ -368,6 +370,38 @@ def get_students_features(request, course_id, csv=False):  # pylint: disable=W06
         return analytics.csvs.create_csv_response("enrolled_profiles.csv", header, datarows)
 
 
+@ensure_csrf_cookie
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+@require_level('staff')
+def get_anon_ids(request, course_id):  # pylint: disable=W0613
+    """
+    Respond with 2-column CSV output of user-id, anonymized-user-id
+    """
+    # TODO: the User.objects query and CSV generation here could be
+    # centralized into analytics. Currently analytics has similar functionality
+    # but not quite what's needed.
+    def csv_response(filename, header, rows):
+        """Returns a CSV http response for the given header and rows (excel/utf-8)."""
+        response = HttpResponse(mimetype='text/csv')
+        response['Content-Disposition'] = 'attachment; filename={0}'.format(filename)
+        writer = csv.writer(response, dialect='excel', quotechar='"', quoting=csv.QUOTE_ALL)
+        # In practice, there should not be non-ascii data in this query,
+        # but trying to do the right thing anyway.
+        encoded = [unicode(s).encode('utf-8') for s in header]
+        writer.writerow(encoded)
+        for row in rows:
+            encoded = [unicode(s).encode('utf-8') for s in row]
+            writer.writerow(encoded)
+        return response
+
+    students = User.objects.filter(
+        courseenrollment__course_id=course_id,
+    ).order_by('id')
+    header =['User ID', 'Anonymized user ID']
+    rows = [[s.id, unique_id_for_user(s)] for s in students]
+    return csv_response(course_id.replace('/', '-') + '-anon-ids.csv', header, rows)
+
+
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
 @require_level('staff')
diff --git a/lms/djangoapps/instructor/views/api_urls.py b/lms/djangoapps/instructor/views/api_urls.py
index 8c67c24a7748..07af69558f40 100644
--- a/lms/djangoapps/instructor/views/api_urls.py
+++ b/lms/djangoapps/instructor/views/api_urls.py
@@ -16,6 +16,8 @@
         'instructor.views.api.get_grading_config', name="get_grading_config"),
     url(r'^get_students_features(?P<csv>/csv)?$',
         'instructor.views.api.get_students_features', name="get_students_features"),
+    url(r'^get_anon_ids$',
+        'instructor.views.api.get_anon_ids', name="get_anon_ids"),
     url(r'^get_distribution$',
         'instructor.views.api.get_distribution', name="get_distribution"),
     url(r'^get_student_progress_url$',
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 9a1bea222ea6..031eac266bfe 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -133,6 +133,7 @@ def _section_data_download(course_id):
         'section_display_name': _('Data Download'),
         'get_grading_config_url': reverse('get_grading_config', kwargs={'course_id': course_id}),
         'get_students_features_url': reverse('get_students_features', kwargs={'course_id': course_id}),
+        'get_anon_ids_url': reverse('get_anon_ids', kwargs={'course_id': course_id}),
     }
     return section_data
 
diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index df467b8637e8..c7e32a52ae45 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -591,7 +591,7 @@ def getdat(u):
 
         datatable = {'header': ['User ID', 'Anonymized user ID']}
         datatable['data'] = [[s.id, unique_id_for_user(s)] for s in students]
-        return return_csv(course_id.replace('/', '-')+'-anon-ids.csv', datatable)
+        return return_csv(course_id.replace('/', '-') + '-anon-ids.csv', datatable)
 
     #----------------------------------------
     # Group management
diff --git a/lms/static/coffee/src/instructor_dashboard/data_download.coffee b/lms/static/coffee/src/instructor_dashboard/data_download.coffee
index cfd3534e0424..ee9be4254dc9 100644
--- a/lms/static/coffee/src/instructor_dashboard/data_download.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/data_download.coffee
@@ -16,10 +16,16 @@ class DataDownload
     @$display_table          = @$display.find '.data-display-table'
     @$request_response_error = @$display.find '.request-response-error'
     @$list_studs_btn = @$section.find("input[name='list-profiles']'")
+    @$list_anon_btn = @$section.find("input[name='list-anon-ids']'")
     @$grade_config_btn = @$section.find("input[name='dump-gradeconf']'")
 
     # attach click handlers
 
+    # The list-anon case is always CSV
+    @$list_anon_btn.click (e) =>
+      url = @$list_anon_btn.data 'endpoint'
+      location.href = url
+
     # this handler binds to both the download
     # and the csv button
     @$list_studs_btn.click (e) =>
diff --git a/lms/templates/instructor/instructor_dashboard_2/data_download.html b/lms/templates/instructor/instructor_dashboard_2/data_download.html
index 196d9d580b72..c9f15bdca4e6 100644
--- a/lms/templates/instructor/instructor_dashboard_2/data_download.html
+++ b/lms/templates/instructor/instructor_dashboard_2/data_download.html
@@ -10,6 +10,8 @@
 ## <input type="button" name="list-answer-distributions" value="Answer distributions (x students got y points)">
 ## <br>
 <input type="button" name="dump-gradeconf" value="${_("Grading Configuration")}" data-endpoint="${ section_data['get_grading_config_url'] }">
+<input type="button" name="list-anon-ids" value="${_("Get Student Anonymized IDs CSV")}" data-csv="true" class="csv" data-endpoint="${ section_data['get_anon_ids_url'] }">
+
 
 <div class="data-display">
   <div class="data-display-text"></div>
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index aeb860854365..c209db0103b8 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -3,6 +3,19 @@
 <%! from django.core.urlresolvers import reverse %>
 <%namespace name='static' file='/static_content.html'/>
 
+## ----- Tips on adding something to the new instructor dashboard -----
+## 1. add your input element, e.g. in instructor_dashboard2/data_download.html
+##   the input includes a reference like data-endpoint="${ section_data['get_anon_ids_url'] }"
+## 2. Go to the old dashboard djangoapps/instructor/views/instructor_dashboard.py and
+##   add in a definition of 'xxx_url' in the right section_data for whatever page your
+##   feature is on.
+## 3. Add a url() entry in api_urls.py
+## 4. Over in lms/static/coffee/src/instructor_dashboard/ there there are .coffee files
+##   for each page which define the .js. Edit this to make your input do something
+##   when clicked. The .coffee files use the name=xx to pick out inputs, not id=
+## 5. Implement your standard django/python in lms/djangoapps/instructor/views/api.py
+## 6. And tests go in lms/djangoapps/instructor/tests/
+
 <%block name="headextra">
   <%static:css group='course'/>
   <script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>

From c64e04d8c2d8c18acb47b4ea75cc1ed55f3123cc Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Thu, 19 Sep 2013 15:50:56 -0400
Subject: [PATCH 59/92] Add the ability to lock assets.

---
 .../contentstore/features/common.py           |  47 +++
 .../contentstore/features/course-team.py      |  43 +-
 .../contentstore/features/upload.feature      |  56 +++
 .../contentstore/features/upload.py           |  73 +++-
 .../contentstore/tests/test_assets.py         |  47 ++-
 cms/djangoapps/contentstore/views/assets.py   |  92 +++--
 .../coffee/spec/views/assets_spec.coffee      |  39 +-
 cms/static/img/bg-micro-stripes.png           | Bin 0 -> 91 bytes
 cms/static/js/models/asset.js                 |   2 +-
 cms/static/js/views/asset_view.js             |  31 +-
 cms/static/sass/views/_assets.scss            | 385 ++++++++++++------
 cms/templates/asset_index.html                | 156 +++----
 cms/templates/js/asset.underscore             |  20 +-
 13 files changed, 678 insertions(+), 313 deletions(-)
 create mode 100644 cms/static/img/bg-micro-stripes.png

diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index eb666d18379e..76c56a5fdc99 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -18,6 +18,8 @@
 from terrain.browser import reset_data
 
 TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
+PASSWORD = 'test'
+EMAIL_EXTENSION = '@edx.org'
 
 
 @step('I (?:visit|access|open) the Studio homepage$')
@@ -300,3 +302,48 @@ def upload_file(filename):
     world.browser.attach_file('file', os.path.abspath(path))
     button_css = '.upload-dialog .action-upload'
     world.css_click(button_css)
+
+
+@step(u'"([^"]*)" logs in$')
+def other_user_login(step, name):
+    step.given('I log out')
+    world.visit('/')
+
+    signin_css = 'a.action-signin'
+    world.is_css_present(signin_css)
+    world.css_click(signin_css)
+
+    def fill_login_form():
+        login_form = world.browser.find_by_css('form#login_form')
+        login_form.find_by_name('email').fill(name + EMAIL_EXTENSION)
+        login_form.find_by_name('password').fill(PASSWORD)
+        login_form.find_by_name('submit').click()
+    world.retry_on_exception(fill_login_form)
+    assert_true(world.is_css_present('.new-course-button'))
+    world.scenario_dict['USER'] = get_user_by_email(name + EMAIL_EXTENSION)
+
+
+@step(u'the user "([^"]*)" exists( as a course (admin|staff member|is_staff))?$')
+def create_other_user(_step, name, has_extra_perms, role_name):
+    email = name + EMAIL_EXTENSION
+    user = create_studio_user(uname=name, password=PASSWORD, email=email)
+    if has_extra_perms:
+        if role_name == "is_staff":
+            user.is_staff = True
+        else:
+            if role_name == "admin":
+                # admins get staff privileges, as well
+                roles = ("staff", "instructor")
+            else:
+                roles = ("staff",)
+            location = world.scenario_dict["COURSE"].location
+            for role in roles:
+                groupname = get_course_groupname_for_role(location, role)
+                group, __ = Group.objects.get_or_create(name=groupname)
+                user.groups.add(group)
+        user.save()
+
+
+@step('I log out')
+def log_out(_step):
+    world.visit('logout')
diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py
index 91049b029ecd..fd39c1ae3a7c 100644
--- a/cms/djangoapps/contentstore/features/course-team.py
+++ b/cms/djangoapps/contentstore/features/course-team.py
@@ -2,14 +2,10 @@
 #pylint: disable=W0621
 
 from lettuce import world, step
-from common import create_studio_user
-from django.contrib.auth.models import Group
+from common import EMAIL_EXTENSION
 from auth.authz import get_course_groupname_for_role, get_user_by_email
 from nose.tools import assert_true, assert_in  # pylint: disable=E0611
 
-PASSWORD = 'test'
-EMAIL_EXTENSION = '@edx.org'
-
 
 @step(u'(I am viewing|s?he views) the course team settings')
 def view_grading_settings(_step, whom):
@@ -18,24 +14,6 @@ def view_grading_settings(_step, whom):
     world.css_click(link_css)
 
 
-@step(u'the user "([^"]*)" exists( as a course (admin|staff member))?$')
-def create_other_user(_step, name, has_extra_perms, role_name):
-    email = name + EMAIL_EXTENSION
-    user = create_studio_user(uname=name, password=PASSWORD, email=email)
-    if has_extra_perms:
-        location = world.scenario_dict["COURSE"].location
-        if role_name == "admin":
-            # admins get staff privileges, as well
-            roles = ("staff", "instructor")
-        else:
-            roles = ("staff",)
-        for role in roles:
-            groupname = get_course_groupname_for_role(location, role)
-            group, __ = Group.objects.get_or_create(name=groupname)
-            user.groups.add(group)
-        user.save()
-
-
 @step(u'I add "([^"]*)" to the course team')
 def add_other_user(_step, name):
     new_user_css = 'a.create-user-button'
@@ -89,25 +67,6 @@ def remove_course_team_admin(_step, outer_capture, name):
     world.css_click(admin_btn_css)
 
 
-@step(u'"([^"]*)" logs in$')
-def other_user_login(_step, name):
-    world.visit('logout')
-    world.visit('/')
-
-    signin_css = 'a.action-signin'
-    world.is_css_present(signin_css)
-    world.css_click(signin_css)
-
-    def fill_login_form():
-        login_form = world.browser.find_by_css('form#login_form')
-        login_form.find_by_name('email').fill(name + EMAIL_EXTENSION)
-        login_form.find_by_name('password').fill(PASSWORD)
-        login_form.find_by_name('submit').click()
-    world.retry_on_exception(fill_login_form)
-    assert_true(world.is_css_present('.new-course-button'))
-    world.scenario_dict['USER'] = get_user_by_email(name + EMAIL_EXTENSION)
-
-
 @step(u'I( do not)? see the course on my page')
 @step(u's?he does( not)? see the course on (his|her) page')
 def see_course(_step, do_not_see, gender='self'):
diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature
index fed8c65ca108..6a9dfda1432c 100644
--- a/cms/djangoapps/contentstore/features/upload.feature
+++ b/cms/djangoapps/contentstore/features/upload.feature
@@ -58,3 +58,59 @@ Feature: CMS.Upload Files
         And I reload the page
         And I upload the file "test"
         Then I can download the correct "test" file
+
+    # Uploading isn't working on safari with sauce labs
+    @skip_safari
+    Scenario: Users can lock assets through asset index
+        Given I have opened a new course in studio
+        And I go to the files and uploads page
+        When I upload the file "test"
+        And I lock "test"
+        Then "test" is locked
+        And I see a "saving" notification
+        And I reload the page
+        Then "test" is locked
+
+    # Uploading isn't working on safari with sauce labs
+    @skip_safari
+    Scenario: Users can unlock assets through asset index
+        Given I have opened a course with a locked asset "test"
+        And I unlock "test"
+        Then "test" is unlocked
+        And I see a "saving" notification
+        And I reload the page
+        Then "test" is unlocked
+
+    # Uploading isn't working on safari with sauce labs
+    @skip_safari
+    Scenario: Locked assets can't be viewed if logged in as unregistered user
+        Given I have opened a course with a locked asset "locked.html"
+#        Then the asset "locked.html" is viewable
+        And the user "bob" exists
+        And "bob" logs in
+        Then the asset "locked.html" is protected
+
+    # Uploading isn't working on safari with sauce labs
+    @skip_safari
+    Scenario: Locked assets can't be viewed if logged out
+        Given I have opened a course with a locked asset "locked.html"
+        And I log out
+        Then the asset "locked.html" is protected
+
+    # Uploading isn't working on safari with sauce labs
+    @skip_safari
+    Scenario: Locked assets can be viewed with is_staff account
+        Given I have opened a course with a locked asset "locked.html"
+        And the user "staff" exists as a course is_staff
+#        Then the asset "locked.html" is viewable
+
+    # Uploading isn't working on safari with sauce labs
+    @skip_safari
+    Scenario: Unlocked assets can be viewed by anyone
+        Given I have opened a course with a unlocked asset "unlocked.html"
+        Then the asset "unlocked.html" is viewable
+        And the user "bob" exists
+        And "bob" logs in
+        Then the asset "unlocked.html" is viewable
+        And I log out
+        Then the asset "unlocked.html" is viewable
diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
index d0a4e9f3660d..18ad757c2f81 100644
--- a/cms/djangoapps/contentstore/features/upload.py
+++ b/cms/djangoapps/contentstore/features/upload.py
@@ -11,6 +11,7 @@
 
 
 TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
+ASSET_NAMES_CSS = 'td.name-col > span.title > a.filename'
 
 
 @step(u'I go to the files and uploads page')
@@ -59,8 +60,7 @@ def check_not_there(_step, file_name):
     # the only file that was uploaded, our success criteria
     # will be that there are no files.
     # In the future we can refactor if necessary.
-    names_css = 'td.name-col > a.filename'
-    assert(world.is_css_not_present(names_css))
+    assert(world.is_css_not_present(ASSET_NAMES_CSS))
 
 
 @step(u'I should see the file "([^"]*)" was uploaded$')
@@ -88,11 +88,10 @@ def delete_file(_step, file_name):
 
 @step(u'I should see only one "([^"]*)"$')
 def no_duplicate(_step, file_name):
-    names_css = 'td.name-col > a.filename'
-    all_names = world.css_find(names_css)
+    all_names = world.css_find(ASSET_NAMES_CSS)
     only_one = False
     for i in range(len(all_names)):
-        if file_name == world.css_html(names_css, index=i):
+        if file_name == world.css_html(ASSET_NAMES_CSS, index=i):
             only_one = not only_one
     assert only_one
 
@@ -106,16 +105,67 @@ def check_download(_step, file_name):
         downloaded_text = r.text
         assert cur_text == downloaded_text
     #resetting the file back to its original state
+    _write_test_file(file_name, "This is an arbitrary file for testing uploads")
+
+
+def _write_test_file(file_name, text):
+    path = os.path.join(TEST_ROOT, 'uploads/', file_name)
+    #resetting the file back to its original state
     with open(os.path.abspath(path), 'w') as cur_file:
-        cur_file.write("This is an arbitrary file for testing uploads")
+        cur_file.write(text)
 
 
 @step(u'I modify "([^"]*)"$')
 def modify_upload(_step, file_name):
     new_text = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(10))
-    path = os.path.join(TEST_ROOT, 'uploads/', file_name)
-    with open(os.path.abspath(path), 'w') as cur_file:
-        cur_file.write(new_text)
+    _write_test_file(file_name, new_text)
+
+
+@step(u'I (lock|unlock) "([^"]*)"')
+def lock_unlock_file(_step, _lock_state, file_name):
+    index = get_index(file_name)
+    assert index != -1
+    lock_css = "a.lock-asset-button"
+    world.css_click(lock_css, index=index)
+
+
+@step(u'Then "([^"]*)" is (locked|unlocked)')
+def verify_lock_unlock_file(_step, file_name, lock_state):
+    index = get_index(file_name)
+    assert index != -1
+    lock_css = "a.lock-asset-button"
+    text = (world.css_find(lock_css)[index]).text
+    if lock_state == "locked":
+        assert_equal("Unlock this asset", text)
+    else:
+        assert_equal("Lock this asset", text)
+
+
+@step(u'I have opened a course with a (locked|unlocked) asset "([^"]*)"')
+def open_course_with_locked(step, lock_state, file_name):
+    step.given('I have opened a new course in studio')
+    step.given('I go to the files and uploads page')
+    _write_test_file(file_name, "test file")
+    step.given('I upload the file "' + file_name + '"')
+    if lock_state == "locked":
+        step.given('I lock "' + file_name + '"')
+        step.given('I reload the page')
+
+
+@step(u'Then the asset "([^"]*)" is (viewable|protected)')
+def view_asset(step, file_name, status):
+    url = '/c4x/MITx/999/asset/' + file_name
+    if status == 'viewable':
+        world.visit(url)
+        assert world.css_text('body') == 'test file'
+    else:
+        error_thrown = False
+        try:
+            world.visit(url)
+        except Exception as e:
+            assert e.status_code == 403
+            error_thrown = True
+        assert error_thrown
 
 
 @step('I see a confirmation that the file was deleted')
@@ -125,10 +175,9 @@ def i_see_a_delete_confirmation(_step):
 
 
 def get_index(file_name):
-    names_css = 'td.name-col > a.filename'
-    all_names = world.css_find(names_css)
+    all_names = world.css_find(ASSET_NAMES_CSS)
     for i in range(len(all_names)):
-        if file_name == world.css_html(names_css, index=i):
+        if file_name == world.css_html(ASSET_NAMES_CSS, index=i):
             return i
     return -1
 
diff --git a/cms/djangoapps/contentstore/tests/test_assets.py b/cms/djangoapps/contentstore/tests/test_assets.py
index 7dd266b3eb33..55613ea362c6 100644
--- a/cms/djangoapps/contentstore/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/tests/test_assets.py
@@ -18,6 +18,7 @@
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml_importer import import_from_xml
+import json
 
 class AssetsTestCase(CourseTestCase):
     def setUp(self):
@@ -92,7 +93,7 @@ def test_basic(self):
         location = Location(['i4x', 'foo', 'bar', 'asset', 'my_file_name.jpg'])
         thumbnail_location = Location(['i4x', 'foo', 'bar', 'asset', 'my_file_name_thumb.jpg'])
 
-        output = assets._get_asset_json("my_file", upload_date, location, thumbnail_location)
+        output = assets._get_asset_json("my_file", upload_date, location, thumbnail_location, True)
 
         self.assertEquals(output["display_name"], "my_file")
         self.assertEquals(output["date_added"], "Jun 01, 2013 at 10:30 UTC")
@@ -100,6 +101,48 @@ def test_basic(self):
         self.assertEquals(output["portable_url"], "/static/my_file_name.jpg")
         self.assertEquals(output["thumbnail"], "/i4x/foo/bar/asset/my_file_name_thumb.jpg")
         self.assertEquals(output["id"], output["url"])
+        self.assertEquals(output['locked'], True)
 
-        output = assets._get_asset_json("name", upload_date, location, None)
+        output = assets._get_asset_json("name", upload_date, location, None, False)
         self.assertIsNone(output["thumbnail"])
+
+
+class LockAssetTestCase(CourseTestCase):
+    """
+    Unit test for locking and unlocking an asset.
+    """
+
+    def test_locking(self):
+        """
+        Tests a simple locking and unlocking of an asset in the toy course.
+        """
+        def verify_asset_locked_state(locked):
+            """ Helper method to verify lock state in the contentstore """
+            asset_location = StaticContent.get_location_from_path('/c4x/edX/toy/asset/sample_static.txt')
+            content = contentstore().find(asset_location)
+            self.assertEqual(content.locked, locked)
+
+        def post_asset_update(lock):
+            """ Helper method for posting asset update. """
+            upload_date = datetime(2013, 6, 1, 10, 30, tzinfo=UTC)
+            location = Location(['c4x', 'edX', 'toy', 'asset', 'sample_static.txt'])
+            url = reverse('update_asset', kwargs={'org': 'edX', 'course': 'toy', 'name': '2012_Fall'})
+
+            resp = self.client.post(url, json.dumps(assets._get_asset_json("sample_static.txt", upload_date, location, None, lock)), "application/json")
+            self.assertEqual(resp.status_code, 201)
+            return json.loads(resp.content)
+
+        # Load the toy course.
+        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['toy'], static_content_store=contentstore(), verbose=True)
+        verify_asset_locked_state(False)
+
+        # Lock the asset
+        resp_asset = post_asset_update(True)
+        self.assertTrue(resp_asset['locked'])
+        verify_asset_locked_state(True)
+
+        # Unlock the asset
+        resp_asset = post_asset_update(False)
+        self.assertFalse(resp_asset['locked'])
+        verify_asset_locked_state(False)
diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py
index 3d5704b869c6..ea2ee1696910 100644
--- a/cms/djangoapps/contentstore/views/assets.py
+++ b/cms/djangoapps/contentstore/views/assets.py
@@ -60,7 +60,8 @@ def asset_index(request, org, course, name):
         _thumbnail_location = asset.get('thumbnail_location', None)
         thumbnail_location = Location(_thumbnail_location) if _thumbnail_location is not None else None
 
-        asset_json.append(_get_asset_json(asset['displayname'], asset['uploadDate'], asset_location, thumbnail_location))
+        asset_locked = asset.get('locked', False)
+        asset_json.append(_get_asset_json(asset['displayname'], asset['uploadDate'], asset_location, thumbnail_location, asset_locked))
 
     return render_to_response('asset_index.html', {
         'context_course': course_module,
@@ -136,63 +137,75 @@ def upload_asset(request, org, course, coursename):
     # readback the saved content - we need the database timestamp
     readback = contentstore().find(content.location)
 
+    locked = getattr(content, 'locked', False)
     response_payload = {
-        'asset': _get_asset_json(content.name, readback.last_modified_at, content.location, content.thumbnail_location),
+        'asset': _get_asset_json(content.name, readback.last_modified_at, content.location, content.thumbnail_location, locked),
         'msg': _('Upload completed')
     }
 
     return JsonResponse(response_payload)
 
 
-@require_http_methods(("DELETE",))
+@require_http_methods(("DELETE", "POST", "PUT"))
 @login_required
 @ensure_csrf_cookie
 def update_asset(request, org, course, name, asset_id):
     """
     restful CRUD operations for a course asset.
-    Currently only the DELETE method is implemented.
+    Currently only DELETE, POST, and PUT methods are implemented.
 
     org, course, name: Attributes of the Location for the item to edit
     asset_id: the URL of the asset (used by Backbone as the id)
     """
-    get_location_and_verify_access(request, org, course, name)
-
-    # make sure the location is valid
-    try:
-        loc = StaticContent.get_location_from_path(asset_id)
-    except InvalidLocationError as err:
-        # return a 'Bad Request' to browser as we have a malformed Location
-        return JsonResponse({"error": err.message}, status=400)
-
-    # also make sure the item to delete actually exists
-    try:
-        content = contentstore().find(loc)
-    except NotFoundError:
-        return JsonResponse(status=404)
-
-    # ok, save the content into the trashcan
-    contentstore('trashcan').save(content)
-
-    # see if there is a thumbnail as well, if so move that as well
-    if content.thumbnail_location is not None:
+    def get_asset_location(asset_id):
+        """ Helper method to get the location (and verify it is valid). """
         try:
-            thumbnail_content = contentstore().find(content.thumbnail_location)
-            contentstore('trashcan').save(thumbnail_content)
-            # hard delete thumbnail from origin
-            contentstore().delete(thumbnail_content.get_id())
-            # remove from any caching
-            del_cached_content(thumbnail_content.location)
-        except:
-            logging.warning('Could not delete thumbnail: ' + content.thumbnail_location)
-
-    # delete the original
-    contentstore().delete(content.get_id())
-    # remove from cache
-    del_cached_content(content.location)
-    return JsonResponse()
+            return StaticContent.get_location_from_path(asset_id)
+        except InvalidLocationError as err:
+            # return a 'Bad Request' to browser as we have a malformed Location
+            return JsonResponse({"error": err.message}, status=400)
 
+    get_location_and_verify_access(request, org, course, name)
 
-def _get_asset_json(display_name, date, location, thumbnail_location):
+    if request.method == 'DELETE':
+        loc = get_asset_location(asset_id)
+        # Make sure the item to delete actually exists.
+        try:
+            content = contentstore().find(loc)
+        except NotFoundError:
+            return JsonResponse(status=404)
+
+        # ok, save the content into the trashcan
+        contentstore('trashcan').save(content)
+
+        # see if there is a thumbnail as well, if so move that as well
+        if content.thumbnail_location is not None:
+            try:
+                thumbnail_content = contentstore().find(content.thumbnail_location)
+                contentstore('trashcan').save(thumbnail_content)
+                # hard delete thumbnail from origin
+                contentstore().delete(thumbnail_content.get_id())
+                # remove from any caching
+                del_cached_content(thumbnail_content.location)
+            except:
+                logging.warning('Could not delete thumbnail: ' + content.thumbnail_location)
+
+        # delete the original
+        contentstore().delete(content.get_id())
+        # remove from cache
+        del_cached_content(content.location)
+        return JsonResponse()
+
+    elif request.method in ('PUT', 'POST'):
+        # We don't support creation of new assets through this
+        # method-- just changing the locked state.
+        modified_asset = json.loads(request.body)
+        asset_id = modified_asset['url']
+        contentstore().set_attr(get_asset_location(asset_id), 'locked', modified_asset['locked'])
+        return JsonResponse(modified_asset, status=201)
+
+
+def _get_asset_json(display_name, date, location, thumbnail_location, locked):
     """
     Helper method for formatting the asset information to send to client.
     """
@@ -203,6 +216,7 @@ def _get_asset_json(display_name, date, location, thumbnail_location):
         'url': asset_url,
         'portable_url': StaticContent.get_static_path_from_location(location),
         'thumbnail': StaticContent.get_url_path_from_location(thumbnail_location) if thumbnail_location is not None else None,
+        'locked': locked,
         # Needed for Backbone delete/update.
         'id': asset_url
     }
diff --git a/cms/static/coffee/spec/views/assets_spec.coffee b/cms/static/coffee/spec/views/assets_spec.coffee
index f4f67f682c69..dd06491af500 100644
--- a/cms/static/coffee/spec/views/assets_spec.coffee
+++ b/cms/static/coffee/spec/views/assets_spec.coffee
@@ -8,6 +8,8 @@ describe "CMS.Views.Asset", ->
         appendSetFixtures(sandbox({id: "page-prompt"}))
         @model = new CMS.Models.Asset({display_name: "test asset", url: 'actual_asset_url', portable_url: 'portable_url', date_added: 'date', thumbnail: null, id: 'id'})
         spyOn(@model, "destroy").andCallThrough()
+        spyOn(@model, "save").andCallThrough()
+
         @collection = new CMS.Models.AssetCollection([@model])
         @collection.url = "update-asset-url"
         @view = new CMS.Views.Asset({model: @model})
@@ -35,7 +37,10 @@ describe "CMS.Views.Asset", ->
             @xhr = sinon.useFakeXMLHttpRequest()
             @xhr.onCreate = (xhr) -> requests.push(xhr)
 
-            @savingSpies = spyOnConstructor(CMS.Views.Notification, "Confirmation", ["show"])
+            @confirmationSpies = spyOnConstructor(CMS.Views.Notification, "Confirmation", ["show"])
+            @confirmationSpies.show.andReturn(@confirmationSpies)
+
+            @savingSpies = spyOnConstructor(CMS.Views.Notification, "Mini", ["show", "hide"])
             @savingSpies.show.andReturn(@savingSpies)
 
         afterEach ->
@@ -49,13 +54,13 @@ describe "CMS.Views.Asset", ->
             # AJAX request has been sent, but not yet returned
             expect(@model.destroy).toHaveBeenCalled()
             expect(@requests.length).toEqual(1)
-            expect(@savingSpies.constructor).not.toHaveBeenCalled()
+            expect(@confirmationSpies.constructor).not.toHaveBeenCalled()
             expect(@collection.contains(@model)).toBeTruthy()
             # return a success response
             @requests[0].respond(200)
-            expect(@savingSpies.constructor).toHaveBeenCalled()
-            expect(@savingSpies.show).toHaveBeenCalled()
-            savingOptions = @savingSpies.constructor.mostRecentCall.args[0]
+            expect(@confirmationSpies.constructor).toHaveBeenCalled()
+            expect(@confirmationSpies.show).toHaveBeenCalled()
+            savingOptions = @confirmationSpies.constructor.mostRecentCall.args[0]
             expect(savingOptions.title).toMatch("Your file has been deleted.")
             expect(@collection.contains(@model)).toBeFalsy()
 
@@ -68,9 +73,31 @@ describe "CMS.Views.Asset", ->
             expect(@model.destroy).toHaveBeenCalled()
             # return an error response
             @requests[0].respond(404)
-            expect(@savingSpies.constructor).not.toHaveBeenCalled()
+            expect(@confirmationSpies.constructor).not.toHaveBeenCalled()
             expect(@collection.contains(@model)).toBeTruthy()
 
+        it "should lock the asset on confirmation", ->
+            @view.render().$(".lock-asset-button").click()
+            # AJAX request has been sent, but not yet returned
+            expect(@model.save).toHaveBeenCalled()
+            expect(@requests.length).toEqual(1)
+            expect(@savingSpies.constructor).toHaveBeenCalled()
+            expect(@savingSpies.show).toHaveBeenCalled()
+            savingOptions = @savingSpies.constructor.mostRecentCall.args[0]
+            expect(savingOptions.title).toMatch("Saving...")
+            expect(@model.get("locked")).toBeFalsy()
+            # return a success response
+            @requests[0].respond(200)
+            expect(@savingSpies.hide).toHaveBeenCalled()
+            expect(@model.get("locked")).toBeTruthy()
+
+        it "should not lock the asset if server errors", ->
+            @view.render().$(".lock-asset-button").click()
+            # return an error response
+            @requests[0].respond(404)
+            # Don't call hide because that closes the notification showing the server error.
+            expect(@savingSpies.hide).not.toHaveBeenCalled()
+            expect(@model.get("locked")).toBeFalsy()
 
 describe "CMS.Views.Assets", ->
     beforeEach ->
diff --git a/cms/static/img/bg-micro-stripes.png b/cms/static/img/bg-micro-stripes.png
new file mode 100644
index 0000000000000000000000000000000000000000..4987c73b6eb381295d633e182e99212a595b863d
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=lssJ=LpY+7QyiGm&(B+%-ty5=
oCOP@B+XjXn<|JdKVh1LMo8Ek{AGNb}0aY`2y85}Sb4q9e0K8Hdwg3PC

literal 0
HcmV?d00001

diff --git a/cms/static/js/models/asset.js b/cms/static/js/models/asset.js
index 080f5a5e5e16..6aad5135cf8b 100644
--- a/cms/static/js/models/asset.js
+++ b/cms/static/js/models/asset.js
@@ -8,6 +8,6 @@ CMS.Models.Asset = Backbone.Model.extend({
         date_added: "",
         url: "",
         portable_url: "",
-        is_locked: false
+        locked: false
     }
 });
diff --git a/cms/static/js/views/asset_view.js b/cms/static/js/views/asset_view.js
index c11609e6801f..0a2569a66958 100644
--- a/cms/static/js/views/asset_view.js
+++ b/cms/static/js/views/asset_view.js
@@ -1,27 +1,38 @@
 CMS.Views.Asset = Backbone.View.extend({
     initialize: function() {
         this.template = _.template($("#asset-tpl").text());
+        this.listenTo(this.model, "change", this.render);
     },
 
     tagName: "tr",
 
     events: {
-        "click .remove-asset-button": "confirmDelete"
+        "click .remove-asset-button": "confirmDelete",
+        "click .lock-asset-button": "lockAsset"
     },
 
     render: function() {
+        this.$el.removeClass();
+
         this.$el.html(this.template({
             display_name: this.model.get('display_name'),
             thumbnail: this.model.get('thumbnail'),
             date_added: this.model.get('date_added'),
             url: this.model.get('url'),
-            portable_url: this.model.get('portable_url')}));
+            portable_url: this.model.get('portable_url'),
+            locked: this.model.get('locked')}));
+
+        // Add a class of "locked" to the tr element if appropriate.
+        if (this.model.get('locked')) {
+            this.$el.addClass('is-locked');
+        }
+
         return this;
     },
 
     confirmDelete: function(e) {
         if(e && e.preventDefault) { e.preventDefault(); }
-        var asset = this.model, collection = this.model.collection;
+        var asset = this.model;
         new CMS.Views.Prompt.Warning({
             title: gettext("Delete File Confirmation"),
             message: gettext("Are you sure you wish to delete this item. It cannot be reversed!\n\nAlso any content that links/refers to this item will no longer work (e.g. broken images and/or links)"),
@@ -53,5 +64,19 @@ CMS.Views.Asset = Backbone.View.extend({
                 ]
             }
         }).show();
+    },
+
+    lockAsset: function(e) {
+        if(e && e.preventDefault) { e.preventDefault(); }
+        var asset = this.model;
+        var saving = new CMS.Views.Notification.Mini({
+            title: gettext("Saving&hellip;")
+        }).show();
+        asset.save({'locked': !asset.get('locked')}, {
+            wait: true, // This means we won't re-render until we get back the success state.
+            success: function() {
+                saving.hide();
+            }
+        });
     }
 });
diff --git a/cms/static/sass/views/_assets.scss b/cms/static/sass/views/_assets.scss
index a293b1846bb4..7c24224714f9 100644
--- a/cms/static/sass/views/_assets.scss
+++ b/cms/static/sass/views/_assets.scss
@@ -3,204 +3,331 @@
 
 body.course.uploads {
 
+  .content-primary, .content-supplementary {
+    @include box-sizing(border-box);
+    float: left;
+  }
+
+  .content-primary {
+    width: flex-grid(9, 12);
+    margin-right: flex-gutter();
+
+    .no-assets-content {
+      @extend %ui-well;
+      padding: ($baseline*2);
+      background-color: $gray-l4;
+      text-align: center;
+      color: $gray;
+
+      .new-button {
+        @extend %t-copy-sub1;
+        margin-left: $baseline;
+
+        [class^="icon-"] {
+          margin-right: ($baseline/2);
+        }
+      }
+    }
+  }
+
+  .content-supplementary {
+    width: flex-grid(3, 12);
+  }
 
   .nav-actions {
 
     .icon-cloud-upload {
-      @include font-size(16);
+      @extend %t-copy;
       vertical-align: bottom;
       margin-right: ($baseline/5);
     }
 
   }
 
-  input.asset-search-input {
-    float: left;
-    width: 260px;
-    background-color: #fff;
-  }
-
-
   .asset-library {
     @include clearfix;
 
     table {
       width: 100%;
-      border-radius: 3px 3px 0 0;
-      border: 1px solid #c5cad4;
+      border-top: 5px solid $gray-l4;
+      word-wrap: break-word;
+
+
+      thead tr {
+      }
 
-      td,
       th {
-        padding: 10px 20px;
+        @extend %t-copy-sub2;
+        background-color: $gray-l5;
+        color: $gray;
+        padding: ($baseline*.75) $baseline;
         text-align: left;
         vertical-align: middle;
       }
 
-      thead th {
-        @include linear-gradient(top, transparent, rgba(0, 0, 0, .1));
-        background-color: #ced2db;
-        font-size: 12px;
-        font-weight: 700;
-        text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
+      td {
+        padding: ($baseline/2);
+        text-align: left;
+        vertical-align: middle;
       }
 
       tbody {
-        background: #fff;
+        box-shadow: 0 2px 5px $shadow;
+        border: 1px solid $gray-l4;
+        background: $white;
 
         tr {
-          border-top: 1px solid #c5cad4;
+          @include transition(all $tmg-f2 ease-in-out 0s);
+          border-top: 1px solid $gray-l4;
 
           &:first-child {
             border-top: none;
           }
+
+          &:nth-child(odd) {
+            background-color: $gray-l6;
+          }
+
+          a {
+            color: $gray-d1;
+
+            &:hover {
+              color: $blue;
+            }
+          }
+
+          &.is-locked {
+            background: $gray-l5 url('../img/bg-micro-stripes.png') 0 0 repeat;
+
+            .locked a {
+              background-color: $gray;
+              color: $white;
+
+              &:hover {
+                background-color: $gray-d3;
+              }
+            }
+          }
+
+          &:hover {
+            background-color: $blue-l5;
+
+            .date-col,
+            .embed-col,
+            .embed-col .embeddable-xml-input {
+              color: $gray;
+            }
+          }
+
+
         }
 
-        .name-col {
-          font-size: 14px;
+        .thumb-cols {
+          padding: ($baseline/2) $baseline;
+          width: 100px;
         }
 
-        .date-col {
-          font-size: 12px;
+        .name-cols {
+          width: 250px;
         }
-      }
 
-      .thumb-col {
-        width: 100px;
-      }
+        .date-cols {
+          width: 100px;
+        }
 
-      .date-col {
-        width: 220px;
-      }
+        .embed-cols {
+          width: 200px;
+        }
 
-      .embed-col {
-        width: 250px;
-      }
+        .actions-cols {
+          width: ($baseline*3);
+          padding: ($baseline/2);
+        }
 
-      .delete-col {
-        width: 20px;
-      }
+        .thumb-col {
+          overflow: hidden;
 
-      .embeddable-xml-input {
-        box-shadow: none;
-        width: 100%;
-      }
+          .thumb {
+            width: $baseline*5;
 
-      .thumb {
-        width: 100px;
-        max-height: 80px;
+            img {
+              width: 100%;
+            }
+          }
+        }
 
-        img {
-          width: 100%;
+        .name-col {
+          @extend %t-copy-sub1;
+          text-overflow: ellipsis;
+
+          .title {
+            display: inline-block;
+            max-width: 200px;
+            overflow: hidden;
+          }
         }
-      }
-    }
 
-    .pagination {
-      float: right;
-      margin: 15px 10px;
+        .date-col {
+          @include transition(all $tmg-f2 ease-in-out 0s);
+          @extend %t-copy-sub2;
+          color: $gray-l2;
+        }
 
-      ol, li {
-        display: inline;
-      }
+        .embed-col {
+          @include transition(all $tmg-f2 ease-in-out 0s);
+          padding-left: ($baseline*.75);
+          color: $gray-l2;
+
+          .embeddable-xml-input {
+            @extend %t-copy-sub2;
+            box-shadow: none;
+            border: none;
+            background: none;
+            width: 100%;
+            color: $gray-l2;
+
+            &:focus {
+              background-color: $white;
+              box-shadow: 0 1px 5px $shadow-l1 inset;
+              border: 1px solid $gray-l3;
+            }
+          }
+        }
 
-      a {
-        display: inline-block;
-        height: 25px;
-        padding: 0 4px;
-        text-align: center;
-        line-height: 25px;
+        .actions-col {
+          text-align: center;
+        }
       }
     }
   }
-    .show-xml {
-    @include blue-button;
-  }
-}
 
-.upload-modal {
-  display: none;
-  width: 640px !important;
-  margin-left: -320px !important;
+  .action-item {
+    display: inline-block;
+    margin: ($baseline/4) 0 ($baseline/4) ($baseline/4);
 
-  .modal-body {
-    height: auto !important;
-    overflow-y: auto !important;
-    text-align: center;
-  }
+    .action-button {
+      @include transition(all $tmg-f2 ease-in-out 0s);
+      display: block;
+      height: ($baseline*1.5);
+      width: ($baseline*1.5);
+      border-radius: 3px;
+      color: $gray-l3;
+
+      &:hover {
+        background-color: $gray-l3;
+        color: $gray-l6;
+      }
+    }
 
-  .file-input {
-    display: none;
+    [class^="icon-"] {
+      display: inline-block;
+      vertical-align: bottom;
+    }
   }
 
-  .choose-file-button {
+
+  .show-xml {
     @include blue-button;
-    padding: 10px 82px 12px;
-    font-size: 17px;
   }
 
-  .progress-bar {
+
+  .upload-modal {
     display: none;
-    width: 350px;
-    height: 50px;
-    margin: 30px auto 10px;
-    border: 1px solid $blue;
+    width: 640px !important;
+    margin-left: -320px !important;
 
-    &.loaded {
-      border-color: #66b93d;
+    .modal-body {
+      height: auto !important;
+      overflow-y: auto !important;
+      text-align: center;
+    }
+
+    .title {
+      @extend %t-title3;
+      float: none;
+      margin: ($baseline*2) 0 ($baseline*1.5);
+      font-weight: 300;
+    }
 
-      .progress-fill {
-        background: #66b93d;
+    .file-input {
+      display: none;
+    }
+
+    .choose-file-button {
+      @include blue-button;
+      padding: 10px 82px 12px;
+      font-size: 17px;
+    }
+
+    .progress-bar {
+      display: none;
+      width: ($baseline*15);
+      height: 35px;
+      margin: ($baseline) auto;
+      border: 1px solid $green;
+      border-radius: ($baseline*2);
+
+      &.loaded {
+        border-color: #66b93d;
+
+        .progress-fill {
+          background: #66b93d;
+        }
       }
     }
-  }
 
-  .progress-fill {
-    width: 0%;
-    height: 50px;
-    background: $blue;
-    color: #fff;
-    line-height: 48px;
-  }
+    .progress-fill {
+      @extend %t-copy-sub1;
+      width: 0%;
+      height: ($baseline*1.5);
+      border-radius: ($baseline*2);
+      background: $green;
+      padding-top: ($baseline/4);
+      color: #fff;
+    }
 
-  h1 {
-    float: none;
-    margin: 40px 0 30px;
-    font-size: 34px;
-    font-weight: 300;
-  }
+    .close-button {
+      @include transition(color $tmg-f2 ease-in-out 0s);
+      position: absolute;
+      top: 0;
+      right: 15px;
+      padding: 0 !important;
+      border-radius: 17px !important;
+      line-height: 29px;
+      text-align: center;
+      border: none;
+      background: none;
+
+      [class^="icon-"] {
+        @extend %t-action1;
+      }
 
-  .close-button {
-    @include white-button;
-    position: absolute;
-    top: 0;
-    right: 15px;
-    width: 29px;
-    height: 29px;
-    padding: 0 !important;
-    border-radius: 17px !important;
-    line-height: 29px;
-    text-align: center;
-  }
+      &:hover {
+        background: none;
+        color: $blue;
+      }
+    }
 
-  .embeddable {
-    display: none;
-    margin: 30px 0 130px;
+    .embeddable {
+      display: none;
+      margin: 30px 0 130px;
 
-    label {
-      display: block;
-      margin-bottom: 10px;
-      font-weight: 700;
+      label {
+        display: block;
+        margin-bottom: 10px;
+        font-weight: 700;
+      }
     }
-  }
 
-  .embeddable-xml-input {
-    box-shadow: none;
-    width: 400px;
-  }
+    .embeddable-xml-input {
+      box-shadow: none;
+      width: 400px;
+    }
 
-  .copy-button {
-    @include white-button;
-    display: none;
-    margin-bottom: 100px;
+    .copy-button {
+      @include white-button;
+      display: none;
+      margin-bottom: 100px;
+    }
   }
 }
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 790266fb3071..4dc43487bedd 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -1,8 +1,9 @@
 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
 <%! from django.utils.translation import ugettext as _ %>
-<%block name="bodyclass">is-signedin course uploads</%block>
+
 <%block name="title">${_("Files &amp; Uploads")}</%block>
+<%block name="bodyclass">is-signedin course uploads</%block>
 
 <%namespace name='static' file='static_content.html'/>
 
@@ -27,80 +28,85 @@
 
 <%block name="content">
 
-  <div class="wrapper-mast wrapper">
+<div class="wrapper-mast wrapper">
     <header class="mast has-actions has-subtitle">
-      <h1 class="page-header">
-        <small class="subtitle">${_("Content")}</small>
-        <span class="sr">&gt; </span>${_("Files &amp; Uploads")}
-      </h1>
-
-      <nav class="nav-actions">
-        <h3 class="sr">${_("Page Actions")}</h3>
-        <ul>
-          <li class="nav-item">
-            <a href="#" class="button upload-button new-button"><i class="icon-plus"></i> ${_("Upload New File")}</a>
-          </li>
-        </ul>
-      </nav>
-    </header>
-  </div>
-
-  <div class="main-wrapper">
-    <div class="inner-wrapper">
-      <div class="page-actions">
-        <input type="text" class="asset-search-input search wip-box" placeholder="search assets" style="display:none"/>
-      </div>
-      <article class="asset-library">
-        <table>
-          <thead>
-            <tr>
-              <th class="thumb-col"></th>
-              <th class="name-col">Name</th>
-              <th class="date-col">Date Added</th>
-              <th class="embed-col">URL</th>
-              <th class="delete-col"></th>
-            </tr>
-          </thead>
-          <tbody id="asset_table_body" >
-
-          </tbody>
-        </table>
-        <nav class="pagination wip-box">
-          Page:
-          <ol class="pages">
-            <li>1</li>
-            <li><a href="#">2</a></li>
-            <li><a href="#">3</a></li>
-            <li><a href="#">4</a></li>
-            <li><a href="#">5</a></li>
-          </ol>
-          <a href="#" class="next">»</a>
+        <h1 class="page-header">
+            <small class="subtitle">${_("Content")}</small>
+            <span class="sr">&gt; </span>${_("Files &amp; Uploads")}
+        </h1>
+
+        <nav class="nav-actions">
+            <h3 class="sr">${_("Page Actions")}</h3>
+            <ul>
+                <li class="nav-item">
+                    <a href="#" class="button upload-button new-button"><i class="icon-plus"></i> ${_("Upload New File")}</a>
+                </li>
+            </ul>
         </nav>
-      </article>
-    </div>
-  </div>
+    </header>
+</div>
 
-  <div class="upload-modal modal">
-    <a href="#" class="close-button"><span class="close-icon"></span></a>
-      <div class="modal-body">
-        <h1>${_("Upload New File")}</h1>
+<div class="wrapper-content wrapper">
+    <section class="content">
+        <article class="asset-library content-primary" role="main">
+            <table>
+                <caption class="sr">${_("List of uploaded files and assets in this course")}</caption>
+                <colgroup>
+                  <col class="thumb-cols" />
+                  <col class="name-cols" />
+                  <col class="date-cols" />
+                  <col class="embed-cols" />
+                  <col class="actions-cols" />
+                </colgroup>
+                <thead>
+                <tr>
+                    <th class="thumb-col">${_("Preview")}</th>
+                    <th class="name-col">${_("Name")}</th>
+                    <th class="date-col">${_("Date Added")}</th>
+                    <th class="embed-col">${_("URL")}</th>
+                    <th class="actions-col"><span class="sr">${_("Actions")}</span></th>
+                </tr>
+                </thead>
+                <tbody id="asset_table_body" >
+
+                </tbody>
+            </table>
+        </article>
+
+        <aside class="content-supplementary" role="complimentary">
+            <div class="bit">
+                <h3 class="title-3">${_("What files are included here?")}</h3>
+                <p>${_("Any file you upload to the course will be listed here, including your course image, textbook chapters, and any files you add directly to this page.")}</p>
+            </div>
+            <div class="bit">
+                <h3 class="title-3">${_("What can I do on this page?")}</h3>
+                <p>${_("You can click the file name to view or download the file, upload a new file, delete a file, and lock a file to prevent people who are not enrolled from accessing that specific file. You can also copy the location (URL) of a file to use elsewhere in your course.")}</p>
+            </div>
+        </aside>
+    </section>
+</div>
+
+<div class="upload-modal modal">
+    <a href="#" class="close-button"><i class="icon-remove-sign"></i> <span class="sr">${_('close')}</span></a>
+    <div class="modal-body">
+        <h1 class="title">${_("Upload New File")}</h1>
         <p class="file-name"></a>
         <div class="progress-bar">
-          <div class="progress-fill"></div>
+            <div class="progress-fill"></div>
+        </div>
+        <div class="embeddable">
+            <label>URL:</label>
+            <input type="text" class="embeddable-xml-input" value='' readonly>
         </div>
-      <div class="embeddable">
-        <label>URL:</label>
-        <input type="text" class="embeddable-xml-input" value='' readonly>
-      </div>
         <form class="file-chooser" action="${upload_asset_callback_url}"
-                                method="post" enctype="multipart/form-data">
-          <a href="#" class="choose-file-button">${_("Choose File")}</a>
-          <input type="file" class="file-input" name="file" multiple>
+              method="post" enctype="multipart/form-data">
+            <a href="#" class="choose-file-button">${_("Choose File")}</a>
+            <input type="file" class="file-input" name="file" multiple>
         </form>
-      </div>
     </div>
+</div>
 
-    <div class="modal-cover"></div>
+<div class="modal-cover"></div>
 
 
 </%block>
@@ -108,17 +114,17 @@ <h1>${_("Upload New File")}</h1>
 <%block name="view_alerts">
 <!-- alert: save confirmed with close -->
 <div class="wrapper wrapper-alert wrapper-alert-confirmation" role="status">
-  <div class="alert confirmation">
-    <i class="icon-ok"></i>
+    <div class="alert confirmation">
+        <i class="icon-ok"></i>
 
-    <div class="copy">
-      <h2 class="title title-3">${_('Your file has been deleted.')}</h2>
-    </div>
+        <div class="copy">
+            <h2 class="title title-3">${_('Your file has been deleted.')}</h2>
+        </div>
 
-    <a href="" rel="view" class="action action-alert-close">
-      <i class="icon-remove-sign"></i>
-      <span class="label">${_('close alert')}</span>
-    </a>
-  </div>
+        <a href="" rel="view" class="action action-alert-close">
+            <i class="icon-remove-sign"></i>
+            <span class="label">${_('close alert')}</span>
+        </a>
+    </div>
 </div>
 </%block>
diff --git a/cms/templates/js/asset.underscore b/cms/templates/js/asset.underscore
index a724ca889876..4116189a6f4c 100644
--- a/cms/templates/js/asset.underscore
+++ b/cms/templates/js/asset.underscore
@@ -6,7 +6,7 @@
     </div>
 </td>
 <td class="name-col">
-    <a data-tooltip="<%= gettext('Open/download this file') %>" href="<%= url %>" class="filename"><%= display_name %></a>
+    <span class="title"><a data-tooltip="<%= gettext('Open/download this file') %>" href="<%= url %>" class="filename"><%= display_name %></a></span>
 
     <div class="embeddable-xml"></div>
 </td>
@@ -16,7 +16,19 @@
 <td class="embed-col">
     <input type="text" class="embeddable-xml-input" value="<%= portable_url %>" readonly>
 </td>
-<td class="delete-col">
-    <a href="#" data-tooltip="<%= gettext('Delete this asset') %>" class="remove-asset-button"><span
-            class="delete-icon"></span></a>
+<td class="actions-col">
+    <ul>
+        <li class="action-item">
+            <a href="#" data-tooltip="<%= gettext('Delete this asset') %>" class="remove-asset-button action-button"><i class="icon-remove-sign"></i> <span class="sr"><%= gettext('Delete this asset') %></span></a>
+        </li>
+        <% if (locked) { %>
+        <li class="action-item locked">
+            <a href="#" data-tooltip="<%= gettext('Unlock this asset') %>" class="lock-asset-button action-button"><i class="icon-lock"></i> <span class="sr"><%= gettext('Unlock this asset') %></span></a>
+        </li>
+        <% } else { %>
+        <li class="action-item">
+            <a href="#" data-tooltip="<%= gettext('Lock this asset') %>" class="lock-asset-button action-button"><i class="icon-unlock-alt"></i> <span class="sr"><%= gettext('Lock this asset') %></span></a>
+        </li>
+        <% }%>
+    </ul>
 </td>

From 370872f27491e8b3c0d5e77a70666cb507e4ffe2 Mon Sep 17 00:00:00 2001
From: Frances Botsford <frances@edx.org>
Date: Tue, 24 Sep 2013 16:53:23 -0400
Subject: [PATCH 60/92] ui changes from design team feedback on studio assets
 page

---
 cms/static/img/bg-micro-stripes.png | Bin 91 -> 117 bytes
 cms/static/sass/views/_assets.scss  |  30 +++++++---------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/cms/static/img/bg-micro-stripes.png b/cms/static/img/bg-micro-stripes.png
index 4987c73b6eb381295d633e182e99212a595b863d..4e9cca3e3cd2296a8f306101f4f31512015daacb 100644
GIT binary patch
literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VHl8kyArj%qDGChd=GneJ+~Lpb
z(YSHrN3l6w30w|s385`(7*;Eluu61o&~ylF@n(z>v|~+hZ4qe@VPrV^NNMkjzM6QT
OISihzelF{r5}E*&XCY1i

literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=lssJ=LpY+7QyiGm&(B+%-ty5=
oCOP@B+XjXn<|JdKVh1LMo8Ek{AGNb}0aY`2y85}Sb4q9e0K8Hdwg3PC

diff --git a/cms/static/sass/views/_assets.scss b/cms/static/sass/views/_assets.scss
index 7c24224714f9..e212c2507d2b 100644
--- a/cms/static/sass/views/_assets.scss
+++ b/cms/static/sass/views/_assets.scss
@@ -11,23 +11,6 @@ body.course.uploads {
   .content-primary {
     width: flex-grid(9, 12);
     margin-right: flex-gutter();
-
-    .no-assets-content {
-      @extend %ui-well;
-      padding: ($baseline*2);
-      background-color: $gray-l4;
-      text-align: center;
-      color: $gray;
-
-      .new-button {
-        @extend %t-copy-sub1;
-        margin-left: $baseline;
-
-        [class^="icon-"] {
-          margin-right: ($baseline/2);
-        }
-      }
-    }
   }
 
   .content-supplementary {
@@ -49,7 +32,6 @@ body.course.uploads {
 
     table {
       width: 100%;
-      border-top: 5px solid $gray-l4;
       word-wrap: break-word;
 
 
@@ -60,7 +42,7 @@ body.course.uploads {
         @extend %t-copy-sub2;
         background-color: $gray-l5;
         color: $gray;
-        padding: ($baseline*.75) $baseline;
+        padding: 0 $baseline ($baseline*.75) $baseline;
         text-align: left;
         vertical-align: middle;
       }
@@ -72,7 +54,7 @@ body.course.uploads {
       }
 
       tbody {
-        box-shadow: 0 2px 5px $shadow;
+        box-shadow: 0 2px 2px $shadow-l1;
         border: 1px solid $gray-l4;
         background: $white;
 
@@ -97,14 +79,16 @@ body.course.uploads {
           }
 
           &.is-locked {
-            background: $gray-l5 url('../img/bg-micro-stripes.png') 0 0 repeat;
+            background-image: url('../img/bg-micro-stripes.png');
+            background-position: 0 0;
+            background-repeat: repeat;
 
             .locked a {
               background-color: $gray;
               color: $white;
 
               &:hover {
-                background-color: $gray-d3;
+                background-color: $blue;
               }
             }
           }
@@ -214,7 +198,7 @@ body.course.uploads {
       color: $gray-l3;
 
       &:hover {
-        background-color: $gray-l3;
+        background-color: $blue;
         color: $gray-l6;
       }
     }

From f10cf29425b5f3ec22d14963cd44508512ad894b Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Tue, 24 Sep 2013 17:33:21 -0400
Subject: [PATCH 61/92] Update upload test for what actually works now.

---
 .../contentstore/features/upload.feature      | 21 +++++++++-------
 .../contentstore/features/upload.py           | 24 +++++++++++++++++--
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature
index 6a9dfda1432c..f2578690026b 100644
--- a/cms/djangoapps/contentstore/features/upload.feature
+++ b/cms/djangoapps/contentstore/features/upload.feature
@@ -82,18 +82,22 @@ Feature: CMS.Upload Files
         Then "test" is unlocked
 
     # Uploading isn't working on safari with sauce labs
-    @skip_safari
-    Scenario: Locked assets can't be viewed if logged in as unregistered user
-        Given I have opened a course with a locked asset "locked.html"
-#        Then the asset "locked.html" is viewable
-        And the user "bob" exists
-        And "bob" logs in
-        Then the asset "locked.html" is protected
+    # TODO: work with Jay
+#    @skip_safari
+#    Scenario: Locked assets can't be viewed if logged in as unregistered user
+#        Given I have opened a course with a locked asset "locked.html"
+#        Then the asset "locked.html" can be clicked from the asset index
+#        And the user "bob" exists
+#        And "bob" logs in
+#        Then the asset "locked.html" is protected
 
     # Uploading isn't working on safari with sauce labs
     @skip_safari
     Scenario: Locked assets can't be viewed if logged out
         Given I have opened a course with a locked asset "locked.html"
+        # Note that logging out doesn't really matter at the moment-
+        # the asset will be protected because the user sent to middleware is the anonymous user.
+        # Need to work with Jay.
         And I log out
         Then the asset "locked.html" is protected
 
@@ -102,7 +106,8 @@ Feature: CMS.Upload Files
     Scenario: Locked assets can be viewed with is_staff account
         Given I have opened a course with a locked asset "locked.html"
         And the user "staff" exists as a course is_staff
-#        Then the asset "locked.html" is viewable
+        And "staff" logs in
+        Then the asset "locked.html" can be clicked from the asset index
 
     # Uploading isn't working on safari with sauce labs
     @skip_safari
diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
index 18ad757c2f81..0ea8109a5bfb 100644
--- a/cms/djangoapps/contentstore/features/upload.py
+++ b/cms/djangoapps/contentstore/features/upload.py
@@ -153,11 +153,11 @@ def open_course_with_locked(step, lock_state, file_name):
 
 
 @step(u'Then the asset "([^"]*)" is (viewable|protected)')
-def view_asset(step, file_name, status):
+def view_asset(_step, file_name, status):
     url = '/c4x/MITx/999/asset/' + file_name
     if status == 'viewable':
         world.visit(url)
-        assert world.css_text('body') == 'test file'
+        _verify_body_text()
     else:
         error_thrown = False
         try:
@@ -168,6 +168,26 @@ def view_asset(step, file_name, status):
         assert error_thrown
 
 
+@step(u'Then the asset "([^"]*)" can be clicked from the asset index')
+def click_asset_from_index(step, file_name):
+    # This is not ideal, but I'm having trouble with the middleware not having
+    # the same user in the request when I hit the URL directly.
+    course_link_css = 'a.course-link'
+    world.css_click(course_link_css)
+    step.given("I go to the files and uploads page")
+    index = get_index(file_name)
+    assert index != -1
+    world.css_click('a.filename', index=index)
+    _verify_body_text()
+
+
+def _verify_body_text():
+    def verify_text(driver):
+        return world.css_text('body') == 'test file'
+
+    world.wait_for(verify_text)
+
+
 @step('I see a confirmation that the file was deleted')
 def i_see_a_delete_confirmation(_step):
     alert_css = '#notification-confirmation'

From 7700ec68bb0edbcc53f8a1d17ace800bd61faa17 Mon Sep 17 00:00:00 2001
From: Frances Botsford <frances@edx.org>
Date: Tue, 24 Sep 2013 22:00:53 -0400
Subject: [PATCH 62/92] addressing PR sass/html comments on studio assets

---
 cms/static/sass/views/_assets.scss | 32 ++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/cms/static/sass/views/_assets.scss b/cms/static/sass/views/_assets.scss
index e212c2507d2b..c37ec1771a42 100644
--- a/cms/static/sass/views/_assets.scss
+++ b/cms/static/sass/views/_assets.scss
@@ -41,16 +41,16 @@ body.course.uploads {
       th {
         @extend %t-copy-sub2;
         background-color: $gray-l5;
-        color: $gray;
         padding: 0 $baseline ($baseline*.75) $baseline;
-        text-align: left;
         vertical-align: middle;
+        text-align: left;
+        color: $gray;
       }
 
       td {
         padding: ($baseline/2);
-        text-align: left;
         vertical-align: middle;
+        text-align: left;
       }
 
       tbody {
@@ -112,15 +112,15 @@ body.course.uploads {
         }
 
         .name-cols {
-          width: 250px;
+          width: ($baseline*12.5);
         }
 
         .date-cols {
-          width: 100px;
+          width: ($baseline*5);
         }
 
         .embed-cols {
-          width: 200px;
+          width: ($baseline*10);
         }
 
         .actions-cols {
@@ -132,7 +132,7 @@ body.course.uploads {
           overflow: hidden;
 
           .thumb {
-            width: $baseline*5;
+            width: ($baseline*5);
 
             img {
               width: 100%;
@@ -267,20 +267,17 @@ body.course.uploads {
       border-radius: ($baseline*2);
       background: $green;
       padding-top: ($baseline/4);
-      color: #fff;
+      color: $white;
     }
 
     .close-button {
       @include transition(color $tmg-f2 ease-in-out 0s);
       position: absolute;
       top: 0;
-      right: 15px;
-      padding: 0 !important;
-      border-radius: 17px !important;
-      line-height: 29px;
-      text-align: center;
+      right: ($baseline*.75);
       border: none;
       background: none;
+      padding: 0;
 
       [class^="icon-"] {
         @extend %t-action1;
@@ -288,30 +285,31 @@ body.course.uploads {
 
       &:hover {
         background: none;
+        box-shadow: none;
         color: $blue;
       }
     }
 
     .embeddable {
       display: none;
-      margin: 30px 0 130px;
+      margin: ($baseline*1.5) 0 ($baseline*4);
 
       label {
         display: block;
-        margin-bottom: 10px;
+        margin-bottom: ($baseline/2);
         font-weight: 700;
       }
     }
 
     .embeddable-xml-input {
       box-shadow: none;
-      width: 400px;
+      width: ($baseline*20);
     }
 
     .copy-button {
       @include white-button;
       display: none;
-      margin-bottom: 100px;
+      margin-bottom: ($baseline*5);
     }
   }
 }

From 6dce7f299f8b1d8d1dce0d4adb08fe5a3ff0099d Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Wed, 25 Sep 2013 09:18:30 -0400
Subject: [PATCH 63/92] Asset locking feature.

---
 CHANGELOG.rst                                       | 2 ++
 cms/djangoapps/contentstore/features/upload.feature | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9a12d0ff0aa8..443e78748261 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,6 +7,8 @@ the top.  Include a label indicating the component affected.
 
 LMS: Add split testing functionality for internal use.
 
+Studio and LMS: add ability to lock assets (cannot be viewed unless registered for class).
+
 LMS: Improved accessibility of parts of forum navigation sidebar.
 
 LMS: enhanced accessibility labeling and aria support for the discussion forum new post dropdown as well as response and comment area labeling.
diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature
index f2578690026b..e01bcf8fed59 100644
--- a/cms/djangoapps/contentstore/features/upload.feature
+++ b/cms/djangoapps/contentstore/features/upload.feature
@@ -113,9 +113,6 @@ Feature: CMS.Upload Files
     @skip_safari
     Scenario: Unlocked assets can be viewed by anyone
         Given I have opened a course with a unlocked asset "unlocked.html"
-        Then the asset "unlocked.html" is viewable
-        And the user "bob" exists
-        And "bob" logs in
-        Then the asset "unlocked.html" is viewable
+        Then the asset "unlocked.html" can be clicked from the asset index
         And I log out
         Then the asset "unlocked.html" is viewable

From 5e475c8732d96559e3c99649a5b25fe39b6bd5f0 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Wed, 25 Sep 2013 13:02:04 -0400
Subject: [PATCH 64/92] Code review feedback.

---
 cms/djangoapps/contentstore/features/common.py   | 12 +++++-------
 .../contentstore/features/course-team.py         | 13 ++++++-------
 cms/djangoapps/contentstore/features/upload.py   | 16 ++++++++--------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index 76c56a5fdc99..f3875d5dbcf3 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -18,8 +18,6 @@
 from terrain.browser import reset_data
 
 TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
-PASSWORD = 'test'
-EMAIL_EXTENSION = '@edx.org'
 
 
 @step('I (?:visit|access|open) the Studio homepage$')
@@ -315,18 +313,18 @@ def other_user_login(step, name):
 
     def fill_login_form():
         login_form = world.browser.find_by_css('form#login_form')
-        login_form.find_by_name('email').fill(name + EMAIL_EXTENSION)
-        login_form.find_by_name('password').fill(PASSWORD)
+        login_form.find_by_name('email').fill(name + '@edx.org')
+        login_form.find_by_name('password').fill("test")
         login_form.find_by_name('submit').click()
     world.retry_on_exception(fill_login_form)
     assert_true(world.is_css_present('.new-course-button'))
-    world.scenario_dict['USER'] = get_user_by_email(name + EMAIL_EXTENSION)
+    world.scenario_dict['USER'] = get_user_by_email(name + '@edx.org')
 
 
 @step(u'the user "([^"]*)" exists( as a course (admin|staff member|is_staff))?$')
 def create_other_user(_step, name, has_extra_perms, role_name):
-    email = name + EMAIL_EXTENSION
-    user = create_studio_user(uname=name, password=PASSWORD, email=email)
+    email = name + '@edx.org'
+    user = create_studio_user(uname=name, password="test", email=email)
     if has_extra_perms:
         if role_name == "is_staff":
             user.is_staff = True
diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py
index fd39c1ae3a7c..deba2d820dd4 100644
--- a/cms/djangoapps/contentstore/features/course-team.py
+++ b/cms/djangoapps/contentstore/features/course-team.py
@@ -2,7 +2,6 @@
 #pylint: disable=W0621
 
 from lettuce import world, step
-from common import EMAIL_EXTENSION
 from auth.authz import get_course_groupname_for_role, get_user_by_email
 from nose.tools import assert_true, assert_in  # pylint: disable=E0611
 
@@ -21,7 +20,7 @@ def add_other_user(_step, name):
     world.wait(0.5)
 
     email_css = 'input#user-email-input'
-    world.css_fill(email_css, name + EMAIL_EXTENSION)
+    world.css_fill(email_css, name + '@edx.org')
     if world.is_firefox():
         world.trigger_event(email_css)
     confirm_css = 'form.create-user button.action-primary'
@@ -31,7 +30,7 @@ def add_other_user(_step, name):
 @step(u'I delete "([^"]*)" from the course team')
 def delete_other_user(_step, name):
     to_delete_css = '.user-item .item-actions a.remove-user[data-id="{email}"]'.format(
-        email="{0}{1}".format(name, EMAIL_EXTENSION))
+        email="{0}{1}".format(name, '@edx.org'))
     world.css_click(to_delete_css)
     # confirm prompt
     # need to wait for the animation to be done, there isn't a good success condition that won't work both on latest chrome and jenkins
@@ -52,7 +51,7 @@ def other_delete_self(_step):
 @step(u'I make "([^"]*)" a course team admin')
 def make_course_team_admin(_step, name):
     admin_btn_css = '.user-item[data-email="{email}"] .user-actions .add-admin-role'.format(
-        email=name+EMAIL_EXTENSION)
+        email=name+'@edx.org')
     world.css_click(admin_btn_css)
 
 
@@ -61,7 +60,7 @@ def remove_course_team_admin(_step, outer_capture, name):
     if outer_capture == "myself":
         email = world.scenario_dict["USER"].email
     else:
-        email = name + EMAIL_EXTENSION
+        email = name + '@edx.org'
     admin_btn_css = '.user-item[data-email="{email}"] .user-actions .remove-admin-role'.format(
         email=email)
     world.css_click(admin_btn_css)
@@ -82,7 +81,7 @@ def see_course(_step, do_not_see, gender='self'):
 @step(u'"([^"]*)" should( not)? be marked as an admin')
 def marked_as_admin(_step, name, not_marked_admin):
     flag_css = '.user-item[data-email="{email}"] .flag-role.flag-role-admin'.format(
-        email=name+EMAIL_EXTENSION)
+        email=name+'@edx.org')
     if not_marked_admin:
         assert world.is_css_not_present(flag_css)
     else:
@@ -120,7 +119,7 @@ def can_make_course_admin(_step, can_not_make_admin, outer_capture, name):
     if outer_capture == "myself":
         email = world.scenario_dict["USER"].email
     else:
-        email = name + EMAIL_EXTENSION
+        email = name + '@edx.org'
     add_button_css = '.user-item[data-email="{email}"] .add-admin-role'.format(email=email)
     if can_not_make_admin:
         assert world.is_css_not_present(add_button_css)
diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
index 0ea8109a5bfb..405052b822b4 100644
--- a/cms/djangoapps/contentstore/features/upload.py
+++ b/cms/djangoapps/contentstore/features/upload.py
@@ -14,7 +14,7 @@
 ASSET_NAMES_CSS = 'td.name-col > span.title > a.filename'
 
 
-@step(u'I go to the files and uploads page')
+@step(u'I go to the files and uploads page$')
 def go_to_uploads(_step):
     menu_css = 'li.nav-course-courseware'
     uploads_css = 'li.nav-course-courseware-uploads a'
@@ -121,7 +121,7 @@ def modify_upload(_step, file_name):
     _write_test_file(file_name, new_text)
 
 
-@step(u'I (lock|unlock) "([^"]*)"')
+@step(u'I (lock|unlock) "([^"]*)"$')
 def lock_unlock_file(_step, _lock_state, file_name):
     index = get_index(file_name)
     assert index != -1
@@ -129,19 +129,19 @@ def lock_unlock_file(_step, _lock_state, file_name):
     world.css_click(lock_css, index=index)
 
 
-@step(u'Then "([^"]*)" is (locked|unlocked)')
+@step(u'Then "([^"]*)" is (locked|unlocked)$')
 def verify_lock_unlock_file(_step, file_name, lock_state):
     index = get_index(file_name)
     assert index != -1
     lock_css = "a.lock-asset-button"
-    text = (world.css_find(lock_css)[index]).text
+    text = world.css_text(lock_css, index=index)
     if lock_state == "locked":
         assert_equal("Unlock this asset", text)
     else:
         assert_equal("Lock this asset", text)
 
 
-@step(u'I have opened a course with a (locked|unlocked) asset "([^"]*)"')
+@step(u'I have opened a course with a (locked|unlocked) asset "([^"]*)"$')
 def open_course_with_locked(step, lock_state, file_name):
     step.given('I have opened a new course in studio')
     step.given('I go to the files and uploads page')
@@ -152,7 +152,7 @@ def open_course_with_locked(step, lock_state, file_name):
         step.given('I reload the page')
 
 
-@step(u'Then the asset "([^"]*)" is (viewable|protected)')
+@step(u'Then the asset "([^"]*)" is (viewable|protected)$')
 def view_asset(_step, file_name, status):
     url = '/c4x/MITx/999/asset/' + file_name
     if status == 'viewable':
@@ -168,7 +168,7 @@ def view_asset(_step, file_name, status):
         assert error_thrown
 
 
-@step(u'Then the asset "([^"]*)" can be clicked from the asset index')
+@step(u'Then the asset "([^"]*)" can be clicked from the asset index$')
 def click_asset_from_index(step, file_name):
     # This is not ideal, but I'm having trouble with the middleware not having
     # the same user in the request when I hit the URL directly.
@@ -188,7 +188,7 @@ def verify_text(driver):
     world.wait_for(verify_text)
 
 
-@step('I see a confirmation that the file was deleted')
+@step('I see a confirmation that the file was deleted$')
 def i_see_a_delete_confirmation(_step):
     alert_css = '#notification-confirmation'
     assert world.is_css_present(alert_css)

From 1d7f891145aeff29a612e98dc0d4916aa7ff79f1 Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Wed, 25 Sep 2013 15:24:50 -0400
Subject: [PATCH 65/92] Delete asset from cache.

---
 cms/djangoapps/contentstore/views/assets.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py
index ea2ee1696910..4f9db0bf4d58 100644
--- a/cms/djangoapps/contentstore/views/assets.py
+++ b/cms/djangoapps/contentstore/views/assets.py
@@ -201,7 +201,11 @@ def get_asset_location(asset_id):
         # method-- just changing the locked state.
         modified_asset = json.loads(request.body)
         asset_id = modified_asset['url']
-        contentstore().set_attr(get_asset_location(asset_id), 'locked', modified_asset['locked'])
+        location = get_asset_location(asset_id)
+        contentstore().set_attr(location, 'locked', modified_asset['locked'])
+        # Delete the asset from the cache so we check the lock status the next time it is requested.
+        del_cached_content(location)
+
         return JsonResponse(modified_asset, status=201)
 
 

From 79c2cdc7baebe94d710bde609a2faf5ddc0ea130 Mon Sep 17 00:00:00 2001
From: Frances Botsford <frances@edx.org>
Date: Wed, 25 Sep 2013 16:26:24 -0400
Subject: [PATCH 66/92] switching studio assets lock to use checkbox instead of
 link

---
 cms/static/sass/views/_assets.scss | 112 ++++++++++++++++-------------
 cms/templates/js/asset.underscore  |  14 ++--
 2 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/cms/static/sass/views/_assets.scss b/cms/static/sass/views/_assets.scss
index c37ec1771a42..3647f6ae47da 100644
--- a/cms/static/sass/views/_assets.scss
+++ b/cms/static/sass/views/_assets.scss
@@ -34,10 +34,6 @@ body.course.uploads {
       width: 100%;
       word-wrap: break-word;
 
-
-      thead tr {
-      }
-
       th {
         @extend %t-copy-sub2;
         background-color: $gray-l5;
@@ -82,15 +78,6 @@ body.course.uploads {
             background-image: url('../img/bg-micro-stripes.png');
             background-position: 0 0;
             background-repeat: repeat;
-
-            .locked a {
-              background-color: $gray;
-              color: $white;
-
-              &:hover {
-                background-color: $blue;
-              }
-            }
           }
 
           &:hover {
@@ -102,49 +89,21 @@ body.course.uploads {
               color: $gray;
             }
           }
-
-
-        }
-
-        .thumb-cols {
-          padding: ($baseline/2) $baseline;
-          width: 100px;
-        }
-
-        .name-cols {
-          width: ($baseline*12.5);
-        }
-
-        .date-cols {
-          width: ($baseline*5);
         }
 
-        .embed-cols {
-          width: ($baseline*10);
-        }
-
-        .actions-cols {
-          width: ($baseline*3);
-          padding: ($baseline/2);
-        }
+      .thumb-col {
+        padding: ($baseline/2) $baseline;
 
-        .thumb-col {
-          overflow: hidden;
-
-          .thumb {
-            width: ($baseline*5);
-
-            img {
-              width: 100%;
-            }
+          img {
+            width: 100%;
           }
         }
 
+
         .name-col {
-          @extend %t-copy-sub1;
-          text-overflow: ellipsis;
 
           .title {
+            @extend %t-copy-sub1;
             display: inline-block;
             max-width: 200px;
             overflow: hidden;
@@ -163,6 +122,7 @@ body.course.uploads {
           color: $gray-l2;
 
           .embeddable-xml-input {
+            @include transition(all $tmg-f2 ease-in-out 0s);
             @extend %t-copy-sub2;
             box-shadow: none;
             border: none;
@@ -179,6 +139,7 @@ body.course.uploads {
         }
 
         .actions-col {
+          padding: ($baseline/2);
           text-align: center;
         }
       }
@@ -207,14 +168,67 @@ body.course.uploads {
       display: inline-block;
       vertical-align: bottom;
     }
-  }
 
 
+    &.action-lock {
+      position: relative;
+    }
+
+    &.action-lock label {
+      position: absolute;
+      top: 0;
+      right: 0;
+      height: 30px;
+      width: 30px;
+
+      &:hover {
+        background-color: $blue;
+      }
+    }
+
+    &.action-lock .lock-checkbox {
+      position: absolute;
+      top: 0;
+      right: 0;
+      height: 30px;
+      width: 30px;
+      opacity: 0;
+    }
+
+    &.action-lock .lock-checkbox:hover ~ .action-button {
+      background-color: $blue;
+      color: $gray-l6;
+    }
+
+    &.action-lock .lock-checkbox ~ .action-button {
+      .icon-lock {
+        display: none;
+      }
+
+      .icon-unlock-alt {
+        display: inline-block;
+      }
+    }
+
+    &.action-lock .lock-checkbox:checked ~ .action-button {
+      background-color: $gray;
+      color: $white;
+
+      .icon-lock {
+        display: inline-block;
+      }
+
+     .icon-unlock-alt {
+        display: none;
+      }
+    }
+
+  }
+
   .show-xml {
     @include blue-button;
   }
 
-
   .upload-modal {
     display: none;
     width: 640px !important;
diff --git a/cms/templates/js/asset.underscore b/cms/templates/js/asset.underscore
index 4116189a6f4c..7d83935448a9 100644
--- a/cms/templates/js/asset.underscore
+++ b/cms/templates/js/asset.underscore
@@ -18,17 +18,13 @@
 </td>
 <td class="actions-col">
     <ul>
-        <li class="action-item">
+        <li class="action-item action-delete">
             <a href="#" data-tooltip="<%= gettext('Delete this asset') %>" class="remove-asset-button action-button"><i class="icon-remove-sign"></i> <span class="sr"><%= gettext('Delete this asset') %></span></a>
         </li>
-        <% if (locked) { %>
-        <li class="action-item locked">
-            <a href="#" data-tooltip="<%= gettext('Unlock this asset') %>" class="lock-asset-button action-button"><i class="icon-lock"></i> <span class="sr"><%= gettext('Unlock this asset') %></span></a>
+        <li class="action-item action-lock">
+            <label for="lock-asset"><span class="sr"><%= gettext('Lock this asset') %></span></label>
+            <input type="checkbox" name="lock-asset" class="lock-checkbox" data-tooltip="<%= gettext('Lock/unlock file') %>" />
+            <div class="action-button"><i class="icon-lock"></i><i class="icon-unlock-alt"></i></div>
         </li>
-        <% } else { %>
-        <li class="action-item">
-            <a href="#" data-tooltip="<%= gettext('Lock this asset') %>" class="lock-asset-button action-button"><i class="icon-unlock-alt"></i> <span class="sr"><%= gettext('Lock this asset') %></span></a>
-        </li>
-        <% }%>
     </ul>
 </td>

From 2cbdaaee7d7485c7cfabf2e24f2abc7c3ffb078d Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Wed, 25 Sep 2013 17:27:48 -0400
Subject: [PATCH 67/92] Updates based on switching to checkbox for locking.

---
 .../contentstore/features/upload.py           | 13 ++++-----
 .../coffee/spec/views/assets_spec.coffee      |  4 +--
 cms/static/js/views/asset_view.js             | 29 +++++++++++++------
 cms/static/sass/views/_assets.scss            |  4 +++
 cms/templates/js/asset.underscore             |  4 +--
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
index 405052b822b4..b94ccd114ae1 100644
--- a/cms/djangoapps/contentstore/features/upload.py
+++ b/cms/djangoapps/contentstore/features/upload.py
@@ -125,20 +125,17 @@ def modify_upload(_step, file_name):
 def lock_unlock_file(_step, _lock_state, file_name):
     index = get_index(file_name)
     assert index != -1
-    lock_css = "a.lock-asset-button"
-    world.css_click(lock_css, index=index)
+    lock_css = "input.lock-checkbox"
+    world.css_find(lock_css)[index].click()
 
 
 @step(u'Then "([^"]*)" is (locked|unlocked)$')
 def verify_lock_unlock_file(_step, file_name, lock_state):
     index = get_index(file_name)
     assert index != -1
-    lock_css = "a.lock-asset-button"
-    text = world.css_text(lock_css, index=index)
-    if lock_state == "locked":
-        assert_equal("Unlock this asset", text)
-    else:
-        assert_equal("Lock this asset", text)
+    lock_css = "input.lock-checkbox"
+    checked = world.css_find(lock_css)[index]._element.get_attribute('checked')
+    assert_equal(lock_state == "locked", bool(checked))
 
 
 @step(u'I have opened a course with a (locked|unlocked) asset "([^"]*)"$')
diff --git a/cms/static/coffee/spec/views/assets_spec.coffee b/cms/static/coffee/spec/views/assets_spec.coffee
index dd06491af500..bd8858da42eb 100644
--- a/cms/static/coffee/spec/views/assets_spec.coffee
+++ b/cms/static/coffee/spec/views/assets_spec.coffee
@@ -77,7 +77,7 @@ describe "CMS.Views.Asset", ->
             expect(@collection.contains(@model)).toBeTruthy()
 
         it "should lock the asset on confirmation", ->
-            @view.render().$(".lock-asset-button").click()
+            @view.render().$(".lock-checkbox").click()
             # AJAX request has been sent, but not yet returned
             expect(@model.save).toHaveBeenCalled()
             expect(@requests.length).toEqual(1)
@@ -92,7 +92,7 @@ describe "CMS.Views.Asset", ->
             expect(@model.get("locked")).toBeTruthy()
 
         it "should not lock the asset if server errors", ->
-            @view.render().$(".lock-asset-button").click()
+            @view.render().$(".lock-checkbox").click()
             # return an error response
             @requests[0].respond(404)
             # Don't call hide because that closes the notification showing the server error.
diff --git a/cms/static/js/views/asset_view.js b/cms/static/js/views/asset_view.js
index 0a2569a66958..d158ba58d83d 100644
--- a/cms/static/js/views/asset_view.js
+++ b/cms/static/js/views/asset_view.js
@@ -1,18 +1,18 @@
 CMS.Views.Asset = Backbone.View.extend({
     initialize: function() {
         this.template = _.template($("#asset-tpl").text());
-        this.listenTo(this.model, "change", this.render);
+        this.listenTo(this.model, "change:locked", this.updateLockState);
     },
 
     tagName: "tr",
 
     events: {
         "click .remove-asset-button": "confirmDelete",
-        "click .lock-asset-button": "lockAsset"
+        "click .lock-checkbox": "lockAsset"
     },
 
     render: function() {
-        this.$el.removeClass();
+        var uniqueId = _.uniqueId('lock_asset_');
 
         this.$el.html(this.template({
             display_name: this.model.get('display_name'),
@@ -20,16 +20,28 @@ CMS.Views.Asset = Backbone.View.extend({
             date_added: this.model.get('date_added'),
             url: this.model.get('url'),
             portable_url: this.model.get('portable_url'),
-            locked: this.model.get('locked')}));
+            uniqueId: uniqueId}));
 
-        // Add a class of "locked" to the tr element if appropriate.
-        if (this.model.get('locked')) {
-            this.$el.addClass('is-locked');
-        }
+        this.updateLockState();
 
         return this;
     },
 
+    updateLockState: function () {
+        var locked_class = "is-locked";
+
+        // Add a class of "locked" to the tr element if appropriate,
+        // and toggle locked state of hidden checkbox.
+        if (this.model.get('locked')) {
+            this.$el.addClass(locked_class);
+            this.$el.find('.lock-checkbox').attr('checked','checked');
+        }
+        else {
+            this.$el.removeClass(locked_class);
+            this.$el.find('.lock-checkbox').removeAttr('checked');
+        }
+    },
+
     confirmDelete: function(e) {
         if(e && e.preventDefault) { e.preventDefault(); }
         var asset = this.model;
@@ -67,7 +79,6 @@ CMS.Views.Asset = Backbone.View.extend({
     },
 
     lockAsset: function(e) {
-        if(e && e.preventDefault) { e.preventDefault(); }
         var asset = this.model;
         var saving = new CMS.Views.Notification.Mini({
             title: gettext("Saving&hellip;")
diff --git a/cms/static/sass/views/_assets.scss b/cms/static/sass/views/_assets.scss
index 3647f6ae47da..983559d286c5 100644
--- a/cms/static/sass/views/_assets.scss
+++ b/cms/static/sass/views/_assets.scss
@@ -94,6 +94,10 @@ body.course.uploads {
       .thumb-col {
         padding: ($baseline/2) $baseline;
 
+        .thumb {
+          width: 100px;
+        }
+
           img {
             width: 100%;
           }
diff --git a/cms/templates/js/asset.underscore b/cms/templates/js/asset.underscore
index 7d83935448a9..73f815f9e17e 100644
--- a/cms/templates/js/asset.underscore
+++ b/cms/templates/js/asset.underscore
@@ -22,8 +22,8 @@
             <a href="#" data-tooltip="<%= gettext('Delete this asset') %>" class="remove-asset-button action-button"><i class="icon-remove-sign"></i> <span class="sr"><%= gettext('Delete this asset') %></span></a>
         </li>
         <li class="action-item action-lock">
-            <label for="lock-asset"><span class="sr"><%= gettext('Lock this asset') %></span></label>
-            <input type="checkbox" name="lock-asset" class="lock-checkbox" data-tooltip="<%= gettext('Lock/unlock file') %>" />
+            <label for="<%= uniqueId %>"><span class="sr"><%= gettext('Lock this asset') %></span></label>
+            <input type="checkbox" id="<%= uniqueId %>" class="lock-checkbox" data-tooltip="<%= gettext('Lock/unlock file') %>" />
             <div class="action-button"><i class="icon-lock"></i><i class="icon-unlock-alt"></i></div>
         </li>
     </ul>

From 111a6ae5b9286e56b08632aa2d9204ac6eb9a68e Mon Sep 17 00:00:00 2001
From: Frances Botsford <frances@edx.org>
Date: Thu, 5 Sep 2013 15:36:10 -0400
Subject: [PATCH 68/92] turning off sass debug mode in assets.rake

---
 rakelib/assets.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rakelib/assets.rake b/rakelib/assets.rake
index 6b2ce4bef5ba..ca24f61be764 100644
--- a/rakelib/assets.rake
+++ b/rakelib/assets.rake
@@ -45,7 +45,7 @@ def sass_cmd(watch=false, debug=false)
       sass_watch_paths << THEME_SASS
     end
 
-    "sass #{debug ? '--debug-info' : '--style compressed'} " +
+    "sass #{debug ? '' : '--style compressed'} " +
           "--load-path #{sass_load_paths.join(' ')} " +
           "#{watch ? '--watch' : '--update'} -E utf-8 #{sass_watch_paths.join(' ')}"
 end

From 68ce6ed1c89cd680048c0a4b427fda605d0d5ac8 Mon Sep 17 00:00:00 2001
From: Giulio Gratta <giulio@giuliogratta.com>
Date: Wed, 18 Sep 2013 14:06:50 -0700
Subject: [PATCH 69/92] Second batch of ORA UI fixes:

- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback

Changes after comments:

- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file

More changes:

- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
---
 .../xmodule/xmodule/js/fixtures/rubric.html   |   2 +-
 .../js/src/combinedopenended/display.coffee   |  10 +-
 .../xmodule/js/src/peergrading/ice.min.js     | 233 +-----------------
 .../peergrading/peer_grading_problem.coffee   |  18 +-
 .../js/src/peergrading/track_changes.coffee   |  17 +-
 lms/djangoapps/open_ended_grading/tests.py    |   2 +-
 lms/static/sass/course/_staff_grading.scss    |   2 +-
 .../combined_open_ended.html                  |   4 +-
 .../combined_open_ended_results.html          |  17 +-
 .../open_ended_problems.html                  |  62 ++---
 .../peer_grading/peer_grading_problem.html    |  25 +-
 11 files changed, 108 insertions(+), 284 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/fixtures/rubric.html b/common/lib/xmodule/xmodule/js/fixtures/rubric.html
index 76ad59b8ff22..b869bb1ec480 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/rubric.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/rubric.html
@@ -38,7 +38,7 @@ <h2>Open Response Assessment</h2>
     <div class="visibility-control visibility-control-prompt">
         <div class="inner">
         </div>
-        <a href="" class="question-header">Show Prompt</a>
+        <a href="" class="question-header">Show Question</a>
     </div>
     <div class="problem-container">
         <div class="item">
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index d1a7b4d81627..d1006ae9a9b1 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -576,12 +576,12 @@ class @CombinedOpenEnded
   collapse_question: (event) =>
     @prompt_container.slideToggle()
     @prompt_container.toggleClass('open')
-    if @question_header.text() == "Hide Prompt"
-      new_text = "Show Prompt"
+    if @question_header.text() == "Hide Question"
+      new_text = "Show Question"
       Logger.log 'oe_hide_question', {location: @location}
     else
       Logger.log 'oe_show_question', {location: @location}
-      new_text = "Hide Prompt"
+      new_text = "Hide Question"
     @question_header.text(new_text)
     return false
 
@@ -621,13 +621,13 @@ class @CombinedOpenEnded
     if @prompt_container.is(":hidden")==true
       @prompt_container.slideToggle()
       @prompt_container.toggleClass('open')
-      @question_header.text("Hide Prompt")
+      @question_header.text("Hide Question")
 
   prompt_hide: () =>
     if @prompt_container.is(":visible")==true
       @prompt_container.slideToggle()
       @prompt_container.toggleClass('open')
-      @question_header.text("Show Prompt")
+      @question_header.text("Show Question")
 
   log_feedback_click: (event) ->
     link_text = @$(event.target).html()
diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/ice.min.js b/common/lib/xmodule/xmodule/js/src/peergrading/ice.min.js
index 7b83d82298df..16a08c2c6ff0 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/ice.min.js
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/ice.min.js
@@ -1,224 +1,9 @@
-window.rangy=function(){function e(a,d){var b=typeof a[d];return b==t||!!(b==l&&a[d])||b=="unknown"}function b(a,d){return!!(typeof a[d]==l&&a[d])}function a(a,d){return typeof a[d]!=n}function d(a){return function(d,b){for(var f=b.length;f--;)if(!a(d,b[f]))return!1;return!0}}function f(a){return a&&j(a,r)&&v(a,k)}function g(a){window.alert("Rangy not supported in your browser. Reason: "+a);p.initialized=!0;p.supported=!1}function h(){if(!p.initialized){var a,d=!1,q=!1;e(document,"createRange")&&
-(a=document.createRange(),j(a,o)&&v(a,s)&&(d=!0),a.detach());if((a=b(document,"body")?document.body:document.getElementsByTagName("body")[0])&&e(a,"createTextRange"))a=a.createTextRange(),f(a)&&(q=!0);!d&&!q&&g("Neither Range nor TextRange are implemented");p.initialized=!0;p.features={implementsDomRange:d,implementsTextRange:q};d=F.concat(x);q=0;for(a=d.length;q<a;++q)try{d[q](p)}catch(h){b(window,"console")&&e(window.console,"log")&&window.console.log("Init listener threw an exception. Continuing.",
-h)}}}function i(a){this.name=a;this.supported=this.initialized=!1}var l="object",t="function",n="undefined",s=["startContainer","startOffset","endContainer","endOffset","collapsed","commonAncestorContainer","START_TO_START","START_TO_END","END_TO_START","END_TO_END"],o=["setStart","setStartBefore","setStartAfter","setEnd","setEndBefore","setEndAfter","collapse","selectNode","selectNodeContents","compareBoundaryPoints","deleteContents","extractContents","cloneContents","insertNode","surroundContents",
-"cloneRange","toString","detach"],k=["boundingHeight","boundingLeft","boundingTop","boundingWidth","htmlText","text"],r=["collapse","compareEndPoints","duplicate","getBookmark","moveToBookmark","moveToElementText","parentElement","pasteHTML","select","setEndPoint","getBoundingClientRect"],j=d(e),q=d(b),v=d(a),p={version:"1.2",initialized:!1,supported:!0,util:{isHostMethod:e,isHostObject:b,isHostProperty:a,areHostMethods:j,areHostObjects:q,areHostProperties:v,isTextRange:f},features:{},modules:{},
-config:{alertOnWarn:!1,preferTextRange:!1}};p.fail=g;p.warn=function(a){a="Rangy warning: "+a;p.config.alertOnWarn?window.alert(a):typeof window.console!=n&&typeof window.console.log!=n&&window.console.log(a)};({}).hasOwnProperty?p.util.extend=function(a,d){for(var b in d)d.hasOwnProperty(b)&&(a[b]=d[b])}:g("hasOwnProperty not supported");var x=[],F=[];p.init=h;p.addInitListener=function(a){p.initialized?a(p):x.push(a)};var B=[];p.addCreateMissingNativeApiListener=function(a){B.push(a)};p.createMissingNativeApi=
-function(a){a=a||window;h();for(var d=0,b=B.length;d<b;++d)B[d](a)};i.prototype.fail=function(a){this.initialized=!0;this.supported=!1;throw Error("Module '"+this.name+"' failed to load: "+a);};i.prototype.warn=function(a){p.warn("Module "+this.name+": "+a)};i.prototype.createError=function(a){return Error("Error in Rangy "+this.name+" module: "+a)};p.createModule=function(a,d){var b=new i(a);p.modules[a]=b;F.push(function(a){d(a,b);b.initialized=!0;b.supported=!0})};p.requireModules=function(a){for(var d=
-0,b=a.length,f,e;d<b;++d){e=a[d];f=p.modules[e];if(!f||!(f instanceof i))throw Error("Module '"+e+"' not found");if(!f.supported)throw Error("Module '"+e+"' not supported");}};var A=!1,q=function(){A||(A=!0,p.initialized||h())};if(typeof window==n)g("No window found");else if(typeof document==n)g("No document found");else return e(document,"addEventListener")&&document.addEventListener("DOMContentLoaded",q,!1),e(window,"addEventListener")?window.addEventListener("load",q,!1):e(window,"attachEvent")?
-window.attachEvent("onload",q):g("Window does not have required addEventListener or attachEvent method"),p}();
-rangy.createModule("DomUtil",function(e,b){function a(a){for(var d=0;a=a.previousSibling;)d++;return d}function d(a,d){var b=[],f;for(f=a;f;f=f.parentNode)b.push(f);for(f=d;f;f=f.parentNode)if(j(b,f))return f;return null}function f(a,d,b){for(b=b?a:a.parentNode;b;){a=b.parentNode;if(a===d)return b;b=a}return null}function g(a){a=a.nodeType;return a==3||a==4||a==8}function h(a,d){var b=d.nextSibling,f=d.parentNode;b?f.insertBefore(a,b):f.appendChild(a);return a}function i(a){if(a.nodeType==9)return a;
-else if(typeof a.ownerDocument!=o)return a.ownerDocument;else if(typeof a.document!=o)return a.document;else if(a.parentNode)return i(a.parentNode);else throw Error("getDocument: no document found for node");}function l(a){return!a?"[No node]":g(a)?'"'+a.data+'"':a.nodeType==1?"<"+a.nodeName+(a.id?' id="'+a.id+'"':"")+">["+a.childNodes.length+"]":a.nodeName}function t(a){this._next=this.root=a}function n(a,d){this.node=a;this.offset=d}function s(a){this.code=this[a];this.codeName=a;this.message="DOMException: "+
-this.codeName}var o="undefined",k=e.util;k.areHostMethods(document,["createDocumentFragment","createElement","createTextNode"])||b.fail("document missing a Node creation method");k.isHostMethod(document,"getElementsByTagName")||b.fail("document missing getElementsByTagName method");var r=document.createElement("div");k.areHostMethods(r,["insertBefore","appendChild","cloneNode"])||b.fail("Incomplete Element implementation");r=document.createTextNode("test");k.areHostMethods(r,["splitText","deleteData",
-"insertData","appendData","cloneNode"])||b.fail("Incomplete Text Node implementation");var j=function(a,d){for(var b=a.length;b--;)if(a[b]===d)return!0;return!1};t.prototype={_current:null,hasNext:function(){return!!this._next},next:function(){var a=this._current=this._next,d;if(this._current){d=a.firstChild;if(!d)for(d=null;a!==this.root&&!(d=a.nextSibling);)a=a.parentNode;this._next=d}return this._current},detach:function(){this._current=this._next=this.root=null}};n.prototype={equals:function(a){return this.node===
-a.node&this.offset==a.offset},inspect:function(){return"[DomPosition("+l(this.node)+":"+this.offset+")]"}};s.prototype={INDEX_SIZE_ERR:1,HIERARCHY_REQUEST_ERR:3,WRONG_DOCUMENT_ERR:4,NO_MODIFICATION_ALLOWED_ERR:7,NOT_FOUND_ERR:8,NOT_SUPPORTED_ERR:9,INVALID_STATE_ERR:11};s.prototype.toString=function(){return this.message};e.dom={arrayContains:j,getNodeIndex:a,getNodeLength:function(a){var d;return g(a)?a.length:(d=a.childNodes)?d.length:0},getCommonAncestor:d,isAncestorOf:function(a,d,b){for(d=b?d:
-d.parentNode;d;)if(d===a)return!0;else d=d.parentNode;return!1},getClosestAncestorIn:f,isCharacterDataNode:g,insertAfter:h,splitDataNode:function(a,d){var b=a.cloneNode(!1);b.deleteData(0,d);a.deleteData(d,a.length-d);h(b,a);return b},getDocument:i,getWindow:function(a){a=i(a);if(typeof a.defaultView!=o)return a.defaultView;else if(typeof a.parentWindow!=o)return a.parentWindow;else throw Error("Cannot get a window object for node");},getIframeWindow:function(a){if(typeof a.contentWindow!=o)return a.contentWindow;
-else if(typeof a.contentDocument!=o)return a.contentDocument.defaultView;else throw Error("getIframeWindow: No Window object found for iframe element");},getIframeDocument:function(a){if(typeof a.contentDocument!=o)return a.contentDocument;else if(typeof a.contentWindow!=o)return a.contentWindow.document;else throw Error("getIframeWindow: No Document object found for iframe element");},getBody:function(a){return k.isHostObject(a,"body")?a.body:a.getElementsByTagName("body")[0]},getRootContainer:function(a){for(var d;d=
-a.parentNode;)a=d;return a},comparePoints:function(b,e,g,j){var h;if(b==g)return e===j?0:e<j?-1:1;else if(h=f(g,b,!0))return e<=a(h)?-1:1;else if(h=f(b,g,!0))return a(h)<j?-1:1;else if(e=d(b,g),b=b===e?e:f(b,e,!0),g=g===e?e:f(g,e,!0),b===g)throw Error("comparePoints got to case 4 and childA and childB are the same!");else{for(e=e.firstChild;e;){if(e===b)return-1;else if(e===g)return 1;e=e.nextSibling}throw Error("Should not be here!");}},inspectNode:l,createIterator:function(a){return new t(a)},DomPosition:n};
-e.DOMException=s});
-rangy.createModule("DomRange",function(e){function b(a,d){return a.nodeType!=3&&(m.isAncestorOf(a,d.startContainer,!0)||m.isAncestorOf(a,d.endContainer,!0))}function a(a){return m.getDocument(a.startContainer)}function d(a,d,b){if(d=a._listeners[d])for(var f=0,e=d.length;f<e;++f)d[f].call(a,{target:a,args:b})}function f(a){return new u(a.parentNode,m.getNodeIndex(a))}function g(a){return new u(a.parentNode,m.getNodeIndex(a)+1)}function h(a,d,b){var f=a.nodeType==11?a.firstChild:a;m.isCharacterDataNode(d)?
-b==d.length?m.insertAfter(a,d):d.parentNode.insertBefore(a,b==0?d:m.splitDataNode(d,b)):b>=d.childNodes.length?d.appendChild(a):d.insertBefore(a,d.childNodes[b]);return f}function i(d){for(var b,f,e=a(d.range).createDocumentFragment();f=d.next();){b=d.isPartiallySelectedSubtree();f=f.cloneNode(!b);b&&(b=d.getSubtreeIterator(),f.appendChild(i(b)),b.detach(!0));if(f.nodeType==10)throw new D("HIERARCHY_REQUEST_ERR");e.appendChild(f)}return e}function l(a,d,b){for(var f,e,b=b||{stop:!1};f=a.next();)if(a.isPartiallySelectedSubtree())if(d(f)===
-!1){b.stop=!0;break}else{if(f=a.getSubtreeIterator(),l(f,d,b),f.detach(!0),b.stop)break}else for(f=m.createIterator(f);e=f.next();)if(d(e)===!1){b.stop=!0;return}}function t(a){for(var d;a.next();)a.isPartiallySelectedSubtree()?(d=a.getSubtreeIterator(),t(d),d.detach(!0)):a.remove()}function n(d){for(var b,f=a(d.range).createDocumentFragment(),e;b=d.next();){d.isPartiallySelectedSubtree()?(b=b.cloneNode(!1),e=d.getSubtreeIterator(),b.appendChild(n(e)),e.detach(!0)):d.remove();if(b.nodeType==10)throw new D("HIERARCHY_REQUEST_ERR");
-f.appendChild(b)}return f}function s(a,d,b){var f=!(!d||!d.length),e,g=!!b;f&&(e=RegExp("^("+d.join("|")+")$"));var y=[];l(new k(a,!1),function(a){(!f||e.test(a.nodeType))&&(!g||b(a))&&y.push(a)});return y}function o(a){return"["+(typeof a.getName=="undefined"?"Range":a.getName())+"("+m.inspectNode(a.startContainer)+":"+a.startOffset+", "+m.inspectNode(a.endContainer)+":"+a.endOffset+")]"}function k(a,d){this.range=a;this.clonePartiallySelectedTextNodes=d;if(!a.collapsed){this.sc=a.startContainer;
-this.so=a.startOffset;this.ec=a.endContainer;this.eo=a.endOffset;var b=a.commonAncestorContainer;this.sc===this.ec&&m.isCharacterDataNode(this.sc)?(this.isSingleCharacterDataNode=!0,this._first=this._last=this._next=this.sc):(this._first=this._next=this.sc===b&&!m.isCharacterDataNode(this.sc)?this.sc.childNodes[this.so]:m.getClosestAncestorIn(this.sc,b,!0),this._last=this.ec===b&&!m.isCharacterDataNode(this.ec)?this.ec.childNodes[this.eo-1]:m.getClosestAncestorIn(this.ec,b,!0))}}function r(a){this.code=
-this[a];this.codeName=a;this.message="RangeException: "+this.codeName}function j(a,d,b){this.nodes=s(a,d,b);this._next=this.nodes[0];this._position=0}function q(a){return function(d,b){for(var f,e=b?d:d.parentNode;e;){f=e.nodeType;if(m.arrayContains(a,f))return e;e=e.parentNode}return null}}function v(a,d){if(Z(a,d))throw new r("INVALID_NODE_TYPE_ERR");}function p(a){if(!a.startContainer)throw new D("INVALID_STATE_ERR");}function x(a,d){if(!m.arrayContains(d,a.nodeType))throw new r("INVALID_NODE_TYPE_ERR");
-}function F(a,d){if(d<0||d>(m.isCharacterDataNode(a)?a.length:a.childNodes.length))throw new D("INDEX_SIZE_ERR");}function B(a,d){if(M(a,!0)!==M(d,!0))throw new D("WRONG_DOCUMENT_ERR");}function A(a){if($(a,!0))throw new D("NO_MODIFICATION_ALLOWED_ERR");}function z(a,d){if(!a)throw new D(d);}function w(a){p(a);if(!m.arrayContains(J,a.startContainer.nodeType)&&!M(a.startContainer,!0)||!m.arrayContains(J,a.endContainer.nodeType)&&!M(a.endContainer,!0)||!(a.startOffset<=(m.isCharacterDataNode(a.startContainer)?
-a.startContainer.length:a.startContainer.childNodes.length))||!(a.endOffset<=(m.isCharacterDataNode(a.endContainer)?a.endContainer.length:a.endContainer.childNodes.length)))throw Error("Range error: Range is no longer valid after DOM mutation ("+a.inspect()+")");}function H(){}function K(a){a.START_TO_START=R;a.START_TO_END=U;a.END_TO_END=aa;a.END_TO_START=V;a.NODE_BEFORE=W;a.NODE_AFTER=X;a.NODE_BEFORE_AND_AFTER=Y;a.NODE_INSIDE=S}function I(a){K(a);K(a.prototype)}function G(a,d){return function(){w(this);
-var b=this.startContainer,f=this.startOffset,e=this.commonAncestorContainer,y=new k(this,!0);if(b!==e)b=m.getClosestAncestorIn(b,e,!0),f=g(b),b=f.node,f=f.offset;l(y,A);y.reset();e=a(y);y.detach();d(this,b,f,b,f);return e}}function C(a,d,j){function C(a,d){return function(b){p(this);x(b,O);x(y(b),J);b=(a?f:g)(b);(d?h:l)(this,b.node,b.offset)}}function h(a,b,f){var e=a.endContainer,g=a.endOffset;if(b!==a.startContainer||f!==this.startOffset){if(y(b)!=y(e)||m.comparePoints(b,f,e,g)==1)e=b,g=f;d(a,b,
-f,e,g)}}function l(a,b,f){var e=a.startContainer,g=a.startOffset;if(b!==a.endContainer||f!==this.endOffset){if(y(b)!=y(e)||m.comparePoints(b,f,e,g)==-1)e=b,g=f;d(a,e,g,b,f)}}function M(a,b,f){(b!==a.startContainer||f!==this.startOffset||b!==a.endContainer||f!==this.endOffset)&&d(a,b,f,b,f)}a.prototype=new H;e.util.extend(a.prototype,{setStart:function(a,d){p(this);v(a,!0);F(a,d);h(this,a,d)},setEnd:function(a,d){p(this);v(a,!0);F(a,d);l(this,a,d)},setStartBefore:C(!0,!0),setStartAfter:C(!1,!0),setEndBefore:C(!0,
-!1),setEndAfter:C(!1,!1),collapse:function(a){w(this);a?d(this,this.startContainer,this.startOffset,this.startContainer,this.startOffset):d(this,this.endContainer,this.endOffset,this.endContainer,this.endOffset)},selectNodeContents:function(a){p(this);v(a,!0);d(this,a,0,a,m.getNodeLength(a))},selectNode:function(a){p(this);v(a,!1);x(a,O);var b=f(a),a=g(a);d(this,b.node,b.offset,a.node,a.offset)},extractContents:G(n,d),deleteContents:G(t,d),canSurroundContents:function(){w(this);A(this.startContainer);
-A(this.endContainer);var a=new k(this,!0),d=a._first&&b(a._first,this)||a._last&&b(a._last,this);a.detach();return!d},detach:function(){j(this)},splitBoundaries:function(){w(this);var a=this.startContainer,b=this.startOffset,f=this.endContainer,e=this.endOffset,g=a===f;m.isCharacterDataNode(f)&&e>0&&e<f.length&&m.splitDataNode(f,e);m.isCharacterDataNode(a)&&b>0&&b<a.length&&(a=m.splitDataNode(a,b),g?(e-=b,f=a):f==a.parentNode&&e>=m.getNodeIndex(a)&&e++,b=0);d(this,a,b,f,e)},normalizeBoundaries:function(){w(this);
-var a=this.startContainer,b=this.startOffset,f=this.endContainer,e=this.endOffset,g=function(a){var d=a.nextSibling;if(d&&d.nodeType==a.nodeType)f=a,e=a.length,a.appendData(d.data),d.parentNode.removeChild(d)},y=function(d){var g=d.previousSibling;if(g&&g.nodeType==d.nodeType){a=d;var y=d.length;b=g.length;d.insertData(0,g.data);g.parentNode.removeChild(g);a==f?(e+=b,f=a):f==d.parentNode&&(g=m.getNodeIndex(d),e==g?(f=d,e=y):e>g&&e--)}},j=!0;m.isCharacterDataNode(f)?f.length==e&&g(f):(e>0&&(j=f.childNodes[e-
-1])&&m.isCharacterDataNode(j)&&g(j),j=!this.collapsed);j?m.isCharacterDataNode(a)?b==0&&y(a):b<a.childNodes.length&&(g=a.childNodes[b])&&m.isCharacterDataNode(g)&&y(g):(a=f,b=e);d(this,a,b,f,e)},collapseToPoint:function(a,d){p(this);v(a,!0);F(a,d);M(this,a,d)}});I(a)}function P(a){a.collapsed=a.startContainer===a.endContainer&&a.startOffset===a.endOffset;a.commonAncestorContainer=a.collapsed?a.startContainer:m.getCommonAncestor(a.startContainer,a.endContainer)}function N(a,b,f,e,g){var y=a.startContainer!==
-b||a.startOffset!==f,j=a.endContainer!==e||a.endOffset!==g;a.startContainer=b;a.startOffset=f;a.endContainer=e;a.endOffset=g;P(a);d(a,"boundarychange",{startMoved:y,endMoved:j})}function E(a){this.startContainer=a;this.startOffset=0;this.endContainer=a;this.endOffset=0;this._listeners={boundarychange:[],detach:[]};P(this)}e.requireModules(["DomUtil"]);var m=e.dom,u=m.DomPosition,D=e.DOMException;k.prototype={_current:null,_next:null,_first:null,_last:null,isSingleCharacterDataNode:!1,reset:function(){this._current=
-null;this._next=this._first},hasNext:function(){return!!this._next},next:function(){var a=this._current=this._next;if(a)this._next=a!==this._last?a.nextSibling:null,m.isCharacterDataNode(a)&&this.clonePartiallySelectedTextNodes&&(a===this.ec&&(a=a.cloneNode(!0)).deleteData(this.eo,a.length-this.eo),this._current===this.sc&&(a=a.cloneNode(!0)).deleteData(0,this.so));return a},remove:function(){var a=this._current,d,b;m.isCharacterDataNode(a)&&(a===this.sc||a===this.ec)?(d=a===this.sc?this.so:0,b=a===
-this.ec?this.eo:a.length,d!=b&&a.deleteData(d,b-d)):a.parentNode&&a.parentNode.removeChild(a)},isPartiallySelectedSubtree:function(){return b(this._current,this.range)},getSubtreeIterator:function(){var d;if(this.isSingleCharacterDataNode)d=this.range.cloneRange(),d.collapse();else{d=new E(a(this.range));var b=this._current,f=b,e=0,g=b,y=m.getNodeLength(b);if(m.isAncestorOf(b,this.sc,!0))f=this.sc,e=this.so;if(m.isAncestorOf(b,this.ec,!0))g=this.ec,y=this.eo;N(d,f,e,g,y)}return new k(d,this.clonePartiallySelectedTextNodes)},
-detach:function(a){a&&this.range.detach();this.range=this._current=this._next=this._first=this._last=this.sc=this.so=this.ec=this.eo=null}};r.prototype={BAD_BOUNDARYPOINTS_ERR:1,INVALID_NODE_TYPE_ERR:2};r.prototype.toString=function(){return this.message};j.prototype={_current:null,hasNext:function(){return!!this._next},next:function(){this._current=this._next;this._next=this.nodes[++this._position];return this._current},detach:function(){this._current=this._next=this.nodes=null}};var O=[1,3,4,5,
-7,8,10],J=[2,9,11],Q=[1,3,4,5,7,8,10,11],L=[1,3,4,5,7,8],y=m.getRootContainer,M=q([9,11]),$=q([5,6,10,12]),Z=q([6,10,12]),T=["startContainer","startOffset","endContainer","endOffset","collapsed","commonAncestorContainer"],R=0,U=1,aa=2,V=3,W=0,X=1,Y=2,S=3;H.prototype={attachListener:function(a,d){this._listeners[a].push(d)},compareBoundaryPoints:function(a,d){w(this);B(this.startContainer,d.startContainer);var b=a==V||a==R?"start":"end",f=a==U||a==R?"start":"end";return m.comparePoints(this[b+"Container"],
-this[b+"Offset"],d[f+"Container"],d[f+"Offset"])},insertNode:function(a){w(this);x(a,Q);A(this.startContainer);if(m.isAncestorOf(a,this.startContainer,!0))throw new D("HIERARCHY_REQUEST_ERR");this.setStartBefore(h(a,this.startContainer,this.startOffset))},cloneContents:function(){w(this);var d,b;if(this.collapsed)return a(this).createDocumentFragment();else{if(this.startContainer===this.endContainer&&m.isCharacterDataNode(this.startContainer))return d=this.startContainer.cloneNode(!0),d.data=d.data.slice(this.startOffset,
-this.endOffset),b=a(this).createDocumentFragment(),b.appendChild(d),b;else b=new k(this,!0),d=i(b),b.detach();return d}},canSurroundContents:function(){w(this);A(this.startContainer);A(this.endContainer);var a=new k(this,!0),d=a._first&&b(a._first,this)||a._last&&b(a._last,this);a.detach();return!d},surroundContents:function(a){x(a,L);if(!this.canSurroundContents())throw new r("BAD_BOUNDARYPOINTS_ERR");var d=this.extractContents();if(a.hasChildNodes())for(;a.lastChild;)a.removeChild(a.lastChild);
-h(a,this.startContainer,this.startOffset);a.appendChild(d);this.selectNode(a)},cloneRange:function(){w(this);for(var d=new E(a(this)),b=T.length,f;b--;)f=T[b],d[f]=this[f];return d},toString:function(){w(this);var a=this.startContainer;if(a===this.endContainer&&m.isCharacterDataNode(a))return a.nodeType==3||a.nodeType==4?a.data.slice(this.startOffset,this.endOffset):"";else{var d=[],a=new k(this,!0);l(a,function(a){(a.nodeType==3||a.nodeType==4)&&d.push(a.data)});a.detach();return d.join("")}},compareNode:function(a){w(this);
-var d=a.parentNode,b=m.getNodeIndex(a);if(!d)throw new D("NOT_FOUND_ERR");a=this.comparePoint(d,b);d=this.comparePoint(d,b+1);return a<0?d>0?Y:W:d>0?X:S},comparePoint:function(a,d){w(this);z(a,"HIERARCHY_REQUEST_ERR");B(a,this.startContainer);if(m.comparePoints(a,d,this.startContainer,this.startOffset)<0)return-1;else if(m.comparePoints(a,d,this.endContainer,this.endOffset)>0)return 1;return 0},createContextualFragment:function(d){p(this);var b=a(this),f=b.createElement("div");f.innerHTML=d;for(d=
-b.createDocumentFragment();b=f.firstChild;)d.appendChild(b);return d},toHtml:function(){w(this);var d=a(this).createElement("div");d.appendChild(this.cloneContents());return d.innerHTML},intersectsNode:function(d,b){w(this);z(d,"NOT_FOUND_ERR");if(m.getDocument(d)!==a(this))return!1;var f=d.parentNode,e=m.getNodeIndex(d);z(f,"NOT_FOUND_ERR");var g=m.comparePoints(f,e,this.endContainer,this.endOffset),f=m.comparePoints(f,e+1,this.startContainer,this.startOffset);return b?g<=0&&f>=0:g<0&&f>0},isPointInRange:function(a,
-d){w(this);z(a,"HIERARCHY_REQUEST_ERR");B(a,this.startContainer);return m.comparePoints(a,d,this.startContainer,this.startOffset)>=0&&m.comparePoints(a,d,this.endContainer,this.endOffset)<=0},intersectsRange:function(d,b){w(this);if(a(d)!=a(this))throw new D("WRONG_DOCUMENT_ERR");var f=m.comparePoints(this.startContainer,this.startOffset,d.endContainer,d.endOffset),e=m.comparePoints(this.endContainer,this.endOffset,d.startContainer,d.startOffset);return b?f<=0&&e>=0:f<0&&e>0},intersection:function(a){if(this.intersectsRange(a)){var d=
-m.comparePoints(this.startContainer,this.startOffset,a.startContainer,a.startOffset),b=m.comparePoints(this.endContainer,this.endOffset,a.endContainer,a.endOffset),f=this.cloneRange();d==-1&&f.setStart(a.startContainer,a.startOffset);b==1&&f.setEnd(a.endContainer,a.endOffset);return f}return null},union:function(a){if(this.intersectsRange(a,!0)){var d=this.cloneRange();m.comparePoints(a.startContainer,a.startOffset,this.startContainer,this.startOffset)==-1&&d.setStart(a.startContainer,a.startOffset);
-m.comparePoints(a.endContainer,a.endOffset,this.endContainer,this.endOffset)==1&&d.setEnd(a.endContainer,a.endOffset);return d}else throw new r("Ranges do not intersect");},containsNode:function(a,d){return d?this.intersectsNode(a,!1):this.compareNode(a)==S},containsNodeContents:function(a){return this.comparePoint(a,0)>=0&&this.comparePoint(a,m.getNodeLength(a))<=0},containsRange:function(a){return this.intersection(a).equals(a)},containsNodeText:function(a){var d=this.cloneRange();d.selectNode(a);
-var b=d.getNodes([3]);return b.length>0?(d.setStart(b[0],0),a=b.pop(),d.setEnd(a,a.length),a=this.containsRange(d),d.detach(),a):this.containsNodeContents(a)},createNodeIterator:function(a,d){w(this);return new j(this,a,d)},getNodes:function(a,d){w(this);return s(this,a,d)},getDocument:function(){return a(this)},collapseBefore:function(a){p(this);this.setEndBefore(a);this.collapse(!1)},collapseAfter:function(a){p(this);this.setStartAfter(a);this.collapse(!0)},getName:function(){return"DomRange"},
-equals:function(a){return E.rangesEqual(this,a)},inspect:function(){return o(this)}};C(E,N,function(a){p(a);a.startContainer=a.startOffset=a.endContainer=a.endOffset=null;a.collapsed=a.commonAncestorContainer=null;d(a,"detach",null);a._listeners=null});e.rangePrototype=H.prototype;E.rangeProperties=T;E.RangeIterator=k;E.copyComparisonConstants=I;E.createPrototypeRange=C;E.inspect=o;E.getRangeDocument=a;E.rangesEqual=function(a,d){return a.startContainer===d.startContainer&&a.startOffset===d.startOffset&&
-a.endContainer===d.endContainer&&a.endOffset===d.endOffset};e.DomRange=E;e.RangeException=r});
-rangy.createModule("WrappedRange",function(e){function b(a,d,b,e){var h=a.duplicate();h.collapse(b);var k=h.parentElement();f.isAncestorOf(d,k,!0)||(k=d);if(!k.canHaveHTML)return new g(k.parentNode,f.getNodeIndex(k));var d=f.getDocument(k).createElement("span"),r,j=b?"StartToStart":"StartToEnd";do k.insertBefore(d,d.previousSibling),h.moveToElementText(d);while((r=h.compareEndPoints(j,a))>0&&d.previousSibling);j=d.nextSibling;if(r==-1&&j&&f.isCharacterDataNode(j)){h.setEndPoint(b?"EndToStart":"EndToEnd",
-a);if(/[\r\n]/.test(j.data)){k=h.duplicate();b=k.text.replace(/\r\n/g,"\r").length;for(b=k.moveStart("character",b);k.compareEndPoints("StartToEnd",k)==-1;)b++,k.moveStart("character",1)}else b=h.text.length;k=new g(j,b)}else j=(e||!b)&&d.previousSibling,k=(b=(e||b)&&d.nextSibling)&&f.isCharacterDataNode(b)?new g(b,0):j&&f.isCharacterDataNode(j)?new g(j,j.length):new g(k,f.getNodeIndex(d));d.parentNode.removeChild(d);return k}function a(a,d){var b,e,g=a.offset,h=f.getDocument(a.node),r=h.body.createTextRange(),
-j=f.isCharacterDataNode(a.node);j?(b=a.node,e=b.parentNode):(b=a.node.childNodes,b=g<b.length?b[g]:null,e=a.node);h=h.createElement("span");h.innerHTML="&#feff;";b?e.insertBefore(h,b):e.appendChild(h);r.moveToElementText(h);r.collapse(!d);e.removeChild(h);if(j)r[d?"moveStart":"moveEnd"]("character",g);return r}e.requireModules(["DomUtil","DomRange"]);var d,f=e.dom,g=f.DomPosition,h=e.DomRange;if(e.features.implementsDomRange&&(!e.features.implementsTextRange||!e.config.preferTextRange))(function(){function a(d){for(var b=
-e.length,f;b--;)f=e[b],d[f]=d.nativeRange[f]}var b,e=h.rangeProperties,g;d=function(d){if(!d)throw Error("Range must be specified");this.nativeRange=d;a(this)};h.createPrototypeRange(d,function(a,d,b,f,e){var g=a.endContainer!==f||a.endOffset!=e;if(a.startContainer!==d||a.startOffset!=b||g)a.setEnd(f,e),a.setStart(d,b)},function(a){a.nativeRange.detach();a.detached=!0;for(var d=e.length,b;d--;)b=e[d],a[b]=null});b=d.prototype;b.selectNode=function(d){this.nativeRange.selectNode(d);a(this)};b.deleteContents=
-function(){this.nativeRange.deleteContents();a(this)};b.extractContents=function(){var d=this.nativeRange.extractContents();a(this);return d};b.cloneContents=function(){return this.nativeRange.cloneContents()};b.surroundContents=function(d){this.nativeRange.surroundContents(d);a(this)};b.collapse=function(d){this.nativeRange.collapse(d);a(this)};b.cloneRange=function(){return new d(this.nativeRange.cloneRange())};b.refresh=function(){a(this)};b.toString=function(){return this.nativeRange.toString()};
-var i=document.createTextNode("test");f.getBody(document).appendChild(i);var k=document.createRange();k.setStart(i,0);k.setEnd(i,0);try{k.setStart(i,1),b.setStart=function(d,b){this.nativeRange.setStart(d,b);a(this)},b.setEnd=function(d,b){this.nativeRange.setEnd(d,b);a(this)},g=function(d){return function(b){this.nativeRange[d](b);a(this)}}}catch(r){b.setStart=function(d,b){try{this.nativeRange.setStart(d,b)}catch(f){this.nativeRange.setEnd(d,b),this.nativeRange.setStart(d,b)}a(this)},b.setEnd=function(d,
-b){try{this.nativeRange.setEnd(d,b)}catch(f){this.nativeRange.setStart(d,b),this.nativeRange.setEnd(d,b)}a(this)},g=function(d,b){return function(f){try{this.nativeRange[d](f)}catch(e){this.nativeRange[b](f),this.nativeRange[d](f)}a(this)}}}b.setStartBefore=g("setStartBefore","setEndBefore");b.setStartAfter=g("setStartAfter","setEndAfter");b.setEndBefore=g("setEndBefore","setStartBefore");b.setEndAfter=g("setEndAfter","setStartAfter");k.selectNodeContents(i);b.selectNodeContents=k.startContainer==
-i&&k.endContainer==i&&k.startOffset==0&&k.endOffset==i.length?function(d){this.nativeRange.selectNodeContents(d);a(this)}:function(a){this.setStart(a,0);this.setEnd(a,h.getEndOffset(a))};k.selectNodeContents(i);k.setEnd(i,3);g=document.createRange();g.selectNodeContents(i);g.setEnd(i,4);g.setStart(i,2);b.compareBoundaryPoints=k.compareBoundaryPoints(k.START_TO_END,g)==-1&k.compareBoundaryPoints(k.END_TO_START,g)==1?function(a,d){d=d.nativeRange||d;if(a==d.START_TO_END)a=d.END_TO_START;else if(a==
-d.END_TO_START)a=d.START_TO_END;return this.nativeRange.compareBoundaryPoints(a,d)}:function(a,d){return this.nativeRange.compareBoundaryPoints(a,d.nativeRange||d)};f.getBody(document).removeChild(i);k.detach();g.detach()})(),e.createNativeRange=function(a){return(a||document).createRange()};else if(e.features.implementsTextRange){d=function(a){this.textRange=a;this.refresh()};d.prototype=new h(document);d.prototype.refresh=function(){var a,d,e=this.textRange;a=e.parentElement();var g=e.duplicate();
-g.collapse(!0);d=g.parentElement();g=e.duplicate();g.collapse(!1);e=g.parentElement();d=d==e?d:f.getCommonAncestor(d,e);d=d==a?d:f.getCommonAncestor(a,d);this.textRange.compareEndPoints("StartToEnd",this.textRange)==0?d=a=b(this.textRange,d,!0,!0):(a=b(this.textRange,d,!0,!1),d=b(this.textRange,d,!1,!1));this.setStart(a.node,a.offset);this.setEnd(d.node,d.offset)};h.copyComparisonConstants(d);var i=function(){return this}();if(typeof i.Range=="undefined")i.Range=d;e.createNativeRange=function(a){return(a||
-document).body.createTextRange()}}if(e.features.implementsTextRange)d.rangeToTextRange=function(d){if(d.collapsed)return a(new g(d.startContainer,d.startOffset),!0);else{var b=a(new g(d.startContainer,d.startOffset),!0),e=a(new g(d.endContainer,d.endOffset),!1),d=f.getDocument(d.startContainer).body.createTextRange();d.setEndPoint("StartToStart",b);d.setEndPoint("EndToEnd",e);return d}};d.prototype.getName=function(){return"WrappedRange"};e.WrappedRange=d;e.createRange=function(a){return new d(e.createNativeRange(a||
-document))};e.createRangyRange=function(a){return new h(a||document)};e.createIframeRange=function(a){return e.createRange(f.getIframeDocument(a))};e.createIframeRangyRange=function(a){return e.createRangyRange(f.getIframeDocument(a))};e.addCreateMissingNativeApiListener(function(a){a=a.document;if(typeof a.createRange=="undefined")a.createRange=function(){return e.createRange(this)};a=a=null})});
-rangy.createModule("WrappedSelection",function(e,b){function a(a){return(a||window).getSelection()}function d(a){return(a||window).document.selection}function f(a,d,b){var f=b?"end":"start",b=b?"start":"end";a.anchorNode=d[f+"Container"];a.anchorOffset=d[f+"Offset"];a.focusNode=d[b+"Container"];a.focusOffset=d[b+"Offset"]}function g(a){a.anchorNode=a.focusNode=null;a.anchorOffset=a.focusOffset=0;a.rangeCount=0;a.isCollapsed=!0;a._ranges.length=0}function h(a){var d;if(a instanceof v){if(d=a._selectionNativeRange,
-!d)d=e.createNativeRange(j.getDocument(a.startContainer)),d.setEnd(a.endContainer,a.endOffset),d.setStart(a.startContainer,a.startOffset),a._selectionNativeRange=d,a.attachListener("detach",function(){this._selectionNativeRange=null})}else a instanceof p?d=a.nativeRange:e.features.implementsDomRange&&a instanceof j.getWindow(a.startContainer).Range&&(d=a);return d}function i(a){var d=a.getNodes(),b;a:if(!d.length||d[0].nodeType!=1)b=!1;else{b=1;for(var f=d.length;b<f;++b)if(!j.isAncestorOf(d[0],d[b])){b=
-!1;break a}b=!0}if(!b)throw Error("getSingleElementFromRange: range "+a.inspect()+" did not consist of a single element");return d[0]}function l(a,d){var b=new p(d);a._ranges=[b];f(a,b,!1);a.rangeCount=1;a.isCollapsed=b.collapsed}function t(a){a._ranges.length=0;if(a.docSelection.type=="None")g(a);else{var d=a.docSelection.createRange();if(d&&typeof d.text!="undefined")l(a,d);else{a.rangeCount=d.length;for(var b,h=j.getDocument(d.item(0)),C=0;C<a.rangeCount;++C)b=e.createRange(h),b.selectNode(d.item(C)),
-a._ranges.push(b);a.isCollapsed=a.rangeCount==1&&a._ranges[0].collapsed;f(a,a._ranges[a.rangeCount-1],!1)}}}function n(a,d){for(var b=a.docSelection.createRange(),f=i(d),e=j.getDocument(b.item(0)),e=j.getBody(e).createControlRange(),g=0,h=b.length;g<h;++g)e.add(b.item(g));try{e.add(f)}catch(C){throw Error("addRange(): Element within the specified Range could not be added to control selection (does it have layout?)");}e.select();t(a)}function s(a,d,b){this.nativeSelection=a;this.docSelection=d;this._ranges=
-[];this.win=b;this.refresh()}function o(a,d){for(var b=j.getDocument(d[0].startContainer),b=j.getBody(b).createControlRange(),f=0,e;f<rangeCount;++f){e=i(d[f]);try{b.add(e)}catch(g){throw Error("setRanges(): Element within the one of the specified Ranges could not be added to control selection (does it have layout?)");}}b.select();t(a)}function k(a,d){if(a.anchorNode&&j.getDocument(a.anchorNode)!==j.getDocument(d))throw new x("WRONG_DOCUMENT_ERR");}function r(a){var d=[],b=new F(a.anchorNode,a.anchorOffset),
-f=new F(a.focusNode,a.focusOffset),e=typeof a.getName=="function"?a.getName():"Selection";if(typeof a.rangeCount!="undefined")for(var g=0,h=a.rangeCount;g<h;++g)d[g]=v.inspect(a.getRangeAt(g));return"["+e+"(Ranges: "+d.join(", ")+")(anchor: "+b.inspect()+", focus: "+f.inspect()+"]"}e.requireModules(["DomUtil","DomRange","WrappedRange"]);e.config.checkSelectionRanges=!0;var j=e.dom,q=e.util,v=e.DomRange,p=e.WrappedRange,x=e.DOMException,F=j.DomPosition,B,A,z=e.util.isHostMethod(window,"getSelection"),
-w=e.util.isHostObject(document,"selection"),H=w&&(!z||e.config.preferTextRange);H?(B=d,e.isSelectionValid=function(a){var a=(a||window).document,d=a.selection;return d.type!="None"||j.getDocument(d.createRange().parentElement())==a}):z?(B=a,e.isSelectionValid=function(){return!0}):b.fail("Neither document.selection or window.getSelection() detected.");e.getNativeSelection=B;var z=B(),K=e.createNativeRange(document),I=j.getBody(document),G=q.areHostObjects(z,q.areHostProperties(z,["anchorOffset","focusOffset"]));
-e.features.selectionHasAnchorAndFocus=G;var C=q.isHostMethod(z,"extend");e.features.selectionHasExtend=C;var P=typeof z.rangeCount=="number";e.features.selectionHasRangeCount=P;var N=!1,E=!0;q.areHostMethods(z,["addRange","getRangeAt","removeAllRanges"])&&typeof z.rangeCount=="number"&&e.features.implementsDomRange&&function(){var a=document.createElement("iframe");I.appendChild(a);var d=j.getIframeDocument(a);d.open();d.write("<html><head></head><body>12</body></html>");d.close();var b=j.getIframeWindow(a).getSelection(),
-f=d.documentElement.lastChild.firstChild,d=d.createRange();d.setStart(f,1);d.collapse(!0);b.addRange(d);E=b.rangeCount==1;b.removeAllRanges();var e=d.cloneRange();d.setStart(f,0);e.setEnd(f,2);b.addRange(d);b.addRange(e);N=b.rangeCount==2;d.detach();e.detach();I.removeChild(a)}();e.features.selectionSupportsMultipleRanges=N;e.features.collapsedNonEditableSelectionsSupported=E;var m=!1,u;I&&q.isHostMethod(I,"createControlRange")&&(u=I.createControlRange(),q.areHostProperties(u,["item","add"])&&(m=
-!0));e.features.implementsControlRange=m;A=G?function(a){return a.anchorNode===a.focusNode&&a.anchorOffset===a.focusOffset}:function(a){return a.rangeCount?a.getRangeAt(a.rangeCount-1).collapsed:!1};var D;q.isHostMethod(z,"getRangeAt")?D=function(a,d){try{return a.getRangeAt(d)}catch(b){return null}}:G&&(D=function(a){var d=j.getDocument(a.anchorNode),d=e.createRange(d);d.setStart(a.anchorNode,a.anchorOffset);d.setEnd(a.focusNode,a.focusOffset);d.collapsed!==this.isCollapsed&&(d.setStart(a.focusNode,
-a.focusOffset),d.setEnd(a.anchorNode,a.anchorOffset));return d});e.getSelection=function(a){var a=a||window,b=a._rangySelection,f=B(a),e=w?d(a):null;b?(b.nativeSelection=f,b.docSelection=e,b.refresh(a)):(b=new s(f,e,a),a._rangySelection=b);return b};e.getIframeSelection=function(a){return e.getSelection(j.getIframeWindow(a))};u=s.prototype;if(!H&&G&&q.areHostMethods(z,["removeAllRanges","addRange"])){u.removeAllRanges=function(){this.nativeSelection.removeAllRanges();g(this)};var O=function(a,d){var b=
-v.getRangeDocument(d),b=e.createRange(b);b.collapseToPoint(d.endContainer,d.endOffset);a.nativeSelection.addRange(h(b));a.nativeSelection.extend(d.startContainer,d.startOffset);a.refresh()};u.addRange=P?function(a,d){if(m&&w&&this.docSelection.type=="Control")n(this,a);else if(d&&C)O(this,a);else{var b;N?b=this.rangeCount:(this.removeAllRanges(),b=0);this.nativeSelection.addRange(h(a));this.rangeCount=this.nativeSelection.rangeCount;this.rangeCount==b+1?(e.config.checkSelectionRanges&&(b=D(this.nativeSelection,
-this.rangeCount-1))&&!v.rangesEqual(b,a)&&(a=new p(b)),this._ranges[this.rangeCount-1]=a,f(this,a,L(this.nativeSelection)),this.isCollapsed=A(this)):this.refresh()}}:function(a,d){d&&C?O(this,a):(this.nativeSelection.addRange(h(a)),this.refresh())};u.setRanges=function(a){if(m&&a.length>1)o(this,a);else{this.removeAllRanges();for(var d=0,b=a.length;d<b;++d)this.addRange(a[d])}}}else if(q.isHostMethod(z,"empty")&&q.isHostMethod(K,"select")&&m&&H)u.removeAllRanges=function(){try{if(this.docSelection.empty(),
-this.docSelection.type!="None"){var a;if(this.anchorNode)a=j.getDocument(this.anchorNode);else if(this.docSelection.type=="Control"){var d=this.docSelection.createRange();d.length&&(a=j.getDocument(d.item(0)).body.createTextRange())}a&&(a.body.createTextRange().select(),this.docSelection.empty())}}catch(b){}g(this)},u.addRange=function(a){this.docSelection.type=="Control"?n(this,a):(p.rangeToTextRange(a).select(),this._ranges[0]=a,this.rangeCount=1,this.isCollapsed=this._ranges[0].collapsed,f(this,
-a,!1))},u.setRanges=function(a){this.removeAllRanges();var d=a.length;d>1?o(this,a):d&&this.addRange(a[0])};else return b.fail("No means of selecting a Range or TextRange was found"),!1;u.getRangeAt=function(a){if(a<0||a>=this.rangeCount)throw new x("INDEX_SIZE_ERR");else return this._ranges[a]};var J;if(H)J=function(a){var d;e.isSelectionValid(a.win)?d=a.docSelection.createRange():(d=j.getBody(a.win.document).createTextRange(),d.collapse(!0));a.docSelection.type=="Control"?t(a):d&&typeof d.text!=
-"undefined"?l(a,d):g(a)};else if(q.isHostMethod(z,"getRangeAt")&&typeof z.rangeCount=="number")J=function(a){if(m&&w&&a.docSelection.type=="Control")t(a);else if(a._ranges.length=a.rangeCount=a.nativeSelection.rangeCount,a.rangeCount){for(var d=0,b=a.rangeCount;d<b;++d)a._ranges[d]=new e.WrappedRange(a.nativeSelection.getRangeAt(d));f(a,a._ranges[a.rangeCount-1],L(a.nativeSelection));a.isCollapsed=A(a)}else g(a)};else if(G&&typeof z.isCollapsed=="boolean"&&typeof K.collapsed=="boolean"&&e.features.implementsDomRange)J=
-function(a){var d;d=a.nativeSelection;d.anchorNode?(d=D(d,0),a._ranges=[d],a.rangeCount=1,d=a.nativeSelection,a.anchorNode=d.anchorNode,a.anchorOffset=d.anchorOffset,a.focusNode=d.focusNode,a.focusOffset=d.focusOffset,a.isCollapsed=A(a)):g(a)};else return b.fail("No means of obtaining a Range or TextRange from the user's selection was found"),!1;u.refresh=function(a){var d=a?this._ranges.slice(0):null;J(this);if(a){a=d.length;if(a!=this._ranges.length)return!1;for(;a--;)if(!v.rangesEqual(d[a],this._ranges[a]))return!1;
-return!0}};var Q=function(a,d){var b=a.getAllRanges(),f=!1;a.removeAllRanges();for(var e=0,h=b.length;e<h;++e)f||d!==b[e]?a.addRange(b[e]):f=!0;a.rangeCount||g(a)};u.removeRange=m?function(a){if(this.docSelection.type=="Control"){for(var d=this.docSelection.createRange(),a=i(a),b=j.getDocument(d.item(0)),b=j.getBody(b).createControlRange(),f,e=!1,g=0,h=d.length;g<h;++g)f=d.item(g),f!==a||e?b.add(d.item(g)):e=!0;b.select();t(this)}else Q(this,a)}:function(a){Q(this,a)};var L;!H&&G&&e.features.implementsDomRange?
-(L=function(a){var d=!1;a.anchorNode&&(d=j.comparePoints(a.anchorNode,a.anchorOffset,a.focusNode,a.focusOffset)==1);return d},u.isBackwards=function(){return L(this)}):L=u.isBackwards=function(){return!1};u.toString=function(){for(var a=[],d=0,b=this.rangeCount;d<b;++d)a[d]=""+this._ranges[d];return a.join("")};u.collapse=function(a,d){k(this,a);var b=e.createRange(j.getDocument(a));b.collapseToPoint(a,d);this.removeAllRanges();this.addRange(b);this.isCollapsed=!0};u.collapseToStart=function(){if(this.rangeCount){var a=
-this._ranges[0];this.collapse(a.startContainer,a.startOffset)}else throw new x("INVALID_STATE_ERR");};u.collapseToEnd=function(){if(this.rangeCount){var a=this._ranges[this.rangeCount-1];this.collapse(a.endContainer,a.endOffset)}else throw new x("INVALID_STATE_ERR");};u.selectAllChildren=function(a){k(this,a);var d=e.createRange(j.getDocument(a));d.selectNodeContents(a);this.removeAllRanges();this.addRange(d)};u.deleteFromDocument=function(){if(m&&w&&this.docSelection.type=="Control"){for(var a=this.docSelection.createRange(),
-d;a.length;)d=a.item(0),a.remove(d),d.parentNode.removeChild(d);this.refresh()}else if(this.rangeCount){a=this.getAllRanges();this.removeAllRanges();d=0;for(var b=a.length;d<b;++d)a[d].deleteContents();this.addRange(a[b-1])}};u.getAllRanges=function(){return this._ranges.slice(0)};u.setSingleRange=function(a){this.setRanges([a])};u.containsNode=function(a,d){for(var b=0,f=this._ranges.length;b<f;++b)if(this._ranges[b].containsNode(a,d))return!0;return!1};u.toHtml=function(){var a="";if(this.rangeCount){for(var a=
-v.getRangeDocument(this._ranges[0]).createElement("div"),d=0,b=this._ranges.length;d<b;++d)a.appendChild(this._ranges[d].cloneContents());a=a.innerHTML}return a};u.getName=function(){return"WrappedSelection"};u.inspect=function(){return r(this)};u.detach=function(){this.win=this.anchorNode=this.focusNode=this.win._rangySelection=null};s.inspect=r;e.Selection=s;e.selectionPrototype=u;e.addCreateMissingNativeApiListener(function(a){if(typeof a.getSelection=="undefined")a.getSelection=function(){return e.getSelection(this)};
-a=null})});
-rangy.createModule("CssClassApplier",function(e,b){function a(a,d){return a.className&&RegExp("(?:^|\\s)"+d+"(?:\\s|$)").test(a.className)}function d(d,b){d.className?a(d,b)||(d.className+=" "+b):d.className=b}function f(a){return a.split(/\s+/).sort().join(" ")}function g(a,d){return f(a.className)==f(d.className)}function h(a){for(var d=a.parentNode;a.hasChildNodes();)d.insertBefore(a.firstChild,a);d.removeChild(a)}function i(a,d){var b=a.cloneRange();b.selectNodeContents(d);var f=b.intersection(a),f=
-f?f.toString():"";b.detach();return f!=""}function l(a){return a.getNodes([3],function(d){return i(a,d)})}function t(a,d){if(a.attributes.length!=d.attributes.length)return!1;for(var b=0,f=a.attributes.length,e,g;b<f;++b)if(e=a.attributes[b],g=e.name,g!="class"){g=d.attributes.getNamedItem(g);if(e.specified!=g.specified)return!1;if(e.specified&&e.nodeValue!==g.nodeValue)return!1}return!0}function n(a,d){for(var b=0,f=a.attributes.length,e;b<f;++b)if(e=a.attributes[b].name,(!d||!x.arrayContains(d,
-e))&&a.attributes[b].specified&&e!="class")return!0;return!1}function s(a){var d;return a&&a.nodeType==1&&((d=a.parentNode)&&d.nodeType==9&&d.designMode=="on"||A(a)&&!A(a.parentNode))}function o(a){return(A(a)||a.nodeType!=1&&A(a.parentNode))&&!s(a)}function k(a){return a&&a.nodeType==1&&!z.test(B(a,"display"))}function r(a){if(a.data.length==0)return!0;if(w.test(a.data))return!1;switch(B(a.parentNode,"whiteSpace")){case "pre":case "pre-wrap":case "-moz-pre-wrap":return!1;case "pre-line":if(/[\r\n]/.test(a.data))return!1}return k(a.previousSibling)||
-k(a.nextSibling)}function j(a,d,f,e){var g,h=f==0;if(x.isAncestorOf(d,a))throw b.createError("descendant is ancestor of node");if(x.isCharacterDataNode(d))if(f==0)f=x.getNodeIndex(d),d=d.parentNode;else if(f==d.length)f=x.getNodeIndex(d)+1,d=d.parentNode;else throw b.createError("splitNodeAt should not be called with offset in the middle of a data node ("+f+" in "+d.data);if(x.isCharacterDataNode(d)?f==0?d.previousSibling:f==d.length?d.nextSibling:1:f>0&&f<d.childNodes.length){if(!g){g=d.cloneNode(!1);
-for(g.id&&g.removeAttribute("id");h=d.childNodes[f];)g.appendChild(h);x.insertAfter(g,d)}return d==a?g:j(a,g.parentNode,x.getNodeIndex(g),e)}else if(a!=d)return g=d.parentNode,d=x.getNodeIndex(d),h||d++,j(a,g,d,e);return a}function q(a){var d=a?"nextSibling":"previousSibling";return function(b,f){var e=b.parentNode,h=b[d];if(h){if(h&&h.nodeType==3)return h}else if(f&&(h=e[d])&&h.nodeType==1&&e.tagName==h.tagName&&g(e,h)&&t(e,h))return h[a?"firstChild":"lastChild"];return null}}function v(a){this.firstTextNode=
-(this.isElementMerge=a.nodeType==1)?a.lastChild:a;this.textNodes=[this.firstTextNode]}function p(a,d,b){this.cssClass=a;var e,g,h=null;if(typeof d=="object"&&d!==null){b=d.tagNames;h=d.elementProperties;for(e=0;g=I[e++];)d.hasOwnProperty(g)&&(this[g]=d[g]);e=d.normalize}else e=d;this.normalize=typeof e=="undefined"?!0:e;this.attrExceptions=[];e=document.createElement(this.elementTagName);this.elementProperties={};for(var j in h)h.hasOwnProperty(j)&&(G.hasOwnProperty(j)&&(j=G[j]),e[j]=h[j],this.elementProperties[j]=
-e[j],this.attrExceptions.push(j));this.elementSortedClassName=this.elementProperties.hasOwnProperty("className")?f(this.elementProperties.className+" "+a):a;this.applyToAnyTagName=!1;a=typeof b;if(a=="string")b=="*"?this.applyToAnyTagName=!0:this.tagNames=b.toLowerCase().replace(/^\s\s*/,"").replace(/\s\s*$/,"").split(/\s*,\s*/);else if(a=="object"&&typeof b.length=="number"){this.tagNames=[];e=0;for(a=b.length;e<a;++e)b[e]=="*"?this.applyToAnyTagName=!0:this.tagNames.push(b[e].toLowerCase())}else this.tagNames=
-[this.elementTagName]}e.requireModules(["WrappedSelection","WrappedRange"]);var x=e.dom,F=function(){function a(d,b,f){return b&&f?" ":""}return function(d,b){if(d.className)d.className=d.className.replace(RegExp("(?:^|\\s)"+b+"(?:\\s|$)"),a)}}(),B;typeof window.getComputedStyle!="undefined"?B=function(a,d){return x.getWindow(a).getComputedStyle(a,null)[d]}:typeof document.documentElement.currentStyle!="undefined"?B=function(a,d){return a.currentStyle[d]}:b.fail("No means of obtaining computed style properties found");
-var A;(function(){A=typeof document.createElement("div").isContentEditable=="boolean"?function(a){return a&&a.nodeType==1&&a.isContentEditable}:function(a){return!a||a.nodeType!=1||a.contentEditable=="false"?!1:a.contentEditable=="true"||A(a.parentNode)}})();var z=/^inline(-block|-table)?$/i,w=/[^\r\n\t\f \u200B]/,H=q(!1),K=q(!0);v.prototype={doMerge:function(){for(var a=[],d,b,f=0,e=this.textNodes.length;f<e;++f)d=this.textNodes[f],b=d.parentNode,a[f]=d.data,f&&(b.removeChild(d),b.hasChildNodes()||
-b.parentNode.removeChild(b));return this.firstTextNode.data=a=a.join("")},getLength:function(){for(var a=this.textNodes.length,d=0;a--;)d+=this.textNodes[a].length;return d},toString:function(){for(var a=[],d=0,b=this.textNodes.length;d<b;++d)a[d]="'"+this.textNodes[d].data+"'";return"[Merge("+a.join(",")+")]"}};var I=["elementTagName","ignoreWhiteSpace","applyToEditableOnly"],G={"class":"className"};p.prototype={elementTagName:"span",elementProperties:{},ignoreWhiteSpace:!0,applyToEditableOnly:!1,
-hasClass:function(d){return d.nodeType==1&&x.arrayContains(this.tagNames,d.tagName.toLowerCase())&&a(d,this.cssClass)},getSelfOrAncestorWithClass:function(a){for(;a;){if(this.hasClass(a,this.cssClass))return a;a=a.parentNode}return null},isModifiable:function(a){return!this.applyToEditableOnly||o(a)},isIgnorableWhiteSpaceNode:function(a){return this.ignoreWhiteSpace&&a&&a.nodeType==3&&r(a)},postApply:function(a,d,b){for(var f=a[0],e=a[a.length-1],g=[],h,j=f,k=e,r=0,i=e.length,l,q,n=0,p=a.length;n<
-p;++n)if(l=a[n],q=H(l,!b)){h||(h=new v(q),g.push(h));h.textNodes.push(l);if(l===f)j=h.firstTextNode,r=j.length;if(l===e)k=h.firstTextNode,i=h.getLength()}else h=null;if(a=K(e,!b))h||(h=new v(e),g.push(h)),h.textNodes.push(a);if(g.length){n=0;for(p=g.length;n<p;++n)g[n].doMerge();d.setStart(j,r);d.setEnd(k,i)}},createContainer:function(a){a=a.createElement(this.elementTagName);e.util.extend(a,this.elementProperties);d(a,this.cssClass);return a},applyToTextNode:function(a){var b=a.parentNode;b.childNodes.length==
-1&&x.arrayContains(this.tagNames,b.tagName.toLowerCase())?d(b,this.cssClass):(b=this.createContainer(x.getDocument(a)),a.parentNode.insertBefore(b,a),b.appendChild(a))},isRemovable:function(a){var d;if(d=a.tagName.toLowerCase()==this.elementTagName)if(d=f(a.className)==this.elementSortedClassName){var b;a:{d=this.elementProperties;for(b in d)if(d.hasOwnProperty(b)&&a[b]!==d[b]){b=!1;break a}b=!0}d=b&&!n(a,this.attrExceptions)&&this.isModifiable(a)}return d},undoToTextNode:function(a,d,b){d.containsNode(b)||
-(a=d.cloneRange(),a.selectNode(b),a.isPointInRange(d.endContainer,d.endOffset)&&(j(b,d.endContainer,d.endOffset,[d]),d.setEndAfter(b)),a.isPointInRange(d.startContainer,d.startOffset)&&(b=j(b,d.startContainer,d.startOffset,[d])));this.isRemovable(b)?h(b):F(b,this.cssClass)},applyToRange:function(a){a.splitBoundaries();var d=l(a);if(d.length){for(var b,f=0,e=d.length;f<e;++f)b=d[f],!this.isIgnorableWhiteSpaceNode(b)&&!this.getSelfOrAncestorWithClass(b)&&this.isModifiable(b)&&this.applyToTextNode(b);
-a.setStart(d[0],0);b=d[d.length-1];a.setEnd(b,b.length);this.normalize&&this.postApply(d,a,!1)}},applyToSelection:function(a){var a=e.getSelection(a||window),d,b=a.getAllRanges();a.removeAllRanges();for(var f=b.length;f--;)d=b[f],this.applyToRange(d),a.addRange(d)},undoToRange:function(a){a.splitBoundaries();var d=l(a),b,f,e=d[d.length-1];if(d.length){for(var g=0,h=d.length;g<h;++g)b=d[g],(f=this.getSelfOrAncestorWithClass(b))&&this.isModifiable(b)&&this.undoToTextNode(b,a,f),a.setStart(d[0],0),a.setEnd(e,
-e.length);this.normalize&&this.postApply(d,a,!0)}},undoToSelection:function(a){var a=e.getSelection(a||window),d=a.getAllRanges(),b;a.removeAllRanges();for(var f=0,g=d.length;f<g;++f)b=d[f],this.undoToRange(b),a.addRange(b)},getTextSelectedByRange:function(a,d){var b=d.cloneRange();b.selectNodeContents(a);var f=b.intersection(d),f=f?f.toString():"";b.detach();return f},isAppliedToRange:function(a){if(a.collapsed)return!!this.getSelfOrAncestorWithClass(a.commonAncestorContainer);else{for(var d=a.getNodes([3]),
-b=0,f;f=d[b++];)if(!this.isIgnorableWhiteSpaceNode(f)&&i(a,f)&&this.isModifiable(f)&&!this.getSelfOrAncestorWithClass(f))return!1;return!0}},isAppliedToSelection:function(a){for(var a=e.getSelection(a||window).getAllRanges(),d=a.length;d--;)if(!this.isAppliedToRange(a[d]))return!1;return!0},toggleRange:function(a){this.isAppliedToRange(a)?this.undoToRange(a):this.applyToRange(a)},toggleSelection:function(a){this.isAppliedToSelection(a)?this.undoToSelection(a):this.applyToSelection(a)},detach:function(){}};
-p.util={hasClass:a,addClass:d,removeClass:F,hasSameClasses:g,replaceWithOwnChildren:h,elementsHaveSameNonClassAttributes:t,elementHasNonClassAttributes:n,splitNodeAt:j,isEditableElement:A,isEditingHost:s,isEditable:o};e.CssClassApplier=p;e.createCssClassApplier=function(a,d,b){return new p(a,d,b)}});
-rangy.createModule("SaveRestore",function(e,b){function a(a,d){var b="selectionBoundary_"+ +new Date+"_"+(""+Math.random()).slice(2),f,e=h.getDocument(a.startContainer),g=a.cloneRange();g.collapse(d);f=e.createElement("span");f.id=b;f.style.lineHeight="0";f.style.display="none";f.className="rangySelectionBoundary";f.appendChild(e.createTextNode(i));g.insertNode(f);g.detach();return f}function d(a,d,f,e){(a=(a||document).getElementById(f))?(d[e?"setStartBefore":"setEndBefore"](a),a.parentNode.removeChild(a)):
-b.warn("Marker element has been removed. Cannot restore selection.")}function f(a,d){return d.compareBoundaryPoints(a.START_TO_START,a)}function g(a,d){var b=(a||document).getElementById(d);b&&b.parentNode.removeChild(b)}e.requireModules(["DomUtil","DomRange","WrappedRange"]);var h=e.dom,i="\ufeff";e.saveSelection=function(d){var d=d||window,g=d.document;if(e.isSelectionValid(d)){var h=e.getSelection(d),i=h.getAllRanges(),o=[],k,r;i.sort(f);for(var j=0,q=i.length;j<q;++j)k=i[j],k.collapsed?(r=a(k,
-!1),o.push({markerId:r.id,collapsed:!0})):(r=a(k,!1),k=a(k,!0),o[j]={startMarkerId:k.id,endMarkerId:r.id,collapsed:!1,backwards:i.length==1&&h.isBackwards()});for(j=q-1;j>=0;--j)k=i[j],k.collapsed?k.collapseBefore((g||document).getElementById(o[j].markerId)):(k.setEndBefore((g||document).getElementById(o[j].endMarkerId)),k.setStartAfter((g||document).getElementById(o[j].startMarkerId)));h.setRanges(i);return{win:d,doc:g,rangeInfos:o,restored:!1}}else b.warn("Cannot save selection. This usually happens when the selection is collapsed and the selection document has lost focus.")};
-e.restoreSelection=function(a,f){if(!a.restored){for(var g=a.rangeInfos,h=e.getSelection(a.win),i=[],k=g.length,r=k-1,j,q;r>=0;--r){j=g[r];q=e.createRange(a.doc);if(j.collapsed)if(j=(a.doc||document).getElementById(j.markerId)){j.style.display="inline";var v=j.previousSibling;v&&v.nodeType==3?(j.parentNode.removeChild(j),q.collapseToPoint(v,v.length)):(q.collapseBefore(j),j.parentNode.removeChild(j))}else b.warn("Marker element has been removed. Cannot restore selection.");else d(a.doc,q,j.startMarkerId,
-!0),d(a.doc,q,j.endMarkerId,!1);k==1&&q.normalizeBoundaries();i[r]=q}k==1&&f&&e.features.selectionHasExtend&&g[0].backwards?(h.removeAllRanges(),h.addRange(i[0],!0)):h.setRanges(i);a.restored=!0}};e.removeMarkerElement=g;e.removeMarkers=function(a){for(var d=a.rangeInfos,b=0,f=d.length,e;b<f;++b)e=d[b],e.collapsed?g(a.doc,e.markerId):(g(a.doc,e.startMarkerId),g(a.doc,e.endMarkerId))}});
-rangy.createModule("Serializer",function(e,b){function a(d,b){var b=b||[],f=d.nodeType,e=d.childNodes,g=e.length,h=[f,d.nodeName,g].join(":"),i="",l="";switch(f){case 3:i=d.nodeValue.replace(/</g,"&lt;").replace(/>/g,"&gt;");break;case 8:i="<\!--"+d.nodeValue.replace(/</g,"&lt;").replace(/>/g,"&gt;")+"--\>";break;default:i="<"+h+">",l="</>"}i&&b.push(i);for(f=0;f<g;++f)a(e[f],b);l&&b.push(l);return b}function d(d){d=a(d).join("");return s(d).toString(16)}function f(a,d,b){for(var f=[],e=a,b=b||o.getDocument(a).documentElement;e&&
-e!=b;)f.push(o.getNodeIndex(e,!0)),e=e.parentNode;return f.join("/")+":"+d}function g(a,d,f){d?f||o.getDocument(d):d=(f||document).documentElement;for(var a=a.split(":"),f=a[0]?a[0].split("/"):[],e=f.length,g;e--;)if(g=parseInt(f[e],10),g<d.childNodes.length)d=d.childNodes[parseInt(f[e],10)];else throw b.createError("deserializePosition failed: node "+o.inspectNode(d)+" has no child with index "+g+", "+e);return new o.DomPosition(d,parseInt(a[1],10))}function h(a,b,g){g=g||e.DomRange.getRangeDocument(a).documentElement;
-if(!o.isAncestorOf(g,a.commonAncestorContainer,!0))throw Error("serializeRange: range is not wholly contained within specified root node");a=f(a.startContainer,a.startOffset,g)+","+f(a.endContainer,a.endOffset,g);b||(a+="{"+d(g)+"}");return a}function i(a,b,f){b?f=f||o.getDocument(b):(f=f||document,b=f.documentElement);var a=/^([^,]+),([^,\{]+)({([^}]+)})?$/.exec(a),h=a[4],i=d(b);if(h&&h!==d(b))throw Error("deserializeRange: checksums of serialized range root node ("+h+") and target root node ("+
-i+") do not match");h=g(a[1],b,f);b=g(a[2],b,f);f=e.createRange(f);f.setStart(h.node,h.offset);f.setEnd(b.node,b.offset);return f}function l(a,b,f){b?f||o.getDocument(b):b=(f||document).documentElement;a=/^([^,]+),([^,]+)({([^}]+)})?$/.exec(a)[3];return!a||a===d(b)}function t(a,d,b){for(var a=a||e.getSelection(),a=a.getAllRanges(),f=[],g=0,i=a.length;g<i;++g)f[g]=h(a[g],d,b);return f.join("|")}function n(a,d,b){d?b=b||o.getWindow(d):(b=b||window,d=b.document.documentElement);for(var a=a.split("|"),
-f=e.getSelection(b),g=[],h=0,l=a.length;h<l;++h)g[h]=i(a[h],d,b.document);f.setRanges(g);return f}e.requireModules(["WrappedSelection","WrappedRange"]);(typeof encodeURIComponent=="undefined"||typeof decodeURIComponent=="undefined")&&b.fail("Global object is missing encodeURIComponent and/or decodeURIComponent method");var s=function(){var a=null;return function(d){for(var b=[],f=0,e=d.length,g;f<e;++f)g=d.charCodeAt(f),g<128?b.push(g):g<2048?b.push(g>>6|192,g&63|128):b.push(g>>12|224,g>>6&63|128,
-g&63|128);d=-1;if(!a){for(var f=[],e=0,h;e<256;++e){h=e;for(g=8;g--;)(h&1)==1?h=h>>>1^3988292384:h>>>=1;f[e]=h>>>0}a=f}f=a;e=0;for(g=b.length;e<g;++e)h=(d^b[e])&255,d=d>>>8^f[h];return(d^-1)>>>0}}(),o=e.dom;e.serializePosition=f;e.deserializePosition=g;e.serializeRange=h;e.deserializeRange=i;e.canDeserializeRange=l;e.serializeSelection=t;e.deserializeSelection=n;e.canDeserializeSelection=function(a,d,b){var f;d?f=b?b.document:o.getDocument(d):d=(b||window).document.documentElement;for(var a=a.split("|"),
-b=0,e=a.length;b<e;++b)if(!l(a[b],d,f))return!1;return!0};e.restoreSelectionFromCookie=function(a){var a=a||window,d;a:{d=a.document.cookie.split(/[;,]/);for(var b=0,f=d.length,e;b<f;++b)if(e=d[b].split("="),e[0].replace(/^\s+/,"")=="rangySerializedSelection"&&(e=e[1])){d=decodeURIComponent(e.replace(/\s+$/,""));break a}d=null}d&&n(d,a.doc)};e.saveSelectionCookie=function(a,d){var a=a||window,d=typeof d=="object"?d:{},b=d.expires?";expires="+d.expires.toUTCString():"",f=d.path?";path="+d.path:"",
-g=d.domain?";domain="+d.domain:"",h=d.secure?";secure":"",i=t(e.getSelection(a));a.document.cookie=encodeURIComponent("rangySerializedSelection")+"="+encodeURIComponent(i)+b+f+g+h};e.getElementChecksum=d});
-(function(){var e,b;e={changeIdAttribute:"data-cid",userIdAttribute:"data-userid",userNameAttribute:"data-username",timeAttribute:"data-time",attrValuePrefix:"",blockEl:"p",stylePrefix:"cts",currentUser:{id:null,name:null},changeTypes:{insertType:{tag:"insert",alias:"ins",action:"Inserted"},deleteType:{tag:"delete",alias:"del",action:"Deleted"}},handleEvents:!1,contentEditable:!0,isTracking:!0,noTrack:".ice-no-track",avoid:".ice-avoid"};b=function(a){a||(a={});if(!a.element)throw Error("`options.element` must be defined for ice construction.");
-ice.dom.extend(!0,this,e,a);this.pluginsManager=new ice.IcePluginManager(this);a.plugins&&this.pluginsManager.usePlugins("ice-init",a.plugins)};b.prototype={_changes:{},_userStyles:{},_styles:{},_uniqueStyleIndex:0,_browserType:null,_batchChangeid:null,_uniqueIDIndex:1,_delBookmark:"tempdel",isPlaceHoldingDeletes:!1,startTracking:function(){this.element.setAttribute("contentEditable",this.contentEditable);if(this.handleEvents){var a=this;ice.dom.bind(a.element,"keyup.ice keydown.ice keypress.ice mousedown.ice mouseup.ice",
-function(d){return a.handleEvent(d)})}this.initializeEnvironment();this.initializeEditor();this.initializeRange();this.pluginsManager.fireEnabled(this.element);return this},stopTracking:function(){this.element.setAttribute("contentEditable",!this.contentEditable);this.handleEvents&&ice.dom.unbind(this.element,"keyup.ice keydown.ice keypress.ice mousedown.ice mouseup.ice");this.pluginsManager.fireDisabled(this.element);return this},initializeEnvironment:function(){this.env||(this.env={});this.env.element=
-this.element;this.env.document=this.element.ownerDocument;this.env.window=this.env.document.defaultView||this.env.document.parentWindow||window;this.env.frame=this.env.window.frameElement;this.env.selection=this.selection=new ice.Selection(this.env);this.env.document.createElement(this.changeTypes.insertType.tag);this.env.document.createElement(this.changeTypes.deleteType.tag)},initializeRange:function(){var a=this.selection.createRange();a.setStart(ice.dom.find(this.element,this.blockEl)[0],0);a.collapse(!0);
-this.selection.addRange(a);this.env.frame?this.env.frame.contentWindow.focus():this.element.focus()},initializeEditor:function(){var a=this,d=this.env.document.createElement("div");this.element.childNodes.length?(ice.dom.each(ice.dom.contents(this.element),function(a,b){ice.dom.isBlockElement(b)&&d.appendChild(b)}),d.innerHTML===""&&d.appendChild(ice.dom.create("<"+this.blockEl+" ><br/></"+this.blockEl+">"))):d.appendChild(ice.dom.create("<"+this.blockEl+" ><br/></"+this.blockEl+">"));this.element.innerHTML=
-d.innerHTML;var b=[],e;for(e in this.changeTypes)b.push(this._getIceNodeClass(e));ice.dom.each(ice.dom.find(this.element,"."+b.join(", .")),function(d,e){for(var g=0,t="",n=e.className.split(" "),d=0;d<n.length;d++){var s=RegExp(a.stylePrefix+"-(\\d+)").exec(n[d]);s&&(g=s[1]);(s=RegExp("("+b.join("|")+")").exec(n[d]))&&(t=a._getChangeTypeFromAlias(s[1]))}n=ice.dom.attr(e,a.userIdAttribute);a.setUserStyle(n,Number(g));g=ice.dom.attr(e,a.changeIdAttribute);a._changes[g]={type:t,userid:n,username:ice.dom.attr(e,
-a.userNameAttribute),time:ice.dom.attr(e,a.timeAttribute)}})},enableChangeTracking:function(){this.isTracking=!0;this.pluginsManager.fireEnabled(this.element)},disableChangeTracking:function(){this.isTracking=!1;this.pluginsManager.fireDisabled(this.element)},setCurrentUser:function(a){this.currentUser=a},handleEvent:function(a){if(this.isTracking)if(a.type=="mouseup"){var d=this;setTimeout(function(){d.mouseUp(a)},200)}else if(a.type=="mousedown")return this.mouseDown(a);else if(a.type=="keypress"){var b=
-this.keyPress(a);b||a.preventDefault();return b}else if(a.type=="keydown")return(b=this.keyDown(a))||a.preventDefault(),b;else a.type=="keyup"&&this.pluginsManager.fireCaretUpdated()},createIceNode:function(a,d){var b=this.env.document.createElement(this.changeTypes[a].tag);ice.dom.addClass(b,this._getIceNodeClass(a));b.appendChild(d?d:this.env.document.createTextNode(""));this.addChange(this.changeTypes[a].alias,[b]);this.pluginsManager.fireNodeCreated(b,{action:this.changeTypes[a].action});return b},
-insert:function(a,d){d?this.selection.addRange(d):d=this.getCurrentRange();typeof a==="string"&&(a=document.createTextNode(a));if(!d.collapsed&&(this.deleteContents(),d=this.getCurrentRange(),d.startContainer===d.endContainer&&this.element===d.startContainer)){ice.dom.empty(this.element);var b=d.getLastSelectableChild(this.element);d.setStartAfter(b);d.collapse(!0)}this._moveRangeToValidTrackingPos(d);b=this.startBatchChange();this._insertNode(a||document.createTextNode("\ufeff"),d,!a);this.pluginsManager.fireNodeInserted(a,
-d);this.endBatchChange(b);return!1},placeholdDeletes:function(){var a=this;this.isPlaceholdingDeletes&&this.revertDeletePlaceholders();this.isPlaceholdingDeletes=!0;this._deletes=[];var d="."+this._getIceNodeClass("deleteType");ice.dom.each(ice.dom.find(this.element,d),function(d,b){a._deletes.push(ice.dom.cloneNode(b));ice.dom.replaceWith(b,"<"+a._delBookmark+' data-allocation="'+(a._deletes.length-1)+'"/>')});return!0},revertDeletePlaceholders:function(){var a=this;if(!this.isPlaceholdingDeletes)return!1;
-ice.dom.each(this._deletes,function(d,b){ice.dom.find(a.element,a._delBookmark+"[data-allocation="+d+"]").replaceWith(b)});this.isPlaceholdingDeletes=!1;return!0},deleteContents:function(a,d){var b=!0;d?this.selection.addRange(d):d=this.getCurrentRange();var e=this.startBatchChange(this.changeTypes.deleteType.alias);d.collapsed===!1?this._deleteFromSelection(d):b=a?this._deleteFromRight(d):this._deleteFromLeft(d);this.selection.addRange(d);this.endBatchChange(e);return b},getChanges:function(){return this._changes},
-getElementContent:function(){return this.element.innerHTML},getCleanContent:function(a,d,b){var e="",h=this;ice.dom.each(this.changeTypes,function(a,d){a!="deleteType"&&(d>0&&(e+=","),e+="."+h._getIceNodeClass(a))});a=a?typeof a==="string"?ice.dom.create("<div>"+a+"</div>"):ice.dom.cloneNode(a)[0]:ice.dom.cloneNode(this.element)[0];a=b?b.call(this,a):a;b=ice.dom.find(a,e);ice.dom.each(b,function(){ice.dom.replaceWith(this,ice.dom.contents(this))});b=ice.dom.find(a,"."+this._getIceNodeClass("deleteType"));
-ice.dom.remove(b);a=d?d.call(this,a):a;return a.innerHTML},acceptAll:function(){this.element.innerHTML=this.getCleanContent()},rejectAll:function(){var a="."+this._getIceNodeClass("insertType"),d="."+this._getIceNodeClass("deleteType");ice.dom.remove(ice.dom.find(this.element,a));ice.dom.each(ice.dom.find(this.element,d),function(a,d){ice.dom.replaceWith(d,ice.dom.contents(d))})},acceptChange:function(a){this.acceptRejectChange(a,!0)},rejectChange:function(a){this.acceptRejectChange(a,!1)},acceptRejectChange:function(a,
-d){var b,e,h,i,l,t,n=ice.dom;if(!a)if(b=this.getCurrentRange(),b.collapsed)a=b.startContainer;else return;b=h="."+this._getIceNodeClass("deleteType");e=i="."+this._getIceNodeClass("insertType");l=n.getNode(a,b+","+e);t=n.find(this.element,"["+this.changeIdAttribute+"="+n.attr(l,this.changeIdAttribute)+"]");d||(h=e,i=b);ice.dom.is(l,i)?n.each(t,function(a,d){n.replaceWith(d,ice.dom.contents(d))}):n.is(l,h)&&n.remove(t)},isInsideChange:function(a){var d="."+this._getIceNodeClass("insertType")+", ."+
-this._getIceNodeClass("deleteType");if(!a)if(range=this.getCurrentRange(),range.collapsed)a=range.startContainer;else return!1;return!!ice.dom.getNode(a,d)},addChangeType:function(a,d,b,e){d={tag:d,alias:b};if(e)d.action=e;this.changeTypes[a]=d},getIceNode:function(a,d){var b="."+this._getIceNodeClass(d);return ice.dom.getNode(a,b)},_moveRangeToValidTrackingPos:function(a){for(var d=!1,b=this._getVoidElement(a.endContainer);b;){try{a.moveEnd(ice.dom.CHARACTER_UNIT,1),a.moveEnd(ice.dom.CHARACTER_UNIT,
--1)}catch(e){d=!0}if(d||ice.dom.onBlockBoundary(a.endContainer,a.startContainer,this.blockEl)){a.setStartAfter(b);a.collapse(!0);break}(b=this._getVoidElement(a.endContainer))?(a.setEnd(a.endContainer,0),a.moveEnd(ice.dom.CHARACTER_UNIT,ice.dom.getNodeTextContent(a.endContainer).length),a.collapse()):(a.setStart(a.endContainer,0),a.collapse(!0))}},_getNoTrackElement:function(a){var d=this._getNoTrackSelector();return ice.dom.is(a,d)?a:ice.dom.parents(a,d)[0]||null},_getNoTrackSelector:function(){return this.noTrack},
-_getVoidElement:function(a){var d=this._getVoidElSelector();return ice.dom.is(a,d)?a:ice.dom.parents(a,d)[0]||null},_getVoidElSelector:function(){return"."+this._getIceNodeClass("deleteType")+","+this.avoid},_currentUserIceNode:function(a){return ice.dom.attr(a,this.userIdAttribute)==this.currentUser.id},_getChangeTypeFromAlias:function(a){var d,b=null;for(d in this.changeTypes)this.changeTypes.hasOwnProperty(d)&&this.changeTypes[d].alias==a&&(b=d);return b},_getIceNodeClass:function(a){return this.attrValuePrefix+
-this.changeTypes[a].alias},getUserStyle:function(a){var d=null;return d=this._userStyles[a]?this._userStyles[a]:this.setUserStyle(a,this.getNewStyleId())},setUserStyle:function(a,d){var b=this.stylePrefix+"-"+d;this._styles[d]||(this._styles[d]=!0);return this._userStyles[a]=b},getNewStyleId:function(){var a=++this._uniqueStyleIndex;return this._styles[a]?this.getNewStyleId():(this._styles[a]=!0,a)},addChange:function(a,d){var b=this._batchChangeid||this.getNewChangeId();this._changes[b]||(this._changes[b]=
-{type:this._getChangeTypeFromAlias(a),time:(new Date).getTime(),userid:this.currentUser.id,username:this.currentUser.name});var e=this;ice.dom.foreach(d,function(a){e.addNodeToChange(b,d[a])});return b},addNodeToChange:function(a,d){if(this._batchChangeid!==null)a=this._batchChangeid;var b=this.getChange(a);d.getAttribute(this.changeIdAttribute)||d.setAttribute(this.changeIdAttribute,a);d.getAttribute(this.userIdAttribute)||d.setAttribute(this.userIdAttribute,b.userid);d.getAttribute(this.userNameAttribute)||
-d.setAttribute(this.userNameAttribute,b.username);d.getAttribute(this.timeAttribute)||d.setAttribute(this.timeAttribute,b.time);ice.dom.hasClass(d,this._getIceNodeClass(b.type))||ice.dom.addClass(d,this._getIceNodeClass(b.type));b=this.getUserStyle(b.userid);ice.dom.hasClass(d,b)||ice.dom.addClass(d,b)},getChange:function(a){var d=null;this._changes[a]&&(d=this._changes[a]);return d},getNewChangeId:function(){var a=++this._uniqueIDIndex;this._changes[a]&&(a=this.getNewChangeId());return a},startBatchChange:function(){return this._batchChangeid=
-this.getNewChangeId()},endBatchChange:function(a){if(a===this._batchChangeid)this._batchChangeid=null},getCurrentRange:function(){return this.selection.getRangeAt(0)},_insertNode:function(a,d,b){var e=this._currentUserIceNode(this.getIceNode(d.startContainer,"insertType"));if(!b||!e)e||(a=this.createIceNode("insertType",a)),d.insertNode(a),d.setEnd(a,1),d.collapse(),b&&(d.setStart(a,0),d.setEnd(a,1)),this.selection.addRange(d)},_deleteFromSelection:function(a){for(var d=new ice.Bookmark(this.env,
-a),b=ice.dom.getElementsBetween(d.start,d.end),e=ice.dom.parents(a.startContainer,this.blockEl)[0],h=ice.dom.parents(a.endContainer,this.blockEl)[0],i=[],l=b.length,t=0;t<l;t++){var n=b[t];ice.dom.is(n,this.blockEl)&&i.push(n);if(!(n.nodeType===ice.dom.TEXT_NODE&&ice.dom.getNodeTextContent(n)==="")){if(n.hasChildNodes())for(var s=0;s<n.childNodes.length;s++){var o=n.childNodes[s];(this._getNoTrackElement(o)||this._currentUserIceNode(o))&&ice.dom.remove(o)}(this._getNoTrackElement(n)||this._currentUserIceNode(n))&&
-ice.dom.remove(n);if(!this._getVoidElement(n)){if(n.nodeType!==ice.dom.TEXT_NODE)if(ice.dom.remove(ice.dom.find(n,"br")),s=ice.dom.cloneNode(n),ice.dom.remove(ice.dom.find(s,this._getVoidElSelector())),ice.dom.getNodeTextContent(s).length===0)continue;else if(ice.dom.is(n,this.blockEl)){s=this.createIceNode("deleteType");newEl=document.createElement(this.blockEl);s.innerHTML=n.innerHTML;n.innerHTML="";n.appendChild(s);continue}s=this.createIceNode("deleteType");ice.dom.insertBefore(n,s);s.appendChild(n)}}}if(e!==
-h){for(;i.length;)ice.dom.mergeContainers(i.shift(),e);ice.dom.mergeContainers(h,e)}(b=d.start.previousSibling)?(d.selectBookmark(),a=this.getCurrentRange(),a.moveStart(ice.dom.CHARACTER_UNIT,-1),a.moveStart(ice.dom.CHARACTER_UNIT,1)):(b=this.env.document.createTextNode(""),ice.dom.insertBefore(d.start,b),this.selection.addRange(a),d.selectBookmark(),a=this.getCurrentRange(),a.setStart(b,0));a.collapse(!0)},_deleteFromRight:function(a){var d=ice.dom.parents(a.startContainer,this.blockEl)[0]||ice.dom.is(a.startContainer,
-this.blockEl)&&a.startContainer||null,b=d&&d.nextSibling||null,e=ice.dom.is(a.startContainer,this.blockEl)&&ice.dom.getNodeTextContent(a.startContainer)=="";a.moveEnd(ice.dom.CHARACTER_UNIT,1);a.moveEnd(ice.dom.CHARACTER_UNIT,-1);if(!b&&!ice.dom.isChildOf(a.endContainer,this.element))return a.moveEnd(ice.dom.CHARACTER_UNIT,-1),a.moveEnd(ice.dom.CHARACTER_UNIT,1),a.collapse(),!0;if((ice.dom.onBlockBoundary(a.endContainer,a.startContainer,this.blockEl)||e)&&!this._getVoidElement(d))return b!==ice.dom.parents(a.endContainer,
-this.blockEl)[0]&&a.setEnd(b,0),ice.dom.remove(ice.dom.find(a.startContainer,"br")),ice.dom.mergeBlockWithSibling(a,ice.dom.parents(a.startContainer,this.blockEl)[0]||d,!0);if(this._getVoidElement(a.endContainer))return a.setEnd(a.endContainer,0),a.moveEnd(ice.dom.CHARACTER_UNIT,ice.dom.getNodeTextContent(a.endContainer).length||0),a.collapse(),this._deleteFromRight(a);if(this._getNoTrackElement(a.endContainer.parentElement))return a.deleteContents(),!1;a.collapse();d=a.startContainer;if(a.startContainer.data&&
-a.endOffset===d.data.length){b=a.cloneRange();b.moveEnd(ice.dom.CHARACTER_UNIT,1);if(e=ice.dom.getBlockParent(b.endContainer,this.element)){if(ice.dom.isChildOf(e,this.element)===!1)return;var h=ice.dom.getBlockParent(b.startContainer,this.element);if(e!==h){ice.dom.mergeContainers(e,h);a.setStart(b.startContainer,b.startContainer.data.length);a.collapse(!0);return}}d=a.getNextContainer(d);if(ice.dom.isChildOf(d,this.element)===!1)return!1;d=a.getFirstSelectableChild(d);a.setStart(d,0);this._addTextNodeTracking(d,
-a)}else if(d=this.getIceNode(a.startContainer,"insertType"),d===null||!this._currentUserIceNode(d))this._addTextNodeTracking(a.startContainer,a,!0);else if(a.moveEnd(ice.dom.CHARACTER_UNIT,1),a.deleteContents(),d!==null&&ice.dom.isBlank(ice.dom.getNodeTextContent(d))===!0){b=d.previousSibling;if(!b||b.nodeType!==ice.dom.TEXT_NODE)b=this.env.document.createTextNode(""),ice.dom.insertBefore(d,b);a.setStart(b,b.data.length);ice.dom.remove(d)}a.collapse(!0);return!0},_deleteFromLeft:function(a){var d=
-ice.dom.parents(a.startContainer,this.blockEl)[0]||ice.dom.is(a.startContainer,this.blockEl)&&a.startContainer||null,b=d&&d.previousSibling||null,e=ice.dom.is(a.startContainer,this.blockEl)&&ice.dom.getNodeTextContent(a.startContainer)=="";a.moveStart(ice.dom.CHARACTER_UNIT,-1);var h=a.startOffset===a.endOffset&&a.startContainer===a.endContainer,i=!ice.dom.isChildOf(a.startContainer,this.element);if(h||!b&&i)return b&&a.moveStart(ice.dom.CHARACTER_UNIT,1),a.collapse(!0),!0;a.moveStart(ice.dom.CHARACTER_UNIT,
-1);if((ice.dom.onBlockBoundary(a.startContainer,a.endContainer,this.blockEl)||e)&&this._getVoidElement(b))return a.deleteContents(),!1;if(this._getVoidElement(a.startContainer))return a.setStart(a.startContainer,0),a.collapse(!0),this._deleteFromLeft(a);if(ice.dom.onBlockBoundary(a.startContainer,a.endContainer,this.blockEl)||e)return b!==ice.dom.parents(a.startContainer,this.blockEl)[0]&&a.setStart(b,0),ice.dom.remove(ice.dom.find(a.startContainer,"br")),ice.dom.mergeBlockWithSibling(a,ice.dom.parents(a.endContainer,
-this.blockEl)[0]||d);if(this._getNoTrackElement(a.startContainer.parentElement))return a.deleteContents(),!1;d=a.startContainer;if(a.startOffset===0){b=a.cloneRange();b.moveStart(ice.dom.CHARACTER_UNIT,-1);if(e=ice.dom.getBlockParent(b.startContainer,this.element)){if(ice.dom.isChildOf(e,this.element)===!1)return!1;h=ice.dom.getBlockParent(b.endContainer,this.element);if(h!==e){ice.dom.mergeContainers(h,e);a.setStart(b.startContainer,b.startContainer.data.length);a.collapse(!0);return}}d=a.getPreviousContainer(d);
-if(!ice.dom.isChildOf(d,this.element))return!1;ice.dom.isStubElement(d)?(a.moveStart(ice.dom.CHARACTER_UNIT,-1),ice.dom.addClass(d,this._getIceNodeClass("deleteType")),ice.dom.attr(d,"title","Content removed"),a.collapse(!0)):(d=a.getLastSelectableChild(d),a.setStart(d,d.data.length),this._addTextNodeTracking(d,a))}else b=a.startContainer,d=this.getIceNode(b,"insertType"),d===null||!this._currentUserIceNode(d)?this._addTextNodeTracking(b,a):(a.moveStart(ice.dom.CHARACTER_UNIT,-1),a.moveEnd(ice.dom.CHARACTER_UNIT,
--1),a.moveEnd(ice.dom.CHARACTER_UNIT,1),a.deleteContents(),d!==null&&ice.dom.isBlank(ice.dom.getNodeTextContent(d))&&(b=this.env.document.createTextNode(""),ice.dom.insertBefore(d,b),a.setStart(b,0),a.collapse(!0),ice.dom.replaceWith(d,ice.dom.contents(d))));return!0},_addTextNodeTracking:function(a,d,b){if(!(!b&&d.startOffset===0||this.getIceNode(a,"deleteType")!==null)){var e="",h="",i="";b?(e=a.nodeValue.substring(0,d.endOffset),h=a.nodeValue.substr(d.endOffset,1),i=a.nodeValue.substring(d.endOffset+
-1)):(e=a.nodeValue.substring(0,d.startOffset-1),h=a.nodeValue.substr(d.startOffset-1,1),i=a.nodeValue.substring(d.startOffset));if(d.startOffset===1&&!b||b&&d.startOffset===0){var l=this.getIceNode(a.previousSibling,"deleteType");l!==null&&!this._currentUserIceNode(l)&&(l=null);if(l){if(b)if(l.lastChild&&l.lastChild.nodeType===ice.dom.TEXT_NODE?l.lastChild.nodeValue+=h:(b=this.env.document.createTextNode(h),l.appendChild(b)),a.nodeValue=e+i,a.nodeValue.length===0){b=!1;for(a=a.nextSibling;!b;)(l=
-this.getIceNode(a,"deleteType"))?a=a.nextSibling:b=!0;a&&(d.setStart(a,0),d.collapse(!0))}else d.setStart(a,0),d.collapse(!0);else if(l.lastChild&&l.lastChild.nodeType===ice.dom.TEXT_NODE?(l.lastChild.nodeValue+=h,d.setStart(l.lastChild,l.lastChild.nodeValue.length-1)):(b=this.env.document.createTextNode(h),l.appendChild(b),d.setStart(b,0)),a.nodeValue=e+i,a.nodeValue=e+i,a.nodeValue.length===0){b=!1;for(a=a.previousSibling;!b;)(l=this.getIceNode(a,"deleteType"))?a=a.previousSibling:b=!0;a&&(a=d.getLastSelectableChild(a),
-d.setStart(a,a.nodeValue.length),d.collapse(!0))}else d.collapse(!0);return}}if(d.startOffset===a.nodeValue.length&&(l=this.getIceNode(a.nextSibling,"deleteType"),l!==null&&!this._currentUserIceNode(l)&&(l=null),l)){l.firstChild&&l.firstChild.nodeType===ice.dom.TEXT_NODE?l.firstChild.nodeValue=h+l.firstChild.nodeValue:(b=this.env.document.createTextNode(h),ice.dom.insertBefore(l.firstChild,b));a.nodeValue=e;d.setStart(a,a.nodeValue.length);d.setEnd(a,a.nodeValue.length);return}l=this.createIceNode("deleteType");
-e=null;b!==!0?(e=a.splitText(d.startOffset-1),e.nodeValue=e.nodeValue.substring(1),ice.dom.insertAfter(a,e),l.firstChild.nodeValue=h,ice.dom.insertAfter(a,l),d.setStart(a,a.nodeValue.length),d.setEnd(a,a.nodeValue.length)):(e=a.splitText(d.endOffset),e.nodeValue=e.nodeValue.substring(1),ice.dom.insertAfter(a,e),l.firstChild.nodeValue=h,ice.dom.insertAfter(a,l),d.setStart(e,0),d.setEnd(e,0))}},_handleAncillaryKey:function(a){var d=!0;switch(a.keyCode){case ice.dom.DOM_VK_DELETE:d=this.deleteContents();
-this.pluginsManager.fireKeyPressed(a);break;case 46:d=this.deleteContents(!0);this.pluginsManager.fireKeyPressed(a);break;case ice.dom.DOM_VK_DOWN:case ice.dom.DOM_VK_UP:case ice.dom.DOM_VK_LEFT:case ice.dom.DOM_VK_RIGHT:this.pluginsManager.fireCaretPositioned();d=!1;break;default:d=!1}return d===!0?(ice.dom.preventDefault(a),!1):!0},keyDown:function(a){if(!this.pluginsManager.fireKeyDown(a))return ice.dom.preventDefault(a),!1;var d=!1;if(this._handleSpecialKey(a)===!1){if(ice.dom.isBrowser("msie")!==
-!0)this._preventKeyPress=!0;return!1}else if((a.ctrlKey===!0||a.metaKey===!0)&&(ice.dom.isBrowser("msie")===!0||ice.dom.isBrowser("chrome")===!0)&&!this.pluginsManager.fireKeyPressed(a))return!1;switch(a.keyCode){case 27:break;default:/Firefox/.test(navigator.userAgent)!==!0&&(d=!this._handleAncillaryKey(a))}return d?(ice.dom.preventDefault(a),!1):!0},keyPress:function(a){if(this._preventKeyPress===!0)this._preventKeyPress=!1;else{if(!this.pluginsManager.fireKeyPressed(a))return!1;var d=null;a.which==
-null?d=String.fromCharCode(a.keyCode):a.which>0&&(d=String.fromCharCode(a.which));var b=this.getCurrentRange(),e=ice.dom.parents(b.startContainer,"br")[0]||null;e&&(b.moveToNextEl(e),e.parentNode.removeChild(e));if(d!==null&&a.ctrlKey!==!0&&a.metaKey!==!0)switch(a.keyCode){case ice.dom.DOM_VK_DELETE:break;case ice.dom.DOM_VK_ENTER:return this._handleEnter();default:return this._moveRangeToValidTrackingPos(b,b.startContainer),this.insert(d)}return this._handleAncillaryKey(a)}},_handleEnter:function(){this.getCurrentRange().collapsed||
-this.deleteContents();return!0},_handleSpecialKey:function(a){var d=a.which;if(d===null)d=a.keyCode;var b=!1;switch(d){case 65:if(a.ctrlKey===!0||a.metaKey===!0){b=!0;d=this.getCurrentRange();if(ice.dom.isBrowser("msie")===!0){var e=this.env.document.createTextNode(""),h=this.env.document.createTextNode("");this.element.firstChild?ice.dom.insertBefore(this.element.firstChild,e):this.element.appendChild(e);this.element.appendChild(h);d.setStart(e,0);d.setEnd(h,0)}else d.setStart(d.getFirstSelectableChild(this.element),
-0),e=d.getLastSelectableChild(this.element),d.setEnd(e,e.length);this.selection.addRange(d)}}return b===!0?(ice.dom.preventDefault(a),!1):!0},mouseUp:function(a){if(!this.pluginsManager.fireClicked(a))return!1;this.pluginsManager.fireSelectionChanged(this.getCurrentRange())},mouseDown:function(a){if(!this.pluginsManager.fireMouseDown(a))return!1;this.pluginsManager.fireCaretUpdated()}};this.ice=this.ice||{};this.ice.InlineChangeEditor=b}).call(this);
-(function(){var e={DOM_VK_DELETE:8,DOM_VK_LEFT:37,DOM_VK_UP:38,DOM_VK_RIGHT:39,DOM_VK_DOWN:40,DOM_VK_ENTER:13,ELEMENT_NODE:1,ATTRIBUTE_NODE:2,TEXT_NODE:3,CDATA_SECTION_NODE:4,ENTITY_REFERENCE_NODE:5,ENTITY_NODE:6,PROCESSING_INSTRUCTION_NODE:7,COMMENT_NODE:8,DOCUMENT_NODE:9,DOCUMENT_TYPE_NODE:10,DOCUMENT_FRAGMENT_NODE:11,NOTATION_NODE:12,CHARACTER_UNIT:"character",WORD_UNIT:"word",getKeyChar:function(b){return String.fromCharCode(b.which)},getClass:function(b,a,d){if(!a)a=document.body;b="."+b.split(" ").join(".");
-d&&(b=d+b);return jQuery.makeArray(jQuery(a).find(b))},getId:function(b,a){a||(a=document);return element=a.getElementById(b)},getTag:function(b,a){a||(a=document);return jQuery.makeArray(jQuery(a).find(b))},getElementWidth:function(b){return b.offsetWidth},getElementHeight:function(b){return b.offsetHeight},getElementDimensions:function(b){return{width:e.getElementWidth(b),height:e.getElementHeight(b)}},trim:function(b){return jQuery.trim(b)},empty:function(b){if(b)return jQuery(b).empty()},remove:function(b){if(b)return jQuery(b).remove()},
-prepend:function(b,a){jQuery(b).prepend(a)},append:function(b,a){jQuery(b).append(a)},insertBefore:function(b,a){jQuery(b).before(a)},insertAfter:function(b,a){jQuery(b).after(a)},getHtml:function(b){return jQuery(b).html()},setHtml:function(b,a){b&&jQuery(b).html(a)},contents:function(b){return jQuery(b).contents()},extractContent:function(b){for(var a=document.createDocumentFragment(),d;d=b.firstChild;)a.appendChild(d);return a}};e.getNode=function(b,a){return e.is(b,a)?b:e.parents(b,a)[0]||null};
-e.getParents=function(b,a,d){for(var b=jQuery(b).parents(a),a=b.length,e=[],g=0;g<a;g++){if(b[g]===d)break;e.push(b[g])}return e};e.hasBlockChildren=function(b){for(var a=b.childNodes.length,d=0;d<a;d++)if(b.childNodes[d].nodeType===e.ELEMENT_NODE&&e.isBlockElement(b.childNodes[d])===!0)return!0;return!1};e.removeTag=function(b,a){jQuery(b).find(a).replaceWith(function(){return jQuery(this).contents()});return b};e.stripEnclosingTags=function(b,a){var d=jQuery(b);d.find("*").not(a).replaceWith(function(){return jQuery(this).contents()});
-return d[0]};e.getSiblings=function(b,a,d,e){if(d===!0)return a==="prev"?jQuery(b).prevAll():jQuery(b).nextAll();else{d=[];if(a==="prev")for(;b.previousSibling;){b=b.previousSibling;if(b===e)break;d.push(b)}else for(;b.nextSibling;){b=b.nextSibling;if(b===e)break;d.push(b)}return d}};e.getNodeTextContent=function(b){return jQuery(b).text()};e.setNodeTextContent=function(b,a){return jQuery(b).text(a)};e.getTagName=function(b){return b.tagName&&b.tagName.toLowerCase()||null};e.getIframeDocument=function(b){var a=
-null;if(b.contentDocument)a=b.contentDocument;else if(b.contentWindow)a=b.contentWindow.document;else if(b.document)a=b.document;return a};e.isBlockElement=function(b){switch(b.nodeName.toLowerCase()){case "p":case "div":case "pre":case "ul":case "ol":case "li":case "table":case "tbody":case "td":case "th":case "fieldset":case "form":case "blockquote":case "dl":case "dir":case "center":case "address":case "h1":case "h2":case "h3":case "h4":case "h5":case "h6":case "img":return!0;default:return!1}};
-e.isStubElement=function(b){if(b)switch(b.nodeName.toLowerCase()){case "img":case "br":case "hr":case "iframe":case "param":case "link":case "meta":case "input":case "frame":case "col":case "base":case "area":return!0}return!1};e.isChildOf=function(b,a){try{for(;b&&b.parentNode;){if(b.parentNode===a)return!0;b=b.parentNode}}catch(d){}return!1};e.isChildOfTagName=function(b,a){var d=null;try{for(;b&&b.parentNode;){if(b.parentNode&&b.parentNode.tagName&&b.parentNode.tagName.toLowerCase()===a)d=b.parentNode;
-b=b.parentNode}}catch(e){}return d};e.isChildOfClassName=function(b,a){var d=null;try{for(;b&&b.parentNode;){if(jQuery(b.parentNode).hasClass(a))d=b.parentNode;b=b.parentNode}}catch(e){}return d};e.cloneNode=function(b,a){a===void 0&&(a=!0);return jQuery(b).clone(a)};e.bind=function(b,a,d){return jQuery(b).bind(a,d)};e.unbind=function(b,a,d){return jQuery(b).unbind(a,d)};e.attr=function(b,a,d){return d?jQuery(b).attr(a,d):jQuery(b).attr(a)};e.replaceWith=function(b,a){return jQuery(b).replaceWith(a)};
-e.removeAttr=function(b,a){jQuery(b).removeAttr(a)};e.getElementsBetween=function(b,a){var d=[];if(b===a)return d;if(e.isChildOf(a,b)===!0){for(var f=b.childNodes.length,g=0;g<f;g++)if(b.childNodes[g]===a)break;else if(e.isChildOf(a,b.childNodes[g])===!0)return e.arrayMerge(d,e.getElementsBetween(b.childNodes[g],a));else d.push(b.childNodes[g]);return d}for(f=b.nextSibling;f;)if(e.isChildOf(a,f)===!0)return d=e.arrayMerge(d,e.getElementsBetween(f,a));else if(f===a)return d;else d.push(f),f=f.nextSibling;
-for(var f=e.getParents(b),g=e.getParents(a),f=e.arrayDiff(f,g,!0),g=f.length,h=0;h<g-1;h++)d=e.arrayMerge(d,e.getSiblings(f[h],"next"));return d=e.arrayMerge(d,e.getElementsBetween(f[f.length-1],a))};e.getCommonAncestor=function(b,a){for(var d=b;d;){if(e.isChildOf(a,d)===!0)return d;d=d.parentNode}return null};e.getNextNode=function(b){if(b.nextSibling)return b.nextSibling;else if(b.parentNode)return e.getFirstChild(b.parentNode);return null};e.getPrevNode=function(b){if(b.previousSibling)return b.previousSibling;
-else if(b.parentNode)return e.getLastChild(b.parentNode);return null};e.getFirstChild=function(b){return b.firstChild?b.firstChild.nodeType===e.ELEMENT_NODE?e.getFirstChild(b.firstChild):b.firstChild:b};e.getLastChild=function(b){return b.lastChild?b.lastChild.nodeType===e.ELEMENT_NODE?e.getLastChild(b.lastChild):b.lastChild:b};e.removeEmptyNodes=function(b,a){for(var d=jQuery(b).find(":empty"),f=d.length;f>0;)f--,e.isStubElement(d[f])===!1&&(!a||a.call(this,d[f])!==!1)&&e.remove(d[f])};e.create=
-function(b){return jQuery(b)[0]};e.find=function(b,a){return jQuery(b).find(a)};e.children=function(b,a){return jQuery(b).children(a)};e.parent=function(b,a){return jQuery(b).parent(a)[0]};e.parents=function(b,a){return jQuery(b).parents(a)};e.is=function(b,a){return jQuery(b).is(a)};e.extend=function(b,a,d,e){return jQuery.extend.apply(this,arguments)};e.walk=function(b,a,d){b&&(d||(d=0),a.call(this,b,d)!==!1&&(b.childNodes&&b.childNodes.length>0?e.walk(b.firstChild,a,d+1):b.nextSibling?e.walk(b.nextSibling,
-a,d):b.parentNode&&b.parentNode.nextSibling&&e.walk(b.parentNode.nextSibling,a,d-1)))};e.revWalk=function(b,a){b&&a.call(this,b)!==!1&&(b.childNodes&&b.childNodes.length>0?e.walk(b.lastChild,a):b.previousSibling?e.walk(b.previousSibling,a):b.parentNode&&b.parentNode.previousSibling&&e.walk(b.parentNode.previousSibling,a))};e.setStyle=function(b,a,d){b&&jQuery(b).css(a,d)};e.getStyle=function(b,a){return jQuery(b).css(a)};e.hasClass=function(b,a){return jQuery(b).hasClass(a)};e.addClass=function(b,
-a){jQuery(b).addClass(a)};e.removeClass=function(b,a){jQuery(b).removeClass(a)};e.preventDefault=function(b){b.preventDefault();e.stopPropagation(b)};e.stopPropagation=function(b){b.stopPropagation()};e.noInclusionInherits=function(b,a){if(a instanceof String||typeof a==="string")a=window[a];if(b instanceof String||typeof b==="string")b=window[b];var d=function(){};if(e.isset(a)===!0)for(value in a.prototype)b.prototype[value]?d.prototype[value]=a.prototype[value]:b.prototype[value]=a.prototype[value];
-if(b.prototype)d.prototype.constructor=a,b.prototype["super"]=new d};e.each=function(b,a){jQuery.each(b,function(d,b){a.call(this,d,b)})};e.foreach=function(b,a){if(b instanceof Array||b instanceof NodeList||typeof b.length!="undefined"&&typeof b.item!="undefined")for(var d=b.length,e=0;e<d;e++){var g=a.call(this,e,b[e]);if(g===!1)break}else for(d in b)if(b.hasOwnProperty(d)===!0&&(g=a.call(this,d),g===!1))break};e.isBlank=function(b){return!b||/^\s*$/.test(b)?!0:!1};e.isFn=function(b){return typeof b===
-"function"?!0:!1};e.isObj=function(b){return b!==null&&typeof b==="object"?!0:!1};e.isset=function(b){return typeof b!=="undefined"&&b!==null?!0:!1};e.isArray=function(b){return jQuery.isArray(b)};e.isNumeric=function(b){return b.match(/^\d+$/)!==null?!0:!1};e.getUniqueId=function(){return((new Date).getTime()+""+Math.ceil(Math.random()*1E6)).substr(5,18).replace(/,/,"")};e.inArray=function(b,a){for(var d=a.length,e=0;e<d;e++)if(b===a[e])return!0;return!1};e.arrayDiff=function(b,a,d){for(var f=b.length,
-g=[],h=0;h<f;h++)e.inArray(b[h],a)===!1&&g.push(b[h]);if(d!==!0){f=a.length;for(h=0;h<f;h++)e.inArray(a[h],b)===!1&&g.push(a[h])}return g};e.arrayMerge=function(b,a){for(var d=a.length,e=0;e<d;e++)b.push(a[e]);return b};e.stripTags=function(b,a){if(typeof a==="string"){var d=jQuery("<div>"+b+"</div>");d.find("*").not(a).remove();return d.html()}else{for(var f=RegExp(/<\/?(\w+)((\s+\w+(\s*=\s*(?:".*?"|'.*?'|[^'">\s]+))?)+\s*|\s*)\/?>/gim),g=b;(d=f.exec(b))!=null;)if(e.isset(a)===!1||e.inArray(d[1],
-a)!==!0)g=g.replace(d[0],"");return g}};e.browser=function(){var b={};b.version=jQuery.browser.version;if(jQuery.browser.mozilla===!0)b.type="mozilla";else if(jQuery.browser.msie===!0)b.type="msie";else if(jQuery.browser.opera===!0)b.type="opera";else if(jQuery.browser.safari===!0)b.type="safari";return b};e.getBrowserType=function(){if(this._browserType===null){for(var b=["msie","firefox","chrome","safari"],a=b.length,d=0;d<a;d++)if(RegExp(b[d],"i").test(navigator.userAgent)===!0)return this._browserType=
-b[d];this._browserType="other"}return this._browserType};e.isBrowser=function(b){return e.browser().type===b};e.getBlockParent=function(b,a){if(b)for(;b.parentNode;){b=b.parentNode;if(b===a)break;if(e.isBlockElement(b)===!0)return b}return null};e.onBlockBoundary=function(b,a,d){if(!b||!a)return!1;b=e.isChildOfTagName(b,d)||e.is(b,d)&&b||null;a=e.isChildOfTagName(a,d)||e.is(a,d)&&a||null;return b!==a};e.mergeContainers=function(b,a){if(!b||!a)return!1;if(b.nodeType===e.TEXT_NODE||e.isStubElement(b))a.appendChild(b);
-else if(b.nodeType===e.ELEMENT_NODE){for(;b.firstChild;)a.appendChild(b.firstChild);e.remove(b)}return!0};e.mergeBlockWithSibling=function(b,a,d){var f=d?a.nextSibling:a.previousSibling;d?e.mergeContainers(f,a):e.mergeContainers(a,f);b.collapse(!0);return!0};e.date=function(b,a,d){if(a===null&&d&&(a=e.tsIso8601ToTimestamp(d),!a))return;for(var a=new Date(a),b=b.split(""),d=b.length,f="",g=0;g<d;g++){var h="",i=b[g];switch(i){case "D":case "l":h=["Sunday","Monday","Tuesday","Wednesday","Thursday",
-"Friday","Saturday"][a.getDay()];i==="D"&&(h=h.substring(0,3));break;case "F":case "m":h=a.getMonth()+1;h<10&&(h="0"+h);break;case "M":months=["January","February","March","April","May","June","July","August","September","October","November","December"];h=months[a.getMonth()];i==="M"&&(h=h.substring(0,3));break;case "d":h=a.getDate();break;case "S":h=e.getOrdinalSuffix(a.getDate());break;case "Y":h=a.getFullYear();break;case "y":h=a.getFullYear();h=h.toString().substring(2);break;case "H":h=a.getHours();
-break;case "h":h=a.getHours();h===0?h=12:h>12&&(h-=12);break;case "i":h=e.addNumberPadding(a.getMinutes());break;case "a":h="am";a.getHours()>=12&&(h="pm");break;default:h=i}f+=h}return f};e.getOrdinalSuffix=function(b){var a="",a=b%100;if(a>=4&&a<=20)a="th";else switch(b%10){case 1:a="st";break;case 2:a="nd";break;case 3:a="rd";break;default:a="th"}return a};e.addNumberPadding=function(b){b<10&&(b="0"+b);return b};e.tsIso8601ToTimestamp=function(b){if(b=b.match(RegExp(/(\d\d\d\d)(?:-?(\d\d)(?:-?(\d\d)(?:[T ](\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(?:Z|(?:([-+])(\d\d)(?::?(\d\d))?)?)?)?)?)?/))){var a=
-new Date;a.setDate(b[3]);a.setFullYear(b[1]);a.setMonth(b[2]-1);a.setHours(b[4]);a.setMinutes(b[5]);a.setSeconds(b[6]);var d=b[9]*60;b[8]==="+"&&(d*=-1);d-=a.getTimezoneOffset();return a.getTime()+d*6E4}return null};this.dom=e}).call(this.ice);
-(function(){var e;e=function(b,a,d){this.env=b;this.element=b.element;this.selection=this.env.selection;d||this.removeBookmarks(this.element);var b=a||this.selection.getRangeAt(0),a=b.cloneRange(),e=a.startContainer,g=a.startOffset;a.collapse(!1);d=this.env.document.createElement("span");d.style.display="none";ice.dom.setHtml(d,"&nbsp;");ice.dom.addClass(d,"iceBookmark iceBookmark_end");d.setAttribute("iceBookmark","end");a.insertNode(d);ice.dom.isChildOf(d,this.element)||this.element.appendChild(d);
-a.setStart(e,g);a.collapse(!0);e=this.env.document.createElement("span");e.style.display="none";ice.dom.addClass(e,"iceBookmark iceBookmark_start");ice.dom.setHtml(e,"&nbsp;");e.setAttribute("iceBookmark","start");try{a.insertNode(e),e.previousSibling===d&&(a=e,e=d,d=a)}catch(h){ice.dom.insertBefore(d,e)}ice.dom.isChildOf(e,this.element)===!1&&(this.element.firstChild?ice.dom.insertBefore(this.element.firstChild,e):this.element.appendChild(e));d.previousSibling||(a=this.env.document.createTextNode(""),
-ice.dom.insertBefore(d,a));e.nextSibling||(a=this.env.document.createTextNode(""),ice.dom.insertAfter(e,a));b.setStart(e.nextSibling,0);b.setEnd(d.previousSibling,d.previousSibling.length||0);this.start=e;this.end=d};e.prototype={selectBookmark:function(){var b=this.selection.getRangeAt(0),a=null,d=null,e=0,g=null;if(this.start.nextSibling===this.end||ice.dom.getElementsBetween(this.start,this.end).length===0)if(this.end.nextSibling)a=ice.dom.getFirstChild(this.end.nextSibling);else if(this.start.previousSibling){if(a=
-ice.dom.getFirstChild(this.start.previousSibling),a.nodeType===ice.dom.TEXT_NODE)e=a.length}else this.end.parentNode.appendChild(this.env.document.createTextNode("")),a=ice.dom.getFirstChild(this.end.nextSibling);else this.start.nextSibling?a=ice.dom.getFirstChild(this.start.nextSibling):(this.start.previousSibling||(a=this.env.document.createTextNode(""),ice.dom.insertBefore(this.start,a)),a=ice.dom.getLastChild(this.start.previousSibling),e=a.length),this.end.previousSibling?d=ice.dom.getLastChild(this.end.previousSibling):
-(d=ice.dom.getFirstChild(this.end.nextSibling||this.end),g=0);ice.dom.remove([this.start,this.end]);d===null?(b.setEnd(a,e),b.collapse(!1)):(b.setStart(a,e),g===null&&(g=d.length||0),b.setEnd(d,g));try{this.selection.addRange(b)}catch(h){}},getBookmark:function(b,a){return ice.dom.getClass("iceBookmark_"+a,b)[0]},removeBookmarks:function(b){ice.dom.remove(ice.dom.getClass("iceBookmark",b,"span"))}};this.Bookmark=e}).call(this.ice);
-(function(){var e;e=function(b){this._selection=null;this.env=b;this._initializeRangeLibrary();this._getSelection()};e.prototype={_getSelection:function(){this._selection?this._selection.refresh():this._selection=this.env.frame?rangy.getIframeSelection(this.env.frame):rangy.getSelection();return this._selection},createRange:function(){return rangy.createRange(this.env.document)},getRangeAt:function(b){this._selection.refresh();try{return this._selection.getRangeAt(b)}catch(a){return this._selection=
-null,this._getSelection().getRangeAt(0)}},addRange:function(b){this._selection||(this._selection=this._getSelection());this._selection.setSingleRange(b);this._selection.ranges=[b]},_initializeRangeLibrary:function(){var b=this;rangy.init();rangy.config.checkSelectionRanges=!1;var a=function(a,b,e,h){if(e===0)throw Error("InvalidArgumentException: units cannot be 0");switch(b){case ice.dom.CHARACTER_UNIT:e>0?a.moveCharRight(h,e):a.moveCharLeft(h,e*-1)}};rangy.rangePrototype.moveStart=function(d,b){a(this,
-d,b,!0)};rangy.rangePrototype.moveEnd=function(d,b){a(this,d,b,!1)};rangy.rangePrototype.setRange=function(a,b,e){a?this.setStart(b,e):this.setEnd(b,e)};rangy.rangePrototype.moveCharLeft=function(a,b){var e,h;a?(e=this.startContainer,h=this.startOffset):(e=this.endContainer,h=this.endOffset);if(e.nodeType===ice.dom.ELEMENT_NODE)if(e.hasChildNodes()){e=e.childNodes[h];for(e=this.getPreviousTextNode(e);e&&e.nodeType==ice.dom.TEXT_NODE&&e.nodeValue==="";)e=this.getPreviousTextNode(e);h=e.data.length-
-b}else h=b*-1;else h-=b;if(h<0)for(;h<0;){e=this.getPreviousTextNode(e,[]);if(!e)return;e.nodeType!==ice.dom.ELEMENT_NODE&&(h+=e.data.length)}this.setRange(a,e,h)};rangy.rangePrototype.moveCharRight=function(a,b){var e,h;a?(e=this.startContainer,h=this.startOffset):(e=this.endContainer,h=this.endOffset);e.nodeType===ice.dom.ELEMENT_NODE?(e=e.childNodes[h],e.nodeType!==ice.dom.TEXT_NODE&&(e=this.getNextTextNode(e)),h=b):h+=b;var i=h-e.data.length;if(i>0){for(h=[];i>0;)if(e=this.getNextContainer(e,
-h),e.nodeType!==ice.dom.ELEMENT_NODE)if(e.data.length>=i)break;else e.data.length>0&&(i-=e.data.length);h=i}this.setRange(a,e,h)};rangy.rangePrototype.getNextContainer=function(a,b){if(!a)return null;for(;a.nextSibling;)if(a=a.nextSibling,a.nodeType!==ice.dom.TEXT_NODE){var e=this.getFirstSelectableChild(a);if(e!==null)return e}else if(this.isSelectable(a)===!0)return a;for(;a&&!a.nextSibling;)a=a.parentNode;if(!a)return null;a=a.nextSibling;if(this.isSelectable(a)===!0)return a;else b&&ice.dom.isBlockElement(a)===
-!0&&b.push(a);e=this.getFirstSelectableChild(a);return e!==null?e:this.getNextContainer(a,b)};rangy.rangePrototype.getPreviousContainer=function(a,b){if(!a)return null;for(;a.previousSibling;)if(a=a.previousSibling,a.nodeType!==ice.dom.TEXT_NODE)if(ice.dom.isStubElement(a)===!0)return a;else{var e=this.getLastSelectableChild(a);if(e!==null)return e}else if(this.isSelectable(a)===!0)return a;for(;a&&!a.previousSibling;)a=a.parentNode;if(!a)return null;a=a.previousSibling;if(this.isSelectable(a)===
-!0)return a;else b&&ice.dom.isBlockElement(a)===!0&&b.push(a);e=this.getLastSelectableChild(a);return e!==null?e:this.getPreviousContainer(a,b)};rangy.rangePrototype.getNextTextNode=function(a){if(a.nodeType===ice.dom.ELEMENT_NODE&&a.childNodes.length!==0)return this.getFirstSelectableChild(a);a=this.getNextContainer(a);return a.nodeType===ice.dom.TEXT_NODE?a:this.getNextTextNode(a)};rangy.rangePrototype.getPreviousTextNode=function(a,b){if(a.nodeType===ice.dom.ELEMENT_NODE&&a.childNodes.length!==
-0)return this.getLastSelectableChild(a);a=this.getPreviousContainer(a,b);return a.nodeType===ice.dom.TEXT_NODE?a:this.getPreviousTextNode(a,b)};rangy.rangePrototype.getFirstSelectableChild=function(a){if(a)if(a.nodeType!==ice.dom.TEXT_NODE)for(a=a.firstChild;a;)if(this.isSelectable(a)===!0)return a;else if(a.firstChild){var b=this.getFirstSelectableChild(a);if(b!==null)return b;else a=a.nextSibling}else a=a.nextSibling;else return a;return null};rangy.rangePrototype.getLastSelectableChild=function(a){if(a)if(a.nodeType!==
-ice.dom.TEXT_NODE)for(a=a.lastChild;a;)if(this.isSelectable(a)===!0)return a;else if(a.lastChild){var b=this.getLastSelectableChild(a);if(b!==null)return b;else a=a.previousSibling}else a=a.previousSibling;else return a;return null};rangy.rangePrototype.isSelectable=function(a){return a&&a.nodeType===ice.dom.TEXT_NODE&&a.data.length!==0?!0:!1};rangy.rangePrototype.getHTMLContents=function(a){a||(a=this.cloneContents());var e=b.env.document.createElement("div");e.appendChild(a.cloneNode(!0));return e.innerHTML};
-rangy.rangePrototype.getHTMLContentsObj=function(){return this.cloneContents()}}};this.Selection=e}).call(this.ice);
-(function(){var e=function(b){this._ice=b};e.prototype={start:function(){},clicked:function(){return!0},mouseDown:function(){return!0},keyDown:function(){return!0},keyPress:function(){return!0},selectionChanged:function(){},setEnabled:function(){},setDisabled:function(){},caretUpdated:function(){},nodeInserted:function(){},nodeCreated:function(){},caretPositioned:function(){},remove:function(){this._ice.removeKeyPressListener(this)},setSettings:function(){}};this.IcePlugin=e}).call(this.ice);
-(function(){var e=function(b){this.plugins={};this.pluginConstructors={};this.keyPressListeners={};this.activePlugin=null;this.pluginSets={};this.activePluginSet=null;this._ice=b};e.prototype={getPluginNames:function(){var b=[],a;for(a in this.plugins)b.push(a);return b},addPluginObject:function(b,a){this.plugins[b]=a},addPlugin:function(b,a){if(typeof a!=="function")throw Error("IcePluginException: plugin must be a constructor function");ice.dom.isset(this.pluginConstructors[b])===!1&&(this.pluginConstructors[b]=
-a)},loadPlugins:function(b,a){if(b.length===0)a.call(this);else{var d=b.shift();if(typeof d==="object")d=d.name;if(ice.dom.isset(ice._plugin[d])===!0)this.addPlugin(d,ice._plugin[d]),this.loadPlugins(b,a);else throw Error("plugin was not included in the page: "+d);}},_enableSet:function(b){this.activePluginSet=b;for(var a=this.pluginSets[b].length,d=0;d<a;d++){var e=this.pluginSets[b][d],g="",g=typeof e==="object"?e.name:e,h=this.pluginConstructors[g];h&&(h=new h(this._ice),this.plugins[g]=h,ice.dom.isset(e.settings)===
-!0&&h.setSettings(e.settings),h.start())}},setActivePlugin:function(b){this.activePlugin=b},getActivePlugin:function(){return this.activePlugin},_getPluginName:function(b){b=b.toString();return b.substr(9,b.indexOf("(")-9)},removePlugin:function(b){this.plugins[b]&&this.plugins[b].remove()},getPlugin:function(b){return this.plugins[b]},usePlugins:function(b,a,d){var e=this;this.pluginSets[b]=ice.dom.isset(a)===!0?a:[];this.loadPlugins(this.pluginSets[b].concat([]),function(){e._enableSet(b);d&&d.call(this)})},
-disablePlugin:function(b){this.plugins[b].disable()},isPluginElement:function(b){for(var a in this.plugins)if(this.plugins[a].isPluginElement&&this.plugins[a].isPluginElement(b)===!0)return!0;return!1},fireKeyPressed:function(b){if(this._fireKeyPressFns(b,"all_keys")===!1)return!1;var a=[];(b.ctrlKey===!0||b.metaKey===!0)&&a.push("ctrl");b.shiftKey===!0&&a.push("shift");b.altKey===!0&&a.push("alt");switch(b.keyCode){case 13:a.push("enter");break;case ice.dom.DOM_VK_LEFT:a.push("left");break;case ice.dom.DOM_VK_RIGHT:a.push("right");
-break;case ice.dom.DOM_VK_UP:a.push("up");break;case ice.dom.DOM_VK_DOWN:a.push("down");break;case 9:a.push("tab");break;case ice.dom.DOM_VK_DELETE:a.push("delete");break;default:var d;if(b.keyCode)d=b.keyCode;else if(b.which)d=b.which;d&&a.push(String.fromCharCode(d).toLowerCase())}a=a.sort().join("+");return this._fireKeyPressFns(b,a)},_fireKeyPressFns:function(b,a){if(this.keyPressListeners[a])for(var d=this.keyPressListeners[a].length,e=0;e<d;e++){var g=this.keyPressListeners[a][e],h=g.fn,i=g.plugin,
-g=g.data;if(h)if(ice.dom.isFn(h)===!0){if(h.call(i,b,g)===!0)return ice.dom.preventDefault(b),!1}else if(i[h]&&i[h].call(i,b,g)===!0)return ice.dom.preventDefault(b),!1}return!0},fireSelectionChanged:function(b){for(var a in this.plugins)this.plugins[a].selectionChanged(b)},fireNodeInserted:function(b,a){for(var d in this.plugins)if(this.plugins[d].nodeInserted(b,a)===!1)return!1},fireNodeCreated:function(b,a){for(var d in this.plugins)if(this.plugins[d].nodeCreated(b,a)===!1)return!1},fireCaretPositioned:function(){for(var b in this.plugins)this.plugins[b].caretPositioned()},
-fireClicked:function(b){var a=!0,d;for(d in this.plugins)this.plugins[d].clicked(b)===!1&&(a=!1);return a},fireMouseDown:function(b){var a=!0,d;for(d in this.plugins)this.plugins[d].mouseDown(b)===!1&&(a=!1);return a},fireKeyDown:function(b){var a=!0,d;for(d in this.plugins)this.plugins[d].keyDown(b)===!1&&(a=!1);return a},fireKeyPress:function(b){var a=!0,d;for(d in this.plugins)this.plugins[d].keyPress(b)===!1&&(a=!1);return a},fireEnabled:function(b){for(var a in this.plugins)this.plugins[a].setEnabled(b)},
-fireDisabled:function(b){for(var a in this.plugins)this.plugins[a].setDisabled(b)},fireCaretUpdated:function(){for(var b in this.plugins)this.plugins[b].caretUpdated&&this.plugins[b].caretUpdated()}};this._plugin={};this.IcePluginManager=e}).call(this.ice);
-(function(){var e;e=function(b){this._ice=b};e.prototype={nodeCreated:function(b,a){b.setAttribute("title",(a.action||"Modified")+" by "+b.getAttribute(this._ice.userNameAttribute)+" - "+ice.dom.date("m/d/Y h:ia",parseInt(b.getAttribute(this._ice.timeAttribute))))}};ice.dom.noInclusionInherits(e,ice.IcePlugin);this._plugin.IceAddTitlePlugin=e}).call(this.ice);
-(function(){var e;e=function(b){this._ice=b;this._tmpNode=null;this._tmpNodeTagName="icepaste";this._pasteId="icepastediv";var a=this;this.pasteType="formattedClean";this.preserve="p";this.beforePasteClean=function(a){return a};this.afterPasteClean=function(a){return a};b.element.oncopy=function(){return a.handleCopy.apply(a)};b.element.oncut=function(){return a.handleCut.apply(a)}};e.prototype={setSettings:function(b){b=b||{};ice.dom.extend(this,b);this.preserve+=","+this._tmpNodeTagName;this.setupPreserved()},
-keyDown:function(b){b.metaKey!==!0&&b.ctrlKey!==!0||b.keyCode==86&&this.handlePaste()},handleCut:function(){if(this._ice.isTracking){var b=this._ice.getCurrentRange();if(!b.collapsed){var a=b.cloneContents(),d=this;setTimeout(function(){d.doCut(a)},1);return!0}}},doCut:function(b){var a=this._ice.getCurrentRange(),d,e;this._tmpNode=this._ice.env.document.createElement("span");a.insertNode(this._tmpNode);a.setStartAfter(this._tmpNode);for(a.collapse(!0);d=b.firstChild;)a.insertNode(d),a.setStartAfter(d),
-a.collapse(!0),e=d;a.setStartBefore(this._tmpNode);a.collapse(!0);a.setEndAfter(e);this._ice.env.selection.addRange(a);this._ice.deleteContents(null,null,"cutType");ice.dom.remove(this._tmpNode)},handleCopy:function(){},handlePaste:function(){var b=this._ice.getCurrentRange();b.collapsed||(this._ice.isTracking?(this._ice.deleteContents(),b=b.cloneRange()):(b.deleteContents(),b.collapse(!0)));this._ice.isTracking&&this._ice._moveRangeToValidTrackingPos(b);if(b.startContainer==this._ice.element){var a=
-ice.dom.find(this._ice.element,this._ice.blockEl)[0];a||(a=ice.dom.create("<"+this._ice.blockEl+" ><br/></"+this._ice.blockEl+">"),this._ice.element.appendChild(a));b.setStart(a,0);b.collapse(!0);this._ice.env.selection.addRange(b)}this._tmpNode=this._ice.env.document.createElement(this._tmpNodeTagName);b.insertNode(this._tmpNode);switch(this.pasteType){case "formatted":this.setupPaste();break;case "formattedClean":this.setupPaste(!0)}return!0},setupPaste:function(b){var a=this.createDiv(this._pasteId),
-d=this;a.focus();a.onpaste=function(){setTimeout(function(){d.handlePasteValue(b)},1)};return!0},handlePasteValue:function(b){var a=ice.dom.getHtml(document.getElementById(this._pasteId)),d=ice.dom.children("<div>"+a+"</div>",this._ice.blockEl);d.length===1&&ice.dom.getNodeTextContent("<div>"+a+"</div>")===ice.dom.getNodeTextContent(d)&&(a=ice.dom.getHtml(a));a=this.beforePasteClean.call(this,a);b&&(a=this._ice.getCleanContent(a),a=this.stripPaste(a));var a=this.afterPasteClean.call(this,a),a=ice.dom.trim(a),
-e=this._ice.getCurrentRange();e.setStartAfter(this._tmpNode);e.collapse(!0);var g=null,a=e.createContextualFragment(a),b=this._ice.startBatchChange();if(ice.dom.hasBlockChildren(a)){var h=ice.dom.isChildOfTagName(this._tmpNode,this._ice.blockEl);e.setEndAfter(h.lastChild);this._ice.selection.addRange(e);g=e.extractContents();d=this._ice.env.document.createElement(this._ice.blockEl);d.appendChild(g);ice.dom.insertAfter(h,d);e.setStart(d,0);e.collapse(!0);this._ice.selection.addRange(e);for(var e=e.startContainer,
-i=null,h=null;a.firstChild;)if(a.firstChild.nodeType===3&&!jQuery.trim(a.firstChild.nodeValue))a.removeChild(a.firstChild);else if(ice.dom.isBlockElement(a.firstChild)){if(a.firstChild.textContent!=="")h=i=null,this._ice.isTracking?(h=this._ice.createIceNode("insertType"),this._ice.addChange("insertType",[h]),g=document.createElement(a.firstChild.tagName),h.innerHTML=a.firstChild.innerHTML,g.appendChild(h)):(h=g=document.createElement(a.firstChild.tagName),g.innerHTML=a.firstChild.innerHTML),ice.dom.insertBefore(e,
-g);a.removeChild(a.firstChild)}else i||(g=document.createElement(this._ice.blockEl),ice.dom.insertBefore(e,g),this._ice.isTracking?(i=this._ice.createIceNode("insertType"),this._ice.addChange("insertType",[i]),g.appendChild(i)):i=g),h=i,i.appendChild(a.removeChild(a.firstChild));d.textContent||d.parentNode.removeChild(d)}else if(this._ice.isTracking)g=this._ice.createIceNode("insertType",a),this._ice.addChange("insertType",[g]),e.insertNode(g),h=g;else for(;d=a.firstChild;)e.insertNode(d),e.setStartAfter(d),
-e.collapse(!0),h=d;this._ice.endBatchChange(b);this._cleanup(h)},createDiv:function(b){var a=ice.dom.getId(b);if(a)return ice.dom.empty(a),a;a=this._ice.env.document.createElement("div");a.id=b;a.setAttribute("contentEditable",!0);ice.dom.setStyle(a,"width","1px");ice.dom.setStyle(a,"height","1px");ice.dom.setStyle(a,"overflow","hidden");ice.dom.setStyle(a,"position","fixed");ice.dom.setStyle(a,"top","10px");ice.dom.setStyle(a,"left","10px");document.body.appendChild(a);return a},handleCut:function(){this.cutElementId=
-"icecut";this.cutElement=this.createDiv(this.cutElementId);var b=this._ice.getCurrentRange();if(!b.collapsed){var a=b.getHTMLContents();this._ice.isTracking?this._ice.deleteContents():b.deleteContents();var d=b.cloneRange();d.collapse(!0);this.cutElement.innerHTML=a;b.setStart(this.cutElement.firstChild,0);b.setEndAfter(this.cutElement.lastChild,this.cutElement.lastChild.length);var e=this;setTimeout(function(){b.setStart(d.startContainer,d.startOffset);b.collapse(!0);e._ice.env.selection.addRange(b);
-ice.dom.remove(this.cutElement)},10)}},stripPaste:function(b){b=this._cleanWordPaste(b);return b=this.cleanPreserved(b)},setupPreserved:function(){var b=this;this._tags="";this._attributesMap=[];ice.dom.each(this.preserve.split(","),function(a,d){d.match(/(\w+)(\[(.+)\])?/);var e=RegExp.$1,g=RegExp.$3;b._tags&&(b._tags+=",");b._tags+=e.toLowerCase();b._attributesMap[e]=g.split("|")})},cleanPreserved:function(b){var a=this,d=this._ice.env.document.createElement("div");d.innerHTML=b;d=ice.dom.stripEnclosingTags(d,
-this._tags);ice.dom.each(ice.dom.find(d,this._tags),function(b,d){if(ice.dom.hasClass(d,"skip-clean"))return!0;var e=d.tagName.toLowerCase(),e=a._attributesMap[e];if(e[0]&&e[0]==="*")return!0;if(d.hasAttributes())for(var i=d.attributes,b=i.length-1;b>=0;b--)ice.dom.inArray(i[b].name,e)||d.removeAttribute(i[b].name)});return d.innerHTML},_cleanWordPaste:function(b){b=b.replace(/<(meta|link)[^>]+>/g,"");b=b.replace(/<\!--(.|\s)*?--\>/g,"");b=b.replace(/<style>[\s\S]*?<\/style>/g,"");b=b.replace(/<\/?\w+:[^>]*>/gi,
-"");b=b.replace(/<\\?\?xml[^>]*>/gi,"");b=this._cleanPaste(b);return b=b.replace(/<(\w[^>]*) (lang)=([^ |>]*)([^>]*)/gi,"<$1$4")},_getListType:function(b,a){var d=ice.dom.getHtml(b),e=null;ice.dom.foreach(a,function(b){ice.dom.foreach(a[b],function(h){ice.dom.foreach(a[b][h],function(i){if(RegExp(a[b][h][i]).test(d)===!0)return e={html:d.replace(RegExp(a[b][h][i]),""),listType:b,listStyle:h},!1});if(e!==null)return!1});if(e!==null)return!1});return e},_cleanPaste:function(b){b=b.replace(/<b(\s+|>)/g,
-"<strong$1");b=b.replace(/<\/b(\s+|>)/g,"</strong$1");b=b.replace(/<i(\s+|>)/g,"<em$1");return b=b.replace(/<\/i(\s+|>)/g,"</em$1")},_cleanup:function(b){try{var b=b&&b.lastChild||b||this._tmpNode,a=this._ice.getCurrentRange();a.setStart(b,b.length);a.collapse(!0);this._ice.selection.addRange(a);this._ice.env.frame?this._ice.env.frame.contentWindow.focus():this._ice.element.focus();this._tmpNode.parentNode.removeChild(this._tmpNode);this._tmpNode=null;for(var d=this._ice.env.document.getElementsByClassName(this._ice.changeTypes.insertType.alias),
-b=0;b<d.length;b++)d[b].textContent||d[b].parentNode&&d[b].parentNode.removeChild(d[b])}catch(e){window.console&&console.error(e)}}};ice.dom.noInclusionInherits(e,ice.IcePlugin);this._plugin.IceCopyPastePlugin=e}).call(this.ice);
-(function(){var e=this.ice,b=function(a){this._ice=a};b.prototype={convert:function(a){var b=this;try{b._ice.placeholdDeletes(),e.dom.each(a.getElementsByTagName(this._ice.blockEl),function(a,e){b._convertBlock(e)})}catch(f){window.console&&console.error(f)}finally{b._ice.revertDeletePlaceholders()}},_convertBlock:function(a){if(!(e.dom.getNodeTextContent(a)<2)){var b,f,g,h,i,l=String.fromCharCode(8216),t=String.fromCharCode(8217),n=String.fromCharCode(8220),s=String.fromCharCode(8221),o=function(a){return a===
-String.fromCharCode(160)||a===String.fromCharCode(32)},k=function(a){return o(a)||a==null||a===";"||a===")"||a=="."||a==="!"||a===","||a==="?"||a===":"},r=function(a){return a==="'"||a===l||a===t};h=e.dom.getHtml(a).match(/(<("[^"]*"|'[^']*'|[^'">])*>|&.*;|.)/g);i=function(a,b,d){var e=a.length,f=d<0?-1:1;return function B(a,b,d){if(b<0||b>=e)return null;var g=a[b+f];return g&&g.length==1&&(d+=f*-1,!d)?g:B(a,b+f,d)}(a,b,d)};e.dom.each(h,function(a,e){e=="&nbsp;"&&(e=h[a]=" ");if(e.length==1){b=i(h,
-a,-1);f=e;g=i(h,a,1);switch(f){case l:case t:f="'";case "'":var v;if(v=b==null||o(b))if(v=/\d/.test(g))v=/\d/.test(i(h,a,2))&&k(i(h,a,3));v?f=t:b==null||(o(b)||b==="(")&&!o(g)?f=l:g==null||!o(b)&&k(g)?f=t:/\w/.test(b)&&/\w/.test(g)&&(f=t);break;case n:case s:f='"';case '"':if(k(g)&&o(b)&&r(i(h,a,-2)))f=s;else if(b==null||(o(b)||b==="(")&&!o(g))f=n;else if(g==null||!o(b)&&k(g))f=s;else if((b==null||o(b))&&o(g)&&r(i(h,a,1)))f=n}f!=null&&(h[a]=f)}});e.dom.setHtml(a,h.join(""))}}};e.dom.noInclusionInherits(b,
-e.IcePlugin);this.ice._plugin.IceSmartQuotesPlugin=b}).call(this);
-(function(){var e=function(b){this._ice=b};e.prototype={keyDown:function(b){if(ice.dom.isBrowser("mozilla")){var a=parseInt(ice.dom.browser().version);if(a>14&&b.keyCode===173||a<=14&&b.keyCode===109)return this.convertEmdash(b)}else if(b.keyCode===189)return this.convertEmdash(b);return!0},convertEmdash:function(){var b=this._ice.getCurrentRange();if(b.collapsed){try{b.moveStart(ice.dom.CHARACTER_UNIT,-1);var a=ice.dom.getParents(b.startContainer,this._ice.blockEl)[0],d=ice.dom.getParents(b.endContainer,
-this._ice.blockEl)[0];if(a===d&&!this._ice.getIceNode(b.startContainer,"deleteType")&&(c=b.toHtml(),c==="-")){b.extractContents();b.collapse();var e=this._ice.env.document.createTextNode("\u2014");this._ice.isTracking?this._ice._insertNode(e,b):(b.insertNode(e),b.setStart(e,1),b.collapse(!0));this._ice._preventKeyPress=!0;return!1}}catch(g){}b.collapse()}return!0}};ice.dom.noInclusionInherits(e,ice.IcePlugin);this._plugin.IceEmdashPlugin=e}).call(this.ice);
+//
+// ice - Master
+// The MIT License
+// Copyright (c) 2012 The New York Times, CMS Group, Matthew DeLambo <delambo@gmail.com>
+//
+window.rangy=function(){function e(e,t){var n=typeof e[t];return n==u||!(n!=d||!e[t])||"unknown"==n}function t(e,t){return!(typeof e[t]!=d||!e[t])}function n(e,t){return typeof e[t]!=h}function i(e){return function(t,n){for(var i=n.length;i--;)if(!e(t,n[i]))return!1;return!0}}function r(e){return e&&C(e,p)&&N(e,m)}function o(e){window.alert("Rangy not supported in your browser. Reason: "+e),E.initialized=!0,E.supported=!1}function s(e){var t="Rangy warning: "+e;E.config.alertOnWarn?window.alert(t):typeof window.console!=h&&typeof window.console.log!=h&&window.console.log(t)}function a(){if(!E.initialized){var n,i=!1,s=!1;e(document,"createRange")&&(n=document.createRange(),C(n,g)&&N(n,f)&&(i=!0),n.detach());var a=t(document,"body")?document.body:document.getElementsByTagName("body")[0];a&&e(a,"createTextRange")&&(n=a.createTextRange(),r(n)&&(s=!0)),i||s||o("Neither Range nor TextRange are implemented"),E.initialized=!0,E.features={implementsDomRange:i,implementsTextRange:s};for(var c=_.concat(y),l=0,d=c.length;d>l;++l)try{c[l](E)}catch(u){t(window,"console")&&e(window.console,"log")&&window.console.log("Init listener threw an exception. Continuing.",u)}}}function c(e){e=e||window,a();for(var t=0,n=T.length;n>t;++t)T[t](e)}function l(e){this.name=e,this.initialized=!1,this.supported=!1}var d="object",u="function",h="undefined",f=["startContainer","startOffset","endContainer","endOffset","collapsed","commonAncestorContainer","START_TO_START","START_TO_END","END_TO_START","END_TO_END"],g=["setStart","setStartBefore","setStartAfter","setEnd","setEndBefore","setEndAfter","collapse","selectNode","selectNodeContents","compareBoundaryPoints","deleteContents","extractContents","cloneContents","insertNode","surroundContents","cloneRange","toString","detach"],m=["boundingHeight","boundingLeft","boundingTop","boundingWidth","htmlText","text"],p=["collapse","compareEndPoints","duplicate","getBookmark","moveToBookmark","moveToElementText","parentElement","pasteHTML","select","setEndPoint","getBoundingClientRect"],C=i(e),v=i(t),N=i(n),E={version:"1.2.3",initialized:!1,supported:!0,util:{isHostMethod:e,isHostObject:t,isHostProperty:n,areHostMethods:C,areHostObjects:v,areHostProperties:N,isTextRange:r},features:{},modules:{},config:{alertOnWarn:!1,preferTextRange:!1}};E.fail=o,E.warn=s,{}.hasOwnProperty?E.util.extend=function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])}:o("hasOwnProperty not supported");var y=[],_=[];E.init=a,E.addInitListener=function(e){E.initialized?e(E):y.push(e)};var T=[];E.addCreateMissingNativeApiListener=function(e){T.push(e)},E.createMissingNativeApi=c,l.prototype.fail=function(e){throw this.initialized=!0,this.supported=!1,Error("Module '"+this.name+"' failed to load: "+e)},l.prototype.warn=function(e){E.warn("Module "+this.name+": "+e)},l.prototype.createError=function(e){return Error("Error in Rangy "+this.name+" module: "+e)},E.createModule=function(e,t){var n=new l(e);E.modules[e]=n,_.push(function(e){t(e,n),n.initialized=!0,n.supported=!0})},E.requireModules=function(e){for(var t,n,i=0,r=e.length;r>i;++i){if(n=e[i],t=E.modules[n],!(t&&t instanceof l))throw Error("Module '"+n+"' not found");if(!t.supported)throw Error("Module '"+n+"' not supported")}};var S=!1,R=function(){S||(S=!0,E.initialized||a())};return typeof window==h?(o("No window found"),void 0):typeof document==h?(o("No document found"),void 0):(e(document,"addEventListener")&&document.addEventListener("DOMContentLoaded",R,!1),e(window,"addEventListener")?window.addEventListener("load",R,!1):e(window,"attachEvent")?window.attachEvent("onload",R):o("Window does not have required addEventListener or attachEvent method"),E)}(),rangy.createModule("DomUtil",function(e,t){function n(e){var t;return typeof e.namespaceURI==R||null===(t=e.namespaceURI)||"http://www.w3.org/1999/xhtml"==t}function i(e){var t=e.parentNode;return 1==t.nodeType?t:null}function r(e){for(var t=0;e=e.previousSibling;)t++;return t}function o(e){var t;return l(e)?e.length:(t=e.childNodes)?t.length:0}function s(e,t){var n,i=[];for(n=e;n;n=n.parentNode)i.push(n);for(n=t;n;n=n.parentNode)if(D(i,n))return n;return null}function a(e,t,n){for(var i=n?t:t.parentNode;i;){if(i===e)return!0;i=i.parentNode}return!1}function c(e,t,n){for(var i,r=n?e:e.parentNode;r;){if(i=r.parentNode,i===t)return r;r=i}return null}function l(e){var t=e.nodeType;return 3==t||4==t||8==t}function d(e,t){var n=t.nextSibling,i=t.parentNode;return n?i.insertBefore(e,n):i.appendChild(e),e}function u(e,t){var n=e.cloneNode(!1);return n.deleteData(0,t),e.deleteData(t,e.length-t),d(n,e),n}function h(e){if(9==e.nodeType)return e;if(typeof e.ownerDocument!=R)return e.ownerDocument;if(typeof e.document!=R)return e.document;if(e.parentNode)return h(e.parentNode);throw Error("getDocument: no document found for node")}function f(e){var t=h(e);if(typeof t.defaultView!=R)return t.defaultView;if(typeof t.parentWindow!=R)return t.parentWindow;throw Error("Cannot get a window object for node")}function g(e){if(typeof e.contentDocument!=R)return e.contentDocument;if(typeof e.contentWindow!=R)return e.contentWindow.document;throw Error("getIframeWindow: No Document object found for iframe element")}function m(e){if(typeof e.contentWindow!=R)return e.contentWindow;if(typeof e.contentDocument!=R)return e.contentDocument.defaultView;throw Error("getIframeWindow: No Window object found for iframe element")}function p(e){return b.isHostObject(e,"body")?e.body:e.getElementsByTagName("body")[0]}function C(e){for(var t;t=e.parentNode;)e=t;return e}function v(e,t,n,i){var o,a,l,d,u;if(e==n)return t===i?0:i>t?-1:1;if(o=c(n,e,!0))return r(o)>=t?-1:1;if(o=c(e,n,!0))return i>r(o)?-1:1;if(a=s(e,n),l=e===a?a:c(e,a,!0),d=n===a?a:c(n,a,!0),l===d)throw Error("comparePoints got to case 4 and childA and childB are the same!");for(u=a.firstChild;u;){if(u===l)return-1;if(u===d)return 1;u=u.nextSibling}throw Error("Should not be here!")}function N(e){for(var t,n=h(e).createDocumentFragment();t=e.firstChild;)n.appendChild(t);return n}function E(e){if(!e)return"[No node]";if(l(e))return'"'+e.data+'"';if(1==e.nodeType){var t=e.id?' id="'+e.id+'"':"";return"<"+e.nodeName+t+">["+e.childNodes.length+"]"}return e.nodeName}function y(e){this.root=e,this._next=e}function _(e){return new y(e)}function T(e,t){this.node=e,this.offset=t}function S(e){this.code=this[e],this.codeName=e,this.message="DOMException: "+this.codeName}var R="undefined",b=e.util;b.areHostMethods(document,["createDocumentFragment","createElement","createTextNode"])||t.fail("document missing a Node creation method"),b.isHostMethod(document,"getElementsByTagName")||t.fail("document missing getElementsByTagName method");var O=document.createElement("div");b.areHostMethods(O,["insertBefore","appendChild","cloneNode"]||!b.areHostObjects(O,["previousSibling","nextSibling","childNodes","parentNode"]))||t.fail("Incomplete Element implementation"),b.isHostProperty(O,"innerHTML")||t.fail("Element is missing innerHTML property");var w=document.createTextNode("test");b.areHostMethods(w,["splitText","deleteData","insertData","appendData","cloneNode"]||!b.areHostObjects(O,["previousSibling","nextSibling","childNodes","parentNode"])||!b.areHostProperties(w,["data"]))||t.fail("Incomplete Text Node implementation");var D=function(e,t){for(var n=e.length;n--;)if(e[n]===t)return!0;return!1};y.prototype={_current:null,hasNext:function(){return!!this._next},next:function(){var e,t,n=this._current=this._next;if(this._current)if(e=n.firstChild)this._next=e;else{for(t=null;n!==this.root&&!(t=n.nextSibling);)n=n.parentNode;this._next=t}return this._current},detach:function(){this._current=this._next=this.root=null}},T.prototype={equals:function(e){return this.node===e.node&this.offset==e.offset},inspect:function(){return"[DomPosition("+E(this.node)+":"+this.offset+")]"}},S.prototype={INDEX_SIZE_ERR:1,HIERARCHY_REQUEST_ERR:3,WRONG_DOCUMENT_ERR:4,NO_MODIFICATION_ALLOWED_ERR:7,NOT_FOUND_ERR:8,NOT_SUPPORTED_ERR:9,INVALID_STATE_ERR:11},S.prototype.toString=function(){return this.message},e.dom={arrayContains:D,isHtmlNamespace:n,parentElement:i,getNodeIndex:r,getNodeLength:o,getCommonAncestor:s,isAncestorOf:a,getClosestAncestorIn:c,isCharacterDataNode:l,insertAfter:d,splitDataNode:u,getDocument:h,getWindow:f,getIframeWindow:m,getIframeDocument:g,getBody:p,getRootContainer:C,comparePoints:v,inspectNode:E,fragmentFromNodeChildren:N,createIterator:_,DomPosition:T},e.DOMException=S}),rangy.createModule("DomRange",function(e){function t(e,t){return 3!=e.nodeType&&(L.isAncestorOf(e,t.startContainer,!0)||L.isAncestorOf(e,t.endContainer,!0))}function n(e){return L.getDocument(e.startContainer)}function i(e,t,n){var i=e._listeners[t];if(i)for(var r=0,o=i.length;o>r;++r)i[r].call(e,{target:e,args:n})}function r(e){return new H(e.parentNode,L.getNodeIndex(e))}function o(e){return new H(e.parentNode,L.getNodeIndex(e)+1)}function s(e,t,n){var i=11==e.nodeType?e.firstChild:e;return L.isCharacterDataNode(t)?n==t.length?L.insertAfter(e,t):t.parentNode.insertBefore(e,0==n?t:L.splitDataNode(t,n)):n>=t.childNodes.length?t.appendChild(e):t.insertBefore(e,t.childNodes[n]),i}function a(e){for(var t,i,r,o=n(e.range).createDocumentFragment();i=e.next();){if(t=e.isPartiallySelectedSubtree(),i=i.cloneNode(!t),t&&(r=e.getSubtreeIterator(),i.appendChild(a(r)),r.detach(!0)),10==i.nodeType)throw new j("HIERARCHY_REQUEST_ERR");o.appendChild(i)}return o}function c(e,t,n){var i,r;n=n||{stop:!1};for(var o,s;o=e.next();)if(e.isPartiallySelectedSubtree()){if(t(o)===!1)return n.stop=!0,void 0;if(s=e.getSubtreeIterator(),c(s,t,n),s.detach(!0),n.stop)return}else for(i=L.createIterator(o);r=i.next();)if(t(r)===!1)return n.stop=!0,void 0}function l(e){for(var t;e.next();)e.isPartiallySelectedSubtree()?(t=e.getSubtreeIterator(),l(t),t.detach(!0)):e.remove()}function d(e){for(var t,i,r=n(e.range).createDocumentFragment();t=e.next();){if(e.isPartiallySelectedSubtree()?(t=t.cloneNode(!1),i=e.getSubtreeIterator(),t.appendChild(d(i)),i.detach(!0)):e.remove(),10==t.nodeType)throw new j("HIERARCHY_REQUEST_ERR");r.appendChild(t)}return r}function u(e,t,n){var i,r=!(!t||!t.length),o=!!n;r&&(i=RegExp("^("+t.join("|")+")$"));var s=[];return c(new f(e,!1),function(e){r&&!i.test(e.nodeType)||o&&!n(e)||s.push(e)}),s}function h(e){var t=e.getName===void 0?"Range":e.getName();return"["+t+"("+L.inspectNode(e.startContainer)+":"+e.startOffset+", "+L.inspectNode(e.endContainer)+":"+e.endOffset+")]"}function f(e,t){if(this.range=e,this.clonePartiallySelectedTextNodes=t,!e.collapsed){this.sc=e.startContainer,this.so=e.startOffset,this.ec=e.endContainer,this.eo=e.endOffset;var n=e.commonAncestorContainer;this.sc===this.ec&&L.isCharacterDataNode(this.sc)?(this.isSingleCharacterDataNode=!0,this._first=this._last=this._next=this.sc):(this._first=this._next=this.sc!==n||L.isCharacterDataNode(this.sc)?L.getClosestAncestorIn(this.sc,n,!0):this.sc.childNodes[this.so],this._last=this.ec!==n||L.isCharacterDataNode(this.ec)?L.getClosestAncestorIn(this.ec,n,!0):this.ec.childNodes[this.eo-1])}}function g(e){this.code=this[e],this.codeName=e,this.message="RangeException: "+this.codeName}function m(e,t,n){this.nodes=u(e,t,n),this._next=this.nodes[0],this._position=0}function p(e){return function(t,n){for(var i,r=n?t:t.parentNode;r;){if(i=r.nodeType,L.arrayContains(e,i))return r;r=r.parentNode}return null}}function C(e,t){if(q(e,t))throw new g("INVALID_NODE_TYPE_ERR")}function v(e){if(!e.startContainer)throw new j("INVALID_STATE_ERR")}function N(e,t){if(!L.arrayContains(t,e.nodeType))throw new g("INVALID_NODE_TYPE_ERR")}function E(e,t){if(0>t||t>(L.isCharacterDataNode(e)?e.length:e.childNodes.length))throw new j("INDEX_SIZE_ERR")}function y(e,t){if(X(e,!0)!==X(t,!0))throw new j("WRONG_DOCUMENT_ERR")}function _(e){if(z(e,!0))throw new j("NO_MODIFICATION_ALLOWED_ERR")}function T(e,t){if(!e)throw new j(t)}function S(e){return!L.arrayContains(Q,e.nodeType)&&!X(e,!0)}function R(e,t){return(L.isCharacterDataNode(e)?e.length:e.childNodes.length)>=t}function b(e){return!!e.startContainer&&!!e.endContainer&&!S(e.startContainer)&&!S(e.endContainer)&&R(e.startContainer,e.startOffset)&&R(e.endContainer,e.endOffset)}function O(e){if(v(e),!b(e))throw Error("Range error: Range is no longer valid after DOM mutation ("+e.inspect()+")")}function w(){}function D(e){e.START_TO_START=et,e.START_TO_END=tt,e.END_TO_END=nt,e.END_TO_START=it,e.NODE_BEFORE=rt,e.NODE_AFTER=ot,e.NODE_BEFORE_AND_AFTER=st,e.NODE_INSIDE=at}function x(e){D(e),D(e.prototype)}function k(e,t){return function(){O(this);var n,i,r=this.startContainer,s=this.startOffset,a=this.commonAncestorContainer,l=new f(this,!0);r!==a&&(n=L.getClosestAncestorIn(r,a,!0),i=o(n),r=i.node,s=i.offset),c(l,_),l.reset();var d=e(l);return l.detach(),t(this,r,s,r,s),d}}function A(n,i,s){function a(e,t){return function(n){v(this),N(n,U),N(V(n),Q);var i=(e?r:o)(n);(t?c:u)(this,i.node,i.offset)}}function c(e,t,n){var r=e.endContainer,o=e.endOffset;(t!==e.startContainer||n!==e.startOffset)&&((V(t)!=V(r)||1==L.comparePoints(t,n,r,o))&&(r=t,o=n),i(e,t,n,r,o))}function u(e,t,n){var r=e.startContainer,o=e.startOffset;(t!==e.endContainer||n!==e.endOffset)&&((V(t)!=V(r)||-1==L.comparePoints(t,n,r,o))&&(r=t,o=n),i(e,r,o,t,n))}function h(e,t,n){(t!==e.startContainer||n!==e.startOffset||t!==e.endContainer||n!==e.endOffset)&&i(e,t,n,t,n)}n.prototype=new w,e.util.extend(n.prototype,{setStart:function(e,t){v(this),C(e,!0),E(e,t),c(this,e,t)},setEnd:function(e,t){v(this),C(e,!0),E(e,t),u(this,e,t)},setStartBefore:a(!0,!0),setStartAfter:a(!1,!0),setEndBefore:a(!0,!1),setEndAfter:a(!1,!1),collapse:function(e){O(this),e?i(this,this.startContainer,this.startOffset,this.startContainer,this.startOffset):i(this,this.endContainer,this.endOffset,this.endContainer,this.endOffset)},selectNodeContents:function(e){v(this),C(e,!0),i(this,e,0,e,L.getNodeLength(e))},selectNode:function(e){v(this),C(e,!1),N(e,U);var t=r(e),n=o(e);i(this,t.node,t.offset,n.node,n.offset)},extractContents:k(d,i),deleteContents:k(l,i),canSurroundContents:function(){O(this),_(this.startContainer),_(this.endContainer);var e=new f(this,!0),n=e._first&&t(e._first,this)||e._last&&t(e._last,this);return e.detach(),!n},detach:function(){s(this)},splitBoundaries:function(){O(this);var e=this.startContainer,t=this.startOffset,n=this.endContainer,r=this.endOffset,o=e===n;L.isCharacterDataNode(n)&&r>0&&n.length>r&&L.splitDataNode(n,r),L.isCharacterDataNode(e)&&t>0&&e.length>t&&(e=L.splitDataNode(e,t),o?(r-=t,n=e):n==e.parentNode&&r>=L.getNodeIndex(e)&&r++,t=0),i(this,e,t,n,r)},normalizeBoundaries:function(){O(this);var e=this.startContainer,t=this.startOffset,n=this.endContainer,r=this.endOffset,o=function(e){var t=e.nextSibling;t&&t.nodeType==e.nodeType&&(n=e,r=e.length,e.appendData(t.data),t.parentNode.removeChild(t))},s=function(i){var o=i.previousSibling;if(o&&o.nodeType==i.nodeType){e=i;var s=i.length;if(t=o.length,i.insertData(0,o.data),o.parentNode.removeChild(o),e==n)r+=t,n=e;else if(n==i.parentNode){var a=L.getNodeIndex(i);r==a?(n=i,r=s):r>a&&r--}}},a=!0;if(L.isCharacterDataNode(n))n.length==r&&o(n);else{if(r>0){var c=n.childNodes[r-1];c&&L.isCharacterDataNode(c)&&o(c)}a=!this.collapsed}if(a){if(L.isCharacterDataNode(e))0==t&&s(e);else if(e.childNodes.length>t){var l=e.childNodes[t];l&&L.isCharacterDataNode(l)&&s(l)}}else e=n,t=r;i(this,e,t,n,r)},collapseToPoint:function(e,t){v(this),C(e,!0),E(e,t),h(this,e,t)}}),x(n)}function P(e){e.collapsed=e.startContainer===e.endContainer&&e.startOffset===e.endOffset,e.commonAncestorContainer=e.collapsed?e.startContainer:L.getCommonAncestor(e.startContainer,e.endContainer)}function I(e,t,n,r,o){var s=e.startContainer!==t||e.startOffset!==n,a=e.endContainer!==r||e.endOffset!==o;e.startContainer=t,e.startOffset=n,e.endContainer=r,e.endOffset=o,P(e),i(e,"boundarychange",{startMoved:s,endMoved:a})}function B(e){v(e),e.startContainer=e.startOffset=e.endContainer=e.endOffset=null,e.collapsed=e.commonAncestorContainer=null,i(e,"detach",null),e._listeners=null}function M(e){this.startContainer=e,this.startOffset=0,this.endContainer=e,this.endOffset=0,this._listeners={boundarychange:[],detach:[]},P(this)}e.requireModules(["DomUtil"]);var L=e.dom,H=L.DomPosition,j=e.DOMException;f.prototype={_current:null,_next:null,_first:null,_last:null,isSingleCharacterDataNode:!1,reset:function(){this._current=null,this._next=this._first},hasNext:function(){return!!this._next},next:function(){var e=this._current=this._next;return e&&(this._next=e!==this._last?e.nextSibling:null,L.isCharacterDataNode(e)&&this.clonePartiallySelectedTextNodes&&(e===this.ec&&(e=e.cloneNode(!0)).deleteData(this.eo,e.length-this.eo),this._current===this.sc&&(e=e.cloneNode(!0)).deleteData(0,this.so))),e},remove:function(){var e,t,n=this._current;!L.isCharacterDataNode(n)||n!==this.sc&&n!==this.ec?n.parentNode&&n.parentNode.removeChild(n):(e=n===this.sc?this.so:0,t=n===this.ec?this.eo:n.length,e!=t&&n.deleteData(e,t-e))},isPartiallySelectedSubtree:function(){var e=this._current;return t(e,this.range)},getSubtreeIterator:function(){var e;if(this.isSingleCharacterDataNode)e=this.range.cloneRange(),e.collapse();else{e=new M(n(this.range));var t=this._current,i=t,r=0,o=t,s=L.getNodeLength(t);L.isAncestorOf(t,this.sc,!0)&&(i=this.sc,r=this.so),L.isAncestorOf(t,this.ec,!0)&&(o=this.ec,s=this.eo),I(e,i,r,o,s)}return new f(e,this.clonePartiallySelectedTextNodes)},detach:function(e){e&&this.range.detach(),this.range=this._current=this._next=this._first=this._last=this.sc=this.so=this.ec=this.eo=null}},g.prototype={BAD_BOUNDARYPOINTS_ERR:1,INVALID_NODE_TYPE_ERR:2},g.prototype.toString=function(){return this.message},m.prototype={_current:null,hasNext:function(){return!!this._next},next:function(){return this._current=this._next,this._next=this.nodes[++this._position],this._current},detach:function(){this._current=this._next=this.nodes=null}};var U=[1,3,4,5,7,8,10],Q=[2,9,11],W=[5,6,10,12],F=[1,3,4,5,7,8,10,11],K=[1,3,4,5,7,8],V=L.getRootContainer,X=p([9,11]),z=p(W),q=p([6,10,12]),Y=document.createElement("style"),$=!1;try{Y.innerHTML="<b>x</b>",$=3==Y.firstChild.nodeType}catch(G){}e.features.htmlParsingConforms=$;var Z=$?function(e){var t=this.startContainer,n=L.getDocument(t);if(!t)throw new j("INVALID_STATE_ERR");var i=null;return 1==t.nodeType?i=t:L.isCharacterDataNode(t)&&(i=L.parentElement(t)),i=null===i||"HTML"==i.nodeName&&L.isHtmlNamespace(L.getDocument(i).documentElement)&&L.isHtmlNamespace(i)?n.createElement("body"):i.cloneNode(!1),i.innerHTML=e,L.fragmentFromNodeChildren(i)}:function(e){v(this);var t=n(this),i=t.createElement("body");return i.innerHTML=e,L.fragmentFromNodeChildren(i)},J=["startContainer","startOffset","endContainer","endOffset","collapsed","commonAncestorContainer"],et=0,tt=1,nt=2,it=3,rt=0,ot=1,st=2,at=3;w.prototype={attachListener:function(e,t){this._listeners[e].push(t)},compareBoundaryPoints:function(e,t){O(this),y(this.startContainer,t.startContainer);var n,i,r,o,s=e==it||e==et?"start":"end",a=e==tt||e==et?"start":"end";return n=this[s+"Container"],i=this[s+"Offset"],r=t[a+"Container"],o=t[a+"Offset"],L.comparePoints(n,i,r,o)},insertNode:function(e){if(O(this),N(e,F),_(this.startContainer),L.isAncestorOf(e,this.startContainer,!0))throw new j("HIERARCHY_REQUEST_ERR");var t=s(e,this.startContainer,this.startOffset);this.setStartBefore(t)},cloneContents:function(){O(this);var e,t;if(this.collapsed)return n(this).createDocumentFragment();if(this.startContainer===this.endContainer&&L.isCharacterDataNode(this.startContainer))return e=this.startContainer.cloneNode(!0),e.data=e.data.slice(this.startOffset,this.endOffset),t=n(this).createDocumentFragment(),t.appendChild(e),t;var i=new f(this,!0);return e=a(i),i.detach(),e},canSurroundContents:function(){O(this),_(this.startContainer),_(this.endContainer);var e=new f(this,!0),n=e._first&&t(e._first,this)||e._last&&t(e._last,this);return e.detach(),!n},surroundContents:function(e){if(N(e,K),!this.canSurroundContents())throw new g("BAD_BOUNDARYPOINTS_ERR");var t=this.extractContents();if(e.hasChildNodes())for(;e.lastChild;)e.removeChild(e.lastChild);s(e,this.startContainer,this.startOffset),e.appendChild(t),this.selectNode(e)},cloneRange:function(){O(this);for(var e,t=new M(n(this)),i=J.length;i--;)e=J[i],t[e]=this[e];return t},toString:function(){O(this);var e=this.startContainer;if(e===this.endContainer&&L.isCharacterDataNode(e))return 3==e.nodeType||4==e.nodeType?e.data.slice(this.startOffset,this.endOffset):"";var t=[],n=new f(this,!0);return c(n,function(e){(3==e.nodeType||4==e.nodeType)&&t.push(e.data)}),n.detach(),t.join("")},compareNode:function(e){O(this);var t=e.parentNode,n=L.getNodeIndex(e);if(!t)throw new j("NOT_FOUND_ERR");var i=this.comparePoint(t,n),r=this.comparePoint(t,n+1);return 0>i?r>0?st:rt:r>0?ot:at},comparePoint:function(e,t){return O(this),T(e,"HIERARCHY_REQUEST_ERR"),y(e,this.startContainer),0>L.comparePoints(e,t,this.startContainer,this.startOffset)?-1:L.comparePoints(e,t,this.endContainer,this.endOffset)>0?1:0},createContextualFragment:Z,toHtml:function(){O(this);var e=n(this).createElement("div");return e.appendChild(this.cloneContents()),e.innerHTML},intersectsNode:function(e,t){if(O(this),T(e,"NOT_FOUND_ERR"),L.getDocument(e)!==n(this))return!1;var i=e.parentNode,r=L.getNodeIndex(e);T(i,"NOT_FOUND_ERR");var o=L.comparePoints(i,r,this.endContainer,this.endOffset),s=L.comparePoints(i,r+1,this.startContainer,this.startOffset);return t?0>=o&&s>=0:0>o&&s>0},isPointInRange:function(e,t){return O(this),T(e,"HIERARCHY_REQUEST_ERR"),y(e,this.startContainer),L.comparePoints(e,t,this.startContainer,this.startOffset)>=0&&0>=L.comparePoints(e,t,this.endContainer,this.endOffset)},intersectsRange:function(e,t){if(O(this),n(e)!=n(this))throw new j("WRONG_DOCUMENT_ERR");var i=L.comparePoints(this.startContainer,this.startOffset,e.endContainer,e.endOffset),r=L.comparePoints(this.endContainer,this.endOffset,e.startContainer,e.startOffset);return t?0>=i&&r>=0:0>i&&r>0},intersection:function(e){if(this.intersectsRange(e)){var t=L.comparePoints(this.startContainer,this.startOffset,e.startContainer,e.startOffset),n=L.comparePoints(this.endContainer,this.endOffset,e.endContainer,e.endOffset),i=this.cloneRange();return-1==t&&i.setStart(e.startContainer,e.startOffset),1==n&&i.setEnd(e.endContainer,e.endOffset),i}return null},union:function(e){if(this.intersectsRange(e,!0)){var t=this.cloneRange();return-1==L.comparePoints(e.startContainer,e.startOffset,this.startContainer,this.startOffset)&&t.setStart(e.startContainer,e.startOffset),1==L.comparePoints(e.endContainer,e.endOffset,this.endContainer,this.endOffset)&&t.setEnd(e.endContainer,e.endOffset),t}throw new g("Ranges do not intersect")},containsNode:function(e,t){return t?this.intersectsNode(e,!1):this.compareNode(e)==at},containsNodeContents:function(e){return this.comparePoint(e,0)>=0&&0>=this.comparePoint(e,L.getNodeLength(e))},containsRange:function(e){return this.intersection(e).equals(e)},containsNodeText:function(e){var t=this.cloneRange();t.selectNode(e);var n=t.getNodes([3]);if(n.length>0){t.setStart(n[0],0);var i=n.pop();t.setEnd(i,i.length);var r=this.containsRange(t);return t.detach(),r}return this.containsNodeContents(e)},createNodeIterator:function(e,t){return O(this),new m(this,e,t)},getNodes:function(e,t){return O(this),u(this,e,t)},getDocument:function(){return n(this)},collapseBefore:function(e){v(this),this.setEndBefore(e),this.collapse(!1)},collapseAfter:function(e){v(this),this.setStartAfter(e),this.collapse(!0)},getName:function(){return"DomRange"},equals:function(e){return M.rangesEqual(this,e)},isValid:function(){return b(this)},inspect:function(){return h(this)}},A(M,I,B),e.rangePrototype=w.prototype,M.rangeProperties=J,M.RangeIterator=f,M.copyComparisonConstants=x,M.createPrototypeRange=A,M.inspect=h,M.getRangeDocument=n,M.rangesEqual=function(e,t){return e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset},e.DomRange=M,e.RangeException=g}),rangy.createModule("WrappedRange",function(e){function t(e){var t=e.parentElement(),n=e.duplicate();n.collapse(!0);var i=n.parentElement();n=e.duplicate(),n.collapse(!1);var r=n.parentElement(),o=i==r?i:s.getCommonAncestor(i,r);return o==t?o:s.getCommonAncestor(t,o)}function n(e){return 0==e.compareEndPoints("StartToEnd",e)}function i(e,t,n,i){var r=e.duplicate();r.collapse(n);var o=r.parentElement();if(s.isAncestorOf(t,o,!0)||(o=t),!o.canHaveHTML)return new a(o.parentNode,s.getNodeIndex(o));var c,l,d,u,h,f=s.getDocument(o).createElement("span"),g=n?"StartToStart":"StartToEnd";do o.insertBefore(f,f.previousSibling),r.moveToElementText(f);while((c=r.compareEndPoints(g,e))>0&&f.previousSibling);if(h=f.nextSibling,-1==c&&h&&s.isCharacterDataNode(h)){r.setEndPoint(n?"EndToStart":"EndToEnd",e);var m;if(/[\r\n]/.test(h.data)){var p=r.duplicate(),C=p.text.replace(/\r\n/g,"\r").length;for(m=p.moveStart("character",C);-1==(c=p.compareEndPoints("StartToEnd",p));)m++,p.moveStart("character",1)}else m=r.text.length;u=new a(h,m)}else l=(i||!n)&&f.previousSibling,d=(i||n)&&f.nextSibling,u=d&&s.isCharacterDataNode(d)?new a(d,0):l&&s.isCharacterDataNode(l)?new a(l,l.length):new a(o,s.getNodeIndex(f));return f.parentNode.removeChild(f),u}function r(e,t){var n,i,r,o,a=e.offset,c=s.getDocument(e.node),l=c.body.createTextRange(),d=s.isCharacterDataNode(e.node);return d?(n=e.node,i=n.parentNode):(o=e.node.childNodes,n=o.length>a?o[a]:null,i=e.node),r=c.createElement("span"),r.innerHTML="&#feff;",n?i.insertBefore(r,n):i.appendChild(r),l.moveToElementText(r),l.collapse(!t),i.removeChild(r),d&&l[t?"moveStart":"moveEnd"]("character",a),l}e.requireModules(["DomUtil","DomRange"]);var o,s=e.dom,a=s.DomPosition,c=e.DomRange;if(!e.features.implementsDomRange||e.features.implementsTextRange&&e.config.preferTextRange){if(e.features.implementsTextRange){o=function(e){this.textRange=e,this.refresh()},o.prototype=new c(document),o.prototype.refresh=function(){var e,r,o=t(this.textRange);n(this.textRange)?r=e=i(this.textRange,o,!0,!0):(e=i(this.textRange,o,!0,!1),r=i(this.textRange,o,!1,!1)),this.setStart(e.node,e.offset),this.setEnd(r.node,r.offset)},c.copyComparisonConstants(o);var l=function(){return this}();l.Range===void 0&&(l.Range=o),e.createNativeRange=function(e){return e=e||document,e.body.createTextRange()}}}else(function(){function t(e){for(var t,n=d.length;n--;)t=d[n],e[t]=e.nativeRange[t]}function n(e,t,n,i,r){var o=e.startContainer!==t||e.startOffset!=n,s=e.endContainer!==i||e.endOffset!=r;(o||s)&&(e.setEnd(i,r),e.setStart(t,n))}function i(e){e.nativeRange.detach(),e.detached=!0;for(var t,n=d.length;n--;)t=d[n],e[t]=null}var r,a,l,d=c.rangeProperties;o=function(e){if(!e)throw Error("Range must be specified");this.nativeRange=e,t(this)},c.createPrototypeRange(o,n,i),r=o.prototype,r.selectNode=function(e){this.nativeRange.selectNode(e),t(this)},r.deleteContents=function(){this.nativeRange.deleteContents(),t(this)},r.extractContents=function(){var e=this.nativeRange.extractContents();return t(this),e},r.cloneContents=function(){return this.nativeRange.cloneContents()},r.surroundContents=function(e){this.nativeRange.surroundContents(e),t(this)},r.collapse=function(e){this.nativeRange.collapse(e),t(this)},r.cloneRange=function(){return new o(this.nativeRange.cloneRange())},r.refresh=function(){t(this)},r.toString=function(){return""+this.nativeRange};var u=document.createTextNode("test");s.getBody(document).appendChild(u);var h=document.createRange();h.setStart(u,0),h.setEnd(u,0);try{h.setStart(u,1),a=!0,r.setStart=function(e,n){this.nativeRange.setStart(e,n),t(this)},r.setEnd=function(e,n){this.nativeRange.setEnd(e,n),t(this)},l=function(e){return function(n){this.nativeRange[e](n),t(this)}}}catch(f){a=!1,r.setStart=function(e,n){try{this.nativeRange.setStart(e,n)}catch(i){this.nativeRange.setEnd(e,n),this.nativeRange.setStart(e,n)}t(this)},r.setEnd=function(e,n){try{this.nativeRange.setEnd(e,n)}catch(i){this.nativeRange.setStart(e,n),this.nativeRange.setEnd(e,n)}t(this)},l=function(e,n){return function(i){try{this.nativeRange[e](i)}catch(r){this.nativeRange[n](i),this.nativeRange[e](i)}t(this)}}}r.setStartBefore=l("setStartBefore","setEndBefore"),r.setStartAfter=l("setStartAfter","setEndAfter"),r.setEndBefore=l("setEndBefore","setStartBefore"),r.setEndAfter=l("setEndAfter","setStartAfter"),h.selectNodeContents(u),r.selectNodeContents=h.startContainer==u&&h.endContainer==u&&0==h.startOffset&&h.endOffset==u.length?function(e){this.nativeRange.selectNodeContents(e),t(this)}:function(e){this.setStart(e,0),this.setEnd(e,c.getEndOffset(e))},h.selectNodeContents(u),h.setEnd(u,3);var g=document.createRange();g.selectNodeContents(u),g.setEnd(u,4),g.setStart(u,2),r.compareBoundaryPoints=-1==h.compareBoundaryPoints(h.START_TO_END,g)&1==h.compareBoundaryPoints(h.END_TO_START,g)?function(e,t){return t=t.nativeRange||t,e==t.START_TO_END?e=t.END_TO_START:e==t.END_TO_START&&(e=t.START_TO_END),this.nativeRange.compareBoundaryPoints(e,t)}:function(e,t){return this.nativeRange.compareBoundaryPoints(e,t.nativeRange||t)},e.util.isHostMethod(h,"createContextualFragment")&&(r.createContextualFragment=function(e){return this.nativeRange.createContextualFragment(e)}),s.getBody(document).removeChild(u),h.detach(),g.detach()})(),e.createNativeRange=function(e){return e=e||document,e.createRange()};e.features.implementsTextRange&&(o.rangeToTextRange=function(e){if(e.collapsed){var t=r(new a(e.startContainer,e.startOffset),!0);return t}var n=r(new a(e.startContainer,e.startOffset),!0),i=r(new a(e.endContainer,e.endOffset),!1),o=s.getDocument(e.startContainer).body.createTextRange();return o.setEndPoint("StartToStart",n),o.setEndPoint("EndToEnd",i),o}),o.prototype.getName=function(){return"WrappedRange"},e.WrappedRange=o,e.createRange=function(t){return t=t||document,new o(e.createNativeRange(t))},e.createRangyRange=function(e){return e=e||document,new c(e)},e.createIframeRange=function(t){return e.createRange(s.getIframeDocument(t))},e.createIframeRangyRange=function(t){return e.createRangyRange(s.getIframeDocument(t))},e.addCreateMissingNativeApiListener(function(t){var n=t.document;n.createRange===void 0&&(n.createRange=function(){return e.createRange(this)}),n=t=null})}),rangy.createModule("WrappedSelection",function(e,t){function n(e){return(e||window).getSelection()}function i(e){return(e||window).document.selection}function r(e,t,n){var i=n?"end":"start",r=n?"start":"end";e.anchorNode=t[i+"Container"],e.anchorOffset=t[i+"Offset"],e.focusNode=t[r+"Container"],e.focusOffset=t[r+"Offset"]}function o(e){var t=e.nativeSelection;e.anchorNode=t.anchorNode,e.anchorOffset=t.anchorOffset,e.focusNode=t.focusNode,e.focusOffset=t.focusOffset}function s(e){e.anchorNode=e.focusNode=null,e.anchorOffset=e.focusOffset=0,e.rangeCount=0,e.isCollapsed=!0,e._ranges.length=0}function a(t){var n;return t instanceof S?(n=t._selectionNativeRange,n||(n=e.createNativeRange(_.getDocument(t.startContainer)),n.setEnd(t.endContainer,t.endOffset),n.setStart(t.startContainer,t.startOffset),t._selectionNativeRange=n,t.attachListener("detach",function(){this._selectionNativeRange=null}))):t instanceof R?n=t.nativeRange:e.features.implementsDomRange&&t instanceof _.getWindow(t.startContainer).Range&&(n=t),n}function c(e){if(!e.length||1!=e[0].nodeType)return!1;for(var t=1,n=e.length;n>t;++t)if(!_.isAncestorOf(e[0],e[t]))return!1;return!0}function l(e){var t=e.getNodes();if(!c(t))throw Error("getSingleElementFromRange: range "+e.inspect()+" did not consist of a single element");return t[0]}function d(e){return!!e&&e.text!==void 0}function u(e,t){var n=new R(t);e._ranges=[n],r(e,n,!1),e.rangeCount=1,e.isCollapsed=n.collapsed}function h(t){if(t._ranges.length=0,"None"==t.docSelection.type)s(t);else{var n=t.docSelection.createRange();if(d(n))u(t,n);else{t.rangeCount=n.length;for(var i,o=_.getDocument(n.item(0)),a=0;t.rangeCount>a;++a)i=e.createRange(o),i.selectNode(n.item(a)),t._ranges.push(i);t.isCollapsed=1==t.rangeCount&&t._ranges[0].collapsed,r(t,t._ranges[t.rangeCount-1],!1)
+}}}function f(e,t){for(var n=e.docSelection.createRange(),i=l(t),r=_.getDocument(n.item(0)),o=_.getBody(r).createControlRange(),s=0,a=n.length;a>s;++s)o.add(n.item(s));try{o.add(i)}catch(c){throw Error("addRange(): Element within the specified Range could not be added to control selection (does it have layout?)")}o.select(),h(e)}function g(e,t,n){this.nativeSelection=e,this.docSelection=t,this._ranges=[],this.win=n,this.refresh()}function m(e,t){for(var n,i=_.getDocument(t[0].startContainer),r=_.getBody(i).createControlRange(),o=0;rangeCount>o;++o){n=l(t[o]);try{r.add(n)}catch(s){throw Error("setRanges(): Element within the one of the specified Ranges could not be added to control selection (does it have layout?)")}}r.select(),h(e)}function p(e,t){if(e.anchorNode&&_.getDocument(e.anchorNode)!==_.getDocument(t))throw new b("WRONG_DOCUMENT_ERR")}function C(e){var t=[],n=new O(e.anchorNode,e.anchorOffset),i=new O(e.focusNode,e.focusOffset),r="function"==typeof e.getName?e.getName():"Selection";if(e.rangeCount!==void 0)for(var o=0,s=e.rangeCount;s>o;++o)t[o]=S.inspect(e.getRangeAt(o));return"["+r+"(Ranges: "+t.join(", ")+")(anchor: "+n.inspect()+", focus: "+i.inspect()+"]"}e.requireModules(["DomUtil","DomRange","WrappedRange"]),e.config.checkSelectionRanges=!0;var v,N,E="boolean",y="_rangySelection",_=e.dom,T=e.util,S=e.DomRange,R=e.WrappedRange,b=e.DOMException,O=_.DomPosition,w="Control",D=e.util.isHostMethod(window,"getSelection"),x=e.util.isHostObject(document,"selection"),k=x&&(!D||e.config.preferTextRange);k?(v=i,e.isSelectionValid=function(e){var t=(e||window).document,n=t.selection;return"None"!=n.type||_.getDocument(n.createRange().parentElement())==t}):D?(v=n,e.isSelectionValid=function(){return!0}):t.fail("Neither document.selection or window.getSelection() detected."),e.getNativeSelection=v;var A=v(),P=e.createNativeRange(document),I=_.getBody(document),B=T.areHostObjects(A,["anchorNode","focusNode"]&&T.areHostProperties(A,["anchorOffset","focusOffset"]));e.features.selectionHasAnchorAndFocus=B;var M=T.isHostMethod(A,"extend");e.features.selectionHasExtend=M;var L="number"==typeof A.rangeCount;e.features.selectionHasRangeCount=L;var H=!1,j=!0;T.areHostMethods(A,["addRange","getRangeAt","removeAllRanges"])&&"number"==typeof A.rangeCount&&e.features.implementsDomRange&&function(){var e=document.createElement("iframe");e.frameBorder=0,e.style.position="absolute",e.style.left="-10000px",I.appendChild(e);var t=_.getIframeDocument(e);t.open(),t.write("<html><head></head><body>12</body></html>"),t.close();var n=_.getIframeWindow(e).getSelection(),i=t.documentElement,r=i.lastChild,o=r.firstChild,s=t.createRange();s.setStart(o,1),s.collapse(!0),n.addRange(s),j=1==n.rangeCount,n.removeAllRanges();var a=s.cloneRange();s.setStart(o,0),a.setEnd(o,2),n.addRange(s),n.addRange(a),H=2==n.rangeCount,s.detach(),a.detach(),I.removeChild(e)}(),e.features.selectionSupportsMultipleRanges=H,e.features.collapsedNonEditableSelectionsSupported=j;var U,Q=!1;I&&T.isHostMethod(I,"createControlRange")&&(U=I.createControlRange(),T.areHostProperties(U,["item","add"])&&(Q=!0)),e.features.implementsControlRange=Q,N=B?function(e){return e.anchorNode===e.focusNode&&e.anchorOffset===e.focusOffset}:function(e){return e.rangeCount?e.getRangeAt(e.rangeCount-1).collapsed:!1};var W;T.isHostMethod(A,"getRangeAt")?W=function(e,t){try{return e.getRangeAt(t)}catch(n){return null}}:B&&(W=function(t){var n=_.getDocument(t.anchorNode),i=e.createRange(n);return i.setStart(t.anchorNode,t.anchorOffset),i.setEnd(t.focusNode,t.focusOffset),i.collapsed!==this.isCollapsed&&(i.setStart(t.focusNode,t.focusOffset),i.setEnd(t.anchorNode,t.anchorOffset)),i}),e.getSelection=function(e){e=e||window;var t=e[y],n=v(e),r=x?i(e):null;return t?(t.nativeSelection=n,t.docSelection=r,t.refresh(e)):(t=new g(n,r,e),e[y]=t),t},e.getIframeSelection=function(t){return e.getSelection(_.getIframeWindow(t))};var F=g.prototype;if(!k&&B&&T.areHostMethods(A,["removeAllRanges","addRange"])){F.removeAllRanges=function(){this.nativeSelection.removeAllRanges(),s(this)};var K=function(t,n){var i=S.getRangeDocument(n),r=e.createRange(i);r.collapseToPoint(n.endContainer,n.endOffset),t.nativeSelection.addRange(a(r)),t.nativeSelection.extend(n.startContainer,n.startOffset),t.refresh()};F.addRange=L?function(t,n){if(Q&&x&&this.docSelection.type==w)f(this,t);else if(n&&M)K(this,t);else{var i;if(H?i=this.rangeCount:(this.removeAllRanges(),i=0),this.nativeSelection.addRange(a(t)),this.rangeCount=this.nativeSelection.rangeCount,this.rangeCount==i+1){if(e.config.checkSelectionRanges){var o=W(this.nativeSelection,this.rangeCount-1);o&&!S.rangesEqual(o,t)&&(t=new R(o))}this._ranges[this.rangeCount-1]=t,r(this,t,z(this.nativeSelection)),this.isCollapsed=N(this)}else this.refresh()}}:function(e,t){t&&M?K(this,e):(this.nativeSelection.addRange(a(e)),this.refresh())},F.setRanges=function(e){if(Q&&e.length>1)m(this,e);else{this.removeAllRanges();for(var t=0,n=e.length;n>t;++t)this.addRange(e[t])}}}else{if(!(T.isHostMethod(A,"empty")&&T.isHostMethod(P,"select")&&Q&&k))return t.fail("No means of selecting a Range or TextRange was found"),!1;F.removeAllRanges=function(){try{if(this.docSelection.empty(),"None"!=this.docSelection.type){var e;if(this.anchorNode)e=_.getDocument(this.anchorNode);else if(this.docSelection.type==w){var t=this.docSelection.createRange();t.length&&(e=_.getDocument(t.item(0)).body.createTextRange())}if(e){var n=e.body.createTextRange();n.select(),this.docSelection.empty()}}}catch(i){}s(this)},F.addRange=function(e){this.docSelection.type==w?f(this,e):(R.rangeToTextRange(e).select(),this._ranges[0]=e,this.rangeCount=1,this.isCollapsed=this._ranges[0].collapsed,r(this,e,!1))},F.setRanges=function(e){this.removeAllRanges();var t=e.length;t>1?m(this,e):t&&this.addRange(e[0])}}F.getRangeAt=function(e){if(0>e||e>=this.rangeCount)throw new b("INDEX_SIZE_ERR");return this._ranges[e]};var V;if(k)V=function(t){var n;e.isSelectionValid(t.win)?n=t.docSelection.createRange():(n=_.getBody(t.win.document).createTextRange(),n.collapse(!0)),t.docSelection.type==w?h(t):d(n)?u(t,n):s(t)};else if(T.isHostMethod(A,"getRangeAt")&&"number"==typeof A.rangeCount)V=function(t){if(Q&&x&&t.docSelection.type==w)h(t);else if(t._ranges.length=t.rangeCount=t.nativeSelection.rangeCount,t.rangeCount){for(var n=0,i=t.rangeCount;i>n;++n)t._ranges[n]=new e.WrappedRange(t.nativeSelection.getRangeAt(n));r(t,t._ranges[t.rangeCount-1],z(t.nativeSelection)),t.isCollapsed=N(t)}else s(t)};else{if(!B||typeof A.isCollapsed!=E||typeof P.collapsed!=E||!e.features.implementsDomRange)return t.fail("No means of obtaining a Range or TextRange from the user's selection was found"),!1;V=function(e){var t,n=e.nativeSelection;n.anchorNode?(t=W(n,0),e._ranges=[t],e.rangeCount=1,o(e),e.isCollapsed=N(e)):s(e)}}F.refresh=function(e){var t=e?this._ranges.slice(0):null;if(V(this),e){var n=t.length;if(n!=this._ranges.length)return!1;for(;n--;)if(!S.rangesEqual(t[n],this._ranges[n]))return!1;return!0}};var X=function(e,t){var n=e.getAllRanges(),i=!1;e.removeAllRanges();for(var r=0,o=n.length;o>r;++r)i||t!==n[r]?e.addRange(n[r]):i=!0;e.rangeCount||s(e)};F.removeRange=Q?function(e){if(this.docSelection.type==w){for(var t,n=this.docSelection.createRange(),i=l(e),r=_.getDocument(n.item(0)),o=_.getBody(r).createControlRange(),s=!1,a=0,c=n.length;c>a;++a)t=n.item(a),t!==i||s?o.add(n.item(a)):s=!0;o.select(),h(this)}else X(this,e)}:function(e){X(this,e)};var z;!k&&B&&e.features.implementsDomRange?(z=function(e){var t=!1;return e.anchorNode&&(t=1==_.comparePoints(e.anchorNode,e.anchorOffset,e.focusNode,e.focusOffset)),t},F.isBackwards=function(){return z(this)}):z=F.isBackwards=function(){return!1},F.toString=function(){for(var e=[],t=0,n=this.rangeCount;n>t;++t)e[t]=""+this._ranges[t];return e.join("")},F.collapse=function(t,n){p(this,t);var i=e.createRange(_.getDocument(t));i.collapseToPoint(t,n),this.removeAllRanges(),this.addRange(i),this.isCollapsed=!0},F.collapseToStart=function(){if(!this.rangeCount)throw new b("INVALID_STATE_ERR");var e=this._ranges[0];this.collapse(e.startContainer,e.startOffset)},F.collapseToEnd=function(){if(!this.rangeCount)throw new b("INVALID_STATE_ERR");var e=this._ranges[this.rangeCount-1];this.collapse(e.endContainer,e.endOffset)},F.selectAllChildren=function(t){p(this,t);var n=e.createRange(_.getDocument(t));n.selectNodeContents(t),this.removeAllRanges(),this.addRange(n)},F.deleteFromDocument=function(){if(Q&&x&&this.docSelection.type==w){for(var e,t=this.docSelection.createRange();t.length;)e=t.item(0),t.remove(e),e.parentNode.removeChild(e);this.refresh()}else if(this.rangeCount){var n=this.getAllRanges();this.removeAllRanges();for(var i=0,r=n.length;r>i;++i)n[i].deleteContents();this.addRange(n[r-1])}},F.getAllRanges=function(){return this._ranges.slice(0)},F.setSingleRange=function(e){this.setRanges([e])},F.containsNode=function(e,t){for(var n=0,i=this._ranges.length;i>n;++n)if(this._ranges[n].containsNode(e,t))return!0;return!1},F.toHtml=function(){var e="";if(this.rangeCount){for(var t=S.getRangeDocument(this._ranges[0]).createElement("div"),n=0,i=this._ranges.length;i>n;++n)t.appendChild(this._ranges[n].cloneContents());e=t.innerHTML}return e},F.getName=function(){return"WrappedSelection"},F.inspect=function(){return C(this)},F.detach=function(){this.win[y]=null,this.win=this.anchorNode=this.focusNode=null},g.inspect=C,e.Selection=g,e.selectionPrototype=F,e.addCreateMissingNativeApiListener(function(t){t.getSelection===void 0&&(t.getSelection=function(){return e.getSelection(this)}),t=null})}),"function"!=typeof String.prototype.trim&&(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")}),"indexOf"in Array.prototype||(Array.prototype.indexOf=function(e,t){void 0===t&&(t=0),0>t&&(t+=this.length),0>t&&(t=0);for(var n=this.length;n>t;t++)if(t in this&&this[t]===e)return t;return-1}),"lastIndexOf"in Array.prototype||(Array.prototype.lastIndexOf=function(e,t){for(void 0===t&&(t=this.length-1),0>t&&(t+=this.length),t>this.length-1&&(t=this.length-1),t++;t-->0;)if(t in this&&this[t]===e)return t;return-1}),"map"in Array.prototype||(Array.prototype.map=function(e,t){for(var n=Array(this.length),i=0,r=this.length;r>i;i++)i in this&&(n[i]=e.call(t,this[i],i,this));return n}),"filter"in Array.prototype||(Array.prototype.filter=function(e,t){for(var n,i=[],r=0,o=this.length;o>r;r++)r in this&&e.call(t,n=this[r],r,this)&&i.push(n);return i}),function(){var e,t,n=this;e={changeIdAttribute:"data-cid",userIdAttribute:"data-userid",userNameAttribute:"data-username",timeAttribute:"data-time",attrValuePrefix:"",blockEl:"p",blockEls:["p","ol","ul","li","h1","h2","h3","h4","h5","h6","blockquote"],stylePrefix:"cts",currentUser:{id:null,name:null},changeTypes:{insertType:{tag:"span",alias:"ins",action:"Inserted"},deleteType:{tag:"span",alias:"del",action:"Deleted"}},handleEvents:!1,contentEditable:!0,isTracking:!0,noTrack:".ice-no-track",avoid:".ice-avoid",mergeBlocks:!0},t=function(t){if(this._changes={},t||(t={}),!t.element)throw Error("`options.element` must be defined for ice construction.");ice.dom.extend(!0,this,e,t),this.pluginsManager=new ice.IcePluginManager(this),t.plugins&&this.pluginsManager.usePlugins("ice-init",t.plugins)},t.prototype={_userStyles:{},_styles:{},_uniqueStyleIndex:0,_browserType:null,_batchChangeid:null,_uniqueIDIndex:1,_delBookmark:"tempdel",isPlaceHoldingDeletes:!1,startTracking:function(){if(this.element.setAttribute("contentEditable",this.contentEditable),this.handleEvents){var e=this;ice.dom.bind(e.element,"keyup.ice keydown.ice keypress.ice mousedown.ice mouseup.ice",function(t){return e.handleEvent(t)})}return this.initializeEnvironment(),this.initializeEditor(),this.initializeRange(),this.pluginsManager.fireEnabled(this.element),this},stopTracking:function(){if(this.element.setAttribute("contentEditable",!this.contentEditable),this.handleEvents){var e=this;ice.dom.unbind(e.element,"keyup.ice keydown.ice keypress.ice mousedown.ice mouseup.ice")}return this.pluginsManager.fireDisabled(this.element),this},initializeEnvironment:function(){this.env||(this.env={}),this.env.element=this.element,this.env.document=this.element.ownerDocument,this.env.window=this.env.document.defaultView||this.env.document.parentWindow||window,this.env.frame=this.env.window.frameElement,this.env.selection=this.selection=new ice.Selection(this.env),this.env.document.createElement(this.changeTypes.insertType.tag),this.env.document.createElement(this.changeTypes.deleteType.tag)},initializeRange:function(){var e=this.selection.createRange();e.setStart(ice.dom.find(this.element,this.blockEls.join(", "))[0],0),e.collapse(!0),this.selection.addRange(e),this.env.frame?this.env.frame.contentWindow.focus():this.element.focus()},initializeEditor:function(){var e=this,t=this.env.document.createElement("div");this.element.childNodes.length?(t.innerHTML=this.element.innerHTML,ice.dom.removeWhitespace(t),""===t.innerHTML&&t.appendChild(ice.dom.create("<"+this.blockEl+" ><br/></"+this.blockEl+">"))):t.appendChild(ice.dom.create("<"+this.blockEl+" ><br/></"+this.blockEl+">")),this.element.innerHTML=t.innerHTML;var n=[];for(var i in this.changeTypes)n.push(this._getIceNodeClass(i));ice.dom.each(ice.dom.find(this.element,"."+n.join(", .")),function(t,i){for(var r=0,o="",s=i.className.split(" "),t=0;s.length>t;t++){var a=RegExp(e.stylePrefix+"-(\\d+)").exec(s[t]);a&&(r=a[1]);var c=RegExp("("+n.join("|")+")").exec(s[t]);c&&(o=e._getChangeTypeFromAlias(c[1]))}var l=ice.dom.attr(i,e.userIdAttribute);e.setUserStyle(l,Number(r));var d=ice.dom.attr(i,e.changeIdAttribute);e._changes[d]={type:o,userid:l,username:ice.dom.attr(i,e.userNameAttribute),time:ice.dom.attr(i,e.timeAttribute)}})},enableChangeTracking:function(){this.isTracking=!0,this.pluginsManager.fireEnabled(this.element)},disableChangeTracking:function(){this.isTracking=!1,this.pluginsManager.fireDisabled(this.element)},setCurrentUser:function(e){this.currentUser=e},handleEvent:function(e){if(this.isTracking)if("mouseup"==e.type){var t=this;setTimeout(function(){t.mouseUp(e)},200)}else{if("mousedown"==e.type)return this.mouseDown(e);if("keypress"==e.type){var n=this.keyPress(e);return n||e.preventDefault(),n}if("keydown"==e.type){var n=this.keyDown(e);return n||e.preventDefault(),n}"keyup"==e.type&&this.pluginsManager.fireCaretUpdated()}},createIceNode:function(e,t){var n=this.env.document.createElement(this.changeTypes[e].tag);return ice.dom.addClass(n,this._getIceNodeClass(e)),n.appendChild(t?t:this.env.document.createTextNode("")),this.addChange(this.changeTypes[e].alias,[n]),this.pluginsManager.fireNodeCreated(n,{action:this.changeTypes[e].action}),n},insert:function(e,t){var n=!e;if(e||(e=""),t?this.selection.addRange(t):t=this.getCurrentRange(),"string"==typeof e&&(e=document.createTextNode(e)),!t.collapsed&&(this.deleteContents(),t=this.getCurrentRange(),t.startContainer===t.endContainer&&this.element===t.startContainer)){ice.dom.empty(this.element);var i=t.getLastSelectableChild(this.element);t.setStartAfter(i),t.collapse(!0)}this._moveRangeToValidTrackingPos(t);var r=this.startBatchChange();return this._insertNode(e,t,n),this.pluginsManager.fireNodeInserted(e,t),this.endBatchChange(r),n},placeholdDeletes:function(){var e=this;this.isPlaceholdingDeletes&&this.revertDeletePlaceholders(),this.isPlaceholdingDeletes=!0,this._deletes=[];var t="."+this._getIceNodeClass("deleteType");return ice.dom.each(ice.dom.find(this.element,t),function(t,n){e._deletes.push(ice.dom.cloneNode(n)),ice.dom.replaceWith(n,"<"+e._delBookmark+' data-allocation="'+(e._deletes.length-1)+'"/>')}),!0},revertDeletePlaceholders:function(){var e=this;return this.isPlaceholdingDeletes?(ice.dom.each(this._deletes,function(t,n){ice.dom.find(e.element,e._delBookmark+"[data-allocation="+t+"]").replaceWith(n)}),this.isPlaceholdingDeletes=!1,!0):!1},deleteContents:function(e,t){var n=!0;t?this.selection.addRange(t):t=this.getCurrentRange();var i=this.startBatchChange(this.changeTypes.deleteType.alias);return t.collapsed===!1?this._deleteSelection(t):n=e?this._deleteRight(t):this._deleteLeft(t),this.selection.addRange(t),this.endBatchChange(i),n},getChanges:function(){return this._changes},getChangeUserids:function(){var e=[],t=Object.keys(this._changes);for(var n in t)e.push(this._changes[t[n]].userid);return e.sort().filter(function(e,t,n){return t==n.indexOf(e)?1:0})},getElementContent:function(){return this.element.innerHTML},getCleanContent:function(e,t,n){var i="",r=this;ice.dom.each(this.changeTypes,function(e,t){"deleteType"!=e&&(t>0&&(i+=","),i+="."+r._getIceNodeClass(e))}),e=e?"string"==typeof e?ice.dom.create("<div>"+e+"</div>"):ice.dom.cloneNode(e,!1)[0]:ice.dom.cloneNode(this.element,!1)[0],e=n?n.call(this,e):e;var o=ice.dom.find(e,i);ice.dom.each(o,function(){ice.dom.replaceWith(this,ice.dom.contents(this))});var s=ice.dom.find(e,"."+this._getIceNodeClass("deleteType"));return ice.dom.remove(s),e=t?t.call(this,e):e,e.innerHTML},acceptAll:function(){this.element.innerHTML=this.getCleanContent()},rejectAll:function(){var e="."+this._getIceNodeClass("insertType"),t="."+this._getIceNodeClass("deleteType");ice.dom.remove(ice.dom.find(this.element,e)),ice.dom.each(ice.dom.find(this.element,t),function(e,t){ice.dom.replaceWith(t,ice.dom.contents(t))})},acceptChange:function(e){this.acceptRejectChange(e,!0)},rejectChange:function(e){this.acceptRejectChange(e,!1)},acceptRejectChange:function(e,t){var n,i,r,o,s,a,c,l=ice.dom;if(!e){var d=this.getCurrentRange();if(!d.collapsed)return;e=d.startContainer}n=o="."+this._getIceNodeClass("deleteType"),i=s="."+this._getIceNodeClass("insertType"),r=n+","+i,a=l.getNode(e,r),c=l.find(this.element,"["+this.changeIdAttribute+"="+l.attr(a,this.changeIdAttribute)+"]"),t||(o=i,s=n),ice.dom.is(a,s)?l.each(c,function(e,t){l.replaceWith(t,ice.dom.contents(t))}):l.is(a,o)&&l.remove(c)},isInsideChange:function(e){var t="."+this._getIceNodeClass("insertType")+", ."+this._getIceNodeClass("deleteType");if(!e){if(range=this.getCurrentRange(),!range.collapsed)return!1;e=range.startContainer}return!!ice.dom.getNode(e,t)},addChangeType:function(e,t,n,i){var r={tag:t,alias:n};i&&(r.action=i),this.changeTypes[e]=r},getIceNode:function(e,t){var n="."+this._getIceNodeClass(t);return ice.dom.getNode(e,n)},_moveRangeToValidTrackingPos:function(e){for(var t=!1,n=this._getVoidElement(e.endContainer);n;){try{e.moveEnd(ice.dom.CHARACTER_UNIT,1),e.moveEnd(ice.dom.CHARACTER_UNIT,-1)}catch(i){t=!0}if(t||ice.dom.onBlockBoundary(e.endContainer,e.startContainer,this.blockEls)){e.setStartAfter(n),e.collapse(!0);break}n=this._getVoidElement(e.endContainer),n?(e.setEnd(e.endContainer,0),e.moveEnd(ice.dom.CHARACTER_UNIT,ice.dom.getNodeCharacterLength(e.endContainer)),e.collapse()):(e.setStart(e.endContainer,0),e.collapse(!0))}},_getNoTrackElement:function(e){var t=this._getNoTrackSelector(),n=ice.dom.is(e,t)?e:ice.dom.parents(e,t)[0]||null;return n},_getNoTrackSelector:function(){return this.noTrack},_getVoidElement:function(e){var t=this._getVoidElSelector();return ice.dom.is(e,t)?e:ice.dom.parents(e,t)[0]||null},_getVoidElSelector:function(){return"."+this._getIceNodeClass("deleteType")+","+this.avoid},_currentUserIceNode:function(e){return ice.dom.attr(e,this.userIdAttribute)==this.currentUser.id},_getChangeTypeFromAlias:function(e){var t,n=null;for(t in this.changeTypes)this.changeTypes.hasOwnProperty(t)&&this.changeTypes[t].alias==e&&(n=t);return n},_getIceNodeClass:function(e){return this.attrValuePrefix+this.changeTypes[e].alias},getUserStyle:function(e){var t=null;return t=this._userStyles[e]?this._userStyles[e]:this.setUserStyle(e,this.getNewStyleId())},setUserStyle:function(e,t){var n=this.stylePrefix+"-"+t;return this._styles[t]||(this._styles[t]=!0),this._userStyles[e]=n},getNewStyleId:function(){var e=++this._uniqueStyleIndex;return this._styles[e]?this.getNewStyleId():(this._styles[e]=!0,e)},addChange:function(e,t){var n=this._batchChangeid||this.getNewChangeId();this._changes[n]||(this._changes[n]={type:this._getChangeTypeFromAlias(e),time:(new Date).getTime(),userid:this.currentUser.id,username:this.currentUser.name});var i=this;return ice.dom.foreach(t,function(e){i.addNodeToChange(n,t[e])}),n},addNodeToChange:function(e,t){null!==this._batchChangeid&&(e=this._batchChangeid);var n=this.getChange(e);t.getAttribute(this.changeIdAttribute)||t.setAttribute(this.changeIdAttribute,e),t.getAttribute(this.userIdAttribute)||t.setAttribute(this.userIdAttribute,n.userid),t.getAttribute(this.userNameAttribute)||t.setAttribute(this.userNameAttribute,n.username),t.getAttribute(this.timeAttribute)||t.setAttribute(this.timeAttribute,n.time),ice.dom.hasClass(t,this._getIceNodeClass(n.type))||ice.dom.addClass(t,this._getIceNodeClass(n.type));var i=this.getUserStyle(n.userid);ice.dom.hasClass(t,i)||ice.dom.addClass(t,i)},getChange:function(e){var t=null;return this._changes[e]&&(t=this._changes[e]),t},getNewChangeId:function(){var e=++this._uniqueIDIndex;return this._changes[e]&&(e=this.getNewChangeId()),e},startBatchChange:function(){return this._batchChangeid=this.getNewChangeId(),this._batchChangeid},endBatchChange:function(e){e===this._batchChangeid&&(this._batchChangeid=null)},getCurrentRange:function(){return this.selection.getRangeAt(0)},_insertNode:function(e,t,n){ice.dom.isBlockElement(t.startContainer)||ice.dom.canContainTextElement(ice.dom.getBlockParent(t.startContainer,this.element))||!t.startContainer.previousSibling||t.setStart(t.startContainer.previousSibling,0),t.startContainer;var i=ice.dom.isBlockElement(t.startContainer)&&t.startContainer||ice.dom.getBlockParent(t.startContainer,this.element)||null;if(i===this.element){var r=document.createElement(this.blockEl);return i.appendChild(r),t.setStart(r,0),t.collapse(),this._insertNode(e,t,n)}ice.dom.hasNoTextOrStubContent(i)&&(ice.dom.empty(i),ice.dom.append(i,"<br>"),t.setStart(i,0));var o=this.getIceNode(t.startContainer,"insertType"),s=this._currentUserIceNode(o);n&&s||(s||(e=this.createIceNode("insertType",e)),t.insertNode(e),t.setEnd(e,1),n?t.setStart(e,0):t.collapse(),this.selection.addRange(t))},_handleVoidEl:function(e,t){var n=this._getVoidElement(e);return n&&!this.getIceNode(n,"deleteType")?(t.collapse(!0),!0):!1},_deleteSelection:function(e){for(var t=new ice.Bookmark(this.env,e),n=ice.dom.getElementsBetween(t.start,t.end),i=ice.dom.parents(e.startContainer,this.blockEls.join(", "))[0],r=ice.dom.parents(e.endContainer,this.blockEls.join(", "))[0],o=[],s=0;n.length>s;s++){var a=n[s];if(!ice.dom.isBlockElement(a)||(o.push(a),ice.dom.canContainTextElement(a))){if((a.nodeType!==ice.dom.TEXT_NODE||0!==ice.dom.getNodeTextContent(a).length)&&!this._getVoidElement(a)){if(a.nodeType!==ice.dom.TEXT_NODE){if(ice.dom.BREAK_ELEMENT==ice.dom.getTagName(a))continue;if(ice.dom.isStubElement(a)){this._addNodeTracking(a,!1,!0);continue}for(ice.dom.hasNoTextOrStubContent(a)&&ice.dom.remove(a),j=0;a.childNodes.length>j;j++){var c=a.childNodes[j];n.push(c)}continue}var l=ice.dom.getBlockParent(a);this._addNodeTracking(a,!1,!0,!0),ice.dom.hasNoTextOrStubContent(l)&&ice.dom.remove(l)}}else for(var d=0;a.childNodes.length>d;d++)n.push(a.childNodes[d])}if(this.mergeBlocks&&i!==r){for(;o.length;)ice.dom.mergeContainers(o.shift(),i);ice.dom.removeBRFromChild(r),ice.dom.removeBRFromChild(i),ice.dom.mergeContainers(r,i)}t.selectBookmark(),e.collapse(!1)},_deleteRight:function(e){var t,n,i=ice.dom.isBlockElement(e.startContainer)&&e.startContainer||ice.dom.getBlockParent(e.startContainer,this.element)||null,r=i?ice.dom.hasNoTextOrStubContent(i):!1,o=i&&ice.dom.getNextContentNode(i,this.element),s=o?ice.dom.hasNoTextOrStubContent(o):!1,a=e.endContainer,c=e.endOffset,l=e.commonAncestorContainer;if(r)return!1;if(l.nodeType!==ice.dom.TEXT_NODE){if(0===c&&ice.dom.isBlockElement(l)&&!ice.dom.canContainTextElement(l)){var d=l.firstElementChild;if(d)return e.setStart(d,0),e.collapse(),this._deleteRight(e)}if(l.childNodes.length>c){var u=document.createTextNode(" ");return l.insertBefore(u,l.childNodes[c]),e.setStart(u,1),e.collapse(!0),n=this._deleteRight(e),ice.dom.remove(u),n}return t=ice.dom.getNextContentNode(l,this.element),e.setEnd(t,0),e.collapse(),this._deleteRight(e)}if(e.moveEnd(ice.dom.CHARACTER_UNIT,1),e.moveEnd(ice.dom.CHARACTER_UNIT,-1),c===a.data.length&&!ice.dom.hasNoTextOrStubContent(a)){if(t=ice.dom.getNextNode(a,this.element),!t)return e.selectNodeContents(a),e.collapse(),!1;if(ice.dom.BREAK_ELEMENT==ice.dom.getTagName(t)&&(t=ice.dom.getNextNode(t,this.element)),t.nodeType===ice.dom.TEXT_NODE&&(t=t.parentNode),!t.isContentEditable){n=this._addNodeTracking(t,!1,!1);var h=document.createTextNode("");return t.parentNode.insertBefore(h,t.nextSibling),e.selectNode(h),e.collapse(!0),n}if(this._handleVoidEl(t,e))return!0;if(ice.dom.isChildOf(t,i)&&ice.dom.isStubElement(t))return this._addNodeTracking(t,e,!1)}if(this._handleVoidEl(t,e))return!0;if(this._getNoTrackElement(e.endContainer.parentElement))return e.deleteContents(),!1;if(ice.dom.isOnBlockBoundary(e.startContainer,e.endContainer,this.element)){if(this.mergeBlocks&&ice.dom.is(ice.dom.getBlockParent(t,this.element),this.blockEl)){o!==ice.dom.getBlockParent(e.endContainer,this.element)&&e.setEnd(o,0);for(var f=ice.dom.getElementsBetween(e.startContainer,e.endContainer),g=0;f.length>g;g++)ice.dom.remove(f[g]);var m=e.startContainer,p=e.endContainer;return ice.dom.remove(ice.dom.find(m,"br")),ice.dom.remove(ice.dom.find(p,"br")),ice.dom.mergeBlockWithSibling(e,ice.dom.getBlockParent(e.endContainer,this.element)||i)}return s?(ice.dom.remove(o),e.collapse(!0),!0):(e.setStart(o,0),e.collapse(!0),!0)}var C=e.endContainer,v=C.splitText(e.endOffset);return v.splitText(1),this._addNodeTracking(v,e,!1)},_deleteLeft:function(e){var t,n,i=ice.dom.isBlockElement(e.startContainer)&&e.startContainer||ice.dom.getBlockParent(e.startContainer,this.element)||null,r=i?ice.dom.hasNoTextOrStubContent(i):!1,o=i&&ice.dom.getPrevContentNode(i,this.element),s=o?ice.dom.hasNoTextOrStubContent(o):!1,a=e.startContainer,c=e.startOffset,l=e.commonAncestorContainer;if(r)return!1;if(0===c||l.nodeType!==ice.dom.TEXT_NODE){if(ice.dom.isBlockElement(l)&&!ice.dom.canContainTextElement(l))if(0===c){var d=l.firstElementChild;if(d)return e.setStart(d,0),e.collapse(),this._deleteLeft(e)}else{var u=l.lastElementChild;if(u&&(t=e.getLastSelectableChild(u)))return e.setStart(t,t.data.length),e.collapse(),this._deleteLeft(e)}if(n=0===c?ice.dom.getPrevContentNode(a,this.element):l.childNodes[c-1],!n)return!1;if(ice.dom.is(n,"."+this._getIceNodeClass("insertType")+", ."+this._getIceNodeClass("deleteType"))&&n.childNodes.length>0&&n.lastChild&&(n=n.lastChild),n.nodeType===ice.dom.TEXT_NODE&&(n=n.parentNode),!n.isContentEditable){var h=this._addNodeTracking(n,!1,!0),f=document.createTextNode("");return n.parentNode.insertBefore(f,n),e.selectNode(f),e.collapse(!0),h}if(this._handleVoidEl(n,e))return!0;if(ice.dom.isStubElement(n)&&ice.dom.isChildOf(n,i)||!n.isContentEditable)return this._addNodeTracking(n,e,!0);if(ice.dom.isStubElement(n))return ice.dom.remove(n),e.collapse(!0),!1;if(n!==i&&!ice.dom.isChildOf(n,i)){if(ice.dom.canContainTextElement(n)||(n=n.lastElementChild),n.lastChild&&n.lastChild.nodeType!==ice.dom.TEXT_NODE&&ice.dom.isStubElement(n.lastChild)&&"BR"!==n.lastChild.tagName)return e.setStartAfter(n.lastChild),e.collapse(!0),!0;if(t=e.getLastSelectableChild(n),t&&!ice.dom.isOnBlockBoundary(e.startContainer,t,this.element))return e.selectNodeContents(t),e.collapse(),!0}}if(1===c&&!ice.dom.isBlockElement(l)&&e.startContainer.childNodes.length>1&&e.startContainer.childNodes[0].nodeType===ice.dom.TEXT_NODE&&0===e.startContainer.childNodes[0].data.length)return e.setStart(e.startContainer,0),this._deleteLeft(e);if(e.moveStart(ice.dom.CHARACTER_UNIT,-1),e.moveStart(ice.dom.CHARACTER_UNIT,1),this._getNoTrackElement(e.startContainer.parentElement))return e.deleteContents(),!1;if(ice.dom.isOnBlockBoundary(e.startContainer,e.endContainer,this.element)){if(s)return ice.dom.remove(o),e.collapse(),!0;if(this.mergeBlocks&&ice.dom.is(ice.dom.getBlockParent(n,this.element),this.blockEl)){o!==ice.dom.getBlockParent(e.startContainer,this.element)&&e.setStart(o,o.childNodes.length);for(var g=ice.dom.getElementsBetween(e.startContainer,e.endContainer),m=0;g.length>m;m++)ice.dom.remove(g[m]);var p=e.startContainer,C=e.endContainer;return ice.dom.remove(ice.dom.find(p,"br")),ice.dom.remove(ice.dom.find(C,"br")),ice.dom.mergeBlockWithSibling(e,ice.dom.getBlockParent(e.endContainer,this.element)||i)}return o&&o.lastChild&&ice.dom.isStubElement(o.lastChild)?(e.setStartAfter(o.lastChild),e.collapse(!0),!0):(t=e.getLastSelectableChild(o),t?(e.setStart(t,t.data.length),e.collapse(!0)):o&&(e.setStart(o,o.childNodes.length),e.collapse(!0)),!0)}var v=e.startContainer,N=v.splitText(e.startOffset-1);return N.splitText(1),this._addNodeTracking(N,e,!0)},_addNodeTracking:function(e,t,n){var i=this.getIceNode(e,"insertType");if(i&&this._currentUserIceNode(i)){t&&n&&t.selectNode(e),e.parentNode.removeChild(e);var r=ice.dom.cloneNode(i);if(ice.dom.remove(ice.dom.find(r,".iceBookmark")),null!==i&&ice.dom.hasNoTextOrStubContent(r[0])){var o=this.env.document.createTextNode("");ice.dom.insertBefore(i,o),t&&(t.setStart(o,0),t.collapse(!0)),ice.dom.replaceWith(i,ice.dom.contents(i))}return!0}if(t&&this.getIceNode(e,"deleteType")){e.normalize();var s=!1;if(n){for(var a=ice.dom.getPrevContentNode(e,this.element);!s;)d=this.getIceNode(a,"deleteType"),d?a=ice.dom.getPrevContentNode(a,this.element):s=!0;if(a){var c=t.getLastSelectableChild(a);c&&(a=c),t.setStart(a,ice.dom.getNodeCharacterLength(a)),t.collapse(!0)}return!0}for(var l=ice.dom.getNextContentNode(e,this.element);!s;)d=this.getIceNode(l,"deleteType"),d?l=ice.dom.getNextContentNode(l,this.element):s=!0;return l&&(t.selectNodeContents(l),t.collapse(!0)),!0}e.previousSibling&&e.previousSibling.nodeType===ice.dom.TEXT_NODE&&0===e.previousSibling.length&&e.parentNode.removeChild(e.previousSibling),e.nextSibling&&e.nextSibling.nodeType===ice.dom.TEXT_NODE&&0===e.nextSibling.length&&e.parentNode.removeChild(e.nextSibling);var d,u=this.getIceNode(e.previousSibling,"deleteType"),h=this.getIceNode(e.nextSibling,"deleteType");if(u&&this._currentUserIceNode(u)){if(d=u,d.appendChild(e),h&&this._currentUserIceNode(h)){var f=ice.dom.extractContent(h);ice.dom.append(d,f),h.parentNode.removeChild(h)}}else h&&this._currentUserIceNode(h)?(d=h,d.insertBefore(e,d.firstChild)):(d=this.createIceNode("deleteType"),e.parentNode.insertBefore(d,e),d.appendChild(e));return t&&(ice.dom.isStubElement(e)?t.selectNode(e):t.selectNodeContents(e),n?t.collapse(!0):t.collapse(),e.normalize()),!0},_handleAncillaryKey:function(e){var t=e.keyCode,n=!0;switch(e.shiftKey,t){case ice.dom.DOM_VK_DELETE:n=this.deleteContents(),this.pluginsManager.fireKeyPressed(e);break;case 46:n=this.deleteContents(!0),this.pluginsManager.fireKeyPressed(e);break;case ice.dom.DOM_VK_DOWN:case ice.dom.DOM_VK_UP:case ice.dom.DOM_VK_LEFT:case ice.dom.DOM_VK_RIGHT:this.pluginsManager.fireCaretPositioned(),n=!1;break;default:n=!1}return n===!0?(ice.dom.preventDefault(e),!1):!0},keyDown:function(e){if(!this.pluginsManager.fireKeyDown(e))return ice.dom.preventDefault(e),!1;var t=!1;if(this._handleSpecialKey(e)===!1)return ice.dom.isBrowser("msie")!==!0&&(this._preventKeyPress=!0),!1;if(!(e.ctrlKey!==!0&&e.metaKey!==!0||ice.dom.isBrowser("msie")!==!0&&ice.dom.isBrowser("chrome")!==!0||this.pluginsManager.fireKeyPressed(e)))return!1;switch(e.keyCode){case 27:break;default:/Firefox/.test(navigator.userAgent)!==!0&&(t=!this._handleAncillaryKey(e))}return t?(ice.dom.preventDefault(e),!1):!0},keyPress:function(e){if(this._preventKeyPress===!0)return this._preventKeyPress=!1,void 0;var t=null;if(null==e.which?t=String.fromCharCode(e.keyCode):e.which>0&&(t=String.fromCharCode(e.which)),!this.pluginsManager.fireKeyPress(e))return!1;if(e.ctrlKey||e.metaKey)return!0;var n=this.getCurrentRange(),i=ice.dom.parents(n.startContainer,"br")[0]||null;if(i&&(n.moveToNextEl(i),i.parentNode.removeChild(i)),null!==t&&e.ctrlKey!==!0&&e.metaKey!==!0)switch(e.keyCode){case ice.dom.DOM_VK_DELETE:return this._handleAncillaryKey(e);
+case ice.dom.DOM_VK_ENTER:return this._handleEnter();default:return this._moveRangeToValidTrackingPos(n,n.startContainer),this.insert()}return this._handleAncillaryKey(e)},_handleEnter:function(){var e=this.getCurrentRange();return e.collapsed||this.deleteContents(),!0},_handleSpecialKey:function(e){var t=e.which;null===t&&(t=e.keyCode);var n=!1;switch(t){case 65:if(e.ctrlKey===!0||e.metaKey===!0){n=!0;var i=this.getCurrentRange();if(ice.dom.isBrowser("msie")===!0){var r=this.env.document.createTextNode(""),o=this.env.document.createTextNode("");this.element.firstChild?ice.dom.insertBefore(this.element.firstChild,r):this.element.appendChild(r),this.element.appendChild(o),i.setStart(r,0),i.setEnd(o,0)}else{i.setStart(i.getFirstSelectableChild(this.element),0);var s=i.getLastSelectableChild(this.element);i.setEnd(s,s.length)}this.selection.addRange(i)}break;default:}return n===!0?(ice.dom.preventDefault(e),!1):!0},mouseUp:function(e){return this.pluginsManager.fireClicked(e)?(this.pluginsManager.fireSelectionChanged(this.getCurrentRange()),void 0):!1},mouseDown:function(e){return this.pluginsManager.fireMouseDown(e)?(this.pluginsManager.fireCaretUpdated(),void 0):!1}},n.ice=this.ice||{},n.ice.InlineChangeEditor=t}.call(this),function(){var e=this,t={};t.DOM_VK_DELETE=8,t.DOM_VK_LEFT=37,t.DOM_VK_UP=38,t.DOM_VK_RIGHT=39,t.DOM_VK_DOWN=40,t.DOM_VK_ENTER=13,t.ELEMENT_NODE=1,t.ATTRIBUTE_NODE=2,t.TEXT_NODE=3,t.CDATA_SECTION_NODE=4,t.ENTITY_REFERENCE_NODE=5,t.ENTITY_NODE=6,t.PROCESSING_INSTRUCTION_NODE=7,t.COMMENT_NODE=8,t.DOCUMENT_NODE=9,t.DOCUMENT_TYPE_NODE=10,t.DOCUMENT_FRAGMENT_NODE=11,t.NOTATION_NODE=12,t.CHARACTER_UNIT="character",t.WORD_UNIT="word",t.BREAK_ELEMENT="br",t.CONTENT_STUB_ELEMENTS=["img","hr","iframe","param","link","meta","input","frame","col","base","area"],t.BLOCK_ELEMENTS=["p","div","pre","ul","ol","li","table","tbody","td","th","fieldset","form","blockquote","dl","dt","dd","dir","center","address","h1","h2","h3","h4","h5","h6"],t.TEXT_CONTAINER_ELEMENTS=["p","div","pre","li","td","th","blockquote","dt","dd","center","address","h1","h2","h3","h4","h5","h6"],t.STUB_ELEMENTS=t.CONTENT_STUB_ELEMENTS.slice(),t.STUB_ELEMENTS.push(t.BREAK_ELEMENT),t.getKeyChar=function(e){return String.fromCharCode(e.which)},t.getClass=function(e,t,n){return t||(t=document.body),e="."+e.split(" ").join("."),n&&(e=n+e),jQuery.makeArray(jQuery(t).find(e))},t.getId=function(e,t){return t||(t=document),element=t.getElementById(e)},t.getTag=function(e,t){return t||(t=document),jQuery.makeArray(jQuery(t).find(e))},t.getElementWidth=function(e){return e.offsetWidth},t.getElementHeight=function(e){return e.offsetHeight},t.getElementDimensions=function(e){var n={width:t.getElementWidth(e),height:t.getElementHeight(e)};return n},t.trim=function(e){return jQuery.trim(e)},t.empty=function(e){return e?jQuery(e).empty():void 0},t.remove=function(e){return e?jQuery(e).remove():void 0},t.prepend=function(e,t){jQuery(e).prepend(t)},t.append=function(e,t){jQuery(e).append(t)},t.insertBefore=function(e,t){jQuery(e).before(t)},t.insertAfter=function(e,t){jQuery(e).after(t)},t.getHtml=function(e){return jQuery(e).html()},t.setHtml=function(e,t){e&&jQuery(e).html(t)},t.removeWhitespace=function(e){jQuery(e).contents().filter(function(){return this.nodeType!=ice.dom.TEXT_NODE&&"UL"==this.nodeName||"OL"==this.nodeName?(t.removeWhitespace(this),!1):this.nodeType!=ice.dom.TEXT_NODE?!1:!/\S/.test(this.nodeValue)}).remove()},t.contents=function(e){return jQuery.makeArray(jQuery(e).contents())},t.extractContent=function(e){for(var t,n=document.createDocumentFragment();t=e.firstChild;)n.appendChild(t);return n},t.getNode=function(e,n){return t.is(e,n)?e:t.parents(e,n)[0]||null},t.getParents=function(e,t,n){for(var i=jQuery(e).parents(t),r=i.length,o=[],s=0;r>s&&i[s]!==n;s++)o.push(i[s]);return o},t.hasBlockChildren=function(e){for(var n=e.childNodes.length,i=0;n>i;i++)if(e.childNodes[i].nodeType===t.ELEMENT_NODE&&t.isBlockElement(e.childNodes[i])===!0)return!0;return!1},t.removeTag=function(e,t){return jQuery(e).find(t).replaceWith(function(){return jQuery(this).contents()}),e},t.stripEnclosingTags=function(e,t){var n=jQuery(e);return n.find("*").not(t).replaceWith(function(){var e,t=jQuery();try{e=jQuery(this),t=e.contents()}catch(n){}return 0===t.length&&e.remove(),t}),n[0]},t.getSiblings=function(e,t,n,i){if(n===!0)return"prev"===t?jQuery(e).prevAll():jQuery(e).nextAll();var r=[];if("prev"===t)for(;e.previousSibling&&(e=e.previousSibling,e!==i);)r.push(e);else for(;e.nextSibling&&(e=e.nextSibling,e!==i);)r.push(e);return r},t.getNodeTextContent=function(e){return jQuery(e).text()},t.getNodeStubContent=function(e){return jQuery(e).find(t.CONTENT_STUB_ELEMENTS.join(", "))},t.hasNoTextOrStubContent=function(e){return t.getNodeTextContent(e).length>0?!1:jQuery(e).find(t.CONTENT_STUB_ELEMENTS.join(", ")).length>0?!1:!0},t.getNodeCharacterLength=function(e){return t.getNodeTextContent(e).length+jQuery(e).find(t.STUB_ELEMENTS.join(", ")).length},t.setNodeTextContent=function(e,t){return jQuery(e).text(t)},t.getTagName=function(e){return e.tagName&&e.tagName.toLowerCase()||null},t.getIframeDocument=function(e){var t=null;return e.contentDocument?t=e.contentDocument:e.contentWindow?t=e.contentWindow.document:e.document&&(t=e.document),t},t.isBlockElement=function(e){return-1!=t.BLOCK_ELEMENTS.lastIndexOf(e.nodeName.toLowerCase())},t.isStubElement=function(e){return-1!=t.STUB_ELEMENTS.lastIndexOf(e.nodeName.toLowerCase())},t.removeBRFromChild=function(e){if(e&&e.hasChildNodes())for(var t=0;e.childNodes.length>t;t++){var n=e.childNodes[t];n&&ice.dom.BREAK_ELEMENT==ice.dom.getTagName(n)&&n.parentNode.removeChild(n)}},t.isChildOf=function(e,t){try{for(;e&&e.parentNode;){if(e.parentNode===t)return!0;e=e.parentNode}}catch(n){}return!1},t.isChildOfTagName=function(e,t){try{for(;e&&e.parentNode;){if(e.parentNode&&e.parentNode.tagName&&e.parentNode.tagName.toLowerCase()===t)return e.parentNode;e=e.parentNode}}catch(n){}return!1},t.isChildOfTagNames=function(e,t){try{for(;e&&e.parentNode;){if(e.parentNode&&e.parentNode.tagName){tagName=e.parentNode.tagName.toLowerCase();for(var n=0;t.length>n;n++)if(tagName===t[n])return e.parentNode}e=e.parentNode}}catch(i){}return null},t.isChildOfClassName=function(e,t){try{for(;e&&e.parentNode;){if(jQuery(e.parentNode).hasClass(t))return e.parentNode;e=e.parentNode}}catch(n){}return null},t.cloneNode=function(e,t){return void 0===t&&(t=!0),jQuery(e).clone(t)},t.bind=function(e,t,n){return jQuery(e).bind(t,n)},t.unbind=function(e,t,n){return jQuery(e).unbind(t,n)},t.attr=function(e,t,n){return n?jQuery(e).attr(t,n):jQuery(e).attr(t)},t.replaceWith=function(e,t){return jQuery(e).replaceWith(t)},t.removeAttr=function(e,t){jQuery(e).removeAttr(t)},t.getElementsBetween=function(e,n){var i=[];if(e===n)return i;if(t.isChildOf(n,e)===!0){for(var r=e.childNodes.length,o=0;r>o&&e.childNodes[o]!==n;o++){if(t.isChildOf(n,e.childNodes[o])===!0)return t.arrayMerge(i,t.getElementsBetween(e.childNodes[o],n));i.push(e.childNodes[o])}return i}for(var s=e.nextSibling;s;){if(t.isChildOf(n,s)===!0)return i=t.arrayMerge(i,t.getElementsBetween(s,n));if(s===n)return i;i.push(s),s=s.nextSibling}for(var a=t.getParents(e),c=t.getParents(n),l=t.arrayDiff(a,c,!0),d=l.length,u=0;d-1>u;u++)i=t.arrayMerge(i,t.getSiblings(l[u],"next"));var h=l[l.length-1];return i=t.arrayMerge(i,t.getElementsBetween(h,n))},t.getCommonAncestor=function(e,n){for(var i=e;i;){if(t.isChildOf(n,i)===!0)return i;i=i.parentNode}return null},t.getNextNode=function(e,n){if(e)for(;e.parentNode;){if(e===n)return null;if(e.nextSibling){if(e.nextSibling.nodeType===t.TEXT_NODE&&0===e.nextSibling.length){e=e.nextSibling;continue}return t.getFirstChild(e.nextSibling)}e=e.parentNode}return null},t.getNextContentNode=function(e,n){if(e)for(;e.parentNode;){if(e===n)return null;if(e.nextSibling&&t.canContainTextElement(t.getBlockParent(e))){if(e.nextSibling.nodeType===t.TEXT_NODE&&0===e.nextSibling.length){e=e.nextSibling;continue}return e.nextSibling}if(e.nextElementSibling)return e.nextElementSibling;e=e.parentNode}return null},t.getPrevNode=function(e,n){if(e)for(;e.parentNode;){if(e===n)return null;if(e.previousSibling){if(e.previousSibling.nodeType===t.TEXT_NODE&&0===e.previousSibling.length){e=e.previousSibling;continue}return t.getLastChild(e.previousSibling)}e=e.parentNode}return null},t.getPrevContentNode=function(e,n){if(e)for(;e.parentNode;){if(e===n)return null;if(e.previousSibling&&t.canContainTextElement(t.getBlockParent(e))){if(e.previousSibling.nodeType===t.TEXT_NODE&&0===e.previousSibling.length){e=e.previousSibling;continue}return e.previousSibling}if(e.previousElementSibling)return e.previousElementSibling;e=e.parentNode}return null},t.canContainTextElement=function(e){return e&&e.nodeName?-1!=t.TEXT_CONTAINER_ELEMENTS.lastIndexOf(e.nodeName.toLowerCase()):!1},t.getFirstChild=function(e){return e.firstChild?e.firstChild.nodeType===t.ELEMENT_NODE?t.getFirstChild(e.firstChild):e.firstChild:e},t.getLastChild=function(e){return e.lastChild?e.lastChild.nodeType===t.ELEMENT_NODE?t.getLastChild(e.lastChild):e.lastChild:e},t.removeEmptyNodes=function(e,n){for(var i=jQuery(e).find(":empty"),r=i.length;r>0;)r--,t.isStubElement(i[r])===!1&&(n&&n.call(this,i[r])===!1||t.remove(i[r]))},t.create=function(e){return jQuery(e)[0]},t.find=function(e,t){return jQuery(e).find(t)},t.children=function(e,t){return jQuery(e).children(t)},t.parent=function(e,t){return jQuery(e).parent(t)[0]},t.parents=function(e,t){return jQuery(e).parents(t)},t.is=function(e,t){return jQuery(e).is(t)},t.extend=function(){return jQuery.extend.apply(this,arguments)},t.walk=function(e,n,i){if(e){i||(i=0);var r=n.call(this,e,i);r!==!1&&(e.childNodes&&e.childNodes.length>0?t.walk(e.firstChild,n,i+1):e.nextSibling?t.walk(e.nextSibling,n,i):e.parentNode&&e.parentNode.nextSibling&&t.walk(e.parentNode.nextSibling,n,i-1))}},t.revWalk=function(e,n){if(e){var i=n.call(this,e);i!==!1&&(e.childNodes&&e.childNodes.length>0?t.walk(e.lastChild,n):e.previousSibling?t.walk(e.previousSibling,n):e.parentNode&&e.parentNode.previousSibling&&t.walk(e.parentNode.previousSibling,n))}},t.setStyle=function(e,t,n){e&&jQuery(e).css(t,n)},t.getStyle=function(e,t){return jQuery(e).css(t)},t.hasClass=function(e,t){return jQuery(e).hasClass(t)},t.addClass=function(e,t){jQuery(e).addClass(t)},t.removeClass=function(e,t){jQuery(e).removeClass(t)},t.preventDefault=function(e){e.preventDefault(),t.stopPropagation(e)},t.stopPropagation=function(e){e.stopPropagation()},t.noInclusionInherits=function(e,n){(n instanceof String||"string"==typeof n)&&(n=window[n]),(e instanceof String||"string"==typeof e)&&(e=window[e]);var i=function(){};if(t.isset(n)===!0)for(value in n.prototype)e.prototype[value]?i.prototype[value]=n.prototype[value]:e.prototype[value]=n.prototype[value];e.prototype&&(i.prototype.constructor=n,e.prototype["super"]=new i)},t.each=function(e,t){jQuery.each(e,function(e,n){t.call(this,e,n)})},t.foreach=function(e,t){if(e instanceof Array||e instanceof NodeList||e.length!==void 0&&e.item!==void 0)for(var n=e.length,i=0;n>i;i++){var r=t.call(this,i,e[i]);if(r===!1)break}else for(var o in e)if(e.hasOwnProperty(o)===!0){var r=t.call(this,o);if(r===!1)break}},t.isBlank=function(e){return!e||/^\s*$/.test(e)?!0:!1},t.isFn=function(e){return"function"==typeof e?!0:!1},t.isObj=function(e){return null!==e&&"object"==typeof e?!0:!1},t.isset=function(e){return e!==void 0&&null!==e?!0:!1},t.isArray=function(e){return jQuery.isArray(e)},t.isNumeric=function(e){var t=e.match(/^\d+$/);return null!==t?!0:!1},t.getUniqueId=function(){var e=(new Date).getTime(),t=Math.ceil(1e6*Math.random()),n=e+""+t;return n.substr(5,18).replace(/,/,"")},t.inArray=function(e,t){for(var n=t.length,i=0;n>i;i++)if(e===t[i])return!0;return!1},t.arrayDiff=function(e,n,i){for(var r=e.length,o=[],s=0;r>s;s++)t.inArray(e[s],n)===!1&&o.push(e[s]);if(i!==!0){r=n.length;for(var s=0;r>s;s++)t.inArray(n[s],e)===!1&&o.push(n[s])}return o},t.arrayMerge=function(e,t){for(var n=t.length,i=0;n>i;i++)e.push(t[i]);return e},t.stripTags=function(e,n){if("string"==typeof n){var i=jQuery("<div>"+e+"</div>");return i.find("*").not(n).remove(),i.html()}for(var r,o=RegExp(/<\/?(\w+)((\s+\w+(\s*=\s*(?:".*?"|'.*?'|[^'">\s]+))?)+\s*|\s*)\/?>/gim),s=e;null!=(r=o.exec(e));)(t.isset(n)===!1||t.inArray(r[1],n)!==!0)&&(s=s.replace(r[0],""));return s},t.browser=function(){var e={};return e.version=jQuery.browser.version,jQuery.browser.mozilla===!0?e.type="mozilla":jQuery.browser.msie===!0?e.type="msie":jQuery.browser.opera===!0?e.type="opera":jQuery.browser.webkit===!0&&(e.type="webkit"),e},t.getBrowserType=function(){if(null===this._browserType){for(var e=["msie","firefox","chrome","safari"],t=e.length,n=0;t>n;n++){var i=RegExp(e[n],"i");if(i.test(navigator.userAgent)===!0)return this._browserType=e[n],this._browserType}this._browserType="other"}return this._browserType},t.getWebkitType=function(){if("webkit"!==t.browser().type)return console.log("Not a webkit!"),!1;var e=Object.prototype.toString.call(window.HTMLElement).indexOf("Constructor")>0;return e?"safari":"chrome"},t.isBrowser=function(e){return t.browser().type===e},t.getBlockParent=function(e,n){if(t.isBlockElement(e)===!0)return e;if(e)for(;e.parentNode;){if(e=e.parentNode,e===n)return null;if(t.isBlockElement(e)===!0)return e}return null},t.findNodeParent=function(e,n,i){if(e)for(;e.parentNode;){if(e===i)return null;if(t.is(e,n)===!0)return e;e=e.parentNode}return null},t.onBlockBoundary=function(e,n,i){if(!e||!n)return!1;var r=t.isChildOfTagNames(e,i)||t.is(e,i.join(", "))&&e||null,o=t.isChildOfTagNames(n,i)||t.is(n,i.join(", "))&&n||null;return r!==o},t.isOnBlockBoundary=function(e,n,i){if(!e||!n)return!1;var r=t.getBlockParent(e,i)||t.isBlockElement(e,i)&&e||null,o=t.getBlockParent(n,i)||t.isBlockElement(n,i)&&n||null;return r!==o},t.mergeContainers=function(e,n){if(!e||!n)return!1;if(e.nodeType===t.TEXT_NODE||t.isStubElement(e))n.appendChild(e);else if(e.nodeType===t.ELEMENT_NODE){for(;e.firstChild;)n.appendChild(e.firstChild);t.remove(e)}return!0},t.mergeBlockWithSibling=function(e,n,i){var r=i?jQuery(n).next().get(0):jQuery(n).prev().get(0);return i?t.mergeContainers(r,n):t.mergeContainers(n,r),e.collapse(!0),!0},t.date=function(e,n,i){if(null!==n||!i||(n=t.tsIso8601ToTimestamp(i))){for(var r=new Date(n),o=e.split(""),s=o.length,a="",c=0;s>c;c++){var l="",d=o[c];switch(d){case"D":case"l":var u=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];l=u[r.getDay()],"D"===d&&(l=l.substring(0,3));break;case"F":case"m":l=r.getMonth()+1,10>l&&(l="0"+l);break;case"M":months=["January","February","March","April","May","June","July","August","September","October","November","December"],l=months[r.getMonth()],"M"===d&&(l=l.substring(0,3));break;case"d":l=r.getDate();break;case"S":l=t.getOrdinalSuffix(r.getDate());break;case"Y":l=r.getFullYear();break;case"y":l=r.getFullYear(),l=(""+l).substring(2);break;case"H":l=r.getHours();break;case"h":l=r.getHours(),0===l?l=12:l>12&&(l-=12);break;case"i":l=t.addNumberPadding(r.getMinutes());break;case"a":l="am",r.getHours()>=12&&(l="pm");break;default:l=d}a+=l}return a}},t.getOrdinalSuffix=function(e){var t="",n=e%100;if(n>=4&&20>=n)t="th";else switch(e%10){case 1:t="st";break;case 2:t="nd";break;case 3:t="rd";break;default:t="th"}return t},t.addNumberPadding=function(e){return 10>e&&(e="0"+e),e},t.tsIso8601ToTimestamp=function(e){var t=/(\d\d\d\d)(?:-?(\d\d)(?:-?(\d\d)(?:[T ](\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(?:Z|(?:([-+])(\d\d)(?::?(\d\d))?)?)?)?)?)?/,n=e.match(RegExp(t));if(n){var i=new Date;i.setDate(n[3]),i.setFullYear(n[1]),i.setMonth(n[2]-1),i.setHours(n[4]),i.setMinutes(n[5]),i.setSeconds(n[6]);var r=60*n[9];"+"===n[8]&&(r*=-1),r-=i.getTimezoneOffset();var o=i.getTime()+1e3*60*r;return o}return null},e.dom=t}.call(this.ice),function(){var e,t=this;e=function(e,t,n){this.env=e,this.element=e.element,this.selection=this.env.selection,n||this.removeBookmarks(this.element);var i=t||this.selection.getRangeAt(0);t=i.cloneRange();var r=t.startContainer;t.endContainer;var o=t.startOffset;t.endOffset;var s;t.collapse(!1);var a=this.env.document.createElement("span");a.style.display="none",ice.dom.setHtml(a,"&nbsp;"),ice.dom.addClass(a,"iceBookmark iceBookmark_end"),a.setAttribute("iceBookmark","end"),t.insertNode(a),ice.dom.isChildOf(a,this.element)||this.element.appendChild(a),t.setStart(r,o),t.collapse(!0);var c=this.env.document.createElement("span");c.style.display="none",ice.dom.addClass(c,"iceBookmark iceBookmark_start"),ice.dom.setHtml(c,"&nbsp;"),c.setAttribute("iceBookmark","start");try{t.insertNode(c),c.previousSibling===a&&(s=c,c=a,a=s)}catch(l){ice.dom.insertBefore(a,c)}ice.dom.isChildOf(c,this.element)===!1&&(this.element.firstChild?ice.dom.insertBefore(this.element.firstChild,c):this.element.appendChild(c)),a.previousSibling||(s=this.env.document.createTextNode(""),ice.dom.insertBefore(a,s)),c.nextSibling||(s=this.env.document.createTextNode(""),ice.dom.insertAfter(c,s)),i.setStart(c.nextSibling,0),i.setEnd(a.previousSibling,a.previousSibling.length||0),this.start=c,this.end=a},e.prototype={selectBookmark:function(){var e=this.selection.getRangeAt(0),t=null,n=null,i=0,r=null;if(this.start.nextSibling===this.end||0===ice.dom.getElementsBetween(this.start,this.end).length)this.end.nextSibling?t=ice.dom.getFirstChild(this.end.nextSibling):this.start.previousSibling?(t=ice.dom.getFirstChild(this.start.previousSibling),t.nodeType===ice.dom.TEXT_NODE&&(i=t.length)):(this.end.parentNode.appendChild(this.env.document.createTextNode("")),t=ice.dom.getFirstChild(this.end.nextSibling));else{if(this.start.nextSibling)t=ice.dom.getFirstChild(this.start.nextSibling);else{if(!this.start.previousSibling){var o=this.env.document.createTextNode("");ice.dom.insertBefore(this.start,o)}t=ice.dom.getLastChild(this.start.previousSibling),i=t.length}this.end.previousSibling?n=ice.dom.getLastChild(this.end.previousSibling):(n=ice.dom.getFirstChild(this.end.nextSibling||this.end),r=0)}ice.dom.remove([this.start,this.end]),null===n?(e.setEnd(t,i),e.collapse(!1)):(e.setStart(t,i),null===r&&(r=n.length||0),e.setEnd(n,r));try{this.selection.addRange(e)}catch(s){}},getBookmark:function(e,t){var n=ice.dom.getClass("iceBookmark_"+t,e)[0];return n},removeBookmarks:function(e){ice.dom.remove(ice.dom.getClass("iceBookmark",e,"span"))}},t.Bookmark=e}.call(this.ice),function(){var e,t=this;e=function(e){this._selection=null,this.env=e,this._initializeRangeLibrary(),this._getSelection()},e.prototype={_getSelection:function(){return this._selection?this._selection.refresh():this._selection=this.env.frame?rangy.getIframeSelection(this.env.frame):rangy.getSelection(),this._selection},createRange:function(){return rangy.createRange(this.env.document)},getRangeAt:function(e){this._selection.refresh();try{return this._selection.getRangeAt(e)}catch(t){return this._selection=null,this._getSelection().getRangeAt(0)}},addRange:function(e){this._selection||(this._selection=this._getSelection()),this._selection.setSingleRange(e),this._selection.ranges=[e]},_initializeRangeLibrary:function(){var e=this;rangy.init(),rangy.config.checkSelectionRanges=!1;var t=function(e,t,n,i){if(0===n)throw Error("InvalidArgumentException: units cannot be 0");switch(t){case ice.dom.CHARACTER_UNIT:n>0?e.moveCharRight(i,n):e.moveCharLeft(i,-1*n);break;case ice.dom.WORD_UNIT:default:}};rangy.rangePrototype.moveStart=function(e,n){t(this,e,n,!0)},rangy.rangePrototype.moveEnd=function(e,n){t(this,e,n,!1)},rangy.rangePrototype.setRange=function(e,t,n){e?this.setStart(t,n):this.setEnd(t,n)},rangy.rangePrototype.moveCharLeft=function(e,t){var n,i;if(e?(n=this.startContainer,i=this.startOffset):(n=this.endContainer,i=this.endOffset),n.nodeType===ice.dom.ELEMENT_NODE)if(n.hasChildNodes()){for(n=n.childNodes[i],n=this.getPreviousTextNode(n);n&&n.nodeType==ice.dom.TEXT_NODE&&""===n.nodeValue;)n=this.getPreviousTextNode(n);i=n.data.length-t}else i=-1*t;else i-=t;if(0>i)for(;0>i;){var r=[];if(n=this.getPreviousTextNode(n,r),!n)return;n.nodeType!==ice.dom.ELEMENT_NODE&&(i+=n.data.length)}this.setRange(e,n,i)},rangy.rangePrototype.moveCharRight=function(e,t){var n,i;e?(n=this.startContainer,i=this.startOffset):(n=this.endContainer,i=this.endOffset),n.nodeType===ice.dom.ELEMENT_NODE?(n=n.childNodes[i],n.nodeType!==ice.dom.TEXT_NODE&&(n=this.getNextTextNode(n)),i=t):i+=t;var r=i-n.data.length;if(r>0){for(var o=[];r>0;)if(n=this.getNextContainer(n,o),n.nodeType!==ice.dom.ELEMENT_NODE){if(n.data.length>=r)break;n.data.length>0&&(r-=n.data.length)}i=r}this.setRange(e,n,i)},rangy.rangePrototype.getNextContainer=function(e,t){if(!e)return null;for(;e.nextSibling;)if(e=e.nextSibling,e.nodeType!==ice.dom.TEXT_NODE){var n=this.getFirstSelectableChild(e);if(null!==n)return n}else if(this.isSelectable(e)===!0)return e;for(;e&&!e.nextSibling;)e=e.parentNode;if(!e)return null;if(e=e.nextSibling,this.isSelectable(e)===!0)return e;t&&ice.dom.isBlockElement(e)===!0&&t.push(e);var i=this.getFirstSelectableChild(e);return null!==i?i:this.getNextContainer(e,t)},rangy.rangePrototype.getPreviousContainer=function(e,t){if(!e)return null;for(;e.previousSibling;)if(e=e.previousSibling,e.nodeType!==ice.dom.TEXT_NODE){if(ice.dom.isStubElement(e)===!0)return e;var n=this.getLastSelectableChild(e);if(null!==n)return n}else if(this.isSelectable(e)===!0)return e;for(;e&&!e.previousSibling;)e=e.parentNode;if(!e)return null;if(e=e.previousSibling,this.isSelectable(e)===!0)return e;t&&ice.dom.isBlockElement(e)===!0&&t.push(e);var i=this.getLastSelectableChild(e);return null!==i?i:this.getPreviousContainer(e,t)},rangy.rangePrototype.getNextTextNode=function(e){return e.nodeType===ice.dom.ELEMENT_NODE&&0!==e.childNodes.length?this.getFirstSelectableChild(e):(e=this.getNextContainer(e),e.nodeType===ice.dom.TEXT_NODE?e:this.getNextTextNode(e))},rangy.rangePrototype.getPreviousTextNode=function(e,t){return e=this.getPreviousContainer(e,t),e.nodeType===ice.dom.TEXT_NODE?e:this.getPreviousTextNode(e,t)},rangy.rangePrototype.getFirstSelectableChild=function(e){if(e){if(e.nodeType===ice.dom.TEXT_NODE)return e;for(var t=e.firstChild;t;){if(this.isSelectable(t)===!0)return t;if(t.firstChild){var n=this.getFirstSelectableChild(t);if(null!==n)return n;t=t.nextSibling}else t=t.nextSibling}}return null},rangy.rangePrototype.getLastSelectableChild=function(e){if(e){if(e.nodeType===ice.dom.TEXT_NODE)return e;for(var t=e.lastChild;t;){if(this.isSelectable(t)===!0)return t;if(t.lastChild){var n=this.getLastSelectableChild(t);if(null!==n)return n;t=t.previousSibling}else t=t.previousSibling}}return null},rangy.rangePrototype.isSelectable=function(e){return e&&e.nodeType===ice.dom.TEXT_NODE&&0!==e.data.length?!0:!1},rangy.rangePrototype.getHTMLContents=function(t){t||(t=this.cloneContents());var n=e.env.document.createElement("div");return n.appendChild(t.cloneNode(!0)),n.innerHTML},rangy.rangePrototype.getHTMLContentsObj=function(){return this.cloneContents()}}},t.Selection=e}.call(this.ice),function(){var e=this,t=function(e){this._ice=e};t.prototype={start:function(){},clicked:function(){return!0},mouseDown:function(){return!0},keyDown:function(){return!0},keyPress:function(){return!0},selectionChanged:function(){},setEnabled:function(){},setDisabled:function(){},caretUpdated:function(){},nodeInserted:function(){},nodeCreated:function(){},caretPositioned:function(){},remove:function(){this._ice.removeKeyPressListener(this)},setSettings:function(){}},e.IcePlugin=t}.call(this.ice),function(){var e=this,t=function(e){this.plugins={},this.pluginConstructors={},this.keyPressListeners={},this.activePlugin=null,this.pluginSets={},this.activePluginSet=null,this._ice=e};t.prototype={getPluginNames:function(){var e=[];for(var t in this.plugins)e.push(t);return e},addPluginObject:function(e,t){this.plugins[e]=t},addPlugin:function(e,t){if("function"!=typeof t)throw Error("IcePluginException: plugin must be a constructor function");ice.dom.isset(this.pluginConstructors[e])===!1&&(this.pluginConstructors[e]=t)},loadPlugins:function(e,t){if(0===e.length)t.call(this);else{var n=e.shift();if("object"==typeof n&&(n=n.name),ice.dom.isset(ice._plugin[n])!==!0)throw Error("plugin was not included in the page: "+n);this.addPlugin(n,ice._plugin[n]),this.loadPlugins(e,t)}},_enableSet:function(e){this.activePluginSet=e;for(var t=this.pluginSets[e].length,n=0;t>n;n++){var i=this.pluginSets[e][n],r="";r="object"==typeof i?i.name:i;var o=this.pluginConstructors[r];if(o){var s=new o(this._ice);this.plugins[r]=s,ice.dom.isset(i.settings)===!0&&s.setSettings(i.settings),s.start()}}},setActivePlugin:function(e){this.activePlugin=e},getActivePlugin:function(){return this.activePlugin},_getPluginName:function(e){var t=""+e,n="function ".length,i=t.substr(n,t.indexOf("(")-n);return i},removePlugin:function(e){this.plugins[e]&&this.plugins[e].remove()},getPlugin:function(e){return this.plugins[e]},usePlugins:function(e,t,n){var i=this;this.pluginSets[e]=ice.dom.isset(t)===!0?t:[];var r=this.pluginSets[e].concat([]);this.loadPlugins(r,function(){i._enableSet(e),n&&n.call(this)})},disablePlugin:function(e){this.plugins[e].disable()},isPluginElement:function(e){for(var t in this.plugins)if(this.plugins[t].isPluginElement&&this.plugins[t].isPluginElement(e)===!0)return!0;return!1},fireKeyPressed:function(e){if(this._fireKeyPressFns(e,"all_keys")===!1)return!1;var t=[];switch((e.ctrlKey===!0||e.metaKey===!0)&&t.push("ctrl"),e.shiftKey===!0&&t.push("shift"),e.altKey===!0&&t.push("alt"),e.keyCode){case 13:t.push("enter");break;case ice.dom.DOM_VK_LEFT:t.push("left");break;case ice.dom.DOM_VK_RIGHT:t.push("right");break;case ice.dom.DOM_VK_UP:t.push("up");break;case ice.dom.DOM_VK_DOWN:t.push("down");break;case 9:t.push("tab");break;case ice.dom.DOM_VK_DELETE:t.push("delete");break;default:var n;e.keyCode?n=e.keyCode:e.which&&(n=e.which),n&&t.push(String.fromCharCode(n).toLowerCase())}var i=t.sort().join("+");return this._fireKeyPressFns(e,i)},_fireKeyPressFns:function(e,t){if(this.keyPressListeners[t])for(var n=this.keyPressListeners[t].length,i=0;n>i;i++){var r=this.keyPressListeners[t][i],o=r.fn,s=r.plugin,a=r.data;if(o)if(ice.dom.isFn(o)===!0){if(o.call(s,e,a)===!0)return ice.dom.preventDefault(e),!1}else if(s[o]&&s[o].call(s,e,a)===!0)return ice.dom.preventDefault(e),!1}return!0},fireSelectionChanged:function(e){for(var t in this.plugins)this.plugins[t].selectionChanged(e)},fireNodeInserted:function(e,t){for(var n in this.plugins)if(this.plugins[n].nodeInserted(e,t)===!1)return!1},fireNodeCreated:function(e,t){for(var n in this.plugins)if(this.plugins[n].nodeCreated(e,t)===!1)return!1},fireCaretPositioned:function(){for(var e in this.plugins)this.plugins[e].caretPositioned()},fireClicked:function(e){var t=!0;for(var n in this.plugins)this.plugins[n].clicked(e)===!1&&(t=!1);return t},fireMouseDown:function(e){var t=!0;for(var n in this.plugins)this.plugins[n].mouseDown(e)===!1&&(t=!1);return t},fireKeyDown:function(e){var t=!0;for(var n in this.plugins)this.plugins[n].keyDown(e)===!1&&(t=!1);return t},fireKeyPress:function(e){var t=!0;for(var n in this.plugins)this.plugins[n].keyPress(e)===!1&&(t=!1);return t},fireEnabled:function(e){for(var t in this.plugins)this.plugins[t].setEnabled(e)},fireDisabled:function(e){for(var t in this.plugins)this.plugins[t].setDisabled(e)},fireCaretUpdated:function(){for(var e in this.plugins)this.plugins[e].caretUpdated&&this.plugins[e].caretUpdated()}},e._plugin={},e.IcePluginManager=t}.call(this.ice),function(){var e,t=this;e=function(e){this._ice=e},e.prototype={nodeCreated:function(e,t){e.setAttribute("title",(t.action||"Modified")+" by "+e.getAttribute(this._ice.userNameAttribute)+" - "+ice.dom.date("m/d/Y h:ia",parseInt(e.getAttribute(this._ice.timeAttribute))))}},ice.dom.noInclusionInherits(e,ice.IcePlugin),t._plugin.IceAddTitlePlugin=e}.call(this.ice),function(){var e,t=this;e=function(e){this._ice=e,this._tmpNode=null,this._tmpNodeTagName="icepaste",this._pasteId="icepastediv";var t=this;this.pasteType="formattedClean",this.preserve="p",this.beforePasteClean=function(e){return e},this.afterPasteClean=function(e){return e},e.element.oncopy=function(){return t.handleCopy.apply(t)}},e.prototype={setSettings:function(e){e=e||{},ice.dom.extend(this,e),this.preserve+=","+this._tmpNodeTagName,this.setupPreserved()},keyDown:function(e){return e.metaKey===!0||e.ctrlKey===!0?(86==e.keyCode?this.handlePaste():88==e.keyCode&&this.handleCut(),!0):void 0},keyPress:function(e){var t=null;null==e.which?t=String.fromCharCode(e.keyCode):e.which>0&&(t=String.fromCharCode(e.which));var n=this;return this.cutElement&&"x"===t?ice.dom.isBrowser("webkit")&&n.cutElement.focus():"v"===t&&ice.dom.isBrowser("webkit")&&this._ice.env.document.getElementById(n._pasteId).focus(),!0},handleCopy:function(){},handlePaste:function(){var e=this._ice.getCurrentRange();if(e.collapsed||(this._ice.isTracking?(this._ice.deleteContents(),e=e.cloneRange()):(e.deleteContents(),e.collapse(!0))),this._ice.isTracking&&this._ice._moveRangeToValidTrackingPos(e),e.startContainer==this._ice.element){var t=ice.dom.find(this._ice.element,this._ice.blockEl)[0];t||(t=ice.dom.create("<"+this._ice.blockEl+" ><br/></"+this._ice.blockEl+">"),this._ice.element.appendChild(t)),e.setStart(t,0),e.collapse(!0),this._ice.env.selection.addRange(e)}switch(this._tmpNode=this._ice.env.document.createElement(this._tmpNodeTagName),e.insertNode(this._tmpNode),this.pasteType){case"formatted":this.setupPaste();break;case"formattedClean":this.setupPaste(!0)}return!0},setupPaste:function(e){var t=this.createDiv(this._pasteId),n=this,i=this._ice.getCurrentRange();return i.selectNodeContents(t),this._ice.selection.addRange(i),t.onpaste=function(){setTimeout(function(){n.handlePasteValue(e)},0)},t.focus(),!0},handlePasteValue:function(e){var t=this._ice.env.document,n=t.getElementById(this._pasteId),i=ice.dom.getHtml(n),r=ice.dom.children("<div>"+i+"</div>",this._ice.blockEl);1===r.length&&ice.dom.getNodeTextContent("<div>"+i+"</div>")===ice.dom.getNodeTextContent(r)&&(i=ice.dom.getHtml(i)),i=this.beforePasteClean.call(this,i),e&&(i=this._ice.getCleanContent(i),i=this.stripPaste(i)),i=this.afterPasteClean.call(this,i),i=ice.dom.trim(i);var o=this._ice.getCurrentRange();o.setStartAfter(this._tmpNode),o.collapse(!0);var s=null,a=null,c=null,l=o.createContextualFragment(i),d=this._ice.startBatchChange();if(ice.dom.hasBlockChildren(l)){var u=ice.dom.isChildOfTagName(this._tmpNode,this._ice.blockEl);o.setEndAfter(u.lastChild),this._ice.selection.addRange(o);var h=o.extractContents(),f=t.createElement(this._ice.blockEl);f.appendChild(h),ice.dom.insertAfter(u,f),o.setStart(f,0),o.collapse(!0),this._ice.selection.addRange(o);for(var g=o.startContainer;l.firstChild;)if(3!==l.firstChild.nodeType||jQuery.trim(l.firstChild.nodeValue))if(ice.dom.isBlockElement(l.firstChild)){if(""!==l.firstChild.textContent){s=null;var m=null;this._ice.isTracking?(m=this._ice.createIceNode("insertType"),this._ice.addChange("insertType",[m]),c=t.createElement(l.firstChild.tagName),m.innerHTML=l.firstChild.innerHTML,c.appendChild(m)):(m=c=t.createElement(l.firstChild.tagName),c.innerHTML=l.firstChild.innerHTML),a=m,ice.dom.insertBefore(g,c)}l.removeChild(l.firstChild)}else s||(c=t.createElement(this._ice.blockEl),ice.dom.insertBefore(g,c),this._ice.isTracking?(s=this._ice.createIceNode("insertType"),this._ice.addChange("insertType",[s]),c.appendChild(s)):s=c),a=s,s.appendChild(l.removeChild(l.firstChild));else l.removeChild(l.firstChild);f.textContent||f.parentNode.removeChild(f)}else if(this._ice.isTracking)c=this._ice.createIceNode("insertType",l),this._ice.addChange("insertType",[c]),o.insertNode(c),a=c;else for(var p;p=l.firstChild;)o.insertNode(p),o.setStartAfter(p),o.collapse(!0),a=p;this._ice.endBatchChange(d),n.parentNode.removeChild(n),this._cleanup(a)},createDiv:function(e){var t=this._ice.env.document,n=t.getElementById(e);n&&ice.dom.remove(n);var i=t.createElement("div");return i.id=e,i.setAttribute("contentEditable",!0),ice.dom.setStyle(i,"width","1px"),ice.dom.setStyle(i,"height","1px"),ice.dom.setStyle(i,"overflow","hidden"),ice.dom.setStyle(i,"position","fixed"),ice.dom.setStyle(i,"top","10px"),ice.dom.setStyle(i,"left","10px"),i.appendChild(t.createElement("br")),t.body.appendChild(i),i
+},handleCut:function(){var e=this,t=this._ice.getCurrentRange();if(!t.collapsed){this.cutElement=this.createDiv("icecut"),this.cutElement.innerHTML=t.getHTMLContents().replace(/ </g,"&nbsp;<").replace(/> /g,">&nbsp;"),this._ice.isTracking?this._ice.deleteContents():t.deleteContents();var n=this._ice.env.document.createRange();n.setStart(this.cutElement.firstChild,0),n.setEndAfter(this.cutElement.lastChild),setTimeout(function(){e.cutElement.focus(),setTimeout(function(){ice.dom.remove(e.cutElement),t.setStart(t.startContainer,t.startOffset),t.collapse(!1),e._ice.env.selection.addRange(t)},100)},0),e._ice.env.selection.addRange(n)}},stripPaste:function(e){return e=this._cleanWordPaste(e),e=this.cleanPreserved(e)},setupPreserved:function(){var e=this;this._tags="",this._attributesMap=[],ice.dom.each(this.preserve.split(","),function(t,n){n.match(/(\w+)(\[(.+)\])?/);var i=RegExp.$1,r=RegExp.$3;e._tags&&(e._tags+=","),e._tags+=i.toLowerCase(),e._attributesMap[i]=r.split("|")})},cleanPreserved:function(e){var t=this,n=this._ice.env.document.createElement("div");return n.innerHTML=e,n=ice.dom.stripEnclosingTags(n,this._tags),ice.dom.each(ice.dom.find(n,this._tags),function(e,n){if(ice.dom.hasClass(n,"skip-clean"))return!0;var i=n.tagName.toLowerCase(),r=t._attributesMap[i];if(r[0]&&"*"===r[0])return!0;if(n.hasAttributes())for(var o=n.attributes,e=o.length-1;e>=0;e--)ice.dom.inArray(o[e].name,r)||n.removeAttribute(o[e].name)}),n.innerHTML},_cleanWordPaste:function(e){return e=e.replace(/<(meta|link)[^>]+>/g,""),e=e.replace(/<!--(.|\s)*?-->/g,""),e=e.replace(/<style>[\s\S]*?<\/style>/g,""),e=e.replace(/<\/?\w+:[^>]*>/gi,""),e=e.replace(/<\\?\?xml[^>]*>/gi,""),e=this._cleanPaste(e),e=e.replace(/<(\w[^>]*) (lang)=([^ |>]*)([^>]*)/gi,"<$1$4")},_cleanPaste:function(e){return e=e.replace(/<b(\s+|>)/g,"<strong$1"),e=e.replace(/<\/b(\s+|>)/g,"</strong$1"),e=e.replace(/<i(\s+|>)/g,"<em$1"),e=e.replace(/<\/i(\s+|>)/g,"</em$1")},_cleanup:function(e){try{e=e&&e.lastChild||e||this._tmpNode;var t=this._ice.getCurrentRange();t.setStartAfter(e),t.collapse(!0),this._ice.selection.addRange(t),this._ice.env.frame?this._ice.env.frame.contentWindow.focus():this._ice.element.focus(),this._tmpNode.parentNode.removeChild(this._tmpNode),this._tmpNode=null;for(var n=this._ice.env.document.getElementsByClassName(this._ice.changeTypes.insertType.alias),i=0;n.length>i;i++)n[i].textContent||n[i].parentNode&&n[i].parentNode.removeChild(n[i])}catch(r){window.console&&console.error(r)}}},ice.dom.noInclusionInherits(e,ice.IcePlugin),t._plugin.IceCopyPastePlugin=e}.call(this.ice),function(){var e=this,t=this.ice,n=function(e){this._ice=e};n.prototype={convert:function(e){var n=this;try{n._ice.placeholdDeletes(),t.dom.each(e.getElementsByTagName(this._ice.blockEl),function(e,t){n._convertBlock(t)})}catch(i){window.console&&console.error(i)}finally{n._ice.revertDeletePlaceholders()}},_convertBlock:function(e){if(!(2>t.dom.getNodeTextContent(e))){var n,i,r,o,s,a="'",c='"',l=String.fromCharCode(8216),d=String.fromCharCode(8217),u=String.fromCharCode(8220),h=String.fromCharCode(8221),f=function(e){return/\d/.test(e)},g=function(e){return/\w/.test(e)},m=function(e){return e===String.fromCharCode(160)||e===String.fromCharCode(32)},p=function(e){return m(e)||"("===e},C=function(e){return m(e)||null==e||";"===e||")"===e||"."==e||"!"===e||","===e||"?"===e||":"===e},v=function(e){return!m(e)},N=function(e){return e===a||e===l||e===d};o=t.dom.getHtml(e).match(/(<("[^"]*"|'[^']*'|[^'">])*>|&.*;|.)/g),s=function(e,t,n){var i=e.length,r=0>n?-1:1;return function o(e,t,n){if(0>t||t>=i)return null;var s=e[t+r];return s&&1==s.length&&(n+=-1*r,!n)?s:o(e,t+r,n)}(e,t,n)},t.dom.each(o,function(e,t){if("&nbsp;"==t&&(t=o[e]=" "),1==t.length){switch(n=s(o,e,-1),i=t,r=s(o,e,1),i){case l:case d:i=a;case a:(null==n||m(n))&&f(r)&&f(s(o,e,2))&&C(s(o,e,3))?i=d:null==n||p(n)&&v(r)?i=l:null==r||v(n)&&C(r)?i=d:g(n)&&g(r)&&(i=d);break;case u:case h:i=c;case c:C(r)&&m(n)&&N(s(o,e,-2))?i=h:null==n||p(n)&&v(r)?i=u:null==r||v(n)&&C(r)?i=h:(null==n||m(n))&&m(r)&&N(s(o,e,1))&&(i=u)}null!=i&&(o[e]=i)}}),t.dom.setHtml(e,o.join(""))}}},t.dom.noInclusionInherits(n,t.IcePlugin),e.ice._plugin.IceSmartQuotesPlugin=n}.call(this),function(){var e=this,t=function(e){this._ice=e};t.prototype={keyDown:function(e){if(ice.dom.isBrowser("mozilla")){var t=parseInt(ice.dom.browser().version);if(t>14&&173===e.keyCode||14>=t&&109===e.keyCode)return this.convertEmdash(e)}else if(189===e.keyCode)return this.convertEmdash(e);return!0},convertEmdash:function(){var e=this._ice.getCurrentRange();if(e.collapsed){try{e.moveStart(ice.dom.CHARACTER_UNIT,-1);var t=ice.dom.getParents(e.startContainer,this._ice.blockEl)[0],n=ice.dom.getParents(e.endContainer,this._ice.blockEl)[0];if(t===n&&!this._ice.getIceNode(e.startContainer,"deleteType")&&(c=e.toHtml(),"-"===c)){e.extractContents(),e.collapse();var i=this._ice.env.document.createTextNode("—");return this._ice.isTracking?this._ice._insertNode(i,e):(e.insertNode(i),e.setStart(i,1),e.collapse(!0)),this._ice._preventKeyPress=!0,!1}}catch(r){}e.collapse()}return!0}},ice.dom.noInclusionInherits(t,ice.IcePlugin),e._plugin.IceEmdashPlugin=t}.call(this.ice);
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
index 26cdd92af3bf..b2cdf916079b 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
@@ -179,7 +179,9 @@ class @PeerGradingProblem
   interstitial_page_sel: '.interstitial-page'
   calibration_interstitial_page_sel: '.calibration-interstitial-page'
   error_container_sel: '.error-container'
+  peer_grading_instructions_sel: '.peer-grading-instructions'
   feedback_area_sel: '.feedback-area'
+  ice_legend_sel: '.ice-legend'
   score_selection_container_sel: '.score-selection-container'
   rubric_selection_container_sel: '.rubric-selection-container'
   submit_button_sel: '.submit-button'
@@ -239,7 +241,9 @@ class @PeerGradingProblem
 
     @submission_key_input = $("input[name='submission-key']")
     @essay_id_input = @$("input[name='essay-id']")
+    @peer_grading_instructions = @$(@peer_grading_instructions_sel)
     @feedback_area = @$(@feedback_area_sel)
+    @ice_legend = @$(@ice_legend_sel)
 
     @score_selection_container = @$(@score_selection_container_sel)
     @rubric_selection_container = @$(@rubric_selection_container_sel)
@@ -396,7 +400,7 @@ class @PeerGradingProblem
       @grading_message.fadeIn()
       message = "<p>Successfully saved your feedback. Fetching the next essay."
       if response.required_done
-        message = message + " You have done the required number of peer evals but may continue grading if you like."
+        message = message + " You have done the required number of peer assessments but may continue grading if you like."
       message = message + "</p>"
       @grading_message.html(message)
     else
@@ -459,9 +463,11 @@ class @PeerGradingProblem
       @grading_panel.find(@grading_text_sel).hide()
       @flag_student_container.hide()
       @answer_unknown_container.hide()
+      @peer_grading_instructions.hide()
       @feedback_area.attr('disabled', true)
-      feedback_text = "Once you are done with training and are grading real student essays, you will be asked to share feedback with them in addition to grading their rubric."
+      feedback_text = "Once you are done learning to grade, and are grading your peers' work, you will be asked to share written feedback with them in addition to scoring them."
       if @tracking_changes()
+        @ice_legend.hide()
         @feedback_area.attr('contenteditable', false)
         @feedback_area.text(feedback_text)
       else
@@ -498,7 +504,9 @@ class @PeerGradingProblem
       @grading_panel.find(@grading_text_sel).show()
       @flag_student_container.show()
       @answer_unknown_container.show()
+      @peer_grading_instructions.show()
       if @tracking_changes()
+        @ice_legend.show()
         @feedback_area.html(@make_paragraphs(response.student_response))
         @change_tracker.rebindTracker()
       else
@@ -598,12 +606,12 @@ class @PeerGradingProblem
   collapse_question: (event) =>
     @prompt_container.slideToggle()
     @prompt_container.toggleClass('open')
-    if @question_header.text() == "Hide Prompt"
-      new_text = "Show Prompt"
+    if @question_header.text() == "Hide Question"
+      new_text = "Show Question"
       Logger.log 'oe_hide_question', {location: @location}
     else
       Logger.log 'oe_show_question', {location: @location}
-      new_text = "Hide Prompt"
+      new_text = "Hide Question"
     @question_header.text(new_text)
     return false
 
diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
index 3885505ed9af..311366d4ed0f 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
@@ -1,5 +1,7 @@
 class @TrackChanges
   reset_button_sel: '.reset-changes'
+  undo_button_sel: '.undo-change'
+  tracked_elements_sel: 'span.del, span.ins'
   tracked_feedback_sel: '.feedback-area.track-changes'
   submit_button_sel: '.submit-button'
   tracker: null
@@ -7,9 +9,13 @@ class @TrackChanges
   constructor: (element) ->
     @el = element
     @reset_button = @$(@reset_button_sel)
+    @undo_button = @$(@undo_button_sel)
     @submit_button = @$(@submit_button_sel)
+    @tracked_elements = @$(@tracked_elements_sel)
     @tracked_feedback = @$(@tracked_feedback_sel)
+    
     @reset_button.click @reset_changes
+    @undo_button.click @undo_change
     @submit_button.click @stop_tracking_on_submit
 
 
@@ -42,6 +48,15 @@ class @TrackChanges
   reset_changes: (event) =>
     event.preventDefault()
     @tracker.rejectAll()
+  
+  undo_change: (event) =>
+    event.preventDefault()
+    keyToUndo = 0
+    @tracked_elements.each ->
+      key = parseInt(@attr('data-cid'))
+      if key > keyToUndo
+        keyToUndo = key
+    ICEtracker.rejectChange('[data-cid="'+ keyToUndo + '"]')
 
   stop_tracking_on_submit: () =>
-    @tracker.stopTracking()
+    @tracker.stopTracking()
\ No newline at end of file
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
index ea49e575a096..5a0d9e69e5bc 100644
--- a/lms/djangoapps/open_ended_grading/tests.py
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -351,7 +351,7 @@ def test_problem_list(self):
         """
         request = Mock(user=self.user)
         response = views.student_problem_list(request, self.course.id)
-        self.assertRegexpMatches(response.content, "Here are a list of open ended problems for this course.")
+        self.assertRegexpMatches(response.content, "Here is a list of open ended problems for this course.")
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 class TestPeerGradingFound(ModuleStoreTestCase):
diff --git a/lms/static/sass/course/_staff_grading.scss b/lms/static/sass/course/_staff_grading.scss
index ba0069a3d2ef..6810fe1bff1c 100644
--- a/lms/static/sass/course/_staff_grading.scss
+++ b/lms/static/sass/course/_staff_grading.scss
@@ -10,7 +10,7 @@ div.peer-grading{
     div.feedback-area.track-changes {
         position: relative;
         margin: 0px;
-        height: 150px;
+        height: 400px;
         border: 1px solid lightgray;
         padding: 5px;
         resize: vertical;
diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html
index 971f5432739c..c8f4c029dc7f 100644
--- a/lms/templates/combinedopenended/combined_open_ended.html
+++ b/lms/templates/combinedopenended/combined_open_ended.html
@@ -30,7 +30,7 @@ <h2>${display_name}</h2>
             <div class="visibility-control visibility-control-prompt">
                 <div class="inner">
                 </div>
-                <a href="" class="section-header section-header-prompt question-header">${_("Hide Prompt")}</a>
+                <a href="" class="section-header section-header-prompt question-header">${_("Hide Question")}</a>
             </div>
             <div class="problem-container">
             % for item in items:
@@ -39,7 +39,7 @@ <h2>${display_name}</h2>
             </div>
             <div class="oe-tools response-tools">
                 <span class="oe-tools-label"></span>
-                <input type="button" value="${_('Try Again')}" class="reset-button" name="reset"/>
+                <input type="button" value="${_('New Submission')}" class="reset-button" name="reset"/>
             </div>
         </div>
 
diff --git a/lms/templates/combinedopenended/combined_open_ended_results.html b/lms/templates/combinedopenended/combined_open_ended_results.html
index c66d5b6594c6..b8235470f494 100644
--- a/lms/templates/combinedopenended/combined_open_ended_results.html
+++ b/lms/templates/combinedopenended/combined_open_ended_results.html
@@ -1,4 +1,5 @@
 <%! from django.utils.translation import ugettext as _ %>
+% num_results = len(results)
 % for (i,result) in enumerate(results):
     % if 'task_name' in result and 'result' in result:
         <div class="combined-rubric-container"
@@ -17,12 +18,20 @@
                 <button class="rubric-collapse" href="#">${_("Toggle Full Rubric")}</button>
                 <span class="oe-tools-scores">
                     <span class="oe-tools-scores-label"></span>
-                    % if len(results)>1:
-                        <button href="#" alt="Previous" class="rubric-button rubric-previous-button"><i class="icon-chevron-left"></i></button>
+                    % if num_results>1:
+                        <button href="#" alt="Previous" class="rubric-button rubric-previous-button"
+                            % if i == 0:
+                                disabled="true"
+                            % endif
+                        ><i class="icon-chevron-left"></i></button>
                     % endif 
                     ${result['task_name']} from grader ${i+1}
-                    % if len(results)>1:
-                        <button href="#" alt="Next" class="rubric-button rubric-next-button"><i class="icon-chevron-right"></i></button>
+                    % if num_results>1:
+                        <button href="#" alt="Next" class="rubric-button rubric-next-button"
+                            % if (i+1) >= num_results:
+                                disabled="true"
+                            % endif
+                        ><i class="icon-chevron-right"></i></button>
                     % endif
                 </span>
             </div>
diff --git a/lms/templates/open_ended_problems/open_ended_problems.html b/lms/templates/open_ended_problems/open_ended_problems.html
index 68882984f508..aa053111d8de 100644
--- a/lms/templates/open_ended_problems/open_ended_problems.html
+++ b/lms/templates/open_ended_problems/open_ended_problems.html
@@ -17,38 +17,38 @@
         <div class="error-container">${error_text}</div>
         <h1>${_("Open Ended Problems")}</h1>
         <h2>${_("Instructions")}</h2>
-        <p>${_("Here are a list of open ended problems for this course.")}</p>
+        <p>${_("Here is a list of open ended problems for this course.")}</p>
         % if success:
-        % if len(problem_list) == 0:
-        <div class="message-container">
-          ${_("You have not attempted any open ended problems yet.")}
-        </div>
-        %else:
-        <table class="problem-list">
-            <tr>
-                <th>${_("Problem Name")}</th>
-                <th>${_("Status")}</th>
-                <th>${_("Grader Type")}</th>
-                <th>${_("ETA")}</th>
-            </tr>
-            %for problem in problem_list:
-            <tr>
-                <td>
-                    <a href="${problem['actual_url']}">${problem['problem_name']}</a>
-                </td>
-                <td>
-                    ${problem['state']}
-                </td>
-                <td>
-                    ${problem['grader_type']}
-                </td>
-                <td>
-                    ${problem['eta_string']}
-                </td>
-            </tr>
-            %endfor
-        </table>
-        %endif
+            % if len(problem_list) == 0:
+                <div class="message-container">
+                  ${_("You have not attempted any open ended problems yet.")}
+                </div>
+            %else:
+                <table class="problem-list">
+                    <tr>
+                        <th>${_("Problem Name")}</th>
+                        <th>${_("Status")}</th>
+                        <th>${_("Grader Type")}</th>
+                        <th>${_("ETA")}</th>
+                    </tr>
+                    %for problem in problem_list:
+                    <tr>
+                        <td>
+                            <a href="${problem['actual_url']}">${problem['problem_name']}</a>
+                        </td>
+                        <td>
+                            ${problem['state']}
+                        </td>
+                        <td>
+                            ${problem['grader_type']}
+                        </td>
+                        <td>
+                            ${problem['eta_string']}
+                        </td>
+                    </tr>
+                    %endfor
+                </table>
+            %endif
         %endif
     </div>
 </section>
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html
index 3d8588e73d30..be357bf0544f 100644
--- a/lms/templates/peer_grading/peer_grading_problem.html
+++ b/lms/templates/peer_grading/peer_grading_problem.html
@@ -17,7 +17,7 @@ <h3>${_("Peer Grading")}</h3>
                 <div class="visibility-control visibility-control-prompt">
                     <div class="inner">
                     </div>
-                    <a href="" class="section-header section-header-prompt question-header">${_('Hide Prompt')}</a>
+                    <a href="" class="section-header section-header-prompt question-header">${_('Hide Question')}</a>
                 </div>
                 <div class="prompt-information-container">
                     <section>
@@ -41,28 +41,35 @@ <h3></h3>
                     <div class="evaluation">
                         <p class="rubric-selection-container"></p>
                         <p class="score-selection-container"></p>
+                        <hr />
+                        <div class="answer-unknown-container">
+                            <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown">
+                            ${_("I am unsure about the scores I have given above: ")}
+                        </div>
+                        <br />
                         <h3>${_("Written Feedback")}</h3>
                         % if track_changes:
-                            <p>${_("Please edit your peer's submission below.")}</p>
-                            <p class="legend">
+                            <p class="peer-grading-instructions">${_("Please edit your peer's submission and give them written comments below.")}</p>
+                            <p class="ice-legend">
                                 <span class="ins">${_("This is an insertion.")}</span>&nbsp;
                                 <span class="del">${_("This is a deletion.")}</span>&nbsp;
+                                <span class="ins">${_("[This is a comment.]")}</span>&nbsp;
                                 <span class="ice-controls">
                                     <a href="#" class="reset-changes"><i class="icon-refresh"></i> Reset Changes</a>
+                                    <a href="#" class="undo-change"><i class="icon-undo"></i> Undo Change</a>
                                 </span>
                             </p>
                             <div name="feedback" class="feedback-area track-changes" contenteditable="true"></div>
                         % else:
-                            <p>${_("Please include some written feedback as well.")}</p>
+                            <p class="ora-instructions">${_("Please include some written feedback as well.")}</p>
                             <textarea name="feedback" placeholder="Feedback for student" class="feedback-area" cols="70" ></textarea>
                         % endif
-                        <div class="flag-student-container"> ${_("This submission has explicit or offensive content : ")}
+                        <div class="flag-student-container">
                             <input type="checkbox" class="flag-checkbox" value="student_is_flagged"> 
-                        </div>
-                        <div class="answer-unknown-container"> ${_("I do not know how to grade this question : ")}
-                            <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown">
+                            ${_("This submission has explicit, offensive, or (I suspect) plagiarized content: ")}
                         </div>
                     </div>
+                    <hr />
                     <div class="submission">
                         <input type="button" value="${_("Submit")}" class="submit-button" name="show"/>
                     </div>
@@ -97,7 +104,7 @@ <h1>${_("Learning to grade")}</h1>
         <section class="flag-submission-confirmation">
             <h4>${_("Are you sure that you want to flag this submission?")}</h4>
             <p>
-            ${_("You are about to flag a submission. You should only flag a submission that contains explicit or offensive content. If the submission is not addressed to the question or is incorrect, you should give it a score of zero and accompanying feedback instead of flagging it.")}
+            ${_("You are about to flag a submission. You should only flag a submission that contains explicit, offensive, or  (suspected) plagiarized content. If the submission is not addressed to the question or is incorrect, you should give it a score of zero and accompanying feedback instead of flagging it.")}
             </p>
             <div>
                 <input type="button" class="flag-submission-removal-button" value="${_("Remove Flag")}" name="calibration-interstitial-page-button" />

From bbd902f87e6054a73841701497acf8fc01eb295e Mon Sep 17 00:00:00 2001
From: Giulio Gratta <giulio@giuliogratta.com>
Date: Thu, 26 Sep 2013 09:52:30 -0700
Subject: [PATCH 70/92] Last Changes before Merge

- Change variable name to make it more clear
---
 .../xmodule/js/src/peergrading/track_changes.coffee       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
index 311366d4ed0f..ff0b4111f284 100644
--- a/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
+++ b/common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
@@ -51,12 +51,12 @@ class @TrackChanges
   
   undo_change: (event) =>
     event.preventDefault()
-    keyToUndo = 0
+    keyOfLatestChange = 0
     @tracked_elements.each ->
       key = parseInt(@attr('data-cid'))
-      if key > keyToUndo
-        keyToUndo = key
-    ICEtracker.rejectChange('[data-cid="'+ keyToUndo + '"]')
+      if key > keyOfLatestChange
+        keyOfLatestChange = key
+    ICEtracker.rejectChange('[data-cid="'+ keyOfLatestChange + '"]')
 
   stop_tracking_on_submit: () =>
     @tracker.stopTracking()
\ No newline at end of file

From b4fa316294da8bd572bd77fca12532944c16e613 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 16 Sep 2013 13:59:39 -0400
Subject: [PATCH 71/92] Migrate data from old mongo to split mongo Create
 location mapping Create draft and published course with proper content in
 split.

---
 .../xmodule/modulestore/split_migrator.py     | 181 ++++++++++++
 .../xmodule/modulestore/split_mongo/split.py  |  23 +-
 .../modulestore/tests/test_split_migrator.py  | 263 ++++++++++++++++++
 .../tests/test_split_modulestore.py           |  14 +-
 4 files changed, 473 insertions(+), 8 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/modulestore/split_migrator.py
 create mode 100644 common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py

diff --git a/common/lib/xmodule/xmodule/modulestore/split_migrator.py b/common/lib/xmodule/xmodule/modulestore/split_migrator.py
new file mode 100644
index 000000000000..46d23ee3b0be
--- /dev/null
+++ b/common/lib/xmodule/xmodule/modulestore/split_migrator.py
@@ -0,0 +1,181 @@
+'''
+Code for migrating from other modulestores to the split_mongo modulestore.
+
+Exists at the top level of modulestore b/c it needs to know about and access each modulestore.
+
+In general, it's strategy is to treat the other modulestores as read-only and to never directly
+manipulate storage but use existing api's.
+'''
+from xmodule.modulestore import Location
+from xmodule.modulestore.locator import CourseLocator
+from xmodule.modulestore.mongo import draft
+
+class SplitMigrator(object):
+    """
+    Copies courses from old mongo to split mongo and sets up location mapping so any references to the old
+    name will be able to find the new elements.
+    """
+    def __init__(self, split_modulestore, direct_modulestore, draft_modulestore, loc_mapper):
+        super(SplitMigrator, self).__init__()
+        self.split_modulestore = split_modulestore
+        self.direct_modulestore = direct_modulestore
+        self.draft_modulestore = draft_modulestore
+        self.loc_mapper = loc_mapper
+
+    def migrate_mongo_course(self, course_location, user_id, new_course_id=None):
+        """
+        Create a new course in split_mongo representing the published and draft versions of the course from the
+        original mongo store. And return the new_course_id (which the caller can also get by calling
+        self.loc_mapper.translate_location(old_course_location)
+
+        If the new course already exists, this raises DuplicateItemError
+
+        :param course_location: a Location whose category is 'course' and points to the course
+        :param user_id: the user whose action is causing this migration
+        :param new_course_id: (optional) the Locator.course_id for the new course. Defaults to
+        whatever translate_location_to_locator returns
+        """
+        new_course_id = self.loc_mapper.create_map_entry(course_location, course_id=new_course_id)
+        old_course_id = course_location.course_id
+        # the only difference in data between the old and split_mongo xblocks are the locations;
+        # so, any field which holds a location must change to a Locator; otherwise, the persistence
+        # layer and kvs's know how to store it.
+        # locations are in location, children, conditionals, course.tab
+
+        # create the course: set fields to explicitly_set for each scope, id_root = new_course_id, master_branch = 'production'
+        original_course = self.direct_modulestore.get_item(course_location)
+        new_course_root_locator = self.loc_mapper.translate_location(old_course_id, course_location)
+        new_course = self.split_modulestore.create_course(
+            course_location.org, original_course.display_name,
+            user_id, id_root=new_course_id,
+            fields=self._get_json_fields_translate_children(original_course, old_course_id, True),
+            root_usage_id=new_course_root_locator.usage_id,
+            master_branch=new_course_root_locator.branch
+        )
+
+        self._copy_published_modules_to_course(new_course, course_location, old_course_id, user_id)
+        self._add_draft_modules_to_course(new_course_id, old_course_id, course_location, user_id)
+
+        return new_course_id
+
+
+    def _copy_published_modules_to_course(self, new_course, old_course_loc, old_course_id, user_id):
+        """
+        Copy all of the modules from the 'direct' version of the course to the new split course.
+        """
+        course_version_locator = new_course.location.as_course_locator()
+
+        # iterate over published course elements. Wildcarding rather than descending b/c some elements are orphaned (e.g.,
+        # course about pages, conditionals)
+        for module in self.direct_modulestore.get_items(
+            old_course_loc.replace(category=None, name=None, revision=None),
+            old_course_id
+        ):
+            # don't copy the course again. No drafts should get here but check
+            if module.location != old_course_loc and not getattr(module, 'is_draft', False):
+                # create split_xblock using split.create_item
+                # where usage_id is computed by translate_location_to_locator
+                new_locator = self.loc_mapper.translate_location(
+                    old_course_id, module.location, True, add_entry_if_missing=True
+                )
+                _new_module = self.split_modulestore.create_item(
+                    course_version_locator, module.category, user_id,
+                    usage_id=new_locator.usage_id,
+                    fields=self._get_json_fields_translate_children(module, old_course_id, True),
+                    continue_version=True
+                )
+        # after done w/ published items, add version for 'draft' pointing to the published structure
+        index_info = self.split_modulestore.get_course_index_info(course_version_locator)
+        versions = index_info['versions']
+        versions['draft'] = versions['published']
+        self.split_modulestore.update_course_index(course_version_locator, {'versions': versions}, update_versions=True)
+
+        # clean up orphans in published version: in old mongo, parents pointed to the union of their published and draft
+        # children which meant some pointers were to non-existent locations in 'direct'
+        self.split_modulestore.internal_clean_children(course_version_locator)
+
+
+    def _add_draft_modules_to_course(self, new_course_id, old_course_id, old_course_loc, user_id):
+        """
+        update each draft. Create any which don't exist in published and attach to their parents.
+        """
+        # each true update below will trigger a new version of the structure. We may want to just have one new version
+        # but that's for a later date.
+        new_draft_course_loc = CourseLocator(course_id=new_course_id, branch='draft')
+        # to prevent race conditions of grandchilden being added before their parents and thus having no parent to
+        # add to
+        awaiting_adoption = {}
+        for module in self.draft_modulestore.get_items(
+            old_course_loc.replace(category=None, name=None, revision=draft.DRAFT),
+            old_course_id
+        ):
+            if getattr(module, 'is_draft', False):
+                new_locator = self.loc_mapper.translate_location(
+                    old_course_id, module.location, False, add_entry_if_missing=True
+                )
+                if self.split_modulestore.has_item(new_course_id, new_locator):
+                    # was in 'direct' so draft is a new version
+                    split_module = self.split_modulestore.get_item(new_locator)
+                    # need to remove any no-longer-explicitly-set values and add/update any now set values.
+                    for name, field in split_module.fields.iteritems():
+                        if field.is_set_on(split_module) and not module.fields[name].is_set_on(module):
+                            field.delete_from(split_module)
+                    for name, field in module.fields.iteritems():
+                        # draft children will insert themselves and the others are here already; so, don't do it 2x
+                        if name != 'children' and field.is_set_on(module):
+                            field.write_to(split_module, field.read_from(module))
+
+                    _new_module = self.split_modulestore.update_item(split_module, user_id)
+                else:
+                    # only a draft version (aka, 'private'). parent needs updated too.
+                    # create a new course version just in case the current head is also the prod head
+                    _new_module = self.split_modulestore.create_item(
+                        new_draft_course_loc, module.category, user_id,
+                        usage_id=new_locator.usage_id,
+                        fields=self._get_json_fields_translate_children(module, old_course_id, True)
+                    )
+                    awaiting_adoption[module.location] = new_locator.usage_id
+        for draft_location, new_usage_id in awaiting_adoption.iteritems():
+            for parent_loc in self.draft_modulestore.get_parent_locations(draft_location, old_course_id):
+                old_parent = self.draft_modulestore.get_item(parent_loc)
+                new_parent = self.split_modulestore.get_item(
+                    self.loc_mapper.translate_location(old_course_id, old_parent.location, False)
+                )
+                # this only occurs if the parent was also awaiting adoption
+                if new_usage_id in new_parent.children:
+                    break
+                # find index for module: new_parent may be missing quite a few of old_parent's children
+                new_parent_cursor = 0
+                draft_location = draft_location.url()  # need as string
+                for old_child_loc in old_parent.children:
+                    if old_child_loc == draft_location:
+                        break
+                    sibling_loc = self.loc_mapper.translate_location(old_course_id, Location(old_child_loc), False)
+                    # sibling may move cursor
+                    for idx in range(new_parent_cursor, len(new_parent.children)):
+                        if new_parent.children[idx] == sibling_loc.usage_id:
+                            new_parent_cursor = idx + 1
+                            break
+                new_parent.children.insert(new_parent_cursor, new_usage_id)
+                new_parent = self.split_modulestore.update_item(new_parent, user_id)
+
+
+    def _get_json_fields_translate_children(self, xblock, old_course_id, published):
+        fields = self.get_json_fields_explicitly_set(xblock)
+        # this will too generously copy the children even for ones that don't exist in the published b/c the old mongo
+        # had no way of not having parents point to draft only children :-(
+        if 'children' in fields:
+            fields['children'] = [
+                self.loc_mapper.translate_location(
+                    old_course_id, Location(child), published, add_entry_if_missing=True
+                ).usage_id
+                for child in fields['children']]
+        return fields
+
+
+    def get_json_fields_explicitly_set(self, xblock):
+        """
+        Get the json repr for fields set on this specific xblock
+        :param xblock:
+        """
+        return {field.name: field.read_json(xblock) for field in xblock.fields.itervalues() if field.is_set_on(xblock)}
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
index 49a02d817f3b..3b3acbc9f2fa 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -1201,7 +1201,12 @@ def inherit_settings(self, block_map, block_json, inheriting_settings=None):
                 inheriting_settings[field_name] = block_fields[field_name]
 
         for child in block_fields.get('children', []):
-            self.inherit_settings(block_map, block_map[child], inheriting_settings)
+            try:
+                self.inherit_settings(block_map, block_map[child], inheriting_settings)
+            except KeyError:
+                # here's where we need logic for looking up in other structures when we allow cross pointers
+                # but it's also getting this during course creation if creating top down w/ children set.
+                pass
 
     def descendants(self, block_map, usage_id, depth, descendent_map):
         """
@@ -1236,6 +1241,22 @@ def definition_locator(self, definition):
         else:
             return DescriptionLocator(definition['_id'])
 
+    def internal_clean_children(self, course_locator):
+        """
+        Only intended for rather low level methods to use. Goes through the children attrs of
+        each block removing any whose usage_id is not a member of the course. Does not generate
+        a new version of the course but overwrites the existing one.
+
+        :param course_locator: the course to clean
+        """
+        original_structure = self._lookup_course(course_locator)
+        for block in original_structure['blocks'].itervalues():
+            if 'fields' in block and 'children' in block['fields']:
+                block['fields']["children"] = [
+                    usage_id for usage_id in block['fields']["children"] if usage_id in original_structure['blocks']
+                ]
+        self.structures.update({'_id': original_structure['_id']}, original_structure)
+
 
     def _block_matches(self, value, qualifiers):
         '''
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
new file mode 100644
index 000000000000..86c99f701592
--- /dev/null
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
@@ -0,0 +1,263 @@
+"""
+Created on Sep 10, 2013
+
+@author: dmitchell
+
+Tests for split_migrator
+
+"""
+import unittest
+import uuid
+import random
+import mock
+import datetime
+from xmodule.fields import Date
+from xmodule.modulestore import Location
+from xmodule.modulestore.inheritance import InheritanceMixin
+from xmodule.modulestore.loc_mapper_store import LocMapperStore
+from xmodule.modulestore.mongo.draft import DraftModuleStore
+from xmodule.modulestore.split_mongo.split import SplitMongoModuleStore
+from xmodule.modulestore.mongo.base import MongoModuleStore
+from xmodule.modulestore.split_migrator import SplitMigrator
+from xmodule.modulestore.mongo import draft
+
+
+class TestMigration(unittest.TestCase):
+
+    # Snippet of what would be in the django settings envs file
+    modulestore_options = {
+        'default_class': 'xmodule.raw_module.RawDescriptor',
+        'host': 'localhost',
+        'db': 'test_xmodule',
+        'collection': 'modulestore{0}'.format(uuid.uuid4().hex),
+        'fs_root': '',
+        'render_template': mock.Mock(return_value=""),
+        'xblock_mixins': (InheritanceMixin,)
+    }
+
+    def setUp(self):
+        super(TestMigration, self).setUp()
+        self.loc_mapper = LocMapperStore(**self.modulestore_options)
+        self.old_mongo = MongoModuleStore(**self.modulestore_options)
+        self.draft_mongo = DraftModuleStore(**self.modulestore_options)
+        self.split_mongo = SplitMongoModuleStore(
+            loc_mapper=self.loc_mapper, **self.modulestore_options
+        )
+        self.migrator = SplitMigrator(self.split_mongo, self.old_mongo, self.draft_mongo, self.loc_mapper)
+        self.course_location = None
+        self.create_source_course()
+
+    def tearDown(self):
+        dbref = self.loc_mapper.db
+        dbref.drop_collection(self.loc_mapper.location_map)
+        split_db = self.split_mongo.db
+        split_db.drop_collection(split_db.course_index)
+        split_db.drop_collection(split_db.structures)
+        split_db.drop_collection(split_db.definitions)
+        # old_mongo doesn't give a db attr, but all of the dbs are the same
+        dbref.drop_collection(self.old_mongo.collection)
+
+        dbref.connection.close()
+
+        super(TestMigration, self).tearDown()
+
+    def _create_and_get_item(self, store, location, data, metadata, runtime=None):
+        store.create_and_save_xmodule(location, data, metadata, runtime)
+        return store.get_item(location)
+
+    def create_source_course(self):
+        """
+        A course testing all of the conversion mechanisms:
+        * some inheritable settings
+        * sequences w/ draft and live intermixed children to ensure all get to the draft but
+        only the live ones get to published. Some are only draft, some are both, some are only live.
+        * about, static_tab, and conditional documents
+        """
+        location = Location('i4x', 'test_org', 'test_course', 'course', 'runid')
+        self.course_location = location
+        date_proxy = Date()
+        metadata = {
+            'start': date_proxy.to_json(datetime.datetime(2000, 3, 13, 4)),
+            'display_name': 'Migration test course',
+        }
+        data = {
+            'wiki_slug': 'test_course_slug'
+        }
+        course_root = self._create_and_get_item(self.old_mongo, location, data, metadata)
+        runtime = course_root.runtime
+        # chapters
+        location = location.replace(category='chapter', name=uuid.uuid4().hex)
+        chapter1 = self._create_and_get_item(self.old_mongo, location, {}, {'display_name': 'Chapter 1'}, runtime)
+        course_root.children.append(chapter1.location.url())
+        location = location.replace(category='chapter', name=uuid.uuid4().hex)
+        chapter2 = self._create_and_get_item(self.old_mongo, location, {}, {'display_name': 'Chapter 2'}, runtime)
+        course_root.children.append(chapter2.location.url())
+        self.old_mongo.update_children(course_root.location, course_root.children)
+        # vertical in live only
+        location = location.replace(category='vertical', name=uuid.uuid4().hex)
+        live_vert = self._create_and_get_item(self.old_mongo, location, {}, {'display_name': 'Live vertical'}, runtime)
+        chapter1.children.append(live_vert.location.url())
+        self.create_random_units(self.old_mongo, live_vert)
+        # vertical in both live and draft
+        location = location.replace(category='vertical', name=uuid.uuid4().hex)
+        both_vert = self._create_and_get_item(
+            self.old_mongo, location, {}, {'display_name': 'Both vertical'}, runtime
+        )
+        draft_both = self._create_and_get_item(
+            self.draft_mongo, location, {}, {'display_name': 'Both vertical renamed'}, runtime
+        )
+        chapter1.children.append(both_vert.location.url())
+        self.create_random_units(self.old_mongo, both_vert, self.draft_mongo, draft_both)
+        # vertical in draft only (x2)
+        location = location.replace(category='vertical', name=uuid.uuid4().hex)
+        draft_vert = self._create_and_get_item(self.draft_mongo,
+            location, {}, {'display_name': 'Draft vertical'}, runtime)
+        chapter1.children.append(draft_vert.location.url())
+        self.create_random_units(self.draft_mongo, draft_vert)
+        location = location.replace(category='vertical', name=uuid.uuid4().hex)
+        draft_vert = self._create_and_get_item(self.draft_mongo,
+            location, {}, {'display_name': 'Draft vertical2'}, runtime)
+        chapter1.children.append(draft_vert.location.url())
+        self.create_random_units(self.draft_mongo, draft_vert)
+        # and finally one in live only (so published has to skip 2)
+        location = location.replace(category='vertical', name=uuid.uuid4().hex)
+        live_vert = self._create_and_get_item(self.old_mongo,
+            location, {}, {'display_name': 'Live vertical end'}, runtime)
+        chapter1.children.append(live_vert.location.url())
+        self.create_random_units(self.old_mongo, live_vert)
+
+        # update the chapter
+        self.old_mongo.update_children(chapter1.location, chapter1.children)
+
+        # now the other one w/ the conditional
+        # first create some show children
+        indirect1 = self._create_and_get_item(self.old_mongo,
+            location.replace(category='discussion', name=uuid.uuid4().hex),
+            "", {'display_name': 'conditional show 1'}, runtime
+        )
+        indirect2 = self._create_and_get_item(self.old_mongo,
+            location.replace(category='html', name=uuid.uuid4().hex),
+            "", {'display_name': 'conditional show 2'}, runtime
+        )
+        location = location.replace(category='conditional', name=uuid.uuid4().hex)
+        metadata = {
+            'xml_attributes' : {
+                'sources': [live_vert.location.url(), ],
+                'completed': True,
+            },
+        }
+        data = {
+            'show_tag_list': [indirect1.location.url(), indirect2.location.url()]
+        }
+        conditional = self._create_and_get_item(self.old_mongo, location, data, metadata, runtime)
+        conditional.children = [indirect1.location.url(), indirect2.location.url()]
+        # add direct children
+        self.create_random_units(self.old_mongo, conditional)
+        chapter2.children.append(conditional.location.url())
+        self.old_mongo.update_children(chapter2.location, chapter2.children)
+
+        # and the ancillary docs (not children)
+        location = location.replace(category='static_tab', name=uuid.uuid4().hex)
+        # the below automatically adds the tab to the course
+        _tab = self._create_and_get_item(self.old_mongo, location, "", {'display_name': 'Tab uno'}, runtime)
+
+        location = location.replace(category='about', name='overview')
+        _overview = self._create_and_get_item(self.old_mongo, location, "<p>test</p>", {}, runtime)
+        location = location.replace(category='course_info', name='updates')
+        _overview = self._create_and_get_item(self.old_mongo,
+            location, "<ol><li><h2>Sep 22</h2><p>test</p></li></ol>", {}, runtime
+        )
+
+
+    def create_random_units(self, store, parent, cc_store=None, cc_parent=None):
+        """
+        Create a random selection of units under the given parent w/ random names & attrs
+        :param store: which store (e.g., direct/draft) to create them in
+        :param parent: the parent to have point to them
+        :param cc_store: (optional) if given, make a small change and save also to this store but w/ same location
+        (only makes sense if store is 'direct' and this is 'draft' or vice versa)
+        """
+        for _ in range(random.randrange(6)):
+            location = parent.location.replace(
+                category=random.choice(['html', 'video', 'problem', 'discussion']),
+                name=uuid.uuid4().hex
+            )
+            metadata = {'display_name': str(uuid.uuid4()), 'graded': True}
+            data = {}
+            element = self._create_and_get_item(store, location, data, metadata, parent.runtime)
+            parent.children.append(element.location.url())
+            if cc_store is not None:
+                # change display_name and remove graded to test the delta
+                element = self._create_and_get_item(
+                    cc_store, location, data, {'display_name': str(uuid.uuid4())}, parent.runtime
+                )
+                cc_parent.children.append(element.location.url())
+        store.update_children(parent.location, parent.children)
+        if cc_store is not None:
+            cc_store.update_children(cc_parent.location, cc_parent.children)
+
+    def compare_courses(self, presplit, published):
+        # descend via children to do comparison
+        old_root = presplit.get_item(self.course_location, depth=None)
+        new_root_locator = self.loc_mapper.translate_location(
+            self.course_location.course_id, self.course_location, published, add_entry_if_missing=False
+        )
+        new_root = self.split_mongo.get_course(new_root_locator)
+        self.compare_dags(presplit, old_root, new_root, published)
+
+        # grab the detached items to compare they should be in both published and draft
+        for category in ['conditional', 'about', 'course_info', 'static_tab']:
+            location = self.course_location.replace(name=None, category=category)
+            for conditional in presplit.get_items(location):
+                locator = self.loc_mapper.translate_location(
+                    self.course_location.course_id,
+                    conditional.location, published, add_entry_if_missing=False
+                )
+                self.compare_dags(presplit, conditional, self.split_mongo.get_item(locator), published)
+
+
+    def compare_dags(self, presplit, presplit_dag_root, split_dag_root, published):
+        # check that locations match
+        self.assertEqual(
+            presplit_dag_root.location,
+            self.loc_mapper.translate_locator_to_location(split_dag_root.location).replace(revision=None)
+        )
+        # compare all fields but children
+        for name in presplit_dag_root.fields.iterkeys():
+            if name != 'children':
+                self.assertEqual(
+                    getattr(presplit_dag_root, name),
+                    getattr(split_dag_root, name),
+                    "{}/{}: {} != {}".format(
+                        split_dag_root.location, name, getattr(presplit_dag_root, name), getattr(split_dag_root, name)
+                    )
+                )
+        # test split get_item using old Location: old draft store didn't set revision for things above vertical
+        # but split does distinguish these; so, set revision if not published
+        if not published:
+            location = draft.as_draft(presplit_dag_root.location)
+        else:
+            location = presplit_dag_root.location
+        refetched = self.split_mongo.get_item(location)
+        self.assertEqual(
+            refetched.location, split_dag_root.location,
+            "Fetch from split via old Location {} not same as new {}".format(
+                refetched.location, split_dag_root.location
+            )
+        )
+        # compare children
+        if presplit_dag_root.has_children:
+            self.assertEqual(
+                len(presplit_dag_root.get_children()), len(split_dag_root.get_children()),
+                "{0.category} '{0.display_name}': children count {1} != {2}".format(
+                    presplit_dag_root, len(presplit_dag_root.get_children()), split_dag_root.children
+                )
+            )
+            for pre_child, split_child in zip(presplit_dag_root.get_children(), split_dag_root.get_children()):
+                self.compare_dags(presplit, pre_child, split_child, published)
+
+    def test_migrator(self):
+        self.migrator.migrate_mongo_course(self.course_location, random.getrandbits(32))
+        # now compare the migrated to the original course
+        self.compare_courses(self.old_mongo, True)
+        self.compare_courses(self.draft_mongo, False)
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
index db4f6d2adccd..0f1b65d0a3d4 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
@@ -648,6 +648,13 @@ def test_create_continue_version(self):
                 continue_version=True
             )
 
+        # start a new transaction
+        new_ele = modulestore().create_item(
+            new_course.location, 'chapter', user,
+            fields={'display_name': 'chapter 2'},
+            continue_version=False
+        )
+        transaction_guid = new_ele.location.version_guid
         # ensure force w/ continue gives exception
         with self.assertRaises(VersionConflictError):
             _fail = modulestore().create_item(
@@ -656,13 +663,6 @@ def test_create_continue_version(self):
                 force=True, continue_version=True
             )
 
-        # start a new transaction
-        new_ele = modulestore().create_item(
-            new_course.location, 'chapter', user,
-            fields={'display_name': 'chapter 2'},
-            continue_version=False
-        )
-        transaction_guid = new_ele.location.version_guid
         # ensure trying to continue the old one gives exception
         with self.assertRaises(VersionConflictError):
             _fail = modulestore().create_item(

From 934b3ca7c03244ac911de2cd1531a649cbdf7e6d Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 16 Sep 2013 14:26:39 -0400
Subject: [PATCH 72/92] Check has_children before accessing children

---
 common/lib/xmodule/xmodule/modulestore/mongo/draft.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
index 0f46d3fe0c91..b816ab246dc0 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
@@ -239,7 +239,8 @@ def publish(self, location, published_by_id):
         draft.published_date = datetime.now(UTC)
         draft.published_by = published_by_id
         super(DraftModuleStore, self).update_item(location, draft.get_explicitly_set_fields_by_scope(Scope.content))
-        super(DraftModuleStore, self).update_children(location, draft.children)
+        if draft.has_children:
+            super(DraftModuleStore, self).update_children(location, draft.children)
         super(DraftModuleStore, self).update_metadata(location, own_metadata(draft))
         self.delete_item(location)
 

From c1789adfd97046d24a486804782696c19d914597 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 17 Sep 2013 13:58:05 -0400
Subject: [PATCH 73/92] Always return a Locator: cases weren't exhaustive.

---
 common/lib/xmodule/xmodule/modulestore/locator.py  |  2 +-
 .../xmodule/modulestore/tests/test_locators.py     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/locator.py b/common/lib/xmodule/xmodule/modulestore/locator.py
index 916a970ad0d6..dfeafa5e1de3 100644
--- a/common/lib/xmodule/xmodule/modulestore/locator.py
+++ b/common/lib/xmodule/xmodule/modulestore/locator.py
@@ -377,7 +377,7 @@ def version_agnostic(self):
 
         :param block_locator:
         """
-        if self.course_id and self.version_guid:
+        if self.version_guid:
             return BlockUsageLocator(version_guid=self.version_guid,
                                      branch=self.branch,
                                      usage_id=self.usage_id)
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py b/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py
index 862b05cd53f3..05f4d25283a0 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_locators.py
@@ -208,6 +208,12 @@ def test_block_constructor(self):
                                      block=expected_block_ref)
         self.assertEqual(str(testobj), testurn)
         self.assertEqual(testobj.url(), 'edx://' + testurn)
+        agnostic = testobj.version_agnostic()
+        self.assertIsNone(agnostic.version_guid)
+        self.check_block_locn_fields(agnostic, 'test_block constructor',
+                                     course_id=expected_id,
+                                     branch=expected_branch,
+                                     block=expected_block_ref)
 
     def test_block_constructor_url_version_prefix(self):
         test_id_loc = '519665f6223ebd6980884f2b'
@@ -220,6 +226,14 @@ def test_block_constructor_url_version_prefix(self):
             block='lab2',
             version_guid=ObjectId(test_id_loc)
         )
+        agnostic = testobj.version_agnostic()
+        self.check_block_locn_fields(
+            agnostic, 'error parsing URL with version and block',
+            block='lab2',
+            course_id=None,
+            version_guid=ObjectId(test_id_loc)
+        )
+        self.assertIsNone(agnostic.course_id)
 
     def test_block_constructor_url_kitchen_sink(self):
         test_id_loc = '519665f6223ebd6980884f2b'

From d328c53dff883ed813d088848064e364086c8a49 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 17 Sep 2013 14:07:06 -0400
Subject: [PATCH 74/92] Cached course entry: separate structure from identity
 Don't undo inheritance by unsetting course_entry structure Do finer-grained
 cache clearing

---
 .../split_mongo/caching_descriptor_system.py  | 29 +++++--
 .../xmodule/modulestore/split_mongo/split.py  | 85 +++++++++++--------
 .../split_mongo/split_mongo_kvs.py            |  1 -
 3 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
index f2979723675a..ba81a5231d78 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
@@ -27,6 +27,10 @@ def __init__(self, modulestore, course_entry, default_class, module_data, lazy,
         modulestore: the module store that can be used to retrieve additional
         modules
 
+        course_entry: the originally fetched enveloped course_structure w/ branch and course_id info.
+        Callers to _load_item provide an override but that function ignores the provided structure and
+        only looks at the branch and course_id
+
         module_data: a dict mapping Location -> json that was cached from the
             underlying modulestore
         """
@@ -37,15 +41,13 @@ def __init__(self, modulestore, course_entry, default_class, module_data, lazy,
         self.module_data = module_data
         # Compute inheritance
         modulestore.inherit_settings(
-            course_entry.get('blocks', {}),
-            course_entry.get('blocks', {}).get(course_entry.get('root'))
+            course_entry['structure'].get('blocks', {}),
+            course_entry['structure'].get('blocks', {}).get(course_entry['structure'].get('root'))
         )
         self.default_class = default_class
         self.local_modules = {}
 
     def _load_item(self, usage_id, course_entry_override=None):
-        # TODO ensure all callers of system.load_item pass just the id
-
         if isinstance(usage_id, BlockUsageLocator) and isinstance(usage_id.usage_id, LocalId):
             try:
                 return self.local_modules[usage_id]
@@ -66,9 +68,24 @@ def _load_item(self, usage_id, course_entry_override=None):
         )
         return self.xblock_from_json(class_, usage_id, json_data, course_entry_override)
 
+    # xblock's runtime does not always pass enough contextual information to figure out
+    # which named container (course x branch) or which parent is requesting an item. Because split allows
+    # a many:1 mapping from named containers to structures and because item's identities encode
+    # context as well as unique identity, this function must sometimes infer whether the access is
+    # within an unspecified named container. In most cases, course_entry_override will give the
+    # explicit context; however, runtime.get_block(), e.g., does not. HOWEVER, there are simple heuristics
+    # which will work 99.999% of the time: a runtime is thread & even context specific. The likelihood that
+    # the thread is working with more than one named container pointing to the same specific structure is
+    # low; thus, the course_entry is most likely correct. If the thread is looking at > 1 named container
+    # pointing to the same structure, the access is likely to be chunky enough that the last known container
+    # is the intended one when not given a course_entry_override; thus, the caching of the last branch/course_id.
     def xblock_from_json(self, class_, usage_id, json_data, course_entry_override=None):
         if course_entry_override is None:
             course_entry_override = self.course_entry
+        else:
+            # most recent retrieval is most likely the right one for next caller (see comment above fn)
+            self.course_entry['branch'] = course_entry_override['branch']
+            self.course_entry['course_id'] = course_entry_override['course_id']
         # most likely a lazy loader or the id directly
         definition = json_data.get('definition', {})
         definition_id = self.modulestore.definition_locator(definition)
@@ -78,7 +95,7 @@ def xblock_from_json(self, class_, usage_id, json_data, course_entry_override=No
             usage_id = LocalId()
 
         block_locator = BlockUsageLocator(
-            version_guid=course_entry_override['_id'],
+            version_guid=course_entry_override['structure']['_id'],
             usage_id=usage_id,
             course_id=course_entry_override.get('course_id'),
             branch=course_entry_override.get('branch')
@@ -103,7 +120,7 @@ def xblock_from_json(self, class_, usage_id, json_data, course_entry_override=No
                 json_data,
                 self,
                 BlockUsageLocator(
-                    version_guid=course_entry_override['_id'],
+                    version_guid=course_entry_override['structure']['_id'],
                     usage_id=usage_id
                 ),
                 error_msg=exc_info_to_str(sys.exc_info())
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
index 3b3acbc9f2fa..9f17f5aff74a 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -117,7 +117,7 @@ def cache_items(self, system, base_usage_ids, depth=0, lazy=True):
         new_module_data = {}
         for usage_id in base_usage_ids:
             new_module_data = self.descendants(
-                system.course_entry['blocks'],
+                system.course_entry['structure']['blocks'],
                 usage_id,
                 depth,
                 new_module_data
@@ -148,7 +148,7 @@ def _load_items(self, course_entry, usage_ids, depth=0, lazy=True):
         given depth. Load the definitions into each block if lazy is False;
         otherwise, use the lazy definition placeholder.
         '''
-        system = self._get_cache(course_entry['_id'])
+        system = self._get_cache(course_entry['structure']['_id'])
         if system is None:
             system = CachingDescriptorSystem(
                 modulestore=self,
@@ -161,7 +161,7 @@ def _load_items(self, course_entry, usage_ids, depth=0, lazy=True):
                 resources_fs=None,
                 mixins=self.xblock_mixins
             )
-            self._add_cache(course_entry['_id'], system)
+            self._add_cache(course_entry['structure']['_id'], system)
             self.cache_items(system, usage_ids, depth, lazy)
         return [system.load_item(usage_id, course_entry) for usage_id in usage_ids]
 
@@ -186,11 +186,15 @@ def _add_cache(self, course_version_guid, system):
         self.thread_cache.course_cache[course_version_guid] = system
         return system
 
-    def _clear_cache(self):
+    def _clear_cache(self, course_version_guid=None):
         """
-        Should only be used by testing or something which implements transactional boundary semantics
+        Should only be used by testing or something which implements transactional boundary semantics.
+        :param course_version_guid: if provided, clear only this entry
         """
-        self.thread_cache.course_cache = {}
+        if course_version_guid:
+            del self.thread_cache.course_cache[course_version_guid]
+        else:
+            self.thread_cache.course_cache = {}
 
     def _lookup_course(self, course_locator):
         '''
@@ -229,14 +233,15 @@ def _lookup_course(self, course_locator):
         version_guid = course_locator.as_object_id(version_guid)
         entry = self.structures.find_one({'_id': version_guid})
 
-        # b/c more than one course can use same structure, the 'course_id' is not intrinsic to structure
+        # b/c more than one course can use same structure, the 'course_id' and 'branch' are not intrinsic to structure
         # and the one assoc'd w/ it by another fetch may not be the one relevant to this fetch; so,
-        # fake it by explicitly setting it in the in memory structure.
-
-        if course_locator.course_id:
-            entry['course_id'] = course_locator.course_id
-            entry['branch'] = course_locator.branch
-        return entry
+        # add it in the envelope for the structure.
+        envelope = {
+            'course_id': course_locator.course_id,
+            'branch': course_locator.branch,
+            'structure': entry,
+        }
+        return envelope
 
     def get_courses(self, branch='published', qualifiers=None):
         '''
@@ -259,20 +264,23 @@ def get_courses(self, branch='published', qualifiers=None):
         # collect ids and then query for those
         version_guids = []
         id_version_map = {}
-        for course_entry in matching:
-            version_guid = course_entry['versions'][branch]
+        for structure in matching:
+            version_guid = structure['versions'][branch]
             version_guids.append(version_guid)
-            id_version_map[version_guid] = course_entry['_id']
+            id_version_map[version_guid] = structure['_id']
 
         course_entries = self.structures.find({'_id': {'$in': version_guids}})
 
         # get the block for the course element (s/b the root)
         result = []
         for entry in course_entries:
-            # structures are course agnostic but the caller wants to know course, so add it in here
-            entry['course_id'] = id_version_map[entry['_id']]
+            envelope = {
+                'course_id': id_version_map[entry['_id']],
+                'branch': branch,
+                'structure': entry,
+            }
             root = entry['root']
-            result.extend(self._load_items(entry, [root], 0, lazy=True))
+            result.extend(self._load_items(envelope, [root], 0, lazy=True))
         return result
 
     def get_course(self, course_locator):
@@ -283,7 +291,7 @@ def get_course(self, course_locator):
         raises InsufficientSpecificationError
         '''
         course_entry = self._lookup_course(course_locator)
-        root = course_entry['root']
+        root = course_entry['structure']['root']
         result = self._load_items(course_entry, [root], 0, lazy=True)
         return result[0]
 
@@ -303,7 +311,7 @@ def has_item(self, course_id, block_location):
         if block_location.usage_id is None:
             raise InsufficientSpecificationError(block_location)
         try:
-            course_structure = self._lookup_course(block_location)
+            course_structure = self._lookup_course(block_location)['structure']
         except ItemNotFoundError:
             # this error only occurs if the course does not exist
             return False
@@ -364,7 +372,7 @@ def get_items(self, locator, course_id=None, depth=0, qualifiers=None):
             qualifiers = {}
         course = self._lookup_course(locator)
         items = []
-        for usage_id, value in course['blocks'].iteritems():
+        for usage_id, value in course['structure']['blocks'].iteritems():
             if self._block_matches(value, qualifiers):
                 items.append(usage_id)
 
@@ -397,7 +405,7 @@ def get_parent_locations(self, locator, course_id=None):
         '''
         course = self._lookup_course(locator)
         items = []
-        for parent_id, value in course['blocks'].iteritems():
+        for parent_id, value in course['structure']['blocks'].iteritems():
             for child_id in value['fields'].get('children', []):
                 if locator.usage_id == child_id:
                     items.append(BlockUsageLocator(url=locator.as_course_locator(), usage_id=parent_id))
@@ -434,7 +442,7 @@ def get_course_history_info(self, course_locator):
             'edited_on': when the change was made
         }
         """
-        course = self._lookup_course(course_locator)
+        course = self._lookup_course(course_locator)['structure']
         return {'original_version': course['original_version'],
             'previous_version': course['previous_version'],
             'edited_by': course['edited_by'],
@@ -467,7 +475,7 @@ def get_course_successors(self, course_locator, version_history_depth=1):
             return None
         if course_locator.version_guid is None:
             course = self._lookup_course(course_locator)
-            version_guid = course.version_guid
+            version_guid = course['structure']['_id']
         else:
             version_guid = course_locator.version_guid
 
@@ -497,8 +505,8 @@ def get_block_generations(self, block_locator):
         The block's history tracks its explicit changes but not the changes in its children.
 
         '''
-        block_locator = block_locator.version_agnostic()
-        course_struct = self._lookup_course(block_locator)
+        # version_agnostic means we don't care if the head and version don't align, trust the version
+        course_struct = self._lookup_course(block_locator.version_agnostic())['structure']
         usage_id = block_locator.usage_id
         update_version_field = 'blocks.{}.edit_info.update_version'.format(usage_id)
         all_versions_with_block = self.structures.find({'original_version': course_struct['original_version'],
@@ -683,7 +691,7 @@ def create_item(self, course_or_parent_locator, category, user_id,
         """
         # find course_index entry if applicable and structures entry
         index_entry = self._get_index_if_valid(course_or_parent_locator, force, continue_version)
-        structure = self._lookup_course(course_or_parent_locator)
+        structure = self._lookup_course(course_or_parent_locator)['structure']
 
         partitioned_fields = self._partition_fields_by_scope(category, fields)
         new_def_data = partitioned_fields.get(Scope.content, {})
@@ -739,7 +747,7 @@ def create_item(self, course_or_parent_locator, category, user_id,
             # db update
             self.structures.update({'_id': new_id}, new_structure)
             # clear cache so things get refetched and inheritance recomputed
-            self._clear_cache()
+            self._clear_cache(new_id)
         else:
             new_id = self.structures.insert(new_structure)
 
@@ -851,7 +859,7 @@ def create_course(
         else:
             # just get the draft_version structure
             draft_version = CourseLocator(version_guid=versions_dict[master_branch])
-            draft_structure = self._lookup_course(draft_version)
+            draft_structure = self._lookup_course(draft_version)['structure']
             if definition_fields or block_fields:
                 draft_structure = self._version_structure(draft_structure, user_id)
                 root_block = draft_structure['blocks'][draft_structure['root']]
@@ -903,7 +911,7 @@ def update_item(self, descriptor, user_id, force=False):
         The implementation tries to detect which, if any changes, actually need to be saved and thus won't version
         the definition, structure, nor course if they didn't change.
         """
-        original_structure = self._lookup_course(descriptor.location)
+        original_structure = self._lookup_course(descriptor.location)['structure']
         index_entry = self._get_index_if_valid(descriptor.location, force)
 
         descriptor.definition_locator, is_updated = self.update_definition_from_data(
@@ -945,7 +953,9 @@ def update_item(self, descriptor, user_id, force=False):
                 self._update_head(index_entry, descriptor.location.branch, new_id)
 
             # fetch and return the new item--fetching is unnecessary but a good qc step
-            return self.get_item(BlockUsageLocator(descriptor.location, version_guid=new_id))
+            new_locator = BlockUsageLocator(descriptor.location)
+            new_locator.version_guid = new_id
+            return self.get_item(new_locator)
         else:
             # nothing changed, just return the one sent in
             return descriptor
@@ -969,7 +979,7 @@ def persist_xblock_dag(self, xblock, user_id, force=False):
         """
         # find course_index entry if applicable and structures entry
         index_entry = self._get_index_if_valid(xblock.location, force)
-        structure = self._lookup_course(xblock.location)
+        structure = self._lookup_course(xblock.location)['structure']
         new_structure = self._version_structure(structure, user_id)
 
         changed_blocks = self._persist_subdag(xblock, user_id, new_structure['blocks'])
@@ -1115,7 +1125,7 @@ def delete_item(self, usage_locator, user_id, delete_children=False, force=False
         the course but leaves the head pointer where it is (this change will not be in the course head).
         """
         assert isinstance(usage_locator, BlockUsageLocator) and usage_locator.is_initialized()
-        original_structure = self._lookup_course(usage_locator)
+        original_structure = self._lookup_course(usage_locator)['structure']
         if original_structure['root'] == usage_locator.usage_id:
             raise ValueError("Cannot delete the root of a course")
         index_entry = self._get_index_if_valid(usage_locator, force)
@@ -1205,7 +1215,8 @@ def inherit_settings(self, block_map, block_json, inheriting_settings=None):
                 self.inherit_settings(block_map, block_map[child], inheriting_settings)
             except KeyError:
                 # here's where we need logic for looking up in other structures when we allow cross pointers
-                # but it's also getting this during course creation if creating top down w/ children set.
+                # but it's also getting this during course creation if creating top down w/ children set or
+                # migration where the old mongo published had pointers to privates
                 pass
 
     def descendants(self, block_map, usage_id, depth, descendent_map):
@@ -1249,13 +1260,15 @@ def internal_clean_children(self, course_locator):
 
         :param course_locator: the course to clean
         """
-        original_structure = self._lookup_course(course_locator)
+        original_structure = self._lookup_course(course_locator)['structure']
         for block in original_structure['blocks'].itervalues():
             if 'fields' in block and 'children' in block['fields']:
                 block['fields']["children"] = [
                     usage_id for usage_id in block['fields']["children"] if usage_id in original_structure['blocks']
                 ]
         self.structures.update({'_id': original_structure['_id']}, original_structure)
+        # clear cache again b/c inheritance may be wrong over orphans
+        self._clear_cache(original_structure['_id'])
 
 
     def _block_matches(self, value, qualifiers):
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
index bfec024a1647..02f5aad9f5b5 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
@@ -1,7 +1,6 @@
 import copy
 from xblock.fields import Scope
 from collections import namedtuple
-from xblock.runtime import KeyValueStore
 from xblock.exceptions import InvalidScopeError
 from .definition_lazy_loader import DefinitionLazyLoader
 from xmodule.modulestore.inheritance import InheritanceKeyValueStore

From 59b31474ca26fd7d08df98955ef780787d79a9d4 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Wed, 18 Sep 2013 15:52:19 -0400
Subject: [PATCH 75/92] Separate db config from modulestore config parms

use to instantiate loc_mapper
test loc_mapper injection into split modulestore
---
 .../contentstore/tests/test_crud.py           | 22 ++++++++++++++++++-
 cms/envs/acceptance.py                        | 11 ++++++----
 cms/envs/dev.py                               | 11 ++++++----
 cms/envs/test.py                              |  9 +++++---
 .../lib/xmodule/xmodule/modulestore/django.py |  2 +-
 .../xmodule/modulestore/loc_mapper_store.py   |  5 -----
 .../modulestore/tests/test_split_migrator.py  | 11 ++++++----
 lms/envs/acceptance.py                        | 11 ++++++----
 lms/envs/cms/dev.py                           |  9 +++++---
 9 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/cms/djangoapps/contentstore/tests/test_crud.py b/cms/djangoapps/contentstore/tests/test_crud.py
index a16251fa0f7c..b95d58d91327 100644
--- a/cms/djangoapps/contentstore/tests/test_crud.py
+++ b/cms/djangoapps/contentstore/tests/test_crud.py
@@ -2,7 +2,7 @@
 from xmodule import templates
 from xmodule.modulestore.tests import persistent_factories
 from xmodule.course_module import CourseDescriptor
-from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.django import modulestore, loc_mapper
 from xmodule.seq_module import SequenceDescriptor
 from xmodule.capa_module import CapaDescriptor
 from xmodule.modulestore.locator import CourseLocator, BlockUsageLocator
@@ -191,6 +191,26 @@ def test_block_generations(self):
         version_history = modulestore('split').get_block_generations(second_problem.location)
         self.assertNotEqual(version_history.locator.version_guid, first_problem.location.version_guid)
 
+    def test_split_inject_loc_mapper(self):
+        """
+        Test that creating a loc_mapper causes it to automatically attach to the split mongo store
+        """
+        # instantiate location mapper before split
+        mapper = loc_mapper()
+        # split must inject the location mapper itself since the mapper existed before it did
+        self.assertEqual(modulestore('split').loc_mapper, mapper)
+
+    def test_loc_inject_into_split(self):
+        """
+        Test that creating a loc_mapper causes it to automatically attach to the split mongo store
+        """
+        # force instantiation of split modulestore before there's a location mapper and verify
+        # it has no pointer to loc mapper
+        self.assertIsNone(modulestore('split').loc_mapper)
+        # force instantiation of location mapper which must inject itself into the split
+        mapper = loc_mapper()
+        self.assertEqual(modulestore('split').loc_mapper, mapper)
+
     # ================================= JSON PARSING ===========================
     # These are example methods for creating xmodules in memory w/o persisting them.
     # They were in x_module but since xblock is not planning to support them but will
diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py
index bbb767118c11..73dc91dbd780 100644
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -24,14 +24,17 @@
 def seed():
     return os.getppid()
 
-MODULESTORE_OPTIONS = {
-    'default_class': 'xmodule.raw_module.RawDescriptor',
+DOC_STORE_CONFIG = {
     'host': 'localhost',
     'db': 'acceptance_xmodule',
     'collection': 'acceptance_modulestore_%s' % seed(),
+}
+
+MODULESTORE_OPTIONS = dict({
+    'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': TEST_ROOT / "data",
     'render_template': 'mitxmako.shortcuts.render_to_string',
-}
+}, **DOC_STORE_CONFIG)
 
 MODULESTORE = {
     'default': {
@@ -90,6 +93,6 @@ def seed():
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *      # pylint: disable=F0401
+    from .private import *  # pylint: disable=F0401
 except ImportError:
     pass
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index 42a6f706b6c3..6e4ce460c3a4 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -16,14 +16,17 @@
                             dev_env=True,
                             debug=True)
 
-modulestore_options = {
-    'default_class': 'xmodule.raw_module.RawDescriptor',
+DOC_STORE_CONFIG = {
     'host': 'localhost',
     'db': 'xmodule',
     'collection': 'modulestore',
+}
+
+modulestore_options = dict({
+    'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': GITHUB_REPO_ROOT,
     'render_template': 'mitxmako.shortcuts.render_to_string',
-}
+}, **DOC_STORE_CONFIG)
 
 MODULESTORE = {
     'default': {
@@ -185,6 +188,6 @@
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *      # pylint: disable=F0401
+    from .private import *  # pylint: disable=F0401
 except ImportError:
     pass
diff --git a/cms/envs/test.py b/cms/envs/test.py
index ffbf9f5376d2..364bee2441cb 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -42,14 +42,17 @@
     if os.path.isdir(COMMON_TEST_DATA_ROOT / course_dir)
 ]
 
-MODULESTORE_OPTIONS = {
-    'default_class': 'xmodule.raw_module.RawDescriptor',
+DOC_STORE_CONFIG = {
     'host': 'localhost',
     'db': 'test_xmodule',
     'collection': 'test_modulestore',
+}
+
+MODULESTORE_OPTIONS = dict({
+    'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': TEST_ROOT / "data",
     'render_template': 'mitxmako.shortcuts.render_to_string',
-}
+}, **DOC_STORE_CONFIG)
 
 MODULESTORE = {
     'default': {
diff --git a/common/lib/xmodule/xmodule/modulestore/django.py b/common/lib/xmodule/xmodule/modulestore/django.py
index d9176f6abf82..284f5e4eb783 100644
--- a/common/lib/xmodule/xmodule/modulestore/django.py
+++ b/common/lib/xmodule/xmodule/modulestore/django.py
@@ -93,7 +93,7 @@ def loc_mapper():
     # pylint: disable=W0212
     if _loc_singleton is None:
         # instantiate
-        _loc_singleton = LocMapperStore(settings.modulestore_options)
+        _loc_singleton = LocMapperStore(**settings.DOC_STORE_CONFIG)
     # inject into split mongo modulestore
     if 'split' in _MODULESTORES:
         _MODULESTORES['split'].loc_mapper = _loc_singleton
diff --git a/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py b/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
index 4ab3a8106d6c..1b4cee7c95d9 100644
--- a/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
+++ b/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
@@ -33,11 +33,6 @@ def __init__(self, host, db, collection, port=27017, user=None, password=None,
         '''
         Constructor
         '''
-        # get rid of unwanted args
-        kwargs.pop('default_class', None)
-        kwargs.pop('fs_root', None)
-        kwargs.pop('xblock_mixins', None)
-        kwargs.pop('render_template', None)
         self.db = pymongo.database.Database(
             pymongo.MongoClient(
                 host=host,
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
index 86c99f701592..40e1b466c482 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
@@ -25,19 +25,22 @@
 class TestMigration(unittest.TestCase):
 
     # Snippet of what would be in the django settings envs file
-    modulestore_options = {
-        'default_class': 'xmodule.raw_module.RawDescriptor',
+    db_config = {
         'host': 'localhost',
         'db': 'test_xmodule',
         'collection': 'modulestore{0}'.format(uuid.uuid4().hex),
+    }
+
+    modulestore_options = dict({
+        'default_class': 'xmodule.raw_module.RawDescriptor',
         'fs_root': '',
         'render_template': mock.Mock(return_value=""),
         'xblock_mixins': (InheritanceMixin,)
-    }
+    }, **db_config)
 
     def setUp(self):
         super(TestMigration, self).setUp()
-        self.loc_mapper = LocMapperStore(**self.modulestore_options)
+        self.loc_mapper = LocMapperStore(**self.db_config)
         self.old_mongo = MongoModuleStore(**self.modulestore_options)
         self.draft_mongo = DraftModuleStore(**self.modulestore_options)
         self.split_mongo = SplitMongoModuleStore(
diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py
index 2182bbcad64b..b261e2be549a 100644
--- a/lms/envs/acceptance.py
+++ b/lms/envs/acceptance.py
@@ -26,14 +26,17 @@ def seed():
     return os.getppid()
 
 # Use the mongo store for acceptance tests
-modulestore_options = {
-    'default_class': 'xmodule.raw_module.RawDescriptor',
+DOC_STORE_CONFIG = {
     'host': 'localhost',
     'db': 'acceptance_xmodule',
     'collection': 'acceptance_modulestore_%s' % seed(),
+}
+
+modulestore_options = dict({
+    'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': TEST_ROOT / "data",
     'render_template': 'mitxmako.shortcuts.render_to_string',
-}
+}, **DOC_STORE_CONFIG)
 
 MODULESTORE = {
     'default': {
@@ -129,6 +132,6 @@ def seed():
 #####################################################################
 # Lastly, see if the developer has any local overrides.
 try:
-    from .private import *      # pylint: disable=F0401
+    from .private import *  # pylint: disable=F0401
 except ImportError:
     pass
diff --git a/lms/envs/cms/dev.py b/lms/envs/cms/dev.py
index 0d11c373c9f4..7026d4536676 100644
--- a/lms/envs/cms/dev.py
+++ b/lms/envs/cms/dev.py
@@ -22,14 +22,17 @@
 
 META_UNIVERSITIES = {}
 
-modulestore_options = {
-    'default_class': 'xmodule.raw_module.RawDescriptor',
+DOC_STORE_CONFIG = {
     'host': 'localhost',
     'db': 'xmodule',
     'collection': 'modulestore',
+}
+
+modulestore_options = dict({
+    'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': DATA_DIR,
     'render_template': 'mitxmako.shortcuts.render_to_string',
-}
+}, **DOC_STORE_CONFIG)
 
 MODULESTORE = {
     'default': {

From f63aa0f5475c49cda6bda05bb7000d60a18549b2 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Wed, 18 Sep 2013 16:41:26 -0400
Subject: [PATCH 76/92] Pylint and pep8 hygiene

---
 .../xmodule/modulestore/loc_mapper_store.py   |  6 +++--
 .../xmodule/modulestore/split_migrator.py     |  8 +++---
 .../xmodule/modulestore/split_mongo/split.py  | 26 ++++++++++++-------
 .../modulestore/tests/test_split_migrator.py  | 25 +++++++++++-------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py b/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
index 1b4cee7c95d9..289e4ad1021f 100644
--- a/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
+++ b/common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
@@ -28,8 +28,10 @@ class LocMapperStore(object):
 
     # C0103: varnames and attrs must be >= 3 chars, but db defined by long time usage
     # pylint: disable = C0103
-    def __init__(self, host, db, collection, port=27017, user=None, password=None,
-        **kwargs):
+    def __init__(
+        self, host, db, collection, port=27017, user=None, password=None,
+        **kwargs
+    ):
         '''
         Constructor
         '''
diff --git a/common/lib/xmodule/xmodule/modulestore/split_migrator.py b/common/lib/xmodule/xmodule/modulestore/split_migrator.py
index 46d23ee3b0be..27a758c0839d 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_migrator.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_migrator.py
@@ -10,6 +10,7 @@
 from xmodule.modulestore.locator import CourseLocator
 from xmodule.modulestore.mongo import draft
 
+
 class SplitMigrator(object):
     """
     Copies courses from old mongo to split mongo and sets up location mapping so any references to the old
@@ -58,7 +59,6 @@ def migrate_mongo_course(self, course_location, user_id, new_course_id=None):
 
         return new_course_id
 
-
     def _copy_published_modules_to_course(self, new_course, old_course_loc, old_course_id, user_id):
         """
         Copy all of the modules from the 'direct' version of the course to the new split course.
@@ -94,7 +94,6 @@ def _copy_published_modules_to_course(self, new_course, old_course_loc, old_cour
         # children which meant some pointers were to non-existent locations in 'direct'
         self.split_modulestore.internal_clean_children(course_version_locator)
 
-
     def _add_draft_modules_to_course(self, new_course_id, old_course_id, old_course_loc, user_id):
         """
         update each draft. Create any which don't exist in published and attach to their parents.
@@ -159,8 +158,10 @@ def _add_draft_modules_to_course(self, new_course_id, old_course_id, old_course_
                 new_parent.children.insert(new_parent_cursor, new_usage_id)
                 new_parent = self.split_modulestore.update_item(new_parent, user_id)
 
-
     def _get_json_fields_translate_children(self, xblock, old_course_id, published):
+        """
+        Return the json repr for explicitly set fields but convert all children to their usage_id's
+        """
         fields = self.get_json_fields_explicitly_set(xblock)
         # this will too generously copy the children even for ones that don't exist in the published b/c the old mongo
         # had no way of not having parents point to draft only children :-(
@@ -172,7 +173,6 @@ def _get_json_fields_translate_children(self, xblock, old_course_id, published):
                 for child in fields['children']]
         return fields
 
-
     def get_json_fields_explicitly_set(self, xblock):
         """
         Get the json repr for fields set on this specific xblock
diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
index 9f17f5aff74a..d85092b3636a 100644
--- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
@@ -642,9 +642,11 @@ def _generate_course_id(self, id_root):
     # DHM: Should I rewrite this to take a new xblock instance rather than to construct it? That is, require the
     # caller to use XModuleDescriptor.load_from_json thus reducing similar code and making the object creation and
     # validation behavior a responsibility of the model layer rather than the persistence layer.
-    def create_item(self, course_or_parent_locator, category, user_id,
+    def create_item(
+        self, course_or_parent_locator, category, user_id,
         usage_id=None, definition_locator=None, fields=None,
-        force=False, continue_version=False):
+        force=False, continue_version=False
+    ):
         """
         Add a descriptor to persistence as the last child of the optional parent_location or just as an element
         of the course (if no parent provided). Return the resulting post saved version with populated locators.
@@ -773,7 +775,7 @@ def create_course(
         self, org, prettyid, user_id, id_root=None, fields=None,
         master_branch='draft', versions_dict=None, root_category='course',
         root_usage_id='course'
-        ):
+    ):
         """
         Create a new entry in the active courses index which points to an existing or new structure. Returns
         the course root of the resulting entry (the location has the course id)
@@ -848,9 +850,11 @@ def create_course(
             }
             new_id = self.structures.insert(draft_structure)
             draft_structure['original_version'] = new_id
-            self.structures.update({'_id': new_id},
+            self.structures.update(
+                {'_id': new_id},
                 {'$set': {"original_version": new_id,
-                    'blocks.{}.edit_info.update_version'.format(root_usage_id): new_id}})
+                    'blocks.{}.edit_info.update_version'.format(root_usage_id): new_id}}
+            )
             if versions_dict is None:
                 versions_dict = {master_branch: new_id}
             else:
@@ -1351,17 +1355,19 @@ def _get_index_if_valid(self, locator, force=False, continue_version=False):
                 return None
         else:
             index_entry = self.course_index.find_one({'_id': locator.course_id})
-            if (locator.version_guid is not None
-                and index_entry['versions'][locator.branch] != locator.version_guid
-                and not force) or (force and continue_version):
+            is_head = (
+                locator.version_guid is None or
+                index_entry['versions'][locator.branch] == locator.version_guid
+            )
+            if (is_head or (force and not continue_version)):
+                return index_entry
+            else:
                 raise VersionConflictError(
                     locator,
                     CourseLocator(
                         course_id=index_entry['_id'],
                         version_guid=index_entry['versions'][locator.branch],
                         branch=locator.branch))
-            else:
-                return index_entry
 
     def _version_structure(self, structure, user_id):
         """
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
index 40e1b466c482..92b1304d733f 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
@@ -23,6 +23,9 @@
 
 
 class TestMigration(unittest.TestCase):
+    """
+    Test the split migrator
+    """
 
     # Snippet of what would be in the django settings envs file
     db_config = {
@@ -113,18 +116,21 @@ def create_source_course(self):
         self.create_random_units(self.old_mongo, both_vert, self.draft_mongo, draft_both)
         # vertical in draft only (x2)
         location = location.replace(category='vertical', name=uuid.uuid4().hex)
-        draft_vert = self._create_and_get_item(self.draft_mongo,
+        draft_vert = self._create_and_get_item(
+            self.draft_mongo,
             location, {}, {'display_name': 'Draft vertical'}, runtime)
         chapter1.children.append(draft_vert.location.url())
         self.create_random_units(self.draft_mongo, draft_vert)
         location = location.replace(category='vertical', name=uuid.uuid4().hex)
-        draft_vert = self._create_and_get_item(self.draft_mongo,
+        draft_vert = self._create_and_get_item(
+            self.draft_mongo,
             location, {}, {'display_name': 'Draft vertical2'}, runtime)
         chapter1.children.append(draft_vert.location.url())
         self.create_random_units(self.draft_mongo, draft_vert)
         # and finally one in live only (so published has to skip 2)
         location = location.replace(category='vertical', name=uuid.uuid4().hex)
-        live_vert = self._create_and_get_item(self.old_mongo,
+        live_vert = self._create_and_get_item(
+            self.old_mongo,
             location, {}, {'display_name': 'Live vertical end'}, runtime)
         chapter1.children.append(live_vert.location.url())
         self.create_random_units(self.old_mongo, live_vert)
@@ -134,17 +140,19 @@ def create_source_course(self):
 
         # now the other one w/ the conditional
         # first create some show children
-        indirect1 = self._create_and_get_item(self.old_mongo,
+        indirect1 = self._create_and_get_item(
+            self.old_mongo,
             location.replace(category='discussion', name=uuid.uuid4().hex),
             "", {'display_name': 'conditional show 1'}, runtime
         )
-        indirect2 = self._create_and_get_item(self.old_mongo,
+        indirect2 = self._create_and_get_item(
+            self.old_mongo,
             location.replace(category='html', name=uuid.uuid4().hex),
             "", {'display_name': 'conditional show 2'}, runtime
         )
         location = location.replace(category='conditional', name=uuid.uuid4().hex)
         metadata = {
-            'xml_attributes' : {
+            'xml_attributes': {
                 'sources': [live_vert.location.url(), ],
                 'completed': True,
             },
@@ -167,11 +175,11 @@ def create_source_course(self):
         location = location.replace(category='about', name='overview')
         _overview = self._create_and_get_item(self.old_mongo, location, "<p>test</p>", {}, runtime)
         location = location.replace(category='course_info', name='updates')
-        _overview = self._create_and_get_item(self.old_mongo,
+        _overview = self._create_and_get_item(
+            self.old_mongo,
             location, "<ol><li><h2>Sep 22</h2><p>test</p></li></ol>", {}, runtime
         )
 
-
     def create_random_units(self, store, parent, cc_store=None, cc_parent=None):
         """
         Create a random selection of units under the given parent w/ random names & attrs
@@ -218,7 +226,6 @@ def compare_courses(self, presplit, published):
                 )
                 self.compare_dags(presplit, conditional, self.split_mongo.get_item(locator), published)
 
-
     def compare_dags(self, presplit, presplit_dag_root, split_dag_root, published):
         # check that locations match
         self.assertEqual(

From 8e6c0ea937be491bd7c71bb684eb2d16261263fa Mon Sep 17 00:00:00 2001
From: Jay Zoldak <zoldak@edx.org>
Date: Thu, 26 Sep 2013 16:07:20 -0400
Subject: [PATCH 77/92] Wrap logic for selecting options in acceptance tests

---
 common/djangoapps/terrain/ui_helpers.py             | 13 +++++++++++++
 .../courseware/features/problems_setup.py           | 10 ++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py
index 75bc8bb2cb37..e400ca9b95d9 100644
--- a/common/djangoapps/terrain/ui_helpers.py
+++ b/common/djangoapps/terrain/ui_helpers.py
@@ -189,6 +189,19 @@ def css_click_at(css_selector, index=0, x_coord=10, y_coord=10, timeout=5):
     element.action_chains.perform()
 
 
+@world.absorb
+def select_option(name, value, index=0, wait_time=30):
+    '''
+    A method to select an option
+    This method will return True if the selection worked.
+    '''
+    select_css = "select[name='{}']".format(name)
+    option_css = "option[value='{}']".format(value)
+
+    css_selector = "{} {}".format(select_css, option_css)
+    return css_click(css_selector=css_selector, index=index, wait_time=wait_time)
+
+
 @world.absorb
 def id_click(elem_id):
     """
diff --git a/lms/djangoapps/courseware/features/problems_setup.py b/lms/djangoapps/courseware/features/problems_setup.py
index 3b1b983fc38c..a705a8467c50 100644
--- a/lms/djangoapps/courseware/features/problems_setup.py
+++ b/lms/djangoapps/courseware/features/problems_setup.py
@@ -166,9 +166,7 @@ def answer_problem(problem_type, correctness):
     if problem_type == "drop down":
         select_name = "input_i4x-edx-model_course-problem-drop_down_2_1"
         option_text = 'Option 2' if correctness == 'correct' else 'Option 3'
-        # First wait for the element to be there on the page
-        world.wait_for_visible("select#{}".format(select_name))
-        world.browser.select(select_name, option_text)
+        world.select_option(select_name, option_text)
 
     elif problem_type == "multiple choice":
         if correctness == 'correct':
@@ -244,7 +242,7 @@ def problem_has_answer(problem_type, answer_class):
         if answer_class == 'blank':
             assert world.is_css_not_present('option[selected="true"]')
         else:
-            actual = world.browser.find_by_css('option[selected="true"]').value
+            actual = world.css_value('option[selected="true"]')
             expected = 'Option 2' if answer_class == 'correct' else 'Option 3'
             assert actual == expected
 
@@ -305,10 +303,6 @@ def problem_has_answer(problem_type, answer_class):
         pass
 
 
-##############################
-#       HELPER METHODS
-##############################
-
 def add_problem_to_course(course, problem_type, extraMeta=None):
     '''
     Add a problem to the course we have created using factories.

From 3c88ccb4ff9252429c5dcf31e55480be6db2f988 Mon Sep 17 00:00:00 2001
From: Will Daly <will@edx.org>
Date: Thu, 26 Sep 2013 16:37:25 -0400
Subject: [PATCH 78/92] Use comments to skip tests instead of a tag

---
 .../contentstore/features/component.feature   | 128 +++++++++---------
 .../features/course-overview.feature          |   2 +-
 .../courseware/features/certificates.feature  |  90 ++++++------
 rakelib/acceptance_test.rake                  |   2 +-
 4 files changed, 107 insertions(+), 115 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/component.feature b/cms/djangoapps/contentstore/features/component.feature
index 9440ce7dc2f3..0754049df001 100644
--- a/cms/djangoapps/contentstore/features/component.feature
+++ b/cms/djangoapps/contentstore/features/component.feature
@@ -2,72 +2,70 @@
 Feature: CMS.Component Adding
     As a course author, I want to be able to add a wide variety of components
 
-    @skip
-    Scenario: I can add components
-        Given I have opened a new course in studio
-        And I am editing a new unit
-        When I add the following components:
-            | Component    |
-            | Discussion   |
-            | Blank HTML   |
-            | LaTex        |
-            | Blank Problem|
-            | Dropdown     |
-            | Multi Choice |
-            | Numerical    |
-            | Text Input   |
-            | Advanced     |
-            | Circuit      |
-            | Custom Python|
-            | Image Mapped |
-            | Math Input   |
-            | Problem LaTex|
-            | Adaptive Hint|
-            | Video        |
-        Then I see the following components:
-            | Component    |
-            | Discussion   |
-            | Blank HTML   |
-            | LaTex        |
-            | Blank Problem|
-            | Dropdown     |
-            | Multi Choice |
-            | Numerical    |
-            | Text Input   |
-            | Advanced     |
-            | Circuit      |
-            | Custom Python|
-            | Image Mapped |
-            | Math Input   |
-            | Problem LaTex|
-            | Adaptive Hint|
-            | Video        |
+    #Scenario: I can add components
+    #    Given I have opened a new course in studio
+    #    And I am editing a new unit
+    #    When I add the following components:
+    #        | Component    |
+    #        | Discussion   |
+    #        | Blank HTML   |
+    #        | LaTex        |
+    #        | Blank Problem|
+    #        | Dropdown     |
+    #        | Multi Choice |
+    #        | Numerical    |
+    #        | Text Input   |
+    #        | Advanced     |
+    #        | Circuit      |
+    #        | Custom Python|
+    #        | Image Mapped |
+    #        | Math Input   |
+    #        | Problem LaTex|
+    #        | Adaptive Hint|
+    #        | Video        |
+    #    Then I see the following components:
+    #        | Component    |
+    #        | Discussion   |
+    #        | Blank HTML   |
+    #        | LaTex        |
+    #        | Blank Problem|
+    #        | Dropdown     |
+    #        | Multi Choice |
+    #        | Numerical    |
+    #        | Text Input   |
+    #        | Advanced     |
+    #        | Circuit      |
+    #        | Custom Python|
+    #        | Image Mapped |
+    #        | Math Input   |
+    #        | Problem LaTex|
+    #        | Adaptive Hint|
+    #        | Video        |
 
-    @skip
-    Scenario: I can delete Components
-        Given I have opened a new course in studio
-        And I am editing a new unit
-        And I add the following components:
-            | Component    |
-            | Discussion   |
-            | Blank HTML   |
-            | LaTex        |
-            | Blank Problem|
-            | Dropdown     |
-            | Multi Choice |
-            | Numerical    |
-            | Text Input   |
-            | Advanced     |
-            | Circuit      |
-            | Custom Python|
-            | Image Mapped |
-            | Math Input   |
-            | Problem LaTex|
-            | Adaptive Hint|
-            | Video        |
-        When I will confirm all alerts
-        And I delete all components
-        Then I see no components
+    #Scenario: I can delete Components
+    #    Given I have opened a new course in studio
+    #    And I am editing a new unit
+    #    And I add the following components:
+    #        | Component    |
+    #        | Discussion   |
+    #        | Blank HTML   |
+    #        | LaTex        |
+    #        | Blank Problem|
+    #        | Dropdown     |
+    #        | Multi Choice |
+    #        | Numerical    |
+    #        | Text Input   |
+    #        | Advanced     |
+    #        | Circuit      |
+    #        | Custom Python|
+    #        | Image Mapped |
+    #        | Math Input   |
+    #        | Problem LaTex|
+    #        | Adaptive Hint|
+    #        | Video        |
+    #    When I will confirm all alerts
+    #    And I delete all components
+    #    Then I see no components
 
     Scenario: I see a prompt on delete
         Given I have opened a new course in studio
diff --git a/cms/djangoapps/contentstore/features/course-overview.feature b/cms/djangoapps/contentstore/features/course-overview.feature
index 858572d75e27..80b400a58ef4 100644
--- a/cms/djangoapps/contentstore/features/course-overview.feature
+++ b/cms/djangoapps/contentstore/features/course-overview.feature
@@ -69,7 +69,7 @@ Feature: CMS.Course Overview
     # Safari does not have moveMouseTo implemented
     @skip_internetexplorer
     @skip_safari
-   Scenario: Notification is shown on subsection reorder
+    Scenario: Notification is shown on subsection reorder
         Given I have opened a new course section in Studio
         And I have added a new subsection
         And I have added a new subsection
diff --git a/lms/djangoapps/courseware/features/certificates.feature b/lms/djangoapps/courseware/features/certificates.feature
index 8ea68df5b156..18d1c0a19dfa 100644
--- a/lms/djangoapps/courseware/features/certificates.feature
+++ b/lms/djangoapps/courseware/features/certificates.feature
@@ -11,59 +11,54 @@ Feature: LMS.Verified certificates
 
     # There is currently no way to avoid trying to upload
     # the photos to S3 for processing
-    @skip
-    Scenario: I can submit photos to verify my identity
-        Given I am logged in
-        When I select the verified track
-        And I go to step "1"
-        And I capture my "face" photo
-        And I approve my "face" photo
-        And I go to step "2"
-        And I capture my "photo_id" photo
-        And I approve my "photo_id" photo
-        And I go to step "3"
-        And I select a contribution amount
-        And I confirm that the details match
-        And I go to step "4"
-        Then I am at the payment page
+    #Scenario: I can submit photos to verify my identity
+    #    Given I am logged in
+    #    When I select the verified track
+    #    And I go to step "1"
+    #    And I capture my "face" photo
+    #    And I approve my "face" photo
+    #    And I go to step "2"
+    #    And I capture my "photo_id" photo
+    #    And I approve my "photo_id" photo
+    #    And I go to step "3"
+    #    And I select a contribution amount
+    #    And I confirm that the details match
+    #    And I go to step "4"
+    #    Then I am at the payment page
 
     # There is currently no way to avoid trying to upload
     # the photos to S3 for processing
-    @skip
-    Scenario: I can pay for a verified certificate
-        Given I have submitted photos to verify my identity
-        When I submit valid payment information
-        Then I see that my payment was successful
+    #Scenario: I can pay for a verified certificate
+    #    Given I have submitted photos to verify my identity
+    #    When I submit valid payment information
+    #    Then I see that my payment was successful
 
 
     # There is currently no way to avoid trying to upload
     # the photos to S3 for processing
-    @skip
-    Scenario: Verified courses display correctly on dashboard
-        Given I have submitted photos to verify my identity
-        When I submit valid payment information
-        And I navigate to my dashboard
-        Then I see the course on my dashboard
-        And I see that I am on the verified track
+    #Scenario: Verified courses display correctly on dashboard
+    #    Given I have submitted photos to verify my identity
+    #    When I submit valid payment information
+    #    And I navigate to my dashboard
+    #    Then I see the course on my dashboard
+    #    And I see that I am on the verified track
 
     # Not easily automated
-    @skip
-    Scenario: I can re-take photos
-        Given I have submitted my "<PhotoType>" photo
-        When I retake my "<PhotoType>" photo
-        Then I see the new photo on the confirmation page.
-
-        Examples:
-        | PhotoType     |
-        | face          |
-        | ID            |
+    #Scenario: I can re-take photos
+    #    Given I have submitted my "<PhotoType>" photo
+    #    When I retake my "<PhotoType>" photo
+    #    Then I see the new photo on the confirmation page.
+    #
+    #    Examples:
+    #    | PhotoType     |
+    #    | face          |
+    #    | ID            |
 
     # Not yet implemented LMS-983
-    @skip
-    Scenario: I can edit identity information
-        Given I have submitted face and ID photos
-        When I edit my name
-        Then I see the new name on the confirmation page.
+    #Scenario: I can edit identity information
+    #    Given I have submitted face and ID photos
+    #    When I edit my name
+    #    Then I see the new name on the confirmation page.
 
     Scenario: I can return to the verify flow
         Given I have submitted photos to verify my identity
@@ -71,12 +66,11 @@ Feature: LMS.Verified certificates
         Then I am at the verified page
 
     # Currently broken LMS-1009
-    @skip
-    Scenario: I can pay from the return flow
-        Given I have submitted photos to verify my identity
-        When I leave the flow and return
-        And I press the payment button
-        Then I am at the payment page
+    #Scenario: I can pay from the return flow
+    #    Given I have submitted photos to verify my identity
+    #    When I leave the flow and return
+    #    And I press the payment button
+    #    Then I am at the payment page
 
     Scenario: I can take a verified certificate course for free
         Given I am logged in
diff --git a/rakelib/acceptance_test.rake b/rakelib/acceptance_test.rake
index 111ba986151d..f6fdfd9ad643 100644
--- a/rakelib/acceptance_test.rake
+++ b/rakelib/acceptance_test.rake
@@ -9,7 +9,7 @@ def run_acceptance_tests(system, harvest_args)
 
     report_file = File.join(ACCEPTANCE_REPORT_DIR, "#{system}.xml")
     report_args = "--with-xunit --xunit-file #{report_file}"
-    test_sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', '--verbosity 2', '--tag -skip', report_args, harvest_args))
+    test_sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', '--verbosity 2', report_args, harvest_args))
 end
 
 task :setup_acceptance_db do

From 667a1eadb5abd6af589b56911dfdd66664f337dc Mon Sep 17 00:00:00 2001
From: Jason Bau <jbau@stanford.edu>
Date: Mon, 23 Sep 2013 22:05:53 -0700
Subject: [PATCH 79/92] Stanford paid course registration

With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
---
 common/djangoapps/course_modes/models.py      |  11 +-
 .../course_modes/tests/test_models.py         |  18 +++
 common/djangoapps/student/tests/tests.py      |  40 +++++-
 common/djangoapps/student/views.py            |  14 ++
 lms/djangoapps/courseware/tests/test_views.py |  36 ++++-
 lms/djangoapps/courseware/views.py            |  18 +++
 lms/djangoapps/shoppingcart/exceptions.py     |  18 +++
 lms/djangoapps/shoppingcart/models.py         | 135 ++++++++++++++----
 .../shoppingcart/tests/test_models.py         | 103 +++++++++++--
 .../shoppingcart/tests/test_views.py          |   2 +-
 lms/djangoapps/shoppingcart/views.py          |  27 ++--
 lms/envs/aws.py                               |   4 +
 lms/envs/common.py                            |   7 +-
 lms/envs/test.py                              |   1 -
 lms/static/sass/application.scss.mako         |   1 +
 .../sass/multicourse/_course_about.scss       |   4 +-
 lms/static/sass/shared/_header.scss           |   7 +
 lms/static/sass/views/_shoppingcart.scss      | 103 +++++++++++++
 lms/templates/courseware/course_about.html    |  68 +++++++--
 .../emails/order_confirmation_email.txt       |  19 ++-
 lms/templates/navigation.html                 |  14 +-
 lms/templates/shoppingcart/list.html          |  87 ++++++-----
 lms/templates/shoppingcart/receipt.html       | 109 ++++++++------
 23 files changed, 694 insertions(+), 152 deletions(-)
 create mode 100644 lms/static/sass/views/_shoppingcart.scss

diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py
index cc25031935ff..fa1a687e47c6 100644
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -37,7 +37,7 @@ class CourseMode(models.Model):
     currency = models.CharField(default="usd", max_length=8)
 
     # turn this mode off after the given expiration date
-    expiration_date = models.DateField(default=None, null=True)
+    expiration_date = models.DateField(default=None, null=True, blank=True)
 
     DEFAULT_MODE = Mode('honor', _('Honor Code Certificate'), 0, '', 'usd')
     DEFAULT_MODE_SLUG = 'honor'
@@ -86,6 +86,15 @@ def mode_for_course(cls, course_id, mode_slug):
         else:
             return None
 
+    @classmethod
+    def min_course_price_for_currency(cls, course_id, currency):
+        """
+        Returns the minimum price of the course in the appropriate currency over all the course's modes.
+        If there is no mode found, will return the price of DEFAULT_MODE, which is 0
+        """
+        modes = cls.modes_for_course(course_id)
+        return min(mode.min_price for mode in modes if mode.currency == currency)
+
     def __unicode__(self):
         return u"{} : {}, min={}, prices={}".format(
             self.course_id, self.mode_slug, self.min_price, self.suggested_prices
diff --git a/common/djangoapps/course_modes/tests/test_models.py b/common/djangoapps/course_modes/tests/test_models.py
index 72aa3f2464c8..deeed6ea9ba0 100644
--- a/common/djangoapps/course_modes/tests/test_models.py
+++ b/common/djangoapps/course_modes/tests/test_models.py
@@ -73,6 +73,24 @@ def test_modes_for_course_multiple(self):
         self.assertEqual(mode2, CourseMode.mode_for_course(self.course_id, u'verified'))
         self.assertIsNone(CourseMode.mode_for_course(self.course_id, 'DNE'))
 
+    def test_min_course_price_for_currency(self):
+        """
+        Get the min course price for a course according to currency
+        """
+        # no modes, should get 0
+        self.assertEqual(0, CourseMode.min_course_price_for_currency(self.course_id, 'usd'))
+
+        # create some modes
+        mode1 = Mode(u'honor', u'Honor Code Certificate', 10, '', 'usd')
+        mode2 = Mode(u'verified', u'Verified Certificate', 20, '', 'usd')
+        mode3 = Mode(u'honor', u'Honor Code Certificate', 80, '', 'cny')
+        set_modes = [mode1, mode2, mode3]
+        for mode in set_modes:
+            self.create_mode(mode.slug, mode.name, mode.min_price, mode.suggested_prices, mode.currency)
+
+        self.assertEqual(10, CourseMode.min_course_price_for_currency(self.course_id, 'usd'))
+        self.assertEqual(80, CourseMode.min_course_price_for_currency(self.course_id, 'cny'))
+
     def test_modes_for_course_expired(self):
         expired_mode, _status = self.create_mode('verified', 'Verified Certificate')
         expired_mode.expiration_date = datetime.now(pytz.UTC) + timedelta(days=-1)
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index a6466ee9f96c..c35ad664274d 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -11,20 +11,29 @@
 
 from django.conf import settings
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.test.client import RequestFactory
 from django.contrib.auth.models import User
 from django.contrib.auth.hashers import UNUSABLE_PASSWORD
 from django.contrib.auth.tokens import default_token_generator
 from django.utils.http import int_to_base36
+from django.core.urlresolvers import reverse
 
+from xmodule.modulestore.tests.factories import CourseFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from courseware.tests.tests import TEST_DATA_MIXED_MODULESTORE
 
 from mock import Mock, patch
 from textwrap import dedent
 
 from student.models import unique_id_for_user, CourseEnrollment
-from student.views import process_survey_link, _cert_info, password_reset, password_reset_confirm_wrapper
+from student.views import (process_survey_link, _cert_info, password_reset, password_reset_confirm_wrapper,
+                           change_enrollment)
 from student.tests.factories import UserFactory
 from student.tests.test_email import mock_render_to_string
+
+import shoppingcart
+
 COURSE_1 = 'edX/toy/2012_Fall'
 COURSE_2 = 'edx/full/6.002_Spring_2012'
 
@@ -343,3 +352,32 @@ def test_activation(self):
         # for that user/course_id combination
         CourseEnrollment.enroll(user, course_id)
         self.assertTrue(CourseEnrollment.is_enrolled(user, course_id))
+
+
+@override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
+class PaidRegistrationTest(ModuleStoreTestCase):
+    """
+    Tests for paid registration functionality (not verified student), involves shoppingcart
+    """
+    # arbitrary constant
+    COURSE_SLUG = "100"
+    COURSE_NAME = "test_course"
+    COURSE_ORG = "EDX"
+
+    def setUp(self):
+        # Create course
+        self.req_factory = RequestFactory()
+        self.course = CourseFactory.create(org=self.COURSE_ORG, display_name=self.COURSE_NAME, number=self.COURSE_SLUG)
+        self.assertIsNotNone(self.course)
+        self.user = User.objects.create(username="jack", email="jack@fake.edx.org")
+
+    @unittest.skipUnless(settings.MITX_FEATURES.get('ENABLE_SHOPPING_CART'), "Shopping Cart not enabled in settings")
+    def test_change_enrollment_add_to_cart(self):
+        request = self.req_factory.post(reverse('change_enrollment'), {'course_id': self.course.id,
+                                                                       'enrollment_action': 'add_to_cart'})
+        request.user = self.user
+        response = change_enrollment(request)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.content, reverse('shoppingcart.views.show_cart'))
+        self.assertTrue(shoppingcart.models.PaidCourseRegistration.contained_in_order(
+            shoppingcart.models.Order.get_cart_for_user(self.user), self.course.id))
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 486e32c465fc..db2ce5b4a452 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -58,6 +58,7 @@
 import external_auth.views
 
 from bulk_email.models import Optout
+import shoppingcart
 
 import track.views
 
@@ -405,6 +406,19 @@ def change_enrollment(request):
 
         return HttpResponse()
 
+    elif action == "add_to_cart":
+        # Pass the request handling to shoppingcart.views
+        # The view in shoppingcart.views performs error handling and logs different errors.  But this elif clause
+        # is only used in the "auto-add after user reg/login" case, i.e. it's always wrapped in try_change_enrollment.
+        # This means there's no good way to display error messages to the user.  So we log the errors and send
+        # the user to the shopping cart page always, where they can reasonably discern the status of their cart,
+        # whether things got added, etc
+
+        shoppingcart.views.add_course_to_cart(request, course_id)
+        return HttpResponse(
+            reverse("shoppingcart.views.show_cart")
+        )
+
     elif action == "unenroll":
         try:
             CourseEnrollment.unenroll(user, course_id)
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 1c87abd3bc6e..dbf4bf1994ad 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -1,10 +1,14 @@
-from mock import MagicMock
+"""
+Tests courseware views.py
+"""
+from mock import MagicMock, patch
 import datetime
+import unittest
 
 from django.test import TestCase
 from django.http import Http404
 from django.test.utils import override_settings
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, AnonymousUser
 from django.test.client import RequestFactory
 
 from django.conf import settings
@@ -15,12 +19,14 @@
 from mitxmako.middleware import MakoMiddleware
 
 from xmodule.modulestore.django import modulestore, clear_existing_modulestores
+from xmodule.modulestore.tests.factories import CourseFactory
 
 import courseware.views as views
 from xmodule.modulestore import Location
 from pytz import UTC
 from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
 from course_modes.models import CourseMode
+import shoppingcart
 
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
@@ -78,6 +84,32 @@ def setUp(self):
         chapter = 'Overview'
         self.chapter_url = '%s/%s/%s' % ('/courses', self.course_id, chapter)
 
+    @unittest.skipUnless(settings.MITX_FEATURES.get('ENABLE_SHOPPING_CART'), "Shopping Cart not enabled in settings")
+    @patch.dict(settings.MITX_FEATURES, {'ENABLE_PAID_COURSE_REGISTRATION': True})
+    def test_course_about_in_cart(self):
+        in_cart_span = '<span class="add-to-cart">'
+        # don't mock this course due to shopping cart existence checking
+        course = CourseFactory.create(org="new", number="unenrolled", display_name="course")
+        request = self.request_factory.get(reverse('about_course', args=[course.id]))
+        request.user = AnonymousUser()
+        response = views.course_about(request, course.id)
+        self.assertEqual(response.status_code, 200)
+        self.assertNotIn(in_cart_span, response.content)
+
+        # authenticated user with nothing in cart
+        request.user = self.user
+        response = views.course_about(request, course.id)
+        self.assertEqual(response.status_code, 200)
+        self.assertNotIn(in_cart_span, response.content)
+
+        # now add the course to the cart
+        cart = shoppingcart.models.Order.get_cart_for_user(self.user)
+        shoppingcart.models.PaidCourseRegistration.add_to_order(cart, course.id)
+        response = views.course_about(request, course.id)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(in_cart_span, response.content)
+
+
     def test_user_groups(self):
         # depreciated function
         mock_user = MagicMock()
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 66c91f1b9bea..4488b510d05c 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -36,6 +36,7 @@
 from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundError, NoPathToItem
 from xmodule.modulestore.search import path_to_location
 from xmodule.course_module import CourseDescriptor
+import shoppingcart
 
 import comment_client
 
@@ -604,10 +605,27 @@ def course_about(request, course_id):
     show_courseware_link = (has_access(request.user, course, 'load') or
                             settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'))
 
+    # Note: this is a flow for payment for course registration, not the Verified Certificate flow.
+    registration_price = 0
+    in_cart = False
+    reg_then_add_to_cart_link = ""
+    if settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION'):
+        registration_price = CourseMode.min_course_price_for_currency(course_id,
+                                                                      settings.PAID_COURSE_REGISTRATION_CURRENCY[0])
+        if request.user.is_authenticated():
+            cart = shoppingcart.models.Order.get_cart_for_user(request.user)
+            in_cart = shoppingcart.models.PaidCourseRegistration.contained_in_order(cart, course_id)
+
+        reg_then_add_to_cart_link = "{reg_url}?course_id={course_id}&enrollment_action=add_to_cart".format(
+            reg_url=reverse('register_user'), course_id=course.id)
+
     return render_to_response('courseware/course_about.html',
                               {'course': course,
                                'registered': registered,
                                'course_target': course_target,
+                               'registration_price': registration_price,
+                               'in_cart': in_cart,
+                               'reg_then_add_to_cart_link': reg_then_add_to_cart_link,
                                'show_courseware_link': show_courseware_link})
 
 
diff --git a/lms/djangoapps/shoppingcart/exceptions.py b/lms/djangoapps/shoppingcart/exceptions.py
index 029dc079bb27..a40c2e9feba9 100644
--- a/lms/djangoapps/shoppingcart/exceptions.py
+++ b/lms/djangoapps/shoppingcart/exceptions.py
@@ -1,3 +1,9 @@
+"""
+Exceptions for the shoppingcart app
+"""
+# (Exception Class Names are sort of self-explanatory, so skipping docstring requirement)
+# pylint: disable=C0111
+
 class PaymentException(Exception):
     pass
 
@@ -8,3 +14,15 @@ class PurchasedCallbackException(PaymentException):
 
 class InvalidCartItem(PaymentException):
     pass
+
+
+class ItemAlreadyInCartException(InvalidCartItem):
+    pass
+
+
+class AlreadyEnrolledInCourseException(InvalidCartItem):
+    pass
+
+
+class CourseDoesNotExistException(InvalidCartItem):
+    pass
diff --git a/lms/djangoapps/shoppingcart/models.py b/lms/djangoapps/shoppingcart/models.py
index 368a327fc903..9ae11f6554aa 100644
--- a/lms/djangoapps/shoppingcart/models.py
+++ b/lms/djangoapps/shoppingcart/models.py
@@ -2,7 +2,10 @@
 import pytz
 import logging
 import smtplib
-import textwrap
+
+from model_utils.managers import InheritanceManager
+from collections import namedtuple
+from boto.exception import BotoServerError  # this is a super-class of SESError and catches connection errors
 
 from django.db import models
 from django.conf import settings
@@ -11,19 +14,20 @@
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 from django.db import transaction
-from model_utils.managers import InheritanceManager
+from django.core.urlresolvers import reverse
+
+from xmodule.modulestore.django import modulestore
+from xmodule.course_module import CourseDescriptor
+from xmodule.modulestore.exceptions import ItemNotFoundError
 
 from course_modes.models import CourseMode
-from courseware.courses import get_course_about_section
 from mitxmako.shortcuts import render_to_string
 from student.views import course_from_id
 from student.models import CourseEnrollment
-from dogapi import dog_stats_api
 from verify_student.models import SoftwareSecurePhotoVerification
-from xmodule.modulestore.django import modulestore
-from xmodule.course_module import CourseDescriptor
 
-from .exceptions import InvalidCartItem, PurchasedCallbackException
+from .exceptions import (InvalidCartItem, PurchasedCallbackException, ItemAlreadyInCartException,
+                         AlreadyEnrolledInCourseException, CourseDoesNotExistException)
 
 log = logging.getLogger("shoppingcart")
 
@@ -33,6 +37,9 @@
     ('refunded', 'refunded'),  # Not used for now
 )
 
+# we need a tuple to represent the primary key of various OrderItem subclasses
+OrderItemSubclassPK = namedtuple('OrderItemSubclassPK', ['cls', 'pk'])  # pylint: disable=C0103
+
 
 class Order(models.Model):
     """
@@ -72,13 +79,30 @@ def get_cart_for_user(cls, user):
             cart_order, _created = cls.objects.get_or_create(user=user, status='cart')
         return cart_order
 
+    @classmethod
+    def user_cart_has_items(cls, user):
+        """
+        Returns true if the user (anonymous user ok) has
+        a cart with items in it.  (Which means it should be displayed.
+        """
+        if not user.is_authenticated():
+            return False
+        cart = cls.get_cart_for_user(user)
+        return cart.has_items()
+
     @property
     def total_cost(self):
         """
         Return the total cost of the cart.  If the order has been purchased, returns total of
         all purchased and not refunded items.
         """
-        return sum(i.line_cost for i in self.orderitem_set.filter(status=self.status))
+        return sum(i.line_cost for i in self.orderitem_set.filter(status=self.status))  # pylint: disable=E1101
+
+    def has_items(self):
+        """
+        Does the cart have any items in it?
+        """
+        return self.orderitem_set.exists()  # pylint: disable=E1101
 
     def clear(self):
         """
@@ -135,13 +159,31 @@ def purchase(self, first='', last='', street1='', street2='', city='', state='',
         subject = _("Order Payment Confirmation")
         message = render_to_string('emails/order_confirmation_email.txt', {
             'order': self,
-            'order_items': orderitems
+            'order_items': orderitems,
+            'has_billing_info': settings.MITX_FEATURES['STORE_BILLING_INFO']
         })
         try:
             send_mail(subject, message,
-                      settings.DEFAULT_FROM_EMAIL, [self.user.email])
-        except smtplib.SMTPException:
-            log.error('Failed sending confirmation e-mail for order %d', self.id)
+                      settings.DEFAULT_FROM_EMAIL, [self.user.email])  # pylint: disable=E1101
+        except (smtplib.SMTPException, BotoServerError):  # sadly need to handle diff. mail backends individually
+            log.error('Failed sending confirmation e-mail for order %d', self.id)  # pylint: disable=E1101
+
+    def generate_receipt_instructions(self):
+        """
+        Call to generate specific instructions for each item in the order.  This gets displayed on the receipt
+        page, typically.  Instructions are something like "visit your dashboard to see your new courses".
+        This will return two things in a pair.  The first will be a dict with keys=OrderItemSubclassPK corresponding
+        to an OrderItem and values=a set of html instructions they generate.  The second will be a set of de-duped
+        html instructions
+        """
+        instruction_set = set([])  # heh. not ia32 or alpha or sparc
+        instruction_dict = {}
+        order_items = OrderItem.objects.filter(order=self).select_subclasses()
+        for item in order_items:
+            item_pk_with_subclass, set_of_html = item.generate_receipt_instructions()
+            instruction_dict[item_pk_with_subclass] = set_of_html
+            instruction_set.update(set_of_html)
+        return instruction_dict, instruction_set
 
 
 class OrderItem(models.Model):
@@ -202,6 +244,22 @@ def purchased_callback(self):
         """
         raise NotImplementedError
 
+    def generate_receipt_instructions(self):
+        """
+        This is called on each item in a purchased order to generate receipt instructions.
+        This should return a list of `ReceiptInstruction`s in HTML string
+        Default implementation is to return an empty set
+        """
+        return self.pk_with_subclass, set([])
+
+    @property
+    def pk_with_subclass(self):
+        """
+        Returns a named tuple that annotates the pk of this instance with its class, to fully represent
+        a pk of a subclass (inclusive) of OrderItem
+        """
+        return OrderItemSubclassPK(type(self), self.pk)
+
     @property
     def single_item_receipt_template(self):
         """
@@ -235,9 +293,9 @@ class PaidCourseRegistration(OrderItem):
     mode = models.SlugField(default=CourseMode.DEFAULT_MODE_SLUG)
 
     @classmethod
-    def part_of_order(cls, order, course_id):
+    def contained_in_order(cls, order, course_id):
         """
-        Is the course defined by course_id in the order?
+        Is the course defined by course_id contained in the order?
         """
         return course_id in [item.paidcourseregistration.course_id
                              for item in order.orderitem_set.all().select_subclasses("paidcourseregistration")]
@@ -251,10 +309,26 @@ def add_to_order(cls, order, course_id, mode_slug=CourseMode.DEFAULT_MODE_SLUG,
 
         Returns the order item
         """
-        # TODO: Possibly add checking for whether student is already enrolled in course
-        course = course_from_id(course_id)  # actually fetch the course to make sure it exists, use this to
-                                            # throw errors if it doesn't
-
+        # First a bunch of sanity checks
+        try:
+            course = course_from_id(course_id)  # actually fetch the course to make sure it exists, use this to
+                                                # throw errors if it doesn't
+        except ItemNotFoundError:
+            log.error("User {} tried to add non-existent course {} to cart id {}"
+                      .format(order.user.email, course_id, order.id))
+            raise CourseDoesNotExistException
+
+        if cls.contained_in_order(order, course_id):
+            log.warning("User {} tried to add PaidCourseRegistration for course {}, already in cart id {}"
+                        .format(order.user.email, course_id, order.id))
+            raise ItemAlreadyInCartException
+
+        if CourseEnrollment.is_enrolled(user=order.user, course_id=course_id):
+            log.warning("User {} trying to add course {} to cart id {}, already registered"
+                        .format(order.user.email, course_id, order.id))
+            raise AlreadyEnrolledInCourseException
+
+        ### Validations done, now proceed
         ### handle default arguments for mode_slug, cost, currency
         course_mode = CourseMode.mode_for_course(course_id, mode_slug)
         if not course_mode:
@@ -273,12 +347,13 @@ def add_to_order(cls, order, course_id, mode_slug=CourseMode.DEFAULT_MODE_SLUG,
         item.mode = course_mode.slug
         item.qty = 1
         item.unit_cost = cost
-        item.line_desc = 'Registration for Course: {0}. Mode: {1}'.format(get_course_about_section(course, "title"),
-                                                                          course_mode.name)
+        item.line_desc = 'Registration for Course: {0}'.format(course.display_name_with_default)
         item.currency = currency
         order.currency = currency
         order.save()
         item.save()
+        log.info("User {} added course registration {} to cart: order {}"
+                 .format(order.user.email, course_id, order.id))
         return item
 
     def purchased_callback(self):
@@ -301,14 +376,18 @@ def purchased_callback(self):
 
         CourseEnrollment.enroll(user=self.user, course_id=self.course_id, mode=self.mode)
 
-        log.info("Enrolled {0} in paid course {1}, paid ${2}".format(self.user.email, self.course_id, self.line_cost))
-        org, course_num, run = self.course_id.split("/")
-        dog_stats_api.increment(
-            "shoppingcart.PaidCourseRegistration.purchased_callback.enrollment",
-            tags=["org:{0}".format(org),
-                  "course:{0}".format(course_num),
-                  "run:{0}".format(run)]
-        )
+        log.info("Enrolled {0} in paid course {1}, paid ${2}"
+                 .format(self.user.email, self.course_id, self.line_cost))  # pylint: disable=E1101
+
+    def generate_receipt_instructions(self):
+        """
+        Generates instructions when the user has purchased a PaidCourseRegistration.
+        Basically tells the user to visit the dashboard to see their new classes
+        """
+        notification = (_('Please visit your <a href="{dashboard_link}">dashboard</a> to see your new enrollments.')
+                        .format(dashboard_link=reverse('dashboard')))
+
+        return self.pk_with_subclass, set([notification])
 
 
 class CertificateItem(OrderItem):
diff --git a/lms/djangoapps/shoppingcart/tests/test_models.py b/lms/djangoapps/shoppingcart/tests/test_models.py
index f14599714593..1224bb5093b3 100644
--- a/lms/djangoapps/shoppingcart/tests/test_models.py
+++ b/lms/djangoapps/shoppingcart/tests/test_models.py
@@ -1,19 +1,21 @@
 """
 Tests for the Shopping Cart Models
 """
+import smtplib
+from boto.exception import BotoServerError  # this is a super-class of SESError and catches connection errors
 
-from factory import DjangoModelFactory
-from mock import patch
+from mock import patch, MagicMock
 from django.core import mail
 from django.conf import settings
 from django.db import DatabaseError
 from django.test import TestCase
 from django.test.utils import override_settings
-
+from django.contrib.auth.models import AnonymousUser
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
-from shoppingcart.models import Order, OrderItem, CertificateItem, InvalidCartItem, PaidCourseRegistration
+from shoppingcart.models import (Order, OrderItem, CertificateItem, InvalidCartItem, PaidCourseRegistration,
+                                 OrderItemSubclassPK)
 from student.tests.factories import UserFactory
 from student.models import CourseEnrollment
 from course_modes.models import CourseMode
@@ -39,13 +41,24 @@ def test_get_cart_for_user(self):
         cart2 = Order.get_cart_for_user(user=self.user)
         self.assertEquals(cart2.orderitem_set.count(), 1)
 
+    def test_user_cart_has_items(self):
+        anon = AnonymousUser()
+        self.assertFalse(Order.user_cart_has_items(anon))
+        self.assertFalse(Order.user_cart_has_items(self.user))
+        cart = Order.get_cart_for_user(self.user)
+        item = OrderItem(order=cart, user=self.user)
+        item.save()
+        self.assertTrue(Order.user_cart_has_items(self.user))
+
     def test_cart_clear(self):
         cart = Order.get_cart_for_user(user=self.user)
         CertificateItem.add_to_order(cart, self.course_id, self.cost, 'honor')
         CertificateItem.add_to_order(cart, 'org/test/Test_Course_1', self.cost, 'honor')
         self.assertEquals(cart.orderitem_set.count(), 2)
+        self.assertTrue(cart.has_items())
         cart.clear()
         self.assertEquals(cart.orderitem_set.count(), 0)
+        self.assertFalse(cart.has_items())
 
     def test_add_item_to_cart_currency_match(self):
         cart = Order.get_cart_for_user(user=self.user)
@@ -111,6 +124,22 @@ def test_purchase_twice(self):
         cart.purchase()
         self.assertEquals(len(mail.outbox), 1)
 
+    @patch('shoppingcart.models.log.error')
+    def test_purchase_item_email_smtp_failure(self, error_logger):
+        cart = Order.get_cart_for_user(user=self.user)
+        CertificateItem.add_to_order(cart, self.course_id, self.cost, 'honor')
+        with patch('shoppingcart.models.send_mail', side_effect=smtplib.SMTPException):
+            cart.purchase()
+            self.assertTrue(error_logger.called)
+
+    @patch('shoppingcart.models.log.error')
+    def test_purchase_item_email_boto_failure(self, error_logger):
+        cart = Order.get_cart_for_user(user=self.user)
+        CertificateItem.add_to_order(cart, self.course_id, self.cost, 'honor')
+        with patch('shoppingcart.models.send_mail', side_effect=BotoServerError("status", "reason")):
+            cart.purchase()
+            self.assertTrue(error_logger.called)
+
     def purchase_with_data(self, cart):
         """ purchase a cart with billing information """
         CertificateItem.add_to_order(cart, self.course_id, self.cost, 'honor')
@@ -127,8 +156,9 @@ def purchase_with_data(self, cart):
             cardtype='001',
         )
 
+    @patch('shoppingcart.models.render_to_string')
     @patch.dict(settings.MITX_FEATURES, {'STORE_BILLING_INFO': True})
-    def test_billing_info_storage_on(self):
+    def test_billing_info_storage_on(self, render):
         cart = Order.get_cart_for_user(self.user)
         self.purchase_with_data(cart)
         self.assertNotEqual(cart.bill_to_first, '')
@@ -141,9 +171,12 @@ def test_billing_info_storage_on(self):
         self.assertNotEqual(cart.bill_to_city, '')
         self.assertNotEqual(cart.bill_to_state, '')
         self.assertNotEqual(cart.bill_to_country, '')
+        ((_, context), _) = render.call_args
+        self.assertTrue(context['has_billing_info'])
 
+    @patch('shoppingcart.models.render_to_string')
     @patch.dict(settings.MITX_FEATURES, {'STORE_BILLING_INFO': False})
-    def test_billing_info_storage_off(self):
+    def test_billing_info_storage_off(self, render):
         cart = Order.get_cart_for_user(self.user)
         self.purchase_with_data(cart)
         self.assertNotEqual(cart.bill_to_first, '')
@@ -157,13 +190,30 @@ def test_billing_info_storage_off(self):
         self.assertEqual(cart.bill_to_street2, '')
         self.assertEqual(cart.bill_to_ccnum, '')
         self.assertEqual(cart.bill_to_cardtype, '')
+        ((_, context), _) = render.call_args
+        self.assertFalse(context['has_billing_info'])
+
+    mock_gen_inst = MagicMock(return_value=(OrderItemSubclassPK(OrderItem, 1), set([])))
+
+    def test_generate_receipt_instructions_callchain(self):
+        """
+        This tests the generate_receipt_instructions call chain (ie calling the function on the
+        cart also calls it on items in the cart
+        """
+        cart = Order.get_cart_for_user(self.user)
+        item = OrderItem(user=self.user, order=cart)
+        item.save()
+        self.assertTrue(cart.has_items())
+        with patch.object(OrderItem, 'generate_receipt_instructions', self.mock_gen_inst):
+            cart.generate_receipt_instructions()
+            self.mock_gen_inst.assert_called_with()
 
 
 class OrderItemTest(TestCase):
     def setUp(self):
         self.user = UserFactory.create()
 
-    def test_orderItem_purchased_callback(self):
+    def test_order_item_purchased_callback(self):
         """
         This tests that calling purchased_callback on the base OrderItem class raises NotImplementedError
         """
@@ -171,6 +221,19 @@ def test_orderItem_purchased_callback(self):
         with self.assertRaises(NotImplementedError):
             item.purchased_callback()
 
+    def test_order_item_generate_receipt_instructions(self):
+        """
+        This tests that the generate_receipt_instructions call chain and also
+        that calling it on the base OrderItem class returns an empty list
+        """
+        cart = Order.get_cart_for_user(self.user)
+        item = OrderItem(user=self.user, order=cart)
+        item.save()
+        self.assertTrue(cart.has_items())
+        (inst_dict, inst_set) = cart.generate_receipt_instructions()
+        self.assertDictEqual({item.pk_with_subclass: set([])}, inst_dict)
+        self.assertEquals(set([]), inst_set)
+
 
 @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class PaidCourseRegistrationTest(ModuleStoreTestCase):
@@ -195,8 +258,8 @@ def test_add_to_order(self):
         self.assertEqual(reg1.mode, "honor")
         self.assertEqual(reg1.user, self.user)
         self.assertEqual(reg1.status, "cart")
-        self.assertTrue(PaidCourseRegistration.part_of_order(self.cart, self.course_id))
-        self.assertFalse(PaidCourseRegistration.part_of_order(self.cart, self.course_id + "abcd"))
+        self.assertTrue(PaidCourseRegistration.contained_in_order(self.cart, self.course_id))
+        self.assertFalse(PaidCourseRegistration.contained_in_order(self.cart, self.course_id + "abcd"))
         self.assertEqual(self.cart.total_cost, self.cost)
 
     def test_add_with_default_mode(self):
@@ -212,7 +275,7 @@ def test_add_with_default_mode(self):
         self.assertEqual(reg1.user, self.user)
         self.assertEqual(reg1.status, "cart")
         self.assertEqual(self.cart.total_cost, 0)
-        self.assertTrue(PaidCourseRegistration.part_of_order(self.cart, self.course_id))
+        self.assertTrue(PaidCourseRegistration.contained_in_order(self.cart, self.course_id))
 
     def test_purchased_callback(self):
         reg1 = PaidCourseRegistration.add_to_order(self.cart, self.course_id)
@@ -221,6 +284,26 @@ def test_purchased_callback(self):
         reg1 = PaidCourseRegistration.objects.get(id=reg1.id)  # reload from DB to get side-effect
         self.assertEqual(reg1.status, "purchased")
 
+    def test_generate_receipt_instructions(self):
+        """
+        Add 2 courses to the order and make sure the instruction_set only contains 1 element (no dups)
+        """
+        course2 = CourseFactory.create(org='MITx', number='998', display_name='Robot Duper Course')
+        course_mode2 = CourseMode(course_id=course2.id,
+                                  mode_slug="honor",
+                                  mode_display_name="honor cert",
+                                  min_price=self.cost)
+        course_mode2.save()
+        pr1 = PaidCourseRegistration.add_to_order(self.cart, self.course_id)
+        pr2 = PaidCourseRegistration.add_to_order(self.cart, course2.id)
+        self.cart.purchase()
+        inst_dict, inst_set = self.cart.generate_receipt_instructions()
+        self.assertEqual(2, len(inst_dict))
+        self.assertEqual(1, len(inst_set))
+        self.assertIn("dashboard", inst_set.pop())
+        self.assertIn(pr1.pk_with_subclass, inst_dict)
+        self.assertIn(pr2.pk_with_subclass, inst_dict)
+
     def test_purchased_callback_exception(self):
         reg1 = PaidCourseRegistration.add_to_order(self.cart, self.course_id)
         reg1.course_id = "changedforsomereason"
diff --git a/lms/djangoapps/shoppingcart/tests/test_views.py b/lms/djangoapps/shoppingcart/tests/test_views.py
index 8c124901c114..d60cab78d90e 100644
--- a/lms/djangoapps/shoppingcart/tests/test_views.py
+++ b/lms/djangoapps/shoppingcart/tests/test_views.py
@@ -85,7 +85,7 @@ def test_add_course_to_cart_success(self):
         self.login_user()
         resp = self.client.post(reverse('shoppingcart.views.add_course_to_cart', args=[self.course_id]))
         self.assertEqual(resp.status_code, 200)
-        self.assertTrue(PaidCourseRegistration.part_of_order(self.cart, self.course_id))
+        self.assertTrue(PaidCourseRegistration.contained_in_order(self.cart, self.course_id))
 
 
     @patch('shoppingcart.views.render_purchase_form_html', form_mock)
diff --git a/lms/djangoapps/shoppingcart/views.py b/lms/djangoapps/shoppingcart/views.py
index 8930136b802d..8c6d61d532e5 100644
--- a/lms/djangoapps/shoppingcart/views.py
+++ b/lms/djangoapps/shoppingcart/views.py
@@ -6,30 +6,33 @@
 from django.core.urlresolvers import reverse
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.decorators import login_required
-from student.models import CourseEnrollment
-from xmodule.modulestore.exceptions import ItemNotFoundError
 from mitxmako.shortcuts import render_to_response
-from .models import Order, PaidCourseRegistration, CertificateItem, OrderItem
+from .models import Order, PaidCourseRegistration, OrderItem
 from .processors import process_postpay_callback, render_purchase_form_html
+from .exceptions import ItemAlreadyInCartException, AlreadyEnrolledInCourseException, CourseDoesNotExistException
 
 log = logging.getLogger("shoppingcart")
 
 
+@require_POST
 def add_course_to_cart(request, course_id):
+    """
+    Adds course specified by course_id to the cart.  The model function add_to_order does all the
+    heavy lifting (logging, error checking, etc)
+    """
     if not request.user.is_authenticated():
+        log.info("Anon user trying to add course {} to cart".format(course_id))
         return HttpResponseForbidden(_('You must be logged-in to add to a shopping cart'))
     cart = Order.get_cart_for_user(request.user)
-    if PaidCourseRegistration.part_of_order(cart, course_id):
-        return HttpResponseBadRequest(_('The course {0} is already in your cart.'.format(course_id)))
-    if CourseEnrollment.is_enrolled(user=request.user, course_id=course_id):
-        return HttpResponseBadRequest(_('You are already registered in course {0}.'.format(course_id)))
-
+    # All logging from here handled by the model
     try:
         PaidCourseRegistration.add_to_order(cart, course_id)
-    except ItemNotFoundError:
+    except CourseDoesNotExistException:
         return HttpResponseNotFound(_('The course you requested does not exist.'))
-    if request.method == 'GET':  # This is temporary for testing purposes and will go away before we pull
-        return HttpResponseRedirect(reverse('shoppingcart.views.show_cart'))
+    except ItemAlreadyInCartException:
+        return HttpResponseBadRequest(_('The course {0} is already in your cart.'.format(course_id)))
+    except AlreadyEnrolledInCourseException:
+        return HttpResponseBadRequest(_('You are already registered in course {0}.'.format(course_id)))
     return HttpResponse(_("Course added to cart."))
 
 
@@ -103,12 +106,14 @@ def show_receipt(request, ordernum):
     order_items = OrderItem.objects.filter(order=order).select_subclasses()
     any_refunds = any(i.status == "refunded" for i in order_items)
     receipt_template = 'shoppingcart/receipt.html'
+    __, instructions = order.generate_receipt_instructions()
     # we want to have the ability to override the default receipt page when
     # there is only one item in the order
     context = {
         'order': order,
         'order_items': order_items,
         'any_refunds': any_refunds,
+        'instructions': instructions,
     }
 
     if order_items.count() == 1:
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 1d012e4ca035..86d3d539bd5c 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -100,6 +100,8 @@
     ENV_TOKENS = json.load(env_file)
 
 PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
+# For displaying on the receipt. At Stanford PLATFORM_NAME != MERCHANT_NAME, but PLATFORM_NAME is a fine default
+CC_MERCHANT_NAME = ENV_TOKENS.get('CC_MERCHANT_NAME', PLATFORM_NAME)
 EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND)
 EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None)
 EMAIL_HOST = ENV_TOKENS.get('EMAIL_HOST', 'localhost')  # django default is localhost
@@ -136,6 +138,8 @@
 CONTACT_EMAIL = ENV_TOKENS.get('CONTACT_EMAIL', CONTACT_EMAIL)
 BUGS_EMAIL = ENV_TOKENS.get('BUGS_EMAIL', BUGS_EMAIL)
 PAYMENT_SUPPORT_EMAIL = ENV_TOKENS.get('PAYMENT_SUPPORT_EMAIL', PAYMENT_SUPPORT_EMAIL)
+PAID_COURSE_REGISTRATION_CURRENCY = ENV_TOKENS.get('PAID_COURSE_REGISTRATION_CURRENCY',
+                                                   PAID_COURSE_REGISTRATION_CURRENCY)
 
 #Theme overrides
 THEME_NAME = ENV_TOKENS.get('THEME_NAME', None)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 47f0083957ae..941809b82fb1 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -36,6 +36,7 @@
 ################################### FEATURES ###################################
 # The display name of the platform to be used in templates/emails/etc.
 PLATFORM_NAME = "edX"
+CC_MERCHANT_NAME = PLATFORM_NAME
 
 COURSEWARE_ENABLED = True
 ENABLE_JASMINE = False
@@ -171,6 +172,9 @@
 
     # Toggle storing detailed billing information
     'STORE_BILLING_INFO': False,
+
+    # Enable flow for payments for course registration (DIFFERENT from verified student flow)
+    'ENABLE_PAID_COURSE_REGISTRATION': False,
 }
 
 # Used for A/B testing
@@ -500,7 +504,8 @@
         'PURCHASE_ENDPOINT': '',
     }
 }
-
+# Setting for PAID_COURSE_REGISTRATION, DOES NOT AFFECT VERIFIED STUDENTS
+PAID_COURSE_REGISTRATION_CURRENCY = ['usd', '$']
 ################################# open ended grading config  #####################
 
 #By setting up the default settings with an incorrect user name and password,
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 45e934ec1f21..30475e26a0e8 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -165,7 +165,6 @@
 ###################### Payment ##############################3
 # Enable fake payment processing page
 MITX_FEATURES['ENABLE_PAYMENT_FAKE'] = True
-
 # Configure the payment processor to use the fake processing page
 # Since both the fake payment page and the shoppingcart app are using
 # the same settings, we can generate this randomly and guarantee
diff --git a/lms/static/sass/application.scss.mako b/lms/static/sass/application.scss.mako
index 2753edda0cd3..a5007481218b 100644
--- a/lms/static/sass/application.scss.mako
+++ b/lms/static/sass/application.scss.mako
@@ -48,6 +48,7 @@
 
 // base - specific views
 @import 'views/verification';
+@import 'views/shoppingcart';
 
 // shared - course
 @import 'shared/forms';
diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss
index 4f1831cc7ffc..26bafff87df9 100644
--- a/lms/static/sass/multicourse/_course_about.scss
+++ b/lms/static/sass/multicourse/_course_about.scss
@@ -98,7 +98,7 @@
           @include transition(all 0.15s linear 0s);
           width: flex-grid(12);
 
-          > a.find-courses, a.register {
+          > a.find-courses, a.register, a.add-to-cart {
             @include button(shiny, $button-color);
             @include box-sizing(border-box);
             border-radius: 3px;
@@ -139,7 +139,7 @@
             }
           }
 
-          span.register {
+          span.register, span.add-to-cart {
             background: $button-archive-color;
             border: 1px solid darken($button-archive-color, 50%);
             @include box-sizing(border-box);
diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss
index a649cb43d950..b3ca2077f0a9 100644
--- a/lms/static/sass/shared/_header.scss
+++ b/lms/static/sass/shared/_header.scss
@@ -123,6 +123,13 @@ header.global {
             border-radius: 0 4px 4px 0;
             border-left: none;
             padding: 5px 8px 7px 8px;
+            
+            &.shopping-cart {
+              border-radius: 4px;
+              border: 1px solid $border-color-2;
+              margin-right: 10px;
+              padding-bottom: 6px;
+            }
           }
         }
       }
diff --git a/lms/static/sass/views/_shoppingcart.scss b/lms/static/sass/views/_shoppingcart.scss
new file mode 100644
index 000000000000..d6861fb45630
--- /dev/null
+++ b/lms/static/sass/views/_shoppingcart.scss
@@ -0,0 +1,103 @@
+// lms - views - shopping cart
+// ====================
+
+.notification {
+  padding: 30px 30px 0 30px;
+}
+
+.cart-list {
+  padding: 30px;
+  margin-top: 40px;
+  border-radius: 3px;
+  border: 1px solid $border-color-1;
+  background-color: $action-primary-fg;
+  
+  > h2 {
+    font-size: 1.5em;
+    color: $base-font-color;
+  }
+  
+  .cart-table {
+    width: 100%;
+    
+    .cart-headings {
+      height: 35px;
+      
+      th {
+        text-align: left;
+        padding-left: 5px;
+        border-bottom: 1px solid $border-color-1;
+        
+        &.qty {
+          width: 100px;
+        }
+        &.u-pr {
+          width: 100px;
+        }
+        &.prc {
+          width: 150px;
+        }
+        &.cur {
+          width: 100px;
+        }
+      }
+    }
+    
+    .cart-items {
+      td {
+        padding: 10px 25px;
+      }
+    }
+    
+    .cart-totals {
+      td {
+        &.cart-total-cost {
+          font-size: 1.25em;
+          font-weight: bold;
+          padding: 10px 25px;
+        }
+      }
+    }
+  }
+  
+  table.order-receipt {
+    width: 100%;
+    
+    .order-number {
+      font-weight: bold;
+    }
+    .order-date {
+      text-align: right;
+    }
+    .items-ordered {
+      padding-top: 50px;
+    }
+    
+    tr {
+      
+    }
+    
+    th {
+      text-align: left;
+      padding: 25px 0 15px 0;
+      
+      &.qty {
+        width: 50px;
+      }
+      &.u-pr {
+        width: 100px;
+      }
+      &.pri {
+        width: 125px;
+      }
+      &.curr {
+        width: 75px;
+      }
+    }
+    tr.order-item {
+      td {
+        padding-bottom: 10px;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html
index 6abcd2998a82..e63003b3ee26 100644
--- a/lms/templates/courseware/course_about.html
+++ b/lms/templates/courseware/course_about.html
@@ -3,6 +3,8 @@
   from django.core.urlresolvers import reverse
   from courseware.courses import course_image_url, get_course_about_section
   from courseware.access import has_access
+
+  cart_link = reverse('shoppingcart.views.show_cart')
 %>
 <%namespace name='static' file='../static_content.html'/>
 
@@ -24,6 +26,29 @@
       $("#class_enroll_form").submit();
       event.preventDefault();
     });
+    add_course_complete_handler = function(jqXHR, textStatus) {
+      if (jqXHR.status == 200) {
+        location.href = "${cart_link}";
+      }
+      if (jqXHR.status == 400) {
+        $("#register_error")
+          .html(jqXHR.responseText ? jqXHR.responseText : "${_('An error occurred. Please try again later.')}")
+          .css("display", "block");
+      }
+      else if (jqXHR.status == 403) {
+          location.href = "${reg_then_add_to_cart_link}";
+      }
+    };
+    $("#add_to_cart_post").click(function(event){
+      $.ajax({
+        url: "${reverse('add_course_to_cart', args=[course.id])}",
+        type: "POST",
+        /* Rant: HAD TO USE COMPLETE B/C PROMISE.DONE FOR SOME REASON DOES NOT WORK ON THIS PAGE. */
+        complete: add_course_complete_handler
+      })
+      event.preventDefault();
+    });
+
 
     ## making the conditional around this entire JS block for sanity
     %if settings.MITX_FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
@@ -88,19 +113,42 @@ <h1>
 
         <div class="main-cta">
         %if user.is_authenticated() and registered:
-	              %if show_courseware_link:
-                    <a href="${course_target}">
-                %endif
+          %if show_courseware_link:
+            <a href="${course_target}">
+          %endif
 
-                <span class="register disabled">${_("You are registered for this course {course.display_number_with_default}").format(course=course) | h}</span>
-                %if show_courseware_link:
-                    <strong>${_("View Courseware")}</strong>
-                    </a>
-                %endif
+          <span class="register disabled">
+            ${_("You are registered for this course {course.display_number_with_default}").format(course=course) | h}
+          </span>
+          %if show_courseware_link:
+            <strong>${_("View Courseware")}</strong>
+            </a>
+          %endif
 
+        %elif in_cart:
+          <span class="add-to-cart">
+            ${_('This course is in your <a href="{cart_link}">cart</a>.').format(cart_link=cart_link)}
+          </span>
+        %elif settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION') and registration_price:
+          <%
+          if user.is_authenticated():
+            reg_href = "#"
+            reg_element_id = "add_to_cart_post"
+          else:
+            reg_href = reg_then_add_to_cart_link
+            reg_element_id = "reg_then_add_to_cart"
+          %>
+          <a href="${reg_href}" class="add-to-cart" id="${reg_element_id}">
+            ${_("Add {course.display_number_with_default} to Cart ({currency_symbol}{cost})")\
+              .format(course=course, currency_symbol=settings.PAID_COURSE_REGISTRATION_CURRENCY[1],
+                      cost=registration_price)}
+          </a>
+          <div id="register_error"></div>
         %else:
-            <a href="#" class="register">${_("Register for {course.display_number_with_default}").format(course=course) | h}</a>
-            <div id="register_error"></div>
+          <a href="#" class="register">
+            ${_("Register for {course.display_number_with_default}").format(course=course) | h}
+          </a>
+          <div id="register_error"></div>
         %endif
         </div>
 
diff --git a/lms/templates/emails/order_confirmation_email.txt b/lms/templates/emails/order_confirmation_email.txt
index 74f945b06ad9..65c0e3a67e71 100644
--- a/lms/templates/emails/order_confirmation_email.txt
+++ b/lms/templates/emails/order_confirmation_email.txt
@@ -1,8 +1,13 @@
 <%! from django.utils.translation import ugettext as _ %>
 ${_("Hi {name}").format(name=order.user.profile.name)}
 
-${_("Your payment was successful. You will see the charge below on your next credit or debit card statement. The charge will show up on your statement under the company name {platform_name}. If you have billing questions, please read the FAQ ({faq_url}) or contact {billing_email}.").format(platform_name=settings.PLATFORM_NAME, billing_email=settings.PAYMENT_SUPPORT_EMAIL, faq_url=marketing_link('FAQ'))}
-
+${_("Your payment was successful. You will see the charge below on your next credit or debit card statement.")}
+${_("The charge will show up on your statement under the company name {merchant_name}.").format(merchant_name=settings.CC_MERCHANT_NAME)}
+% if marketing_link('FAQ'):
+${_("If you have billing questions, please read the FAQ ({faq_url}) or contact {billing_email}.").format(billing_email=settings.PAYMENT_SUPPORT_EMAIL, faq_url=marketing_link('FAQ'))}
+% else:
+${_("If you have billing questions, please contact {billing_email}.").format(billing_email=settings.PAYMENT_SUPPORT_EMAIL)}
+% endif
 ${_("-The {platform_name} Team").format(platform_name=settings.PLATFORM_NAME)}
 
 ${_("Your order number is: {order_number}").format(order_number=order.id)}
@@ -13,8 +18,18 @@ ${_("Quantity - Description - Price")}
 %for order_item in order_items:
     ${order_item.qty} - ${order_item.line_desc} - ${"$" if order_item.currency == 'usd' else ""}${order_item.line_cost} 
 %endfor
+
 ${_("Total billed to credit/debit card: {currency_symbol}{total_cost}").format(total_cost=order.total_cost, currency_symbol=("$" if order.currency == 'usd' else ""))}
 
+% if has_billing_info:
+${order.bill_to_cardtype} ${_("#:")} ${order.bill_to_ccnum}
+${order.bill_to_first} ${order.bill_to_last}
+${order.bill_to_street1}
+${order.bill_to_street2}
+${order.bill_to_city}, ${order.bill_to_state} ${order.bill_to_postalcode}
+${order.bill_to_country.upper()}
+% endif
+
 %for order_item in order_items:
     ${order_item.additional_instruction_text}
 %endfor
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index 1dd5aa5229f8..8f6da00e68d2 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -9,6 +9,8 @@
 import branding
 # app that handles site status messages
 from status.status import get_site_status_msg
+# shopping cart
+import shoppingcart
 %>
 
 ## Provide a hook for themes to inject branding on top.
@@ -79,7 +81,17 @@ <h2><span class="provider">${course.display_org_with_default | h}:</span> ${cour
         </ul>
       </li>
     </ol>
-
+      % if settings.MITX_FEATURES.get('ENABLE_PAID_COURSE_REGISTRATION') and \
+           settings.MITX_FEATURES['ENABLE_SHOPPING_CART'] and \
+           shoppingcart.models.Order.user_cart_has_items(user):
+        <ol class="user">
+          <li class="primary">
+            <a class="shopping-cart" href="${reverse('shoppingcart.views.show_cart')}">
+              <i class="icon-shopping-cart"></i> Shopping Cart
+            </a>
+          </li>
+        </ol>
+      % endif
     % else:
     <ol class="left nav-global">
       <%block name="navigation_global_links">
diff --git a/lms/templates/shoppingcart/list.html b/lms/templates/shoppingcart/list.html
index cf452baab0de..820e05dc47bc 100644
--- a/lms/templates/shoppingcart/list.html
+++ b/lms/templates/shoppingcart/list.html
@@ -7,47 +7,62 @@
 <%block name="title"><title>${_("Your Shopping Cart")}</title></%block>
 
 <section class="container cart-list">
-    <h2>${_("Your selected items:")}</h2>
-    % if shoppingcart_items:
-        <table>
-            <thead>
-            <tr>${_("<td>Quantity</td><td>Description</td><td>Unit Price</td><td>Price</td><td>Currency</td>")}</tr>
-            </thead>
-            <tbody>
-            % for item in shoppingcart_items:
-            <tr><td>${item.qty}</td><td>${item.line_desc}</td>
-                <td>${"{0:0.2f}".format(item.unit_cost)}</td><td>${"{0:0.2f}".format(item.line_cost)}</td>
-                <td>${item.currency.upper()}</td>
-                <td><a data-item-id="${item.id}" class='remove_line_item' href='#'>[x]</a></td></tr>
-            % endfor
-            <tr><td></td><td></td><td></td><td>${_("Total Amount")}</td></tr>
-            <tr><td></td><td></td><td></td><td>${"{0:0.2f}".format(amount)}</td></tr>
-
-            </tbody>
-        </table>
-        <!-- <input id="back_input" type="submit" value="Return" /> -->
-        ${form_html}
-    % else:
-        <p>${_("You have selected no items for purchase.")}</p>
-    % endif
+  <h2>${_("Your selected items:")}</h2>
+  % if shoppingcart_items:
+    <table class="cart-table">
+      <thead>
+        <tr class="cart-headings">
+          <th class="qty">${_("Quantity")}</th>
+          <th class="dsc">${_("Description")}</th>
+          <th class="u-pr">${_("Unit Price")}</th>
+          <th class="prc">${_("Price")}</th>
+          <th class="cur">${_("Currency")}</th>
+        </tr>
+      </thead>
+      <tbody>
+        % for item in shoppingcart_items:
+        <tr class="cart-items">
+          <td>${item.qty}</td>
+          <td>${item.line_desc}</td>
+          <td>${"{0:0.2f}".format(item.unit_cost)}</td>
+          <td>${"{0:0.2f}".format(item.line_cost)}</td>
+          <td>${item.currency.upper()}</td>
+          <td><a data-item-id="${item.id}" class='remove_line_item' href='#'>[x]</a></td>
+        </tr>
+        % endfor
+        <tr class="cart-headings">
+          <td colspan="4"></td>
+          <th>${_("Total Amount")}</th>
+        </tr>
+        <tr class="cart-totals">
+          <td colspan="4"></td>
+          <td class="cart-total-cost">${"{0:0.2f}".format(amount)}</td>
+        </tr>
+      </tbody>
+    </table>
+    <!-- <input id="back_input" type="submit" value="Return" /> -->
+    ${form_html}
+  % else:
+    <p>${_("You have selected no items for purchase.")}</p>
+  % endif
 
 </section>
 
 
 <script>
-    $(function() {
-        $('a.remove_line_item').click(function(event) {
-            event.preventDefault();
-            var post_url = "${reverse('shoppingcart.views.remove_item')}";
-            $.post(post_url, {id:$(this).data('item-id')})
-                   .always(function(data){
-                        location.reload(true);
-                    });
-        });
-
-        $('#back_input').click(function(){
-           history.back();
-        });
+  $(function() {
+    $('a.remove_line_item').click(function(event) {
+      event.preventDefault();
+      var post_url = "${reverse('shoppingcart.views.remove_item')}";
+      $.post(post_url, {id:$(this).data('item-id')})
+        .always(function(data){
+        location.reload(true);
+      });
     });
+
+    $('#back_input').click(function(){
+      history.back();
+    });
+  });
 </script>
 
diff --git a/lms/templates/shoppingcart/receipt.html b/lms/templates/shoppingcart/receipt.html
index 7802f88dea2c..20c8a4272cda 100644
--- a/lms/templates/shoppingcart/receipt.html
+++ b/lms/templates/shoppingcart/receipt.html
@@ -3,70 +3,89 @@
 <%! from django.conf import settings %>
 
 <%inherit file="../main.html" />
-<%block name="bodyclass">register verification-process step-requirements</%block>
+<%block name="bodyclass">purchase-receipt</%block>
 
 <%block name="title"><title>${_("Register for [Course Name] | Receipt (Order")} ${order.id})</title></%block>
 
 <%block name="content">
 
-% if notification is not UNDEFINED:
-<section class="notification">
-    ${notification}
-</section>
-% endif
-
 <div class="container">
-  <section class="wrapper cart-list">
+  <section class="notification">
+    <h2>Thank you for your Purchase!</h2>
+    <p>Please print this receipt page for your records.  You should also have received a receipt in your email.</p>
+    % for inst in instructions:
+      <p>${inst}</p>
+    % endfor
+  </section>
 
+  <section class="wrapper cart-list">
     <div class="wrapper-content-main">
       <article class="content-main">
-        <h3 class="title">${_(settings.PLATFORM_NAME + " (" + settings.SITE_NAME + ")" + " Electronic Receipt")}</h3>
-
-
-
-    <h2>${_("Order #")}${order.id}</h2>
-    <h2>${_("Date:")} ${order.purchase_time.date().isoformat()}</h2>
-    <h2>${_("Items ordered:")}</h2>
+        <h1>${_(settings.PLATFORM_NAME + " (" + settings.SITE_NAME + ")" + " Electronic Receipt")}</h1>
+        <hr />
 
-        <table>
-            <thead>
-            <tr>${_("<td>Qty</td><td>Description</td><td>Unit Price</td><td>Price</td><td>Currency</td>")}</tr>
-            </thead>
-            <tbody>
-            % for item in order_items:
-            <tr>
-                % if item.status == "purchased":
-                <td>${item.qty}</td><td>${item.line_desc}</td>
+        <table class="order-receipt">
+          <tbody>
+          <tr>
+            <td colspan="2"><h3 class="order-number">${_("Order #")}${order.id}</h3></td>
+            <td></td>
+            <td colspan="2"><h3 class="order-date">${_("Date:")} ${order.purchase_time.date().isoformat()}</h3></td>
+          </tr>
+          <tr>
+            <td colspan="5"><h2 class="items-ordered">${_("Items ordered:")}</h2></td>
+          </tr>
+          <tr>
+            <th class="qty">${_("Qty")}</th>
+            <th class="desc">${_("Description")}</th>
+            <th class="u-pr">${_("Unit Price")}</th>
+            <th class="pri">${_("Price")}</th>
+            <th class="curr">${_("Currency")}</th>
+          </tr>
+          % for item in order_items:
+            <tr class="order-item">
+              % if item.status == "purchased":
+                <td>${item.qty}</td>
+                <td>${item.line_desc}</td>
                 <td>${"{0:0.2f}".format(item.unit_cost)}</td>
                 <td>${"{0:0.2f}".format(item.line_cost)}</td>
                 <td>${item.currency.upper()}</td></tr>
-                % elif item.status == "refunded":
-                <td><del>${item.qty}</del></td><td><del>${item.line_desc}</del></td>
+              % elif item.status == "refunded":
+                <td><del>${item.qty}</del></td>
+                <td><del>${item.line_desc}</del></td>
                 <td><del>${"{0:0.2f}".format(item.unit_cost)}</del></td>
                 <td><del>${"{0:0.2f}".format(item.line_cost)}</del></td>
                 <td><del>${item.currency.upper()}</del></td></tr>
-                % endif
-            % endfor
-            <tr><td></td><td></td><td></td><td>${_("Total Amount")}</td></tr>
-            <tr><td></td><td></td><td></td><td>${"{0:0.2f}".format(order.total_cost)}</td></tr>
-            </tbody>
+              % endif
+          % endfor
+          <tr>
+            <td colspan="3"></td>
+            <th>${_("Total Amount")}</th>
+            <td></td>
+          </tr>
+          <tr>
+            <td colspan="3"></td>
+            <td>${"{0:0.2f}".format(order.total_cost)}</td>
+            <td></td>
+          </tr>
+          </tbody>
         </table>
-    % if any_refunds:
-    <p>
-        ${_("Note: items with strikethough like ")}<del>this</del>${_(" have been refunded.")}
-    </p>
-    % endif
 
-    <h2>${_("Billed To:")}</h2>
-    <p>
-        ${order.bill_to_cardtype} ${_("#:")} ${order.bill_to_ccnum}<br />
-        ${order.bill_to_first} ${order.bill_to_last}<br />
-        ${order.bill_to_street1}<br />
-        ${order.bill_to_street2}<br />
-        ${order.bill_to_city}, ${order.bill_to_state} ${order.bill_to_postalcode}<br />
-        ${order.bill_to_country.upper()}<br />
-    </p>
+        % if any_refunds:
+          <p>
+            ${_("Note: items with strikethough like ")}<del>this</del>${_(" have been refunded.")}
+          </p>
+        % endif
 
+        <h2>${_("Billed To:")}</h2>
+        <p>
+          ${order.bill_to_cardtype} ${_("#:")} ${order.bill_to_ccnum}<br />
+          ${order.bill_to_first} ${order.bill_to_last}<br />
+          ${order.bill_to_street1}<br />
+          ${order.bill_to_street2}<br />
+          ${order.bill_to_city}, ${order.bill_to_state} ${order.bill_to_postalcode}<br />
+          ${order.bill_to_country.upper()}<br />
+        </p>
+    </div>
   </section>
 </div>
 </%block>

From bf5a801fa8979d68a9a4a33647ef6cd6bd84a594 Mon Sep 17 00:00:00 2001
From: Greg Price <gprice@edx.org>
Date: Fri, 27 Sep 2013 11:04:51 -0400
Subject: [PATCH 80/92] Make discussion elements change color on focus

Previously, colors changed to afford interaction only on hover; now, all
elements with a hover color change behave the same way on focus.
---
 lms/static/sass/_discussion.scss | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index a685404d3494..cd87927fc1ac 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -12,7 +12,7 @@
   text-shadow: 0 1px 0 rgba(0, 0, 0, .3);
   box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 1px 1px rgba(0, 0, 0, .15);
 
-  &:hover {
+  &:hover, &:focus {
     border-color: #297095;
     @include linear-gradient(top, #4fbbe4, #2090d0);
   }
@@ -32,7 +32,7 @@
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);
   box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 1px 1px rgba(0, 0, 0, .15);
 
-  &:hover {
+  &:hover, &:focus {
     @include linear-gradient(top, $white, #ddd);
   }
 }
@@ -51,7 +51,7 @@
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.6);
   box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) inset, 0 1px 1px rgba(0, 0, 0, .15);
 
-  &:hover {
+  &:hover, &:focus {
     background: -webkit-linear-gradient(top, #888, #666);
   }
 }
@@ -217,8 +217,7 @@ body.discussion {
           color: #eee;
           @include transition(none);
 
-          &:hover,
-          &.focused {
+          &:hover, &:focus {
             background-color: #666;
           }
 
@@ -305,7 +304,7 @@ body.discussion {
       padding-bottom: 2px;
       height: 37px;
 
-      &:hover {
+      &:hover, &:focus {
         border-color: #222;
       }
     }
@@ -436,7 +435,7 @@ body.discussion {
       height: 37px;
       border-color: #333;
 
-      &:hover {
+      &:hover, &:focus {
         border-color: #222;
       }
     }
@@ -714,7 +713,7 @@ body.discussion {
       height: 100%;
       background-color: #dedede;
 
-      &:hover {
+      &:hover, &:focus {
         background-color: $white;
       }
     }
@@ -881,8 +880,7 @@ body.discussion {
           display: none;
         }
 
-        &:hover,
-        &.focused {
+        &:hover, &:focus {
           background-color: #636363;
         }
 
@@ -1015,7 +1013,7 @@ body.discussion {
       color: #333;
       line-height: 17px;
 
-      &:hover {
+      &:hover, &:focus {
         @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, .2));
         color: #333;
       }
@@ -1067,7 +1065,7 @@ body.discussion {
       line-height: 33px;
       text-align: center;
 
-      &:hover {
+      &:hover, &:focus {
         background-image: none;
         background-color: #e6e6e6;
       }
@@ -1086,7 +1084,7 @@ body.discussion {
       background-color: $white;
       @include clearfix;
 
-      &:hover {
+      &:hover, &:focus {
         @include linear-gradient(top, rgba(255, 255, 255, .7), rgba(255, 255, 255, 0));
         background-color: #eee;
       }
@@ -2225,7 +2223,7 @@ body.discussion {
         padding-bottom: 2px;
         border-color: #333;
 
-        &:hover {
+        &:hover, &:focus {
           border-color: #222;
         }
       }
@@ -2522,7 +2520,7 @@ body.discussion {
       margin-top: $baseline/2;
       padding-bottom: 2px;
 
-      &:hover {
+      &:hover, &:focus {
         border-color: #222;
       }
     }
@@ -2596,7 +2594,7 @@ body.discussion {
         cursor: pointer;
       }
 
-      &:hover {
+      &:hover, &:focus {
         @include transition(opacity .2s linear 0s);
         opacity: 1.0;
       }
@@ -2659,7 +2657,7 @@ display:none;
   cursor:pointer;
   opacity: 0.8;
 
-  &:hover {
+  &:hover, &:focus {
     @include transition(opacity .2s linear 0s);
     opacity: 1.0;
   }

From 8a2bd25b7c6e3906b98eb4ff109e530f4ad7c687 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@mitx.mit.edu>
Date: Tue, 24 Sep 2013 10:57:39 -0400
Subject: [PATCH 81/92] Visual rearrangement of new dash "Student Admin" page

---
 .../instructor/views/instructor_dashboard.py  | 23 +++---
 .../instructor_dashboard/student_admin.coffee | 23 +++---
 .../courseware/instructor_dashboard.html      |  2 +-
 .../instructor_dashboard_2/course_info.html   | 18 +++++
 .../instructor_dashboard_2/student_admin.html | 70 +++++++++++++------
 5 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 031eac266bfe..e248d47a593d 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -38,7 +38,7 @@ def instructor_dashboard_2(request, course_id):
         raise Http404()
 
     sections = [
-        _section_course_info(course_id),
+        _section_course_info(course_id, access),
         _section_membership(course_id, access),
         _section_student_admin(course_id, access),
         _section_data_download(course_id),
@@ -67,18 +67,21 @@ def instructor_dashboard_2(request, course_id):
 """  # pylint: disable=W0105
 
 
-def _section_course_info(course_id):
+def _section_course_info(course_id, access):
     """ Provide data for the corresponding dashboard section """
     course = get_course_by_id(course_id, depth=None)
 
-    section_data = {}
-    section_data['section_key'] = 'course_info'
-    section_data['section_display_name'] = _('Course Info')
-    section_data['course_id'] = course_id
-    section_data['course_display_name'] = course.display_name
-    section_data['enrollment_count'] = CourseEnrollment.objects.filter(course_id=course_id).count()
-    section_data['has_started'] = course.has_started()
-    section_data['has_ended'] = course.has_ended()
+    section_data = {
+        'section_key': 'course_info',
+        'section_display_name': _('Course Info'),
+        'course_id': course_id,
+        'access': access,
+        'course_display_name': course.display_name,
+        'enrollment_count': CourseEnrollment.objects.filter(course_id=course_id).count(),
+        'has_started': course.has_started(),
+        'has_ended': course.has_ended(),
+        'list_instructor_tasks_url': reverse('list_instructor_tasks', kwargs={'course_id': course_id}),
+    }
 
     try:
         advance = lambda memo, (letter, score): "{}: {}, ".format(letter, score) + memo
diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
index 7e40eb98d4a3..e607a463fcd8 100644
--- a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
@@ -80,12 +80,13 @@ class StudentAdmin
     # gather buttons
     # some buttons are optional because they can be flipped by the instructor task feature switch
     # student-specific
-    @$field_student_select        = find_and_assert @$section, "input[name='student-select']"
+    @$field_student_select_progress = find_and_assert @$section, "input[name='student-select-progress']"
+    @$field_student_select_grade  = find_and_assert @$section, "input[name='student-select-grade']"
     @$progress_link               = find_and_assert @$section, "a.progress-link"
-    @$btn_enroll                  = find_and_assert @$section, "input[name='enroll']"
-    @$btn_unenroll                = find_and_assert @$section, "input[name='unenroll']"
     @$field_problem_select_single = find_and_assert @$section, "input[name='problem-select-single']"
     @$btn_reset_attempts_single   = find_and_assert @$section, "input[name='reset-attempts-single']"
+    @$btn_enroll                  = @$section.find "input[name='enroll']"
+    @$btn_unenroll                = @$section.find "input[name='unenroll']"
     @$btn_delete_state_single     = @$section.find "input[name='delete-state-single']"
     @$btn_rescore_problem_single  = @$section.find "input[name='rescore-problem-single']"
     @$btn_task_history_single     = @$section.find "input[name='task-history-single']"
@@ -117,7 +118,7 @@ class StudentAdmin
     # go to student progress page
     @$progress_link.click (e) =>
       e.preventDefault()
-      email = @$field_student_select.val()
+      email = @$field_student_select_progress.val()
 
       $.ajax
         dataType: 'json'
@@ -131,7 +132,7 @@ class StudentAdmin
     @$btn_enroll.click =>
       send_data =
         action: 'enroll'
-        emails: @$field_student_select.val()
+        emails: @$field_student_select_progress.val()
         auto_enroll: false
 
       $.ajax
@@ -145,7 +146,7 @@ class StudentAdmin
     @$btn_unenroll.click =>
       send_data =
         action: 'unenroll'
-        emails: @$field_student_select.val()
+        emails: @$field_student_select_progress.val()
 
       $.ajax
         dataType: 'json'
@@ -157,7 +158,7 @@ class StudentAdmin
     # reset attempts for student on problem
     @$btn_reset_attempts_single.click =>
       send_data =
-        student_email: @$field_student_select.val()
+        student_email: @$field_student_select_grade.val()
         problem_to_reset: @$field_problem_select_single.val()
         delete_module: false
 
@@ -170,10 +171,10 @@ class StudentAdmin
 
     # delete state for student on problem
     @$btn_delete_state_single.click => confirm_then
-      msg: "Delete student '#{@$field_student_select.val()}'s state on problem '#{@$field_problem_select_single.val()}'?"
+      msg: "Delete student '#{@$field_student_select_grade.val()}'s state on problem '#{@$field_problem_select_single.val()}'?"
       ok: =>
         send_data =
-          student_email: @$field_student_select.val()
+          student_email: @$field_student_select_grade.val()
           problem_to_reset: @$field_problem_select_single.val()
           delete_module: true
 
@@ -187,7 +188,7 @@ class StudentAdmin
     # start task to rescore problem for student
     @$btn_rescore_problem_single.click =>
       send_data =
-        student_email: @$field_student_select.val()
+        student_email: @$field_student_select_grade.val()
         problem_to_reset: @$field_problem_select_single.val()
 
       $.ajax
@@ -200,7 +201,7 @@ class StudentAdmin
     # list task history for student+problem
     @$btn_task_history_single.click =>
       send_data =
-        student_email: @$field_student_select.val()
+        student_email: @$field_student_select_grade.val()
         problem_urlname: @$field_problem_select_single.val()
 
       if not send_data.student_email
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index 7f41c82c9dea..7b06d8e309f5 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -240,7 +240,7 @@ <H2>${_("Course-specific grade adjustment")}</h2>
     <hr width="40%" style="align:left">
   %endif
 
-    <H2>${_("Student-specific grade inspection and adjustment")}</h2>
+    <h2>${_("Student-specific grade inspection and adjustment")}</h2>
     <p>
       ${_("Specify the {platform_name} email address or username of a student here:").format(platform_name=settings.PLATFORM_NAME)}
       <input type="text" name="unique_student_identifier">
diff --git a/lms/templates/instructor/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html
index 9b4114d95c2c..cb113e18469b 100644
--- a/lms/templates/instructor/instructor_dashboard_2/course_info.html
+++ b/lms/templates/instructor/instructor_dashboard_2/course_info.html
@@ -38,8 +38,21 @@ <h2>${_("Course Information")}</h2>
 ##   ${ section_data['offline_grades'] }
 ## </div>
 
+%if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']:
+  <div class="running-tasks-container action-type-container">
+    <hr>
+    <h2> ${_("Pending Instructor Tasks")} </h2>
+    <p>${_("The status for any active tasks appears in a table below.")} </p>
+
+    <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
+  </div>
+
+%endif
+
 %if len(section_data['course_errors']):
   <div class="course-errors-wrapper">
+    <hr>
+    <p>
     <div class="toggle-wrapper">
       <h2 class="title">${_("Course Warnings")}:</h2>
       <div class="triangle"></div>
@@ -52,5 +65,10 @@ <h2 class="title">${_("Course Warnings")}:</h2>
         </div>
       %endfor
     </div>
+    <p>
   </div>
+<br>
 %endif
+
+
+
diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
index 6b6da617f68b..001987ec1841 100644
--- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html
+++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -2,25 +2,47 @@
 <%page args="section_data"/>
 
 <div class="student-specific-container action-type-container">
-  <H2>${_("Student-specific grade adjustment")}</h2>
+  <h2>${_("Student-specific grade inspection")}</h2>
   <div class="request-response-error"></div>
-
-  <input type="text" name="student-select" placeholder="${_("Student Email")}">
+  <p>
+    <!-- Doesn't work for username but this MUST work -->
+  ${_("Specify the {platform_name} email address or username of a student here:").format(platform_name=settings.PLATFORM_NAME)}
+  <input type="text" name="student-select-progress" placeholder="${_("Student Email or Username")}">
+  </p>
   <br>
 
   <div class="progress-link-wrapper">
+  <p>
+    ${_("Click this link to view the student's progress page:")}
+
     <a href="" class="progress-link" data-endpoint="${ section_data['get_student_progress_url_url'] }"> ${_("Student Progress Page")} </a>
+  </p>
   </div>
-
   <br>
+
+  <!-- These buttons don't appear to be working
+  <p>
+    ${_("Click to enroll or unenroll this student from the course:")}
   <input type="button" name="enroll" value="${_("Enroll")}" data-endpoint="${ section_data['enrollment_url'] }">
   <input type="button" name="unenroll" value="${_("Unenroll")}" data-endpoint="${ section_data['enrollment_url'] }">
-  ## <select class="problems">
-  ##   <option>Getting problems...</option>
-  ## </select>
+  </p>
+  -->
 
-  <p> ${_('Specify a particular problem in the course here by its url:')} </p>
+  <hr>
+
+  <h2>${_("Student-specific grade adjustment")}</h2>
+
+  <p>
+    <!-- Doesn't work for username but this MUST work -->
+  ${_("Specify the {platform_name} email address or username of a student here:").format(platform_name=settings.PLATFORM_NAME)}
+  <input type="text" name="student-select-grade" placeholder="${_("Student Email or Username")}">
+  </p>
+  <br>
+
+  <p> ${_('Specify a particular problem in the course here by its url:')} 
   <input type="text" name="problem-select-single" placeholder="${_("Problem urlname")}">
+  </p>
+
   <p>
     ${_('You may use just the "urlname" if a problem, or "modulename/urlname" if not. (For example, if the location is {location1}, then just provide the {urlname1}. If the location is {location2}, then provide {urlname2}.)').format(
     location1="<tt>i4x://university/course/problem/problemname</tt>",
@@ -29,20 +51,31 @@ <H2>${_("Student-specific grade adjustment")}</h2>
     urlname2="<tt>notaproblem/someothername</tt>")
     }
   </p>
-  <input type="button" name="reset-attempts-single" value="${_("Reset Student Attempts")}" data-endpoint="${ section_data['reset_student_attempts_url'] }">
 
-  %if section_data['access']['instructor']:
-    <p> ${_('You may also delete the entire state of a student for the specified module:')} </p>
-    <input type="button" class="molly-guard" name="delete-state-single" value="${_("Delete Student State for Module")}" data-endpoint="${ section_data['reset_student_attempts_url'] }">
-  %endif
+  <p>
+  ${_("Next, select an action to perform for the given user and problem:")}
+  </p>
+
+  <p>
+    <!-- Doesn't give any type of notification upon success -->
+  <input type="button" name="reset-attempts-single" value="${_("Reset Student Attempts")}" data-endpoint="${ section_data['reset_student_attempts_url'] }">
 
   %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']:
     <input type="button" name="rescore-problem-single" value="${_("Rescore Student Submission")}" data-endpoint="${ section_data['rescore_problem_url'] }">
   %endif
+  </p>
+
+  <p>
+  %if section_data['access']['instructor']:
+    <p> ${_('You may also delete the entire state of a student for the specified problem:')} </p>
+    <input type="button" class="molly-guard" name="delete-state-single" value="${_("Delete Student State for Problem")}" data-endpoint="${ section_data['reset_student_attempts_url'] }">
+  %endif
+  </p>
+
 
   %if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']:
     <p>
-      ${_("Rescoring runs in the background, and status for active tasks will appear in a table below. "
+      ${_("Rescoring runs in the background, and status for active tasks will appear in a table on the Course Info tab. "
       "To see status for all tasks submitted for this problem and student, click on this button:")}
     </p>
 
@@ -76,18 +109,11 @@ <H2>${_('Course-specific grade adjustment')}</h2>
     </p>
     <p>
     <p>
-      ${_("These actions run in the background, and status for active tasks will appear in a table below. "
+      ${_("These actions run in the background, and status for active tasks will appear in a table on the Course Info tab. "
       "To see status for all tasks submitted for this problem, click on this button")}:
     </p>
       <input type="button" name="task-history-all" value="${_("Show Background Task History for Problem")}" data-endpoint="${ section_data['list_instructor_tasks_url'] }">
       <div class="task-history-all-table"></div>
     </p>
   </div>
-
-
-  <div class="running-tasks-container action-type-container">
-    <hr>
-    <h2> ${_("Pending Instructor Tasks")} </h2>
-    <div class="running-tasks-table" data-endpoint="${ section_data['list_instructor_tasks_url'] }"></div>
-  </div>
 %endif

From 07e76b3b2f92d7f97e2ad1f3a3f094885426b55e Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@mitx.mit.edu>
Date: Thu, 26 Sep 2013 08:09:09 -0400
Subject: [PATCH 82/92] Enable use of student usernames on student admin page

This is in addition to email addresses, which also work.
---
 lms/djangoapps/instructor/views/api.py        | 53 ++++++++++---------
 lms/djangoapps/instructor/views/tools.py      | 17 ++++++
 .../instructor_dashboard/student_admin.coffee | 22 ++++----
 3 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 8a552feb66f0..9e58ecea5f5f 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -33,7 +33,7 @@
 from instructor_task.api_helper import AlreadyRunningError
 import instructor.enrollment as enrollment
 from instructor.enrollment import enroll_email, unenroll_email
-from instructor.views.tools import strip_if_string
+from instructor.views.tools import strip_if_string, get_student_from_identifier
 import instructor.access as access
 import analytics.basic
 import analytics.distributions
@@ -456,20 +456,19 @@ def get_distribution(request, course_id):
 @common_exceptions_400
 @require_level('staff')
 @require_query_params(
-    student_email="email of student for whom to get progress url"
+    unique_student_identifier="email or username of student for whom to get progress url"
 )
 def get_student_progress_url(request, course_id):
     """
     Get the progress url of a student.
     Limited to staff access.
 
-    Takes query paremeter student_email and if the student exists
+    Takes query paremeter unique_student_identifier and if the student exists
     returns e.g. {
         'progress_url': '/../...'
     }
     """
-    student_email = strip_if_string(request.GET.get('student_email'))
-    user = User.objects.get(email=student_email)
+    user = get_student_from_identifier(request.GET.get('unique_student_identifier'))
 
     progress_url = reverse('student_progress', kwargs={'course_id': course_id, 'student_id': user.id})
 
@@ -496,7 +495,7 @@ def reset_student_attempts(request, course_id):
 
     Takes some of the following query paremeters
         - problem_to_reset is a urlname of a problem
-        - student_email is an email
+        - unique_student_identifier is an email or username
         - all_students is a boolean
             requires instructor access
             mutually exclusive with delete_module
@@ -510,14 +509,14 @@ def reset_student_attempts(request, course_id):
     )
 
     problem_to_reset = strip_if_string(request.GET.get('problem_to_reset'))
-    student_email = strip_if_string(request.GET.get('student_email'))
+    student = get_student_from_identifier(request.GET.get('unique_student_identifier'))
     all_students = request.GET.get('all_students', False) in ['true', 'True', True]
     delete_module = request.GET.get('delete_module', False) in ['true', 'True', True]
 
     # parameter combinations
-    if all_students and student_email:
+    if all_students and student:
         return HttpResponseBadRequest(
-            "all_students and student_email are mutually exclusive."
+            "all_students and unique_student_identifier are mutually exclusive."
         )
     if all_students and delete_module:
         return HttpResponseBadRequest(
@@ -534,9 +533,8 @@ def reset_student_attempts(request, course_id):
     response_payload = {}
     response_payload['problem_to_reset'] = problem_to_reset
 
-    if student_email:
+    if student:
         try:
-            student = User.objects.get(email=student_email)
             enrollment.reset_student_attempts(course_id, student, module_state_key, delete_module=delete_module)
         except StudentModule.DoesNotExist:
             return HttpResponseBadRequest("Module does not exist.")
@@ -561,21 +559,24 @@ def rescore_problem(request, course_id):
 
     Takes either of the following query paremeters
         - problem_to_reset is a urlname of a problem
-        - student_email is an email
+        - unique_student_identifier is an email or username
         - all_students is a boolean
 
-    all_students and student_email cannot both be present.
+    all_students and unique_student_identifier cannot both be present.
     """
     problem_to_reset = strip_if_string(request.GET.get('problem_to_reset'))
-    student_email = strip_if_string(request.GET.get('student_email', False))
+    student = request.GET.get('unique_student_identifier', None)
+    if student is not None:
+        student = get_student_from_identifier(student)
+
     all_students = request.GET.get('all_students') in ['true', 'True', True]
 
-    if not (problem_to_reset and (all_students or student_email)):
+    if not (problem_to_reset and (all_students or student)):
         return HttpResponseBadRequest("Missing query parameters.")
 
-    if all_students and student_email:
+    if all_students and student:
         return HttpResponseBadRequest(
-            "Cannot rescore with all_students and student_email."
+            "Cannot rescore with all_students and unique_student_identifier."
         )
 
     module_state_key = _msk_from_problem_urlname(course_id, problem_to_reset)
@@ -583,9 +584,8 @@ def rescore_problem(request, course_id):
     response_payload = {}
     response_payload['problem_to_reset'] = problem_to_reset
 
-    if student_email:
-        response_payload['student_email'] = student_email
-        student = User.objects.get(email=student_email)
+    if student:
+        response_payload['student'] = student
         instructor_task.api.submit_rescore_problem_for_student(request, course_id, module_state_key, student)
         response_payload['task'] = 'created'
     elif all_students:
@@ -608,21 +608,22 @@ def list_instructor_tasks(request, course_id):
     Takes optional query paremeters.
         - With no arguments, lists running tasks.
         - `problem_urlname` lists task history for problem
-        - `problem_urlname` and `student_email` lists task
+        - `problem_urlname` and `unique_student_identifier` lists task
             history for problem AND student (intersection)
     """
     problem_urlname = strip_if_string(request.GET.get('problem_urlname', False))
-    student_email = strip_if_string(request.GET.get('student_email', False))
+    student = request.GET.get('unique_student_identifier', None)
+    if student is not None:
+        student = get_student_from_identifier(student)
 
-    if student_email and not problem_urlname:
+    if student and not problem_urlname:
         return HttpResponseBadRequest(
-            "student_email must accompany problem_urlname"
+            "unique_student_identifier must accompany problem_urlname"
         )
 
     if problem_urlname:
         module_state_key = _msk_from_problem_urlname(course_id, problem_urlname)
-        if student_email:
-            student = User.objects.get(email=student_email)
+        if student:
             tasks = instructor_task.api.get_instructor_task_history(course_id, module_state_key, student)
         else:
             tasks = instructor_task.api.get_instructor_task_history(course_id, module_state_key)
diff --git a/lms/djangoapps/instructor/views/tools.py b/lms/djangoapps/instructor/views/tools.py
index 11fc1359762c..eab0e661961b 100644
--- a/lms/djangoapps/instructor/views/tools.py
+++ b/lms/djangoapps/instructor/views/tools.py
@@ -1,7 +1,24 @@
 """
 Tools for the instructor dashboard
 """
+from django.contrib.auth.models import User
+
 def strip_if_string(value):
     if isinstance(value, basestring):
         return value.strip()
     return value
+
+def get_student_from_identifier(unique_student_identifier):
+    """
+    Gets a student object using either an email address or username.
+
+    Returns the student object associated with `unique_student_identifier`
+
+    Raises User.DoesNotExist if no user object can be found.
+    """
+    unique_student_identifier = strip_if_string(unique_student_identifier)
+    if "@" in unique_student_identifier:
+        student = User.objects.get(email=unique_student_identifier)
+    else:
+        student = User.objects.get(username=unique_student_identifier)
+    return student
diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
index e607a463fcd8..10d83c4a00b5 100644
--- a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
@@ -118,15 +118,15 @@ class StudentAdmin
     # go to student progress page
     @$progress_link.click (e) =>
       e.preventDefault()
-      email = @$field_student_select_progress.val()
+      unique_student_identifier = @$field_student_select_progress.val()
 
       $.ajax
         dataType: 'json'
         url: @$progress_link.data 'endpoint'
-        data: student_email: email
+        data: unique_student_identifier: unique_student_identifier
         success: @clear_errors_then (data) ->
           window.location = data.progress_url
-        error: std_ajax_err => @$request_response_error_single.text "Error getting student progress url for '#{email}'."
+        error: std_ajax_err => @$request_response_error_single.text "Error getting student progress url for '#{unique_student_identifier}'."
 
     # enroll student
     @$btn_enroll.click =>
@@ -158,7 +158,7 @@ class StudentAdmin
     # reset attempts for student on problem
     @$btn_reset_attempts_single.click =>
       send_data =
-        student_email: @$field_student_select_grade.val()
+        unique_student_identifier: @$field_student_select_grade.val()
         problem_to_reset: @$field_problem_select_single.val()
         delete_module: false
 
@@ -167,14 +167,14 @@ class StudentAdmin
         url: @$btn_reset_attempts_single.data 'endpoint'
         data: send_data
         success: @clear_errors_then -> console.log 'problem attempts reset'
-        error: std_ajax_err => @$request_response_error_single.text "Error resetting problem attempts."
+        error: std_ajax_err => @$request_response_error_single.text "Error resetting problem attempts for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'."
 
     # delete state for student on problem
     @$btn_delete_state_single.click => confirm_then
       msg: "Delete student '#{@$field_student_select_grade.val()}'s state on problem '#{@$field_problem_select_single.val()}'?"
       ok: =>
         send_data =
-          student_email: @$field_student_select_grade.val()
+          unique_student_identifier: @$field_student_select_grade.val()
           problem_to_reset: @$field_problem_select_single.val()
           delete_module: true
 
@@ -188,7 +188,7 @@ class StudentAdmin
     # start task to rescore problem for student
     @$btn_rescore_problem_single.click =>
       send_data =
-        student_email: @$field_student_select_grade.val()
+        unique_student_identifier: @$field_student_select_grade.val()
         problem_to_reset: @$field_problem_select_single.val()
 
       $.ajax
@@ -201,13 +201,13 @@ class StudentAdmin
     # list task history for student+problem
     @$btn_task_history_single.click =>
       send_data =
-        student_email: @$field_student_select_grade.val()
+        unique_student_identifier: @$field_student_select_grade.val()
         problem_urlname: @$field_problem_select_single.val()
 
-      if not send_data.student_email
-        return @$request_response_error_single.text "Enter a student email."
+      if not send_data.unique_student_identifier
+        return @$request_response_error_single.text "Please enter a student email address or username."
       if not send_data.problem_urlname
-        return @$request_response_error_single.text "Enter a problem urlname."
+        return @$request_response_error_single.text "Please enter a problem urlname."
 
       $.ajax
         dataType: 'json'

From 086f544a1a39d3cac22c30bd8c0ee3d693fd0748 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@mitx.mit.edu>
Date: Thu, 26 Sep 2013 17:57:55 -0400
Subject: [PATCH 83/92] Fix, and add more, tests

---
 lms/djangoapps/instructor/tests/test_api.py | 41 +++++++++++++++++----
 lms/djangoapps/instructor/views/api.py      | 16 +++++---
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index c5b1b21b52e7..a32217ab30b7 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -512,7 +512,7 @@ def test_get_distribution_gender(self):
     def test_get_student_progress_url(self):
         """ Test that progress_url is in the successful response. """
         url = reverse('get_student_progress_url', kwargs={'course_id': self.course.id})
-        url += "?student_email={}".format(
+        url += "?unique_student_identifier={}".format(
             quote(self.students[0].email.encode("utf-8"))
         )
         print url
@@ -522,6 +522,19 @@ def test_get_student_progress_url(self):
         res_json = json.loads(response.content)
         self.assertIn('progress_url', res_json)
 
+    def test_get_student_progress_url_from_uname(self):
+        """ Test that progress_url is in the successful response. """
+        url = reverse('get_student_progress_url', kwargs={'course_id': self.course.id})
+        url += "?unique_student_identifier={}".format(
+            quote(self.students[0].username.encode("utf-8"))
+        )
+        print url
+        response = self.client.get(url)
+        print response
+        self.assertEqual(response.status_code, 200)
+        res_json = json.loads(response.content)
+        self.assertIn('progress_url', res_json)
+
     def test_get_student_progress_url_noparams(self):
         """ Test that the endpoint 404's without the required query params. """
         url = reverse('get_student_progress_url', kwargs={'course_id': self.course.id})
@@ -579,7 +592,7 @@ def test_reset_student_attempts_single(self):
         url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {
             'problem_to_reset': self.problem_urlname,
-            'student_email': self.student.email,
+            'unique_student_identifier': self.student.email,
         })
         print response.content
         self.assertEqual(response.status_code, 200)
@@ -608,7 +621,7 @@ def test_reset_student_attempts_missingmodule(self):
         url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {
             'problem_to_reset': 'robot-not-a-real-module',
-            'student_email': self.student.email,
+            'unique_student_identifier': self.student.email,
         })
         print response.content
         self.assertEqual(response.status_code, 400)
@@ -618,7 +631,7 @@ def test_reset_student_attempts_delete(self):
         url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {
             'problem_to_reset': self.problem_urlname,
-            'student_email': self.student.email,
+            'unique_student_identifier': self.student.email,
             'delete_module': True,
         })
         print response.content
@@ -634,11 +647,11 @@ def test_reset_student_attempts_delete(self):
         )
 
     def test_reset_student_attempts_nonsense(self):
-        """ Test failure with both student_email and all_students. """
+        """ Test failure with both unique_student_identifier and all_students. """
         url = reverse('reset_student_attempts', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {
             'problem_to_reset': self.problem_urlname,
-            'student_email': self.student.email,
+            'unique_student_identifier': self.student.email,
             'all_students': True,
         })
         print response.content
@@ -650,7 +663,19 @@ def test_rescore_problem_single(self, act):
         url = reverse('rescore_problem', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {
             'problem_to_reset': self.problem_urlname,
-            'student_email': self.student.email,
+            'unique_student_identifier': self.student.email,
+        })
+        print response.content
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(act.called)
+
+    @patch.object(instructor_task.api, 'submit_rescore_problem_for_student')
+    def test_rescore_problem_single_from_uname(self, act):
+        """ Test rescoring of a single student. """
+        url = reverse('rescore_problem', kwargs={'course_id': self.course.id})
+        response = self.client.get(url, {
+            'problem_to_reset': self.problem_urlname,
+            'unique_student_identifier': self.student.username,
         })
         print response.content
         self.assertEqual(response.status_code, 200)
@@ -747,7 +772,7 @@ def test_list_instructor_tasks_problem_student(self, act):
         url = reverse('list_instructor_tasks', kwargs={'course_id': self.course.id})
         response = self.client.get(url, {
             'problem_urlname': self.problem_urlname,
-            'student_email': self.student.email,
+            'unique_student_identifier': self.student.email,
         })
         print response.content
         self.assertEqual(response.status_code, 200)
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 9e58ecea5f5f..e0b047604e14 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -509,7 +509,10 @@ def reset_student_attempts(request, course_id):
     )
 
     problem_to_reset = strip_if_string(request.GET.get('problem_to_reset'))
-    student = get_student_from_identifier(request.GET.get('unique_student_identifier'))
+    student_identifier = request.GET.get('unique_student_identifier', None)
+    student = None
+    if student_identifier is not None:
+        student = get_student_from_identifier(student_identifier)
     all_students = request.GET.get('all_students', False) in ['true', 'True', True]
     delete_module = request.GET.get('delete_module', False) in ['true', 'True', True]
 
@@ -538,9 +541,11 @@ def reset_student_attempts(request, course_id):
             enrollment.reset_student_attempts(course_id, student, module_state_key, delete_module=delete_module)
         except StudentModule.DoesNotExist:
             return HttpResponseBadRequest("Module does not exist.")
+        response_payload['student'] = student_identifier
     elif all_students:
         instructor_task.api.submit_reset_problem_attempts_for_all_students(request, course_id, module_state_key)
         response_payload['task'] = 'created'
+        response_payload['student'] = 'All Students'
     else:
         return HttpResponseBadRequest()
 
@@ -565,9 +570,10 @@ def rescore_problem(request, course_id):
     all_students and unique_student_identifier cannot both be present.
     """
     problem_to_reset = strip_if_string(request.GET.get('problem_to_reset'))
-    student = request.GET.get('unique_student_identifier', None)
-    if student is not None:
-        student = get_student_from_identifier(student)
+    student_identifier = request.GET.get('unique_student_identifier', None)
+    student = None
+    if student_identifier is not None:
+        student = get_student_from_identifier(student_identifier)
 
     all_students = request.GET.get('all_students') in ['true', 'True', True]
 
@@ -585,7 +591,7 @@ def rescore_problem(request, course_id):
     response_payload['problem_to_reset'] = problem_to_reset
 
     if student:
-        response_payload['student'] = student
+        response_payload['student'] = student_identifier
         instructor_task.api.submit_rescore_problem_for_student(request, course_id, module_state_key, student)
         response_payload['task'] = 'created'
     elif all_students:

From 91d85f5c2a1b1a43f282c64a7f78a84bd2aecc09 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@mitx.mit.edu>
Date: Thu, 26 Sep 2013 18:54:15 -0400
Subject: [PATCH 84/92] Enable alerts when a task succeeds.

Note: Alerts are pop-up boxes. Not sure if this is desireable, but I couldn't figure out
how to make a success message show up in the same place that error messages do.
---
 lms/djangoapps/instructor/views/tools.py      |  1 +
 .../instructor_dashboard/student_admin.coffee | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lms/djangoapps/instructor/views/tools.py b/lms/djangoapps/instructor/views/tools.py
index eab0e661961b..cbf6b6468a6c 100644
--- a/lms/djangoapps/instructor/views/tools.py
+++ b/lms/djangoapps/instructor/views/tools.py
@@ -8,6 +8,7 @@ def strip_if_string(value):
         return value.strip()
     return value
 
+
 def get_student_from_identifier(unique_student_identifier):
     """
     Gets a student object using either an email address or username.
diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
index 10d83c4a00b5..3030f622ceb2 100644
--- a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
@@ -157,16 +157,18 @@ class StudentAdmin
 
     # reset attempts for student on problem
     @$btn_reset_attempts_single.click =>
+      unique_student_identifier = @$field_student_select_grade.val()
+      problem_to_reset = @$field_problem_select_single.val()
       send_data =
-        unique_student_identifier: @$field_student_select_grade.val()
-        problem_to_reset: @$field_problem_select_single.val()
+        unique_student_identifier: unique_student_identifier
+        problem_to_reset: problem_to_reset
         delete_module: false
 
       $.ajax
         dataType: 'json'
         url: @$btn_reset_attempts_single.data 'endpoint'
         data: send_data
-        success: @clear_errors_then -> console.log 'problem attempts reset'
+        success: @clear_errors_then -> alert "Success! Problem attempts reset for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'."
         error: std_ajax_err => @$request_response_error_single.text "Error resetting problem attempts for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'."
 
     # delete state for student on problem
@@ -182,21 +184,23 @@ class StudentAdmin
           dataType: 'json'
           url: @$btn_delete_state_single.data 'endpoint'
           data: send_data
-          success: @clear_errors_then -> console.log 'module state deleted'
+          success: @clear_errors_then -> alert 'Module state successfully deleted.'
           error: std_ajax_err => @$request_response_error_single.text "Error deleting problem state."
 
     # start task to rescore problem for student
     @$btn_rescore_problem_single.click =>
+      unique_student_identifier = @$field_student_select_grade.val()
+      problem_to_reset = @$field_problem_select_single.val()
       send_data =
-        unique_student_identifier: @$field_student_select_grade.val()
-        problem_to_reset: @$field_problem_select_single.val()
+        unique_student_identifier: unique_student_identifier
+        problem_to_reset: problem_to_reset
 
       $.ajax
         dataType: 'json'
         url: @$btn_rescore_problem_single.data 'endpoint'
         data: send_data
-        success: @clear_errors_then -> console.log 'started rescore problem task'
-        error: std_ajax_err => @$request_response_error_single.text "Error starting a task to rescore student's problem."
+        success: @clear_errors_then -> alert "Started rescore problem task for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'. Click the 'Show Background Task History for Student' button to see the status of the task."
+        error: std_ajax_err => @$request_response_error_single.text "Error starting a task to rescore problem '#{problem_to_reset}' for student '#{unique_student_identifier}'."
 
     # list task history for student+problem
     @$btn_task_history_single.click =>
@@ -221,30 +225,32 @@ class StudentAdmin
     @$btn_reset_attempts_all.click => confirm_then
       msg: "Reset attempts for all students on problem '#{@$field_problem_select_all.val()}'?"
       ok: =>
+        problem_to_reset = @$field_problem_select_all.val()
         send_data =
           all_students: true
-          problem_to_reset: @$field_problem_select_all.val()
+          problem_to_reset: problem_to_reset
 
         $.ajax
           dataType: 'json'
           url: @$btn_reset_attempts_all.data 'endpoint'
           data: send_data
-          success: @clear_errors_then -> console.log 'started reset attempts task'
+          success: @clear_errors_then -> alert "Successfully started task to reset attempts for problem '#{problem_to_reset}'. Click the 'Show Background Task History for Problem' button to see the status of the task."
           error: std_ajax_err => @$request_response_error_all.text "Error starting a task to reset attempts for all students on this problem."
 
     # start task to rescore problem for all students
     @$btn_rescore_problem_all.click => confirm_then
       msg: "Rescore problem '#{@$field_problem_select_all.val()}' for all students?"
       ok: =>
+        problem_to_reset = @$field_problem_select_all.val()
         send_data =
           all_students: true
-          problem_to_reset: @$field_problem_select_all.val()
+          problem_to_reset: problem_to_reset
 
         $.ajax
           dataType: 'json'
           url: @$btn_rescore_problem_all.data 'endpoint'
           data: send_data
-          success: @clear_errors_then -> console.log 'started rescore problem task'
+          success: @clear_errors_then -> alert "Successfully started task to rescore problem '#{problem_to_reset}' for all students. Click the 'Show Background Task History for Problem' button to see the status of the task."
           error: std_ajax_err => @$request_response_error_all.text "Error starting a task to rescore this problem for all students."
 
     # list task history for problem

From 3813e51cfbb684c1a7b5efd93378eeec5a5a71e8 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@mitx.mit.edu>
Date: Fri, 27 Sep 2013 09:42:51 -0400
Subject: [PATCH 85/92] Add more feedback for instructors on Student Admin
 section of the dash.

---
 .../instructor_dashboard/student_admin.coffee | 93 +++++++++++++------
 .../instructor_dashboard_2/student_admin.html |  4 +-
 2 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
index 3030f622ceb2..3e5c8c27c2b8 100644
--- a/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
+++ b/lms/static/coffee/src/instructor_dashboard/student_admin.coffee
@@ -101,7 +101,8 @@ class StudentAdmin
     @$table_running_tasks         = @$section.find ".running-tasks-table"
 
     # response areas
-    @$request_response_error_single = find_and_assert @$section, ".student-specific-container .request-response-error"
+    @$request_response_error_progress = find_and_assert @$section, ".student-specific-container .request-response-error"
+    @$request_response_error_grade = find_and_assert @$section, ".student-grade-container .request-response-error"
     @$request_response_error_all    = @$section.find ".course-specific-container .request-response-error"
 
     # start polling for task list
@@ -119,6 +120,8 @@ class StudentAdmin
     @$progress_link.click (e) =>
       e.preventDefault()
       unique_student_identifier = @$field_student_select_progress.val()
+      if not unique_student_identifier
+        return @$request_response_error_progress.text "Please enter a student email address or username."
 
       $.ajax
         dataType: 'json'
@@ -126,7 +129,7 @@ class StudentAdmin
         data: unique_student_identifier: unique_student_identifier
         success: @clear_errors_then (data) ->
           window.location = data.progress_url
-        error: std_ajax_err => @$request_response_error_single.text "Error getting student progress url for '#{unique_student_identifier}'."
+        error: std_ajax_err => @$request_response_error_progress.text "Error getting student progress url for '#{unique_student_identifier}'."
 
     # enroll student
     @$btn_enroll.click =>
@@ -140,7 +143,7 @@ class StudentAdmin
         url: @$btn_enroll.data 'endpoint'
         data: send_data
         success: @clear_errors_then -> console.log "student #{send_data.emails} enrolled"
-        error: std_ajax_err => @$request_response_error_single.text "Error enrolling student '#{send_data.emails}'."
+        error: std_ajax_err => @$request_response_error_progress.text "Error enrolling student '#{send_data.emails}'."
 
     # unenroll student
     @$btn_unenroll.click =>
@@ -153,12 +156,16 @@ class StudentAdmin
         url: @$btn_unenroll.data 'endpoint'
         data: send_data
         success: @clear_errors_then -> console.log "student #{send_data.emails} unenrolled"
-        error: std_ajax_err => @$request_response_error_single.text "Error unenrolling student '#{send_data.emails}'."
+        error: std_ajax_err => @$request_response_error_progress.text "Error unenrolling student '#{send_data.emails}'."
 
     # reset attempts for student on problem
     @$btn_reset_attempts_single.click =>
       unique_student_identifier = @$field_student_select_grade.val()
       problem_to_reset = @$field_problem_select_single.val()
+      if not unique_student_identifier
+        return @$request_response_error_grade.text "Please enter a student email address or username."
+      if not problem_to_reset
+        return @$request_response_error_grade.text "Please enter a problem urlname."
       send_data =
         unique_student_identifier: unique_student_identifier
         problem_to_reset: problem_to_reset
@@ -169,15 +176,21 @@ class StudentAdmin
         url: @$btn_reset_attempts_single.data 'endpoint'
         data: send_data
         success: @clear_errors_then -> alert "Success! Problem attempts reset for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'."
-        error: std_ajax_err => @$request_response_error_single.text "Error resetting problem attempts for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'."
+        error: std_ajax_err => @$request_response_error_grade.text "Error resetting problem attempts for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'."
 
     # delete state for student on problem
-    @$btn_delete_state_single.click => confirm_then
-      msg: "Delete student '#{@$field_student_select_grade.val()}'s state on problem '#{@$field_problem_select_single.val()}'?"
-      ok: =>
+    @$btn_delete_state_single.click =>
+      unique_student_identifier = @$field_student_select_grade.val()
+      problem_to_reset = @$field_problem_select_single.val()
+      if not unique_student_identifier
+        return @$request_response_error_grade.text "Please enter a student email address or username."
+      if not problem_to_reset
+        return @$request_response_error_grade.text "Please enter a problem urlname."
+
+      if window.confirm "Delete student '#{unique_student_identifier}'s state on problem '#{problem_to_reset}'?"
         send_data =
-          unique_student_identifier: @$field_student_select_grade.val()
-          problem_to_reset: @$field_problem_select_single.val()
+          unique_student_identifier: unique_student_identifier
+          problem_to_reset: problem_to_reset
           delete_module: true
 
         $.ajax
@@ -185,12 +198,18 @@ class StudentAdmin
           url: @$btn_delete_state_single.data 'endpoint'
           data: send_data
           success: @clear_errors_then -> alert 'Module state successfully deleted.'
-          error: std_ajax_err => @$request_response_error_single.text "Error deleting problem state."
+          error: std_ajax_err => @$request_response_error_grade.text "Error deleting problem state."
+      else
+        @clear_errors()
 
     # start task to rescore problem for student
     @$btn_rescore_problem_single.click =>
       unique_student_identifier = @$field_student_select_grade.val()
       problem_to_reset = @$field_problem_select_single.val()
+      if not unique_student_identifier
+        return @$request_response_error_grade.text "Please enter a student email address or username."
+      if not problem_to_reset
+        return @$request_response_error_grade.text "Please enter a problem urlname."
       send_data =
         unique_student_identifier: unique_student_identifier
         problem_to_reset: problem_to_reset
@@ -200,18 +219,19 @@ class StudentAdmin
         url: @$btn_rescore_problem_single.data 'endpoint'
         data: send_data
         success: @clear_errors_then -> alert "Started rescore problem task for problem '#{problem_to_reset}' and student '#{unique_student_identifier}'. Click the 'Show Background Task History for Student' button to see the status of the task."
-        error: std_ajax_err => @$request_response_error_single.text "Error starting a task to rescore problem '#{problem_to_reset}' for student '#{unique_student_identifier}'."
+        error: std_ajax_err => @$request_response_error_grade.text "Error starting a task to rescore problem '#{problem_to_reset}' for student '#{unique_student_identifier}'."
 
     # list task history for student+problem
     @$btn_task_history_single.click =>
+      unique_student_identifier = @$field_student_select_grade.val()
+      problem_to_reset = @$field_problem_select_single.val()
+      if not unique_student_identifier
+        return @$request_response_error_grade.text "Please enter a student email address or username."
+      if not problem_to_reset
+        return @$request_response_error_grade.text "Please enter a problem urlname."
       send_data =
-        unique_student_identifier: @$field_student_select_grade.val()
-        problem_urlname: @$field_problem_select_single.val()
-
-      if not send_data.unique_student_identifier
-        return @$request_response_error_single.text "Please enter a student email address or username."
-      if not send_data.problem_urlname
-        return @$request_response_error_single.text "Please enter a problem urlname."
+        unique_student_identifier: unique_student_identifier
+        problem_urlname: problem_to_reset
 
       $.ajax
         dataType: 'json'
@@ -219,13 +239,14 @@ class StudentAdmin
         data: send_data
         success: @clear_errors_then (data) =>
           create_task_list_table @$table_task_history_single, data.tasks
-        error: std_ajax_err => @$request_response_error_single.text "Error getting task history for student+problem"
+        error: std_ajax_err => @$request_response_error_grade.text "Error getting task history for student '#{unique_student_identifier}' and problem '#{problem_to_reset}'."
 
     # start task to reset attempts on problem for all students
-    @$btn_reset_attempts_all.click => confirm_then
-      msg: "Reset attempts for all students on problem '#{@$field_problem_select_all.val()}'?"
-      ok: =>
-        problem_to_reset = @$field_problem_select_all.val()
+    @$btn_reset_attempts_all.click =>
+      problem_to_reset = @$field_problem_select_all.val()
+      if not problem_to_reset
+        return @$request_response_error_all.text "Please enter a problem urlname."
+      if window.confirm "Reset attempts for all students on problem '#{@$field_problem_select_all.val()}'?"
         send_data =
           all_students: true
           problem_to_reset: problem_to_reset
@@ -236,12 +257,15 @@ class StudentAdmin
           data: send_data
           success: @clear_errors_then -> alert "Successfully started task to reset attempts for problem '#{problem_to_reset}'. Click the 'Show Background Task History for Problem' button to see the status of the task."
           error: std_ajax_err => @$request_response_error_all.text "Error starting a task to reset attempts for all students on this problem."
+      else
+        @clear_errors()
 
     # start task to rescore problem for all students
-    @$btn_rescore_problem_all.click => confirm_then
-      msg: "Rescore problem '#{@$field_problem_select_all.val()}' for all students?"
-      ok: =>
-        problem_to_reset = @$field_problem_select_all.val()
+    @$btn_rescore_problem_all.click =>
+      problem_to_reset = @$field_problem_select_all.val()
+      if not problem_to_reset
+        return @$request_response_error_all.text "Please enter a problem urlname."
+      if window.confirm "Rescore problem '#{@$field_problem_select_all.val()}' for all students?"
         send_data =
           all_students: true
           problem_to_reset: problem_to_reset
@@ -252,6 +276,8 @@ class StudentAdmin
           data: send_data
           success: @clear_errors_then -> alert "Successfully started task to rescore problem '#{problem_to_reset}' for all students. Click the 'Show Background Task History for Problem' button to see the status of the task."
           error: std_ajax_err => @$request_response_error_all.text "Error starting a task to rescore this problem for all students."
+      else
+        @clear_errors()
 
     # list task history for problem
     @$btn_task_history_all.click =>
@@ -259,7 +285,7 @@ class StudentAdmin
         problem_urlname: @$field_problem_select_all.val()
 
       if not send_data.problem_urlname
-        return @$request_response_error_all.text "Enter a problem urlname."
+        return @$request_response_error_all.text "Please enter a problem urlname."
 
       $.ajax
         dataType: 'json'
@@ -279,11 +305,18 @@ class StudentAdmin
 
   # wraps a function, but first clear the error displays
   clear_errors_then: (cb) ->
-    @$request_response_error_single.empty()
+    @$request_response_error_progress.empty()
+    @$request_response_error_grade.empty()
     @$request_response_error_all.empty()
     ->
       cb?.apply this, arguments
 
+
+  clear_errors: ->
+    @$request_response_error_progress.empty()
+    @$request_response_error_grade.empty()
+    @$request_response_error_all.empty()
+
   # handler for when the section title is clicked.
   onClickTitle: -> @task_poller?.start()
 
diff --git a/lms/templates/instructor/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
index 001987ec1841..f3fc7b6054c9 100644
--- a/lms/templates/instructor/instructor_dashboard_2/student_admin.html
+++ b/lms/templates/instructor/instructor_dashboard_2/student_admin.html
@@ -29,9 +29,11 @@ <h2>${_("Student-specific grade inspection")}</h2>
   -->
 
   <hr>
+</div>
 
+<div class="student-grade-container action-type-container">
   <h2>${_("Student-specific grade adjustment")}</h2>
-
+  <div class="request-response-error"></div>
   <p>
     <!-- Doesn't work for username but this MUST work -->
   ${_("Specify the {platform_name} email address or username of a student here:").format(platform_name=settings.PLATFORM_NAME)}

From f4971e753b729bca6eb1e86fbdae374a65b3b6e9 Mon Sep 17 00:00:00 2001
From: Greg Price <gprice@edx.org>
Date: Fri, 27 Sep 2013 13:45:38 -0400
Subject: [PATCH 86/92] Add accessible labels for forum post body inputs

---
 lms/static/coffee/src/customwmd.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lms/static/coffee/src/customwmd.coffee b/lms/static/coffee/src/customwmd.coffee
index 838112059e4e..2dabc3ed1506 100644
--- a/lms/static/coffee/src/customwmd.coffee
+++ b/lms/static/coffee/src/customwmd.coffee
@@ -131,9 +131,11 @@ $ ->
         initialText = $elem.html()
         $elem.empty()
         _append = appended_id || ""
+        wmdInputId = "wmd-input#{_append}"
         $wmdPanel = $("<div>").addClass("wmd-panel")
                    .append($("<div>").attr("id", "wmd-button-bar#{_append}"))
-                   .append($("<textarea>").addClass("wmd-input").attr("id", "wmd-input#{_append}").html(initialText))
+                   .append($("<label>").addClass("sr").attr("for", wmdInputId).text("Post body"))
+                   .append($("<textarea>").addClass("wmd-input").attr("id", wmdInputId).html(initialText))
                    .append($("<div>").attr("id", "wmd-preview#{_append}").addClass("wmd-panel wmd-preview"))
         $elem.append($wmdPanel)
 

From f39886ef57ef5f77b2cc4e16522c1d8ba4d6651f Mon Sep 17 00:00:00 2001
From: Greg Price <gprice@edx.org>
Date: Fri, 27 Sep 2013 11:40:06 -0400
Subject: [PATCH 87/92] Ensure nav sidebar is sized correctly on page load

---
 .../src/discussion/views/discussion_thread_list_view.coffee      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index 2fc31da97a6b..5ce38a4164ab 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -95,6 +95,7 @@ if Backbone?
       @timer = 0
       @$el.html(@template())
 
+      $(window).bind "load", @updateSidebar
       $(window).bind "scroll", @updateSidebar
       $(window).bind "resize", @updateSidebar
 

From 4ab47c4d05f7bca59e550fece76efa3dfbc384e0 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 27 Sep 2013 15:42:50 -0400
Subject: [PATCH 88/92] Fix mako syntax in rubric template.

---
 .../combinedopenended/combined_open_ended_results.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/combinedopenended/combined_open_ended_results.html b/lms/templates/combinedopenended/combined_open_ended_results.html
index b8235470f494..4e357cb129e4 100644
--- a/lms/templates/combinedopenended/combined_open_ended_results.html
+++ b/lms/templates/combinedopenended/combined_open_ended_results.html
@@ -1,5 +1,5 @@
 <%! from django.utils.translation import ugettext as _ %>
-% num_results = len(results)
+<% num_results = len(results) %>
 % for (i,result) in enumerate(results):
     % if 'task_name' in result and 'result' in result:
         <div class="combined-rubric-container"

From 202e4f94e707043182e8e31f1b2c45a981e62507 Mon Sep 17 00:00:00 2001
From: Adam Palay <adam@edx.org>
Date: Fri, 27 Sep 2013 12:22:17 -0400
Subject: [PATCH 89/92] make seq tooltips appear on focus

remove focus from tab when clicked
---
 common/lib/xmodule/xmodule/css/sequence/display.scss      | 4 ++--
 common/lib/xmodule/xmodule/js/src/sequence/display.coffee | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss
index 7d611e5badbc..b15d6c27a63b 100644
--- a/common/lib/xmodule/xmodule/css/sequence/display.scss
+++ b/common/lib/xmodule/xmodule/css/sequence/display.scss
@@ -111,7 +111,7 @@ nav.sequence-nav {
           outline: 0;
         }
 
-        &:hover {
+        &:hover, &:focus {
           background-color: #fff;
           background-repeat: no-repeat;
           background-position: center 14px;
@@ -235,7 +235,7 @@ nav.sequence-nav {
           }
         }
 
-        &:hover {
+        &:hover, &:focus {
           p {
             display: block;
             margin-top: 4px;
diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
index 26246644ea00..686c1963aaf6 100644
--- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
@@ -103,6 +103,7 @@ class @Sequence
 
       sequence_links = @$('#seq_content a.seqnav')
       sequence_links.click @goto
+    @$("a.active").blur()
 
   goto: (event) =>
     event.preventDefault()

From d816d5fadeb510ff507f0ada2636e5c21bedf82c Mon Sep 17 00:00:00 2001
From: Kevin Chugh <kevinchugh@gmail.com>
Date: Fri, 27 Sep 2013 15:23:05 -0400
Subject: [PATCH 90/92] update coffeescript to dynamically render sr spans

---
 .../discussion/views/discussion_thread_show_view.coffee  | 9 ++++++++-
 .../discussion/views/thread_response_show_view.coffee    | 8 ++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
index 46a13db83e82..ef873d961cea 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
@@ -42,8 +42,10 @@ if Backbone?
     renderVoted: =>
       if window.user.voted(@model)
         @$("[data-role=discussion-vote]").addClass("is-cast")
+        @$("[data-role=discussion-vote] span.sr").html("votes (click to remove your vote)")
       else
         @$("[data-role=discussion-vote]").removeClass("is-cast")
+        @$("[data-role=discussion-vote] span.sr").html("votes (click to vote)")
         
     renderFlagged: =>
       if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
@@ -70,7 +72,12 @@ if Backbone?
       @renderVoted()
       @renderFlagged()
       @renderPinned()
-      @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])
+      @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"] + '<span class ="sr"></span>')
+      if window.user.voted(@model)
+        @$("[data-role=discussion-vote] .votes-count-number span.sr").html("votes (click to remove your vote)")
+      else
+        @$("[data-role=discussion-vote] .votes-count-number span.sr").html("votes (click to vote)")
+
 
     convertMath: ->
       element = @$(".post-body")
diff --git a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
index cb67125b9f2e..60371bbf6081 100644
--- a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
@@ -23,6 +23,7 @@ if Backbone?
       @delegateEvents()
       if window.user.voted(@model)
         @$(".vote-btn").addClass("is-cast")
+        @$(".vote-btn span.sr").html("votes (click to remove your vote)")
       @renderAttrs()
       @renderFlagged()
       @$el.find(".posted-details").timeago()
@@ -48,12 +49,14 @@ if Backbone?
       @$(".vote-btn").toggleClass("is-cast")
       if @$(".vote-btn").hasClass("is-cast")
         @vote()
+        @$(".vote-btn span.sr").html("votes (click to remove your vote)")
       else
         @unvote()
+        @$(".vote-btn span.sr").html("votes (click vote)")
 
     vote: ->
       url = @model.urlFor("upvote")
-      @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) + 1)
+      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) + 1 ) + '<span class="sr"></span>')
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-vote")
         url: url
@@ -64,7 +67,7 @@ if Backbone?
 
     unvote: ->
       url = @model.urlFor("unvote")
-      @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) - 1)
+      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) - 1 )+'<span class="sr"></span>')
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-vote")
         url: url
@@ -73,6 +76,7 @@ if Backbone?
           if textStatus == 'success'
             @model.set(response)
             
+            
 
     edit: (event) ->
         @trigger "response:edit", event

From cbbb5c7e7e0a107b0c0a0a798b24ead257730a4b Mon Sep 17 00:00:00 2001
From: Greg Price <gprice@edx.org>
Date: Fri, 27 Sep 2013 16:13:52 -0400
Subject: [PATCH 91/92] Improve focus management of forums nav sidebar

Now, when the list is reset (e.g. by sorting), the first thread is
focused. When the "Load more" link is clicked, upon loading more
threads, focus moves to the thread immediately following the thread
that was previously last in the list.
---
 .../views/discussion_thread_list_view.coffee         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index 5ce38a4164ab..82590048936d 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -144,6 +144,18 @@ if Backbone?
             options.group_id = @group_id
         
     
+      lastThread = @collection.last()?.get('id')
+      if lastThread
+        # Pagination; focus the first thread after what was previously the last thread
+        @once("threads:rendered", ->
+          $(".post-list li:has(a[data-id='#{lastThread}']) + li a").focus()
+        )
+      else
+        # Totally refreshing the list (e.g. from clicking a sort button); focus the first thread
+        @once("threads:rendered", ->
+          $(".post-list a").first()?.focus()
+        )
+
       @collection.retrieveAnotherPage(@mode, options, {sort_key: @sortBy})
 
     renderThread: (thread) =>

From 9a5e6f1fdd49d2177b900fa0c4c5ca31b6f5235e Mon Sep 17 00:00:00 2001
From: Kevin Chugh <kevinchugh@gmail.com>
Date: Fri, 27 Sep 2013 17:12:48 -0400
Subject: [PATCH 92/92] code review cleanup

---
 .../src/discussion/views/thread_response_show_view.coffee  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
index 60371bbf6081..43b2d3055ed3 100644
--- a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
@@ -52,11 +52,11 @@ if Backbone?
         @$(".vote-btn span.sr").html("votes (click to remove your vote)")
       else
         @unvote()
-        @$(".vote-btn span.sr").html("votes (click vote)")
+        @$(".vote-btn span.sr").html("votes (click to vote)")
 
     vote: ->
       url = @model.urlFor("upvote")
-      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) + 1 ) + '<span class="sr"></span>')
+      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) + 1) + '<span class="sr"></span>')
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-vote")
         url: url
@@ -67,7 +67,7 @@ if Backbone?
 
     unvote: ->
       url = @model.urlFor("unvote")
-      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) - 1 )+'<span class="sr"></span>')
+      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) - 1)+'<span class="sr"></span>')
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-vote")
         url: url
@@ -76,7 +76,6 @@ if Backbone?
           if textStatus == 'success'
             @model.set(response)
             
-            
 
     edit: (event) ->
         @trigger "response:edit", event