Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
Julian Arni
2013-08-29 17:22:07 -04:00
parent e0ab75fb84
commit b797118811
2 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cms/static/js/views/assets.js
View File

@@ -64,10 +64,8 @@ function showUploadModal(e) {
showUploadFeedback(e, percentComplete);
},
maxFileSize: 10 * 1000 * 1000, // 100 MB
maxNumberofFiles: 30,
maxNumberofFiles: 100,
add: function(e, data) {
// Uncomment this line to get html template on load
// var html = assetUploadTemplate(data.files);
data.process().done(function () {
data.submit();
});
@@ -81,18 +79,6 @@ function showUploadModal(e) {
$modalCover.show();
}
function assetUploadTemplate(files) {
var compiled = _.template('<tr class="modal-asset>' +
'<td><span class="modal-asset new"></span></td>' +
'<td><p class="modal-asset name"> <%= file.name %></td>' +
'</tr>');
var html = '';
for (var i=0; i < files.length; i++) {
html += compiled({ file: files[i]});
}
return html;
}
function showFileSelectionMenu(e) {
e.preventDefault();
$('.file-input').click();

28
cms/templates/asset_index.html
View File

@@ -42,12 +42,12 @@
<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
<small class="subtitle">${_("Content")}</small>
<span class="sr">&gt; </span>${_("Files &amp; Uploads")}
</h1>
<nav class="nav-actions">
<h3 class="sr">Page Actions</h3>
<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>
@@ -117,22 +117,22 @@
<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>
<p class="file-name"></a>
<div class="progress-bar">
<div class="progress-fill"></div>
</div>
<div class="modal-body">
<h1>S{_("Upload New File")}</h1>
<p class="file-name"></a>
<div class="progress-bar">
<div class="progress-fill"></div>
</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}"
<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="files[]" multiple>
</form>
</div>
<a href="#" class="choose-file-button">Choose File</a>
<input type="file" class="file-input" name="files[]" multiple>
</form>
</div>
</div>
<div class="modal-cover"></div>