--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Thu Feb 14 16:34:33 2013 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Thu Feb 14 16:37:27 2013 +0100
@@ -10,12 +10,12 @@
{{ block.super }}
<script type="text/javascript" src="{{ADMIN_MEDIA_PREFIX}}js/core.js" ></script>
<script type="text/javascript" src="{{ADMIN_MEDIA_PREFIX}}js/jquery.init.js"></script>
- <script type="text/javascript" src="{{ADMIN_MEDIA_PREFIX}}js/jquery.min.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.min.js" %}'></script>
+ <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
<script type="text/javascript" src="{% absurl ldt.jsi18n packages='ldt' %}" ></script>
<script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
<script type="text/javascript" src='{% absstatic "ldt/js/jquery.textchange.min.js" %}'></script>
<script type="text/javascript" src='{% absstatic "ldt/js/jquery-ui.min.js" %}'></script>
- <script type="text/javascript" src='{% absstatic "ldt/js/swfupload/swfupload.js" %}'></script>
{{ content_form.media.js }}
{% endblock %}
@@ -29,26 +29,50 @@
post_added_params = {"csrfmiddlewaretoken" : "{{csrf_token}}",
"{{cookie_name}}" : "{{session_key}}"};
- onCreateContentReady("{% url ldt.ldt_utils.views.content.upload %}",
- '{% absstatic "ldt" %}',
- post_added_params,
- '{% trans "Browse" %}',
- '{% trans "File uploaded" %}',
- '{% trans "Please wait, the upload is not finished yet" %}',
- '{% trans "Cancel upload" %}',
- "{% url ldt.ldt_utils.views.content.remove_temp_file %}",
- "{% url ldt.ldt_utils.views.content.get_duration %}");
-
+ onCreateContentReady('{% absstatic "ldt" %}', post_added_params);
});
// the function stopRKey prevents from the validation of the form if the user tape enter button while entering a field
function stopRKey(evt) {
var evt = (evt) ? evt : ((event) ? event : null);
var node = (evt.target) ? evt.target : ((evt.srcElement) ? evt.srcElement : null);
if ((evt.keyCode == 13) && (node.type=="text")) {return false;}
- }
+ }
document.onkeypress = stopRKey;
+ chunked_uploads_endpoints = {
+ upload_url: '{{WEB_URL}}{% url upload %}',
+ done_url: '{{WEB_URL}}{% url upload_done uuid='00000000-0000-0000-0000-000000000000' %}',
+ };
+
+ $(function() {
+ //gets video_url and returns it to the "scr" field
+ chunked_uploads_video_url = function(video_url) {
+ $('#id_content-media_input_type').val("create");
+ $('#id_media-src').val(video_url);
+ $('#id_media-src').attr('readOnly', true);
+ $(".media_fields").hide();
+ $("#media_field_create").show();
+ $('#upload_url').append(video_url);
+ };
+
+ //callback of chunked upload start
+ chunked_uploads_start = function(){
+ };
+
+ //callback of chunked upload stop
+ chunked_uploads_stop = function(){
+ };
+
+ //callback of chunked upload error
+ chunked_uploads_error = function(){
+ alert("The upload failed. Please reload the page, and try again.");
+ };
+
+ //callback of chunked upload complete
+ chunked_uploads_complete = function(){
+ };
+ });
</script>
{% endblock %}
@@ -60,7 +84,7 @@
<link rel="stylesheet" href='{% absstatic "ldt/css/style.css" %}'/>
<link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/screen.css" %}' type="text/css" media="screen, projection" />
<link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/print.css" %}' type="text/css" media="print" />
- <link rel="stylesheet" href='{% absstatic "ldt//css/workspace.css" %}'type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}'type="text/css"/>
{% endblock %}
@@ -114,15 +138,14 @@
<div>{{ content_form.media_input_type.errors }}{{ content_form.media_input_type.label_tag }}{{content_form.media_input_type}}</div>
<div id="media_fields_div">
<div id="media_field_link" class="media_fields">{{ content_form.media_obj.errors }}{{ content_form.media_obj.label_tag }}{{content_form.media_obj}}</div>
+
<div id="media_field_upload" class="media_fields">
- {{ media_form.media_file.errors }}
- {% comment %}{{ media_form.media_file.label_tag }}{{media_form.media_file}}{% endcomment %}
- <div id="upload_btn"></div>
- <input type="text" name="media-local_file_name" id="id_media-local_file_name" readonly/>
- <div id="upload_progress_bar"></div>
- <div id="upload_progress_info"></div>
+ <!-- refers to chunked_upload template -->
+ {% include "chunked_uploads.html"%}
</div>
+
<div id="media_field_url" class="media_fields">{{ media_form.external_src_url.errors }}{{ media_form.external_src_url.label_tag }}{{ media_form.external_src_url }}</div>
+
<div id="media_field_create" class="media_fields">{{ media_form.src.errors }}{{ media_form.src.label_tag }}{{ media_form.src }}</div>
</div>
</div>
@@ -138,7 +161,6 @@
{% endif %}
{% include "ldt/ldt_utils/partial/picture.html"%}
{% include "ldt/ldt_utils/partial/permissions.html" %}
-
<div id="submitcontent" class="span-18 last">
<div id="submitcontent-loader" class="span-10">
@@ -155,4 +177,8 @@
</form>
</div>
+ <script type="text/javascript" src="{{ STATIC_URL }}chunked_uploads/js/jquery.ui.widget.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}chunked_uploads/js/jquery.iframe-transport.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}chunked_uploads/js/jquery.fileupload.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}chunked_uploads/js/jquery.chunked_uploads.js"></script>
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/urls.py Thu Feb 14 16:34:33 2013 +0100
+++ b/src/ldt/ldt/ldt_utils/urls.py Thu Feb 14 16:37:27 2013 +0100
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls.defaults import patterns, url, include
from ldt.management import test_ldt
# Uncomment the next two lines to enable the admin:
@@ -75,5 +75,5 @@
url(r'^space/upload/$', 'views.content.upload'),
url(r'^space/removetempfile/$', 'views.content.remove_temp_file'),
url(r'^space/getduration/$', 'views.content.get_duration'),
-
+ (r'^chunked_uploads/', include('chunked_uploads.urls')),
)