Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
b76556b9
Commit
b76556b9
authored
Oct 17, 2012
by
chrisndodge
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #926 from MITx/fix/cdodge/asset-upload-tweeks
fix/cdodge/asset-upload-tweeks
parents
b91f1886
5964ecc7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
cms/static/js/base.js
+3
-1
cms/templates/asset_index.html
+1
-1
No files found.
cms/static/js/base.js
View file @
b76556b9
...
...
@@ -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
)
{
...
...
cms/templates/asset_index.html
View file @
b76556b9
<
%
inherit
file=
"base.html"
/>
<
%!
from
django
.
core
.
urlresolvers
import
reverse
%
>
<
%
block
name=
"bodyclass"
>
assets
</
%
block>
<
%
block
name=
"title"
>
C
MS Courseware Overview
</
%
block>
<
%
block
name=
"title"
>
C
ourseware Assets
</
%
block>
<
%
block
name=
"content"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment