From 65e3982fd2d8768070a2938a5668ed09ed1e8398 Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Thu, 4 Oct 2012 14:07:30 -0400
Subject: [PATCH 01/11] things now upload

---
 cms/djangoapps/contentstore/views.py | 39 ++++++++++++++++++++++++----
 cms/static/js/base.js                | 24 ++++++++++++++---
 cms/templates/asset_index.html       | 12 ++++++---
 cms/templates/base.html              |  1 +
 cms/urls.py                          |  3 ++-
 5 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index fa9bd30797..cbc487dc37 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -772,23 +772,52 @@ def remove_user(request, location):
 
     return create_json_response()
 
-@login_required
-@ensure_csrf_cookie
-def asset_index(request, location):
-    return render_to_response('asset_index.html',{})
 
 # points to the temporary course landing page with log in and sign up
 def landing(request, org, course, coursename):
     return render_to_response('temp-course-landing.html', {})
 
+
 def static_pages(request, org, course, coursename):
     return render_to_response('static-pages.html', {})
 
+
 def edit_static(request, org, course, coursename):
     return render_to_response('edit-static-page.html', {})
 
+
 def not_found(request):
     return render_to_response('error.html', {'error': '404'})
 
+
 def server_error(request):
-    return render_to_response('error.html', {'error': '500'})
\ No newline at end of file
+    return render_to_response('error.html', {'error': '500'})
+
+
+@login_required
+@ensure_csrf_cookie
+def asset_index(request, org, course, name):
+    """
+    Display an editable asset library
+
+    org, course, name: Attributes of the Location for the item to edit
+    """
+    location = ['i4x', org, course, 'course', name]
+    
+    # check that logged in user has permissions to this item
+    if not has_access(request.user, location):
+        raise PermissionDenied()
+
+    upload_asset_callback_url = reverse('upload_asset', kwargs = {
+            'org' : org,
+            'course' : course,
+            'coursename' : name
+            })
+
+    course = modulestore().get_item(location)
+    sections = course.get_children()
+
+    return render_to_response('asset_index.html', {
+        'sections': sections,
+        'upload_asset_callback_url': upload_asset_callback_url
+    })
diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 42afe992d5..0f42231c1c 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -233,12 +233,28 @@ function showFileSelectionMenu(e) {
 function startUpload(e) {
     $('.upload-modal h1').html('Uploading…');
     $('.upload-modal .file-name').html($('.file-input').val());
+
+    var bar = $('.progress-fill');
+    var percent = $('.percent');
+
+    $('.upload-modal .file-chooser').ajaxSubmit({
+        beforeSend: function() {
+            var percentVal = '0%';
+            bar.width(percentVal)
+            percent.html(percentVal);
+        },
+        uploadProgress: function(event, position, total, percentComplete) {
+            var percentVal = percentComplete + '%';
+            bar.width(percentVal)
+            percent.html(percentVal);
+        },
+        complete: function(xhr) {
+          markAsLoaded();
+        }
+    });
+
     $('.upload-modal .choose-file-button').hide();
     $('.upload-modal .progress-bar').removeClass('loaded').show();
-    $('.upload-modal .progress-fill').html('').css('width', '0').animate({
-        'width': '100%'
-    }, 1500);
-    setTimeout(markAsLoaded, 1500);
 }
 
 function markAsLoaded() {
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 0069cae9ba..41680ade6a 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -9,7 +9,8 @@
     <div class="inner-wrapper">
       <h1>Asset Library</h1>
       <div class="page-actions">
-        <a href="#" class="upload-button">Upload New File</a><input type="text" class="asset-search-input search wip-box" placeholder="search assets" />
+        <a href="#" class="upload-button">Upload New File</a>
+	      <input type="text" class="asset-search-input search wip-box" placeholder="search assets" />
       </div>
       <article class="asset-library">
         <table>
@@ -187,14 +188,17 @@
 			<div class="progress-bar">
 				<div class="progress-fill"></div>
 			</div>
+      <div class="percent">0%</div>
+      <div class="status"></div>
 			<a href="#" class="copy-button">Copy Embed Link</a>
-			<div class="file-chooser">
+			<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">
-			</div>
+				<input type="file" class="file-input" name="file">
+			</form>
 		</div>
 	</div>
 
 	<div class="modal-cover"></div>
 
+
 </%block>
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 915394f458..f847ad6f7b 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -33,6 +33,7 @@
     <script src="${static.url('js/vendor/jquery.cookie.js')}"></script>
     <script src="${static.url('js/vendor/jquery.leanModal.min.js')}"></script>
     <script src="${static.url('js/vendor/jquery.tablednd.js')}"></script>
+    <script src="http://malsup.github.com/jquery.form.js"></script>
     <script type="text/javascript">
       document.write('\x3Cscript type="text/javascript" src="' +
           document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
diff --git a/cms/urls.py b/cms/urls.py
index c5802d8b7f..fc6c9a118d 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -38,8 +38,9 @@ urlpatterns = ('',
     url(r'^landing/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.landing', name='landing'),
 
     url(r'^not_found$', 'contentstore.views.not_found', name='not_found'),
-    url(r'^server_error$', 'contentstore.views.server_error', name='server_error')
+    url(r'^server_error$', 'contentstore.views.server_error', name='server_error'),
 
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$', 'contentstore.views.asset_index', name='asset_index'),
 )
 
 # User creation and updating views

From deca6e66b0e92879dab0eca81b39f4fb47651100 Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Thu, 4 Oct 2012 15:03:51 -0400
Subject: [PATCH 02/11] cleaned filenames

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

diff --git a/common/lib/xmodule/xmodule/contentstore/content.py b/common/lib/xmodule/xmodule/contentstore/content.py
index 48ef078fd9..085823c4c7 100644
--- a/common/lib/xmodule/xmodule/contentstore/content.py
+++ b/common/lib/xmodule/xmodule/contentstore/content.py
@@ -24,7 +24,7 @@ class StaticContent(object):
 
     @staticmethod
     def compute_location(org, course, name, revision=None):
-        return Location([XASSET_LOCATION_TAG, org, course, 'asset', name, revision])
+        return Location([XASSET_LOCATION_TAG, org, course, 'asset', Location.clean(name), revision])
 
     def get_id(self):
         return StaticContent.get_id_from_location(self.location)

From d35ff48e5b7ba24730f33bcb31bfc4c1cb6dd9a9 Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Thu, 4 Oct 2012 16:30:55 -0400
Subject: [PATCH 03/11] fixed up some of the ajax feedback to display to the
 user

---
 cms/static/js/base.js          | 18 +++++++++---------
 cms/templates/asset_index.html |  4 +---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 0f42231c1c..4260e2525a 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -234,25 +234,27 @@ function startUpload(e) {
     $('.upload-modal h1').html('Uploading…');
     $('.upload-modal .file-name').html($('.file-input').val());
 
-    var bar = $('.progress-fill');
-    var percent = $('.percent');
+    var bar = $('.upload-modal .progress-fill');
 
     $('.upload-modal .file-chooser').ajaxSubmit({
         beforeSend: function() {
             var percentVal = '0%';
             bar.width(percentVal)
-            percent.html(percentVal);
+            bar.html(percentVal);
         },
         uploadProgress: function(event, position, total, percentComplete) {
             var percentVal = percentComplete + '%';
             bar.width(percentVal)
-            percent.html(percentVal);
+            bar.html(percentVal);
         },
         complete: function(xhr) {
-          markAsLoaded();
+            if(xhr.status = 200){
+                markAsLoaded();
+            }
+            bar.html(xhr.responseText);
+            $('.upload-modal .choose-file-button').html('Load Another File').show();
         }
     });
-
     $('.upload-modal .choose-file-button').hide();
     $('.upload-modal .progress-bar').removeClass('loaded').show();
 }
@@ -260,9 +262,7 @@ function startUpload(e) {
 function markAsLoaded() {
     $('.upload-modal .copy-button').css('display', 'inline-block');
     $('.upload-modal .progress-bar').addClass('loaded');
-    $('.upload-modal .progress-fill').html('loaded successfully');
-    $('.upload-modal .choose-file-button').html('Load Another File').show();
-}
+}    
 
 function hideModal(e) {
     e.preventDefault();
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 41680ade6a..769ba65c7f 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -188,9 +188,7 @@
 			<div class="progress-bar">
 				<div class="progress-fill"></div>
 			</div>
-      <div class="percent">0%</div>
-      <div class="status"></div>
-			<a href="#" class="copy-button">Copy Embed Link</a>
+  		<a href="#" class="copy-button">Copy Embed Link</a>
 			<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">

From 7791a7c4aa84ebd9c8eda6b8067f57dd8772a2b8 Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Thu, 4 Oct 2012 16:45:22 -0400
Subject: [PATCH 04/11] slight refactoring of the javascript

---
 cms/static/js/base.js | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 4260e2525a..36253b8691 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -233,32 +233,35 @@ function showFileSelectionMenu(e) {
 function startUpload(e) {
     $('.upload-modal h1').html('Uploading…');
     $('.upload-modal .file-name').html($('.file-input').val());
-
-    var bar = $('.upload-modal .progress-fill');
-
     $('.upload-modal .file-chooser').ajaxSubmit({
-        beforeSend: function() {
-            var percentVal = '0%';
-            bar.width(percentVal)
-            bar.html(percentVal);
-        },
-        uploadProgress: function(event, position, total, percentComplete) {
-            var percentVal = percentComplete + '%';
-            bar.width(percentVal)
-            bar.html(percentVal);
-        },
-        complete: function(xhr) {
-            if(xhr.status = 200){
-                markAsLoaded();
-            }
-            bar.html(xhr.responseText);
-            $('.upload-modal .choose-file-button').html('Load Another File').show();
-        }
+        beforeSend: resetUploadBar,
+        uploadProgress: showUploadFeedback,
+        complete: displayFinishedUpload
     });
     $('.upload-modal .choose-file-button').hide();
     $('.upload-modal .progress-bar').removeClass('loaded').show();
 }
 
+function resetUploadBar(){
+    var percentVal = '0%';
+    $('.upload-modal .progress-fill').width(percentVal)
+    $('.upload-modal .progress-fill').html(percentVal);
+}
+
+function showUploadFeedback(event, position, total, percentComplete) {
+    var percentVal = percentComplete + '%';
+    $('.upload-modal .progress-fill').width(percentVal);
+    $('.upload-modal .progress-fill').html(percentVal);
+}
+
+function displayFinishedUpload(xhr) {
+    if(xhr.status = 200){
+        markAsLoaded();
+    }
+    $('.upload-modal .progress-fill').html(xhr.responseText);
+    $('.upload-modal .choose-file-button').html('Load Another File').show();
+}
+
 function markAsLoaded() {
     $('.upload-modal .copy-button').css('display', 'inline-block');
     $('.upload-modal .progress-bar').addClass('loaded');

From f26a4af75c8cd64b316d1f2ab62d412afdc61c7b Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Fri, 5 Oct 2012 09:43:16 -0400
Subject: [PATCH 05/11] thinks work, they just don't display prettily, and it
 is hard to actually use the assets due to links

---
 cms/djangoapps/contentstore/views.py          |  21 ++-
 cms/templates/asset_index.html                | 122 +-----------------
 .../xmodule/xmodule/contentstore/content.py   |  19 +++
 .../lib/xmodule/xmodule/contentstore/mongo.py |   2 +-
 4 files changed, 42 insertions(+), 122 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index cbc487dc37..d4a59be4d6 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -618,7 +618,7 @@ def upload_asset(request, org, course, coursename):
     if not has_access(request.user, location):
         return HttpResponseForbidden()
     
-    # Does the course actually exist?!?
+    # Does the course actually exist?!? Get anything from it to prove its existance
     
     try:
         item = modulestore().get_item(location)
@@ -813,11 +813,22 @@ def asset_index(request, org, course, name):
             'course' : course,
             'coursename' : name
             })
+    
+    course_reference = StaticContent.compute_location(org, course, name)
+    assets = contentstore().get_all_content_for_course(course_reference)
+    asset_display = []
+    for asset in assets:
+        id = asset['_id']
+        display_info = {}
+        display_info['displayname'] = asset['displayname']
+        display_info['uploadDate'] = asset['uploadDate']
+        contentstore_reference = StaticContent.compute_location(id['course'], id['org'], id['name'])
+        display_info['url'] = StaticContent.get_url_path_from_location(contentstore_reference)
+        
+        asset_display.append(display_info)
 
-    course = modulestore().get_item(location)
-    sections = course.get_children()
-
+    print assets[0]
     return render_to_response('asset_index.html', {
-        'sections': sections,
+        'assets': asset_display,
         'upload_asset_callback_url': upload_asset_callback_url
     })
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 769ba65c7f..c27de25bf0 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -23,20 +23,22 @@
             </tr>
           </thead>
           <tbody>
+          % for asset in assets:
             <tr>
               <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/3185/screenshots/149571/picture_39.png"></div>
+                <div class="thumb"><img src="${asset['url']}"></div>
               </td>
               <td class="name-col">
-                <a href="#" class="filename">raygun-1.jpg</a>
+                <a href="${asset['url']}" class="filename">${asset['displayname']}</a>
               </td>
               <td class="date-col">
-                10/2/2012
+                ${asset['uploadDate']}
               </td>
               <td class="embed-col">
-                <a href="#">copy</a>
+                <a href="${asset['url']}">copy</a>
               </td>
             </tr>
+          % endfor
             <tr>
               <td class="thumb-col">
                 <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/4573/screenshots/157708/final.png"></div>
@@ -51,118 +53,6 @@
                 <a href="#">copy</a>
               </td>
             </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/15101/screenshots/228625/star_wars_lightsbaer_2.jpg"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-2.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/3185/screenshots/149571/picture_39.png"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-1.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/4573/screenshots/157708/final.png"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-2.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/15101/screenshots/228625/star_wars_lightsbaer_2.jpg"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-2.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/3185/screenshots/149571/picture_39.png"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-1.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/4573/screenshots/157708/final.png"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-2.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/15101/screenshots/228625/star_wars_lightsbaer_2.jpg"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-2.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/3185/screenshots/149571/picture_39.png"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-1.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
           </tbody>
         </table>
         <nav class="pagination">
diff --git a/common/lib/xmodule/xmodule/contentstore/content.py b/common/lib/xmodule/xmodule/contentstore/content.py
index 085823c4c7..01bb1a626e 100644
--- a/common/lib/xmodule/xmodule/contentstore/content.py
+++ b/common/lib/xmodule/xmodule/contentstore/content.py
@@ -65,4 +65,23 @@ class ContentStore(object):
         raise NotImplementedError
 
     def get_all_content_for_course(self, location):
+        '''
+        Returns a list of all static assets for a course. The return format is a list of dictionary elements. Example:
+
+            [
+
+            {u'displayname': u'profile.jpg', u'chunkSize': 262144, u'length': 85374, 
+            u'uploadDate': datetime.datetime(2012, 10, 3, 5, 41, 54, 183000), u'contentType': u'image/jpeg', 
+            u'_id': {u'category': u'asset', u'name': u'profile.jpg', u'course': u'6.002x', u'tag': u'c4x', 
+            u'org': u'MITx', u'revision': None}, u'md5': u'36dc53519d4b735eb6beba51cd686a0e'}, 
+
+            {u'displayname': u'profile.thumbnail.jpg', u'chunkSize': 262144, u'length': 4073, 
+            u'uploadDate': datetime.datetime(2012, 10, 3, 5, 41, 54, 196000), u'contentType': u'image/jpeg', 
+            u'_id': {u'category': u'asset', u'name': u'profile.thumbnail.jpg', u'course': u'6.002x', u'tag': u'c4x', 
+            u'org': u'MITx', u'revision': None}, u'md5': u'ff1532598830e3feac91c2449eaa60d6'},
+
+            ....
+
+            ]
+        '''
         raise NotImplementedError
diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/common/lib/xmodule/xmodule/contentstore/mongo.py
index 5560624720..9a5e080f3b 100644
--- a/common/lib/xmodule/xmodule/contentstore/mongo.py
+++ b/common/lib/xmodule/xmodule/contentstore/mongo.py
@@ -42,7 +42,7 @@ class MongoContentStore(ContentStore):
         except NoFile:
             raise NotFoundError()
 
-    def get_all_content_info_for_course(self, location):
+    def get_all_content_for_course(self, location):
         '''
         Returns a list of all static assets for a course. The return format is a list of dictionary elements. Example:
 

From 83eeb1961a0a918f0bbbd05f3b06468136654fc7 Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Fri, 5 Oct 2012 10:36:43 -0400
Subject: [PATCH 06/11] fixed erroneous order

---
 cms/djangoapps/contentstore/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index d4a59be4d6..20c3220a1e 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -822,7 +822,7 @@ def asset_index(request, org, course, name):
         display_info = {}
         display_info['displayname'] = asset['displayname']
         display_info['uploadDate'] = asset['uploadDate']
-        contentstore_reference = StaticContent.compute_location(id['course'], id['org'], id['name'])
+        contentstore_reference = StaticContent.compute_location(id['org'], id['course'], id['name'])
         display_info['url'] = StaticContent.get_url_path_from_location(contentstore_reference)
         
         asset_display.append(display_info)

From 63786822019e8670b8199e6ce7f50777cb0a068a Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Fri, 5 Oct 2012 17:41:33 -0400
Subject: [PATCH 07/11] thumnail image is a thumnail image

---
 cms/djangoapps/contentstore/views.py | 11 ++++++++---
 cms/templates/asset_index.html       |  2 +-
 cms/urls.py                          |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 20c3220a1e..4d957c2841 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -822,12 +822,17 @@ def asset_index(request, org, course, name):
         display_info = {}
         display_info['displayname'] = asset['displayname']
         display_info['uploadDate'] = asset['uploadDate']
-        contentstore_reference = StaticContent.compute_location(id['org'], id['course'], id['name'])
-        display_info['url'] = StaticContent.get_url_path_from_location(contentstore_reference)
         
+        asset_location = StaticContent.compute_location(id['org'], id['course'], id['name'])
+        display_info['url'] = StaticContent.get_url_path_from_location(asset_location)
+        
+        thumbnail_name = contentstore().find(asset_location).generate_thumbnail_name()
+        thumbnail_location = StaticContent.compute_location(id['org'], id['course'], thumbnail_name)
+        display_info['thumb_url'] = StaticContent.get_url_path_from_location(thumbnail_location)
+        
+
         asset_display.append(display_info)
 
-    print assets[0]
     return render_to_response('asset_index.html', {
         'assets': asset_display,
         'upload_asset_callback_url': upload_asset_callback_url
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index c27de25bf0..0da3ebc6c7 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -26,7 +26,7 @@
           % for asset in assets:
             <tr>
               <td class="thumb-col">
-                <div class="thumb"><img src="${asset['url']}"></div>
+                <div class="thumb"><img src="${asset['thumb_url']}"></div>
               </td>
               <td class="name-col">
                 <a href="${asset['url']}" class="filename">${asset['displayname']}</a>
diff --git a/cms/urls.py b/cms/urls.py
index fc6c9a118d..33a14fe80e 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -30,9 +30,9 @@ urlpatterns = ('',
         'contentstore.views.remove_user', name='remove_user'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)/remove_user$',
         'contentstore.views.remove_user', name='remove_user'),
-    url(r'^assets/(?P<location>.*?)$', 'contentstore.views.asset_index', name='asset_index'),
     url(r'^pages/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.static_pages', name='static_pages'),
     url(r'^edit_static/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edit_static', name='edit_static'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$', 'contentstore.views.asset_index', name='asset_index'),
 
     # temporary landing page for a course
     url(r'^landing/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.landing', name='landing'),

From 2153aae62ca9eb699aacf699443814e24115156f Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Mon, 8 Oct 2012 11:26:51 -0400
Subject: [PATCH 08/11] schema change to better normalize asset->thumbnail
 relationships

---
 cms/djangoapps/contentstore/views.py          | 56 ++++++++++++-------
 .../xmodule/xmodule/contentstore/content.py   | 23 +++++---
 .../lib/xmodule/xmodule/contentstore/mongo.py | 16 +++++-
 3 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 4d957c2841..5717d964a0 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -635,23 +635,8 @@ def upload_asset(request, org, course, coursename):
     mime_type = request.FILES['file'].content_type
     filedata = request.FILES['file'].read()
 
-    file_location = StaticContent.compute_location(org, course, name)
+    thumbnail_file_location = None
 
-    content = StaticContent(file_location, name, mime_type, filedata)
-
-    # first commit to the DB
-    contentstore().save(content)
-
-    # then remove the cache so we're not serving up stale content
-    # NOTE: we're not re-populating the cache here as the DB owns the last-modified timestamp
-    # which is used when serving up static content. This integrity is needed for
-    # browser-side caching support. We *could* re-fetch the saved content so that we have the
-    # timestamp populated, but we might as well wait for the first real request to come in
-    # to re-populate the cache.
-    del_cached_content(content.location)
-
-    # if we're uploading an image, then let's generate a thumbnail so that we can
-    # serve it up when needed without having to rescale on the fly
     if mime_type.split('/')[0] == 'image':
         try:
             # not sure if this is necessary, but let's rewind the stream just in case
@@ -673,11 +658,11 @@ def upload_asset(request, org, course, coursename):
             thumbnail_file.seek(0)
         
             # use a naming convention to associate originals with the thumbnail
-            thumbnail_name = content.generate_thumbnail_name()
+            thumbnail_name = StaticContent.generate_thumbnail_name(name)
 
             # then just store this thumbnail as any other piece of content
             thumbnail_file_location = StaticContent.compute_location(org, course, 
-                                                                              thumbnail_name)
+                                                                              thumbnail_name, is_thumbnail=True)
             thumbnail_content = StaticContent(thumbnail_file_location, thumbnail_name, 
                                               'image/jpeg', thumbnail_file)
             contentstore().save(thumbnail_content)
@@ -685,9 +670,37 @@ def upload_asset(request, org, course, coursename):
             # remove any cached content at this location, as thumbnails are treated just like any
             # other bit of static content
             del_cached_content(thumbnail_content.location)
+
+            # not sure if this is necessary, but let's rewind the stream just in case
+            request.FILES['file'].seek(0)
         except:
             # catch, log, and continue as thumbnails are not a hard requirement
             logging.error('Failed to generate thumbnail for {0}. Continuing...'.format(name))
+            thumbnail_file_location = None
+            raise
+
+
+    file_location = StaticContent.compute_location(org, course, name)
+
+    # if we're uploading an asset for which we can generate a thumbnail, let's generate it first so that we have
+    # the location to point to
+
+    content = StaticContent(file_location, name, mime_type, filedata, thumbnail_location = thumbnail_file_location)
+
+    # first commit to the DB
+    contentstore().save(content)
+
+    # then remove the cache so we're not serving up stale content
+    # NOTE: we're not re-populating the cache here as the DB owns the last-modified timestamp
+    # which is used when serving up static content. This integrity is needed for
+    # browser-side caching support. We *could* re-fetch the saved content so that we have the
+    # timestamp populated, but we might as well wait for the first real request to come in
+    # to re-populate the cache.
+    del_cached_content(content.location)
+
+    # if we're uploading an image, then let's generate a thumbnail so that we can
+    # serve it up when needed without having to rescale on the fly
+ 
 
 
     return HttpResponse('Upload completed')
@@ -816,6 +829,7 @@ def asset_index(request, org, course, name):
     
     course_reference = StaticContent.compute_location(org, course, name)
     assets = contentstore().get_all_content_for_course(course_reference)
+    thumbnails = contentstore().get_all_content_thumbnails_for_course(course_reference)
     asset_display = []
     for asset in assets:
         id = asset['_id']
@@ -826,11 +840,11 @@ def asset_index(request, org, course, name):
         asset_location = StaticContent.compute_location(id['org'], id['course'], id['name'])
         display_info['url'] = StaticContent.get_url_path_from_location(asset_location)
         
-        thumbnail_name = contentstore().find(asset_location).generate_thumbnail_name()
-        thumbnail_location = StaticContent.compute_location(id['org'], id['course'], thumbnail_name)
+        # note, due to the schema change we may not have a 'thumbnail_location' in the result set
+        thumbnail_location = Location(asset.get('thumbnail_location', None))
+
         display_info['thumb_url'] = StaticContent.get_url_path_from_location(thumbnail_location)
         
-
         asset_display.append(display_info)
 
     return render_to_response('asset_index.html', {
diff --git a/common/lib/xmodule/xmodule/contentstore/content.py b/common/lib/xmodule/xmodule/contentstore/content.py
index 01bb1a626e..2807b1d2ba 100644
--- a/common/lib/xmodule/xmodule/contentstore/content.py
+++ b/common/lib/xmodule/xmodule/contentstore/content.py
@@ -1,30 +1,32 @@
 XASSET_LOCATION_TAG = 'c4x'
 XASSET_SRCREF_PREFIX = 'xasset:'
 
-XASSET_THUMBNAIL_TAIL_NAME = '.thumbnail.jpg'
+XASSET_THUMBNAIL_TAIL_NAME = '.jpg'
 
 import os
 import logging
 from xmodule.modulestore import Location
 
 class StaticContent(object):
-    def __init__(self, loc, name, content_type, data, last_modified_at=None):
+    def __init__(self, loc, name, content_type, data, last_modified_at=None, thumbnail_location=None):
         self.location = loc
         self.name = name #a display string which can be edited, and thus not part of the location which needs to be fixed
         self.content_type = content_type
         self.data = data
         self.last_modified_at = last_modified_at
+        self.thumbnail_location = thumbnail_location
 
     @property
     def is_thumbnail(self):
-        return self.name.endswith(XASSET_THUMBNAIL_TAIL_NAME)
-
-    def generate_thumbnail_name(self):
-        return ('{0}'+XASSET_THUMBNAIL_TAIL_NAME).format(os.path.splitext(self.name)[0])
+        return self.location.category == 'thumbnail'
 
     @staticmethod
-    def compute_location(org, course, name, revision=None):
-        return Location([XASSET_LOCATION_TAG, org, course, 'asset', Location.clean(name), revision])
+    def generate_thumbnail_name(original_name):
+        return ('{0}'+XASSET_THUMBNAIL_TAIL_NAME).format(os.path.splitext(original_name)[0])
+
+    @staticmethod
+    def compute_location(org, course, name, revision=None, is_thumbnail=False):
+        return Location([XASSET_LOCATION_TAG, org, course, 'asset' if not is_thumbnail else 'thumbnail', Location.clean(name), revision])
 
     def get_id(self):
         return StaticContent.get_id_from_location(self.location)
@@ -34,7 +36,10 @@ class StaticContent(object):
     
     @staticmethod
     def get_url_path_from_location(location):
-        return "/{tag}/{org}/{course}/{category}/{name}".format(**location.dict())
+        if location is not None:
+            return "/{tag}/{org}/{course}/{category}/{name}".format(**location.dict())
+        else:
+            return None
 
     @staticmethod
     def get_id_from_location(location):
diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/common/lib/xmodule/xmodule/contentstore/mongo.py
index 9a5e080f3b..b5235e6745 100644
--- a/common/lib/xmodule/xmodule/contentstore/mongo.py
+++ b/common/lib/xmodule/xmodule/contentstore/mongo.py
@@ -28,7 +28,9 @@ class MongoContentStore(ContentStore):
         if self.fs.exists({"_id" : id}):
             self.fs.delete(id)
 
-        with self.fs.new_file(_id = id, filename=content.get_url_path(), content_type=content.content_type, displayname=content.name) as fp:
+        with self.fs.new_file(_id = id, filename=content.get_url_path(), content_type=content.content_type, 
+            displayname=content.name, thumbnail_location=content.thumbnail_location) as fp:
+
             fp.write(content.data)
         
         return content
@@ -38,11 +40,18 @@ class MongoContentStore(ContentStore):
         id = StaticContent.get_id_from_location(location)
         try:
             with self.fs.get(id) as fp:
-                return StaticContent(location, fp.displayname, fp.content_type, fp.read(), fp.uploadDate)
+                return StaticContent(location, fp.displayname, fp.content_type, fp.read(), 
+                    fp.uploadDate, thumbnail_location = fp.thumbnail_location if 'thumbnail_location' in fp else None)
         except NoFile:
             raise NotFoundError()
 
+    def get_all_content_thumbnails_for_course(self, location):
+        return self._get_all_content_for_course(location, get_thumbnails = True)
+
     def get_all_content_for_course(self, location):
+        return self._get_all_content_for_course(location, get_thumbnails = False)
+
+    def _get_all_content_for_course(self, location, get_thumbnails = False):
         '''
         Returns a list of all static assets for a course. The return format is a list of dictionary elements. Example:
 
@@ -62,7 +71,8 @@ class MongoContentStore(ContentStore):
 
             ]
         '''
-        course_filter = Location(XASSET_LOCATION_TAG, category="asset",course=location.course,org=location.org)
+        course_filter = Location(XASSET_LOCATION_TAG, category="asset" if not get_thumbnails else "thumbnail",
+            course=location.course,org=location.org)
         # 'borrow' the function 'location_to_query' from the Mongo modulestore implementation
         items = self.fs_files.find(location_to_query(course_filter))
         return list(items)

From 115d7358fa71367006d011bbc2a0012e12dcc137 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Mon, 8 Oct 2012 11:31:45 -0400
Subject: [PATCH 09/11] fix up commenting after refactoring. Also, don't
 reraise an exception during thumbnail generation - we just want to swallow
 the exception, log, and continue.

---
 cms/djangoapps/contentstore/views.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 5717d964a0..defe4e5902 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -637,6 +637,9 @@ def upload_asset(request, org, course, coursename):
 
     thumbnail_file_location = None
 
+    # if the upload asset is an image, we can generate a thumbnail from it
+    # let's do so now, so that we have the thumbnail location which we need 
+    # so that the asset can point to it
     if mime_type.split('/')[0] == 'image':
         try:
             # not sure if this is necessary, but let's rewind the stream just in case
@@ -677,14 +680,11 @@ def upload_asset(request, org, course, coursename):
             # catch, log, and continue as thumbnails are not a hard requirement
             logging.error('Failed to generate thumbnail for {0}. Continuing...'.format(name))
             thumbnail_file_location = None
-            raise
 
 
     file_location = StaticContent.compute_location(org, course, name)
 
-    # if we're uploading an asset for which we can generate a thumbnail, let's generate it first so that we have
-    # the location to point to
-
+    # create a StaticContent entity and point to the thumbnail
     content = StaticContent(file_location, name, mime_type, filedata, thumbnail_location = thumbnail_file_location)
 
     # first commit to the DB
@@ -698,11 +698,6 @@ def upload_asset(request, org, course, coursename):
     # to re-populate the cache.
     del_cached_content(content.location)
 
-    # if we're uploading an image, then let's generate a thumbnail so that we can
-    # serve it up when needed without having to rescale on the fly
- 
-
-
     return HttpResponse('Upload completed')
 
 '''

From 0bd5446f800eedd49707281ce6a355677e254427 Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Tue, 9 Oct 2012 15:16:36 -0400
Subject: [PATCH 10/11] fixed date display

---
 cms/djangoapps/contentstore/utils.py |  5 +++++
 cms/djangoapps/contentstore/views.py |  7 ++++---
 cms/templates/asset_index.html       | 16 +---------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index bc33c7d1f6..fe1a64f5cf 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -74,3 +74,8 @@ def compute_unit_state(unit):
             return UnitState.private
     else:
         return UnitState.public
+
+
+def get_date_display(date):
+    print date, type(date)
+    return date.strftime("%d %B, %Y at %I:%M %p")
diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index defe4e5902..2a2c38668f 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -1,3 +1,4 @@
+import traceback 
 from util.json_request import expect_json
 import exceptions
 import json
@@ -44,7 +45,7 @@ from cache_toolbox.core import set_cached_content, get_cached_content, del_cache
 from auth.authz import is_user_in_course_group_role, get_users_in_course_group_by_role
 from auth.authz import get_user_by_email, add_user_to_course_group, remove_user_from_course_group
 from auth.authz import INSTRUCTOR_ROLE_NAME, STAFF_ROLE_NAME
-from .utils import get_course_location_for_item, get_lms_link_for_item, compute_unit_state
+from .utils import get_course_location_for_item, get_lms_link_for_item, compute_unit_state, get_date_display
 
 from xmodule.templates import all_templates
 
@@ -669,7 +670,7 @@ def upload_asset(request, org, course, coursename):
             thumbnail_content = StaticContent(thumbnail_file_location, thumbnail_name, 
                                               'image/jpeg', thumbnail_file)
             contentstore().save(thumbnail_content)
-
+            
             # remove any cached content at this location, as thumbnails are treated just like any
             # other bit of static content
             del_cached_content(thumbnail_content.location)
@@ -830,7 +831,7 @@ def asset_index(request, org, course, name):
         id = asset['_id']
         display_info = {}
         display_info['displayname'] = asset['displayname']
-        display_info['uploadDate'] = asset['uploadDate']
+        display_info['uploadDate'] = get_date_display(asset['uploadDate'])
         
         asset_location = StaticContent.compute_location(id['org'], id['course'], id['name'])
         display_info['url'] = StaticContent.get_url_path_from_location(asset_location)
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 0da3ebc6c7..ae2958ecac 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -39,23 +39,9 @@
               </td>
             </tr>
           % endfor
-            <tr>
-              <td class="thumb-col">
-                <div class="thumb"><img src="http://dribbble.s3.amazonaws.com/users/4573/screenshots/157708/final.png"></div>
-              </td>
-              <td class="name-col">
-                <a href="#" class="filename">raygun-2.jpg</a>
-              </td>
-              <td class="date-col">
-                10/2/2012
-              </td>
-              <td class="embed-col">
-                <a href="#">copy</a>
-              </td>
-            </tr>
           </tbody>
         </table>
-        <nav class="pagination">
+        <nav class="pagination wip-box">
           Page: 
           <ol class="pages">
             <li>1</li>

From f06c67ef08157b8edb038ee16b017f727a44acdd Mon Sep 17 00:00:00 2001
From: Lyla Fischer <lyla@edx.org>
Date: Tue, 9 Oct 2012 18:52:54 -0400
Subject: [PATCH 11/11] added embeddable links

---
 cms/djangoapps/contentstore/views.py |  5 +++--
 cms/static/js/base.js                | 16 ++++++++++++++++
 cms/static/sass/_assets.scss         |  3 +++
 cms/templates/asset_index.html       |  9 ++++++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 2a2c38668f..26ed3c53d2 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -698,8 +698,9 @@ def upload_asset(request, org, course, coursename):
     # timestamp populated, but we might as well wait for the first real request to come in
     # to re-populate the cache.
     del_cached_content(content.location)
-
-    return HttpResponse('Upload completed')
+    response = HttpResponse('Upload completed')
+    response['asset_url'] = StaticContent.get_url_path_from_location(file_location)
+    return response
 
 '''
 This view will return all CMS users who are editors for the specified course
diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 36253b8691..c73eaead44 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -23,6 +23,10 @@ $(document).ready(function() {
     $modalCover.bind('click', hideHistoryModal);
     $('.assets .upload-button').bind('click', showUploadModal);
     $('.upload-modal .close-button').bind('click', hideModal);
+
+    $('a.show-xml').toggle(showEmbeddableXML, hideEmbeddableXML);
+
+    $('a.copy-button').toggle(showEmbeddableXML, hideEmbeddableXML);
     $('.unit .item-actions .delete-button').bind('click', deleteUnit);
     $('.new-unit-item').bind('click', createNewUnit);
     $('.save-subsection').bind('click', saveSubsection);
@@ -72,6 +76,17 @@ function removePolicyMetadata(e) {
         _parent_el.remove();
     else
         _parent_el.appendTo("#policy-to-delete");
+
+function showEmbeddableXML(e) {
+    $ceiling = $(this).parents('tr');
+    if ($ceiling.length === 0) $ceiling = $(this).parents('.upload-modal');
+    $ceiling.find('.embeddable-xml').html('&lt;img src="'+$(this).attr('href')+'"/&gt;');
+}
+function hideEmbeddableXML(e) {
+    $ceiling = $(this).parents('tr');
+    console.log($ceiling.length)
+    if ($ceiling.length === 0) $ceiling = $(this).parents('.upload-modal');
+    $ceiling.find('.embeddable-xml').html("");
 }
 
 
@@ -258,6 +273,7 @@ function displayFinishedUpload(xhr) {
     if(xhr.status = 200){
         markAsLoaded();
     }
+    $('.upload-modal .copy-button').attr('href', xhr.getResponseHeader('asset_url'));
     $('.upload-modal .progress-fill').html(xhr.responseText);
     $('.upload-modal .choose-file-button').html('Load Another File').show();
 }
diff --git a/cms/static/sass/_assets.scss b/cms/static/sass/_assets.scss
index 82df497c9b..136b03280d 100644
--- a/cms/static/sass/_assets.scss
+++ b/cms/static/sass/_assets.scss
@@ -86,6 +86,9 @@
       }
     }
   }
+    .show-xml {
+    @include blue-button;
+  }
 }
 
 .upload-modal {
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index ae2958ecac..5940767c86 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -30,12 +30,13 @@
               </td>
               <td class="name-col">
                 <a href="${asset['url']}" class="filename">${asset['displayname']}</a>
+                <div class="embeddable-xml"></div>
               </td>
               <td class="date-col">
                 ${asset['uploadDate']}
               </td>
               <td class="embed-col">
-                <a href="${asset['url']}">copy</a>
+                <a class="show-xml" href="${asset['url']}">XML</a>
               </td>
             </tr>
           % endfor
@@ -64,8 +65,10 @@
 			<div class="progress-bar">
 				<div class="progress-fill"></div>
 			</div>
-  		<a href="#" class="copy-button">Copy Embed Link</a>
-			<form class="file-chooser" action="${upload_asset_callback_url}" method="post" enctype="multipart/form-data">
+      <div class="embeddable-xml"></div>
+      <a href="#" class="copy-button">Show Embeddable XML</a>
+			<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">
 			</form>