# HG changeset patch # User verrierj # Date 1325518851 -3600 # Node ID ea5fead4ea991eda0a2f35a5615b643acf36eeae # Parent c68744402249eb01cbd6574c8c1bba7245d59b87# Parent f95f7880ae49368ca08ac0d205480ebfc5afbd85 Merge with f95f7880ae49368ca08ac0d205480ebfc5afbd85 diff -r c68744402249 -r ea5fead4ea99 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Mon Jan 02 16:40:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Mon Jan 02 16:40:51 2012 +0100 @@ -45,15 +45,15 @@ post_added_params = {"csrfmiddlewaretoken" : "{{csrf_token}}", "{{cookie_name}}" : "{{session_key}}"}; - onCreateContentReady("{% url ldt.ldt_utils.views.upload %}", + onCreateContentReady("{% url ldt.ldt_utils.views.content.upload %}", "{{LDT_MEDIA_PREFIX}}", 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.remove_temp_file %}", - "{% url ldt.ldt_utils.views.get_duration %}"); + "{% url ldt.ldt_utils.views.content.remove_temp_file %}", + "{% url ldt.ldt_utils.views.content.get_duration %}"); $("#public input").change(function () { public_checkbox($(this)); diff -r c68744402249 -r ea5fead4ea99 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Mon Jan 02 16:40:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Mon Jan 02 16:40:51 2012 +0100 @@ -1,4 +1,3 @@ - {% extends "ldt/ldt_raw_base.html" %} {% load i18n %} @@ -71,7 +70,7 @@ }); - var search_url = "{% url ldt.ldt_utils.views.share_filter filter='__FILTER__' use_groups='false' %}"; + var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}"; }); @@ -83,7 +82,7 @@
{% if group_id %}{% trans "Update a group" %}{% else %}{% trans "Create a group" %}{% endif %}
-
+ {% csrf_token %} diff -r c68744402249 -r ea5fead4ea99 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon Jan 02 16:40:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon Jan 02 16:40:51 2012 +0100 @@ -10,15 +10,15 @@ {{block.super}}