--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Fri Dec 14 15:16:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Wed Jan 02 17:03:20 2013 +0100
@@ -10,7 +10,7 @@
{{ 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>
@@ -30,16 +30,7 @@
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) {
@@ -50,6 +41,12 @@
document.onkeypress = stopRKey;
+ $(function() {
+ chunked_uploads_video_url = function(video_url) {
+ return video_url;
+ };
+ });
+
</script>
{% endblock %}
@@ -61,8 +58,8 @@
<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="{{ STATIC_URL }}chunked_uploads/css/chunked_upload.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}'type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "chunked_uploads/css/chunked_uploads.css" %}' type="text/css"/>
{% endblock %}
@@ -116,14 +113,13 @@
<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 id="video_url"></div>
</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>
@@ -140,7 +136,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">
@@ -157,4 +152,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/main.js"></script>
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/urls.py Fri Dec 14 15:16:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/urls.py Wed Jan 02 17:03:20 2013 +0100
@@ -74,6 +74,4 @@
url(r'^space/upload/$', 'views.content.upload'),
url(r'^space/removetempfile/$', 'views.content.remove_temp_file'),
url(r'^space/getduration/$', 'views.content.get_duration'),
-
- url(r'^upload/$', 'views.test_upload.upload'),
)