Mercurial Mercurial > remie / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed containers position for Segments student (single and group mode) scenario and Segments preview scenario
authordurandn
Mon, 02 Nov 2015 17:22:36 +0100
changeset 177 35ee3f9523b7
parent 176 ba9f193121c3
child 178 236780ec02a4
Fixed containers position for Segments student (single and group mode) scenario and Segments preview scenario
server/src/remie/templates/remie/iframe_segments_group.html file | annotate | diff | comparison | revisions
server/src/remie/templates/remie/iframe_segments_preview.html file | annotate | diff | comparison | revisions
server/src/remie/templates/remie/iframe_segments_single.html file | annotate | diff | comparison | revisions 
--- a/server/src/remie/templates/remie/iframe_segments_group.html	Mon Nov 02 16:03:59 2015 +0100
+++ b/server/src/remie/templates/remie/iframe_segments_group.html	Mon Nov 02 17:22:36 2015 +0100
@@ -12,8 +12,8 @@
   </div>
   <div id="info_panel">
     <div id="CurrentSegmentInfobox_container"></div>
+    <div id="CreateAnnotation_container"></div>
     <div id="AnnotationsController_container"></div>
-    <div id="CreateAnnotation_container"></div>
     <div id="AnnotationsList_container"></div>
   </div>
   <script type="text/javascript" src='{% static "remie/metadataplayer/LdtPlayer-core.js" %}'></script>
--- a/server/src/remie/templates/remie/iframe_segments_preview.html	Mon Nov 02 16:03:59 2015 +0100
+++ b/server/src/remie/templates/remie/iframe_segments_preview.html	Mon Nov 02 17:22:36 2015 +0100
@@ -12,8 +12,8 @@
   </div>
   <div id="info_panel">
     <div id="CurrentSegmentInfobox_container"></div>
+    <div id="CreateAnnotation_container"></div>
     <div id="AnnotationsController_container"></div>
-    <div id="CreateAnnotation_container"></div>
     <div id="AnnotationsList_container"></div>
   </div>
   <script type="text/javascript" src='{% static "remie/metadataplayer/LdtPlayer-core.js" %}'></script>
@@ -83,16 +83,6 @@
             scale_to_parent: false
             
         },{
-            type: "AnnotationsController",
-            container: "AnnotationsController_container",
-            display_or_write: false,
-            starts_hidden: true,
-            hide_without_segment: true,
-           	segments_annotation_type: "découpage",
-            starting_widget: "AnnotationsList",
-            toggle_widgets: false,
-            hide_when_writing: true,
-        },{
             type: "CreateAnnotation",
             container: "CreateAnnotation_container",
             show_title_field : false,
@@ -126,6 +116,16 @@
             custom_description_placeholder: "Je rédige une annotation ...",
             preview_mode: true,
         },{
+            type: "AnnotationsController",
+            container: "AnnotationsController_container",
+            display_or_write: false,
+            starts_hidden: true,
+            hide_without_segment: true,
+           	segments_annotation_type: "découpage",
+            starting_widget: "AnnotationsList",
+            toggle_widgets: false,
+            hide_when_writing: true,
+        },{
             type: "AnnotationsList",
             container: "AnnotationsList_container",
             api_users_endpoint: "{% url 'api_dispatch_list' resource_name='users' api_name='1.0' %}?username__in={% templatetag openvariable %}usernames_list_string{% templatetag closevariable %}&limit={% templatetag openvariable %}usernames_list_length{% templatetag closevariable %}",
--- a/server/src/remie/templates/remie/iframe_segments_single.html	Mon Nov 02 16:03:59 2015 +0100
+++ b/server/src/remie/templates/remie/iframe_segments_single.html	Mon Nov 02 17:22:36 2015 +0100
@@ -12,8 +12,8 @@
   </div>
   <div id="info_panel">
     <div id="CurrentSegmentInfobox_container"></div>
+    <div id="CreateAnnotation_container"></div>
     <div id="AnnotationsController_container"></div>
-    <div id="CreateAnnotation_container"></div>
     <div id="AnnotationsList_container"></div>
   </div>
   <script type="text/javascript" src='{% static "remie/metadataplayer/LdtPlayer-core.js" %}'></script>
@@ -82,16 +82,6 @@
             scale_to_parent: false
             
         },{
-            type: "AnnotationsController",
-            container: "AnnotationsController_container",
-            display_or_write: false,
-            starts_hidden: true,
-            hide_without_segment: true,
-            segments_annotation_type: "découpage",
-            starting_widget: "AnnotationsList",
-            toggle_widgets: false,
-            hide_when_writing: true,
-        },{
             type: "CreateAnnotation",
             container: "CreateAnnotation_container",
             show_title_field : false,
@@ -127,6 +117,16 @@
             custom_send_button: "Sauver",
             custom_description_placeholder: "Je rédige une annotation ...",
         },{
+            type: "AnnotationsController",
+            container: "AnnotationsController_container",
+            display_or_write: false,
+            starts_hidden: true,
+            hide_without_segment: true,
+            segments_annotation_type: "découpage",
+            starting_widget: "AnnotationsList",
+            toggle_widgets: false,
+            hide_when_writing: true,
+        },{
             type: "AnnotationsList",
             container: "AnnotationsList_container",
             annotation_type: "user_{{current_user}}",
remie