--- a/server/src/remie/templates/remie/iframe_markers_preview.html Thu Nov 12 18:10:25 2015 +0100
+++ b/server/src/remie/templates/remie/iframe_markers_preview.html Fri Nov 13 14:58:35 2015 +0100
@@ -3,18 +3,14 @@
<head>
<title>Test</title>
<link rel="stylesheet" type="text/css" href="{% static 'remie/css/markers.css' %}" />
+<link rel="stylesheet" type="text/css" href="{% static 'remie/css/markers_student.css' %}" />
</head>
<body>
<div id="remie_player_container">
<div id="media_panel">
<div id="player_container"></div>
- </div>
- <div id="info_panel">
- <div id="CurrentSegmentInfobox_container"></div>
- <div id="LatestAnnotation_container"></div>
- <div id="AnnotationsController_container"></div>
- <div id="CreateAnnotation_container"></div>
- <div id="AnnotationsList_container"></div>
+ <div id="markers_upper_container"></div>
+ <div id="markers_lower_container"></div>
</div>
<script type="text/javascript" src='{% static "remie/metadataplayer/LdtPlayer-core.js" %}'></script>
<script type="text/javascript">
@@ -74,14 +70,28 @@
disable_ctrl_f: true
},{
type: "Markers",
- annotation_type: "markers_{{current_user}}",
- line_height: 24,
- creator_name : "{{current_user}}",
+ background: "#ffffff",
+ annotation_type: "teacher_markers",
+ container: "markers_upper_container",
+ line_height: 50,
project_id: "{{project_id}}",
allow_empty_markers: true,
play_on_submit: true,
custom_send_button: "Sauver",
preview_mode: true,
+ hide_if_empty: true,
+ },{
+ type: "Markers",
+ background: "#ffffff",
+ annotation_type: "markers_{{current_user}}",
+ container: "markers_lower_container",
+ line_height: 50,
+ project_id: "{{project_id}}",
+ allow_empty_markers: true,
+ play_on_submit: true,
+ custom_send_button: "Sauver",
+ filter_per_user: false,
+ preview_mode: true,
}
]
}