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

fix/cdodge/asset-upload-tweeks
This commit is contained in:
chrisndodge
2012-10-17 07:35:23 -07:00
2 changed files with 4 additions and 2 deletions

View File

@@ -327,7 +327,7 @@ function startUpload(e) {
function resetUploadBar(){
var percentVal = '0%';
$('.upload-modal .progress-fill').width(percentVal)
$('.upload-modal .progress-fill').width(percentVal);
$('.upload-modal .progress-fill').html(percentVal);
}
@@ -344,6 +344,7 @@ function displayFinishedUpload(xhr) {
$('.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();
$('.upload-modal .progress-fill').width('100%');
}
function markAsLoaded() {
@@ -355,6 +356,7 @@ function hideModal(e) {
e.preventDefault();
$('.modal').hide();
$modalCover.hide();
location.reload();
}
function onKeyUp(e) {

View File

@@ -1,7 +1,7 @@
<%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %>
<%block name="bodyclass">assets</%block>
<%block name="title">CMS Courseware Overview</%block>
<%block name="title">Courseware Assets</%block>
<%block name="content">