# HG changeset patch
# User durandn
# Date 1437381944 -7200
# Node ID 947f26110cc6117918752640dbe7c2b53c1779a3
# Parent 3e47f3eb145b27448084e9b3d80ce5baf2e8e0c1
small cleanup + added fields for testing copy in iframetester + changed the way project metadata url is generated
diff -r 3e47f3eb145b -r 947f26110cc6 server/src/remie/views.py
--- a/server/src/remie/views.py Mon Jul 20 10:45:02 2015 +0200
+++ b/server/src/remie/views.py Mon Jul 20 10:45:44 2015 +0200
@@ -22,7 +22,6 @@
project_id = request.GET.get("project_id", "") # id of the project we're working on
current_user = request.GET.get("current_user", "") # current username
group_mode = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("group_mode", "").lower()) # if group_mode, annotations from everybody will be displayed
- print(project_id)
render_data = {
"project_id": project_id,
"current_user": current_user,
diff -r 3e47f3eb145b -r 947f26110cc6 server/src/remieplt/templates/remie/iframe.html
--- a/server/src/remieplt/templates/remie/iframe.html Mon Jul 20 10:45:02 2015 +0200
+++ b/server/src/remieplt/templates/remie/iframe.html Mon Jul 20 10:45:44 2015 +0200
@@ -25,7 +25,7 @@
if (typeof jQuery == "undefined") {
jQuery = IriSP.jQuery;
}
- var metadatas = {metadata: {url: "/ldt/cljson/id/{{project_id}}?from_display=false"}};
+ var metadatas = {metadata: {url: "{% url 'projectjson_id' id=project_id %}?from_display=false"}};
var metadata_key = "metadata";
IriSP.libFiles.defaultDir = '{% static "remie/js/" %}';
@@ -126,6 +126,7 @@
show_creation_date: true,
show_only_annotation_from_user: false,
show_timecode: false,
+ show_filters: true,
limit_count: false,
start_visible: false,
newest_first: true,
@@ -137,7 +138,9 @@
filter_by_segment: true,
starts_hidden: true,
hide_without_segment: true,
- segments_annotation_type: "découpage"
+ segments_annotation_type: "découpage",
+ selectable_annotations: true,
+ copy_and_edit_button: true,
},{
type: "CurrentSegmentInfobox",
annotation_type: "découpage",
diff -r 3e47f3eb145b -r 947f26110cc6 server/src/remieplt/templates/remie/iframe_tester.html
--- a/server/src/remieplt/templates/remie/iframe_tester.html Mon Jul 20 10:45:02 2015 +0200
+++ b/server/src/remieplt/templates/remie/iframe_tester.html Mon Jul 20 10:45:44 2015 +0200
@@ -11,9 +11,20 @@
var current_user = $("#current_user").val();
var group_mode = $("#group_mode").is(":checked");
+
var final_url = default_url+"?project_id="+project_id+"¤t_user="+current_user+"&group_mode="+group_mode;
$("#remie_workunit_iframe").attr("src", final_url);
});
+
+ $("#copy_button").click(function(){
+ var project_id = $("#project_id").val();
+
+ var base_url = "http://127.0.0.1:8001/";
+
+ var final_url = base_url+"ldt/copy/"+project_id;
+ console.log(final_url)
+ $("#copy_project_iframe").attr("src", final_url);
+ });
});
@@ -23,6 +34,10 @@
+
+
+