Commit b76556b9 by chrisndodge

Merge pull request #926 from MITx/fix/cdodge/asset-upload-tweeks

fix/cdodge/asset-upload-tweeks
parents b91f1886 5964ecc7
...@@ -327,7 +327,7 @@ function startUpload(e) { ...@@ -327,7 +327,7 @@ function startUpload(e) {
function resetUploadBar(){ function resetUploadBar(){
var percentVal = '0%'; var percentVal = '0%';
$('.upload-modal .progress-fill').width(percentVal) $('.upload-modal .progress-fill').width(percentVal);
$('.upload-modal .progress-fill').html(percentVal); $('.upload-modal .progress-fill').html(percentVal);
} }
...@@ -344,6 +344,7 @@ function displayFinishedUpload(xhr) { ...@@ -344,6 +344,7 @@ function displayFinishedUpload(xhr) {
$('.upload-modal .copy-button').attr('href', xhr.getResponseHeader('asset_url')); $('.upload-modal .copy-button').attr('href', xhr.getResponseHeader('asset_url'));
$('.upload-modal .progress-fill').html(xhr.responseText); $('.upload-modal .progress-fill').html(xhr.responseText);
$('.upload-modal .choose-file-button').html('Load Another File').show(); $('.upload-modal .choose-file-button').html('Load Another File').show();
$('.upload-modal .progress-fill').width('100%');
} }
function markAsLoaded() { function markAsLoaded() {
...@@ -355,6 +356,7 @@ function hideModal(e) { ...@@ -355,6 +356,7 @@ function hideModal(e) {
e.preventDefault(); e.preventDefault();
$('.modal').hide(); $('.modal').hide();
$modalCover.hide(); $modalCover.hide();
location.reload();
} }
function onKeyUp(e) { function onKeyUp(e) {
......
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="bodyclass">assets</%block> <%block name="bodyclass">assets</%block>
<%block name="title">CMS Courseware Overview</%block> <%block name="title">Courseware Assets</%block>
<%block name="content"> <%block name="content">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment