# HG changeset patch # User durandn # Date 1441815004 -7200 # Node ID 42529ea40c4a60894a9bfd2262f0d0ce1f1c3fb7 # Parent 6b92d5d00cf9f21a8f5815e968d9bfbdb1fa32e6 Minor adjustments for remie, changed header texts, inverted buttons on AnnotationsController diff -r 6b92d5d00cf9 -r 42529ea40c4a server/src/remie/static/remie/metadataplayer/AnnotationsController.js --- a/server/src/remie/static/remie/metadataplayer/AnnotationsController.js Wed Sep 09 18:08:32 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/AnnotationsController.js Wed Sep 09 18:10:04 2015 +0200 @@ -21,8 +21,8 @@ IriSP.Widgets.AnnotationsController.prototype.template = "
" + "
" + + "
{{l10n.write}}
" + "
{{l10n.display}}
" - + "
{{l10n.write}}
" + "
" + "
" diff -r 6b92d5d00cf9 -r 42529ea40c4a server/src/remie/static/remie/metadataplayer/CreateAnnotation.js --- a/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js Wed Sep 09 18:08:32 2015 +0200 +++ b/server/src/remie/static/remie/metadataplayer/CreateAnnotation.js Wed Sep 09 18:10:04 2015 +0200 @@ -53,6 +53,8 @@ close_after_send: false, tag_prefix: "#", pause_when_displaying: false, + custom_send_button: false, + custom_cancel_button: false, }; IriSP.Widgets.CreateAnnotation.prototype.messages = { @@ -114,8 +116,8 @@ + '{{#show_creator_field}}{{l10n.your_name_}} {{/show_creator_field}}' + '' + '
' - + '' - + '' + + '' + + '' + '{{#show_mic_record}}
Add voice annotation
' + ' ' + ' ' diff -r 6b92d5d00cf9 -r 42529ea40c4a server/src/remie/templates/remie/iframe_markers.html --- a/server/src/remie/templates/remie/iframe_markers.html Wed Sep 09 18:08:32 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_markers.html Wed Sep 09 18:10:04 2015 +0200 @@ -80,7 +80,8 @@ api_endpoint_template_edit: "{% url 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}{% templatetag openvariable %}annotation_id{% templatetag closevariable %}/", api_endpoint_template_delete: "{% url 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}{% templatetag openvariable %}annotation_id{% templatetag closevariable %}/", creator_name : "{{current_user}}", - project_id: "{{project_id}}" + project_id: "{{project_id}}", + custom_send_button: "Sauver", } ] } diff -r 6b92d5d00cf9 -r 42529ea40c4a server/src/remie/templates/remie/iframe_segments_group.html --- a/server/src/remie/templates/remie/iframe_segments_group.html Wed Sep 09 18:08:32 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_segments_group.html Wed Sep 09 18:10:04 2015 +0200 @@ -121,6 +121,7 @@ // Change id to a given project id project_id: "{{project_id}}", pause_when_displaying: true, + custom_send_button: "Sauver", },{ type: "AnnotationsList", container: "AnnotationsList_container", @@ -132,7 +133,7 @@ show_timecode: false, show_filters: true, show_header: true, - custom_header: "Contributions", + custom_header: "Travail du groupe", limit_count: false, start_visible: false, newest_first: true, @@ -147,8 +148,7 @@ segments_annotation_type: "découpage", selectable_annotations: true, copy_and_edit_button: true, - show_header: true, - custom_header: "Dernière contribution" + show_header: false, },{ type: "CurrentSegmentInfobox", annotation_type: "découpage", diff -r 6b92d5d00cf9 -r 42529ea40c4a server/src/remie/templates/remie/iframe_segments_single.html --- a/server/src/remie/templates/remie/iframe_segments_single.html Wed Sep 09 18:08:32 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_segments_single.html Wed Sep 09 18:10:04 2015 +0200 @@ -120,6 +120,7 @@ // Change id to a given project id project_id: "{{project_id}}", pause_when_displaying: true, + custom_send_button: "Sauver", },{ type: "AnnotationsList", container: "AnnotationsList_container", @@ -129,9 +130,9 @@ show_creation_date: true, show_only_annotation_from_user: false, show_timecode: false, - show_filters: true, + show_filters: false, show_header: true, - custom_header: "Mes contributions", + custom_header: "Ce que j'ai écrit", limit_count: false, start_visible: false, newest_first: true, @@ -146,8 +147,7 @@ segments_annotation_type: "découpage", selectable_annotations: true, copy_and_edit_button: true, - show_header: true, - custom_header: "Ma dernière contribution" + show_header: false, },{ type: "CurrentSegmentInfobox", annotation_type: "découpage", diff -r 6b92d5d00cf9 -r 42529ea40c4a server/src/remie/templates/remie/iframe_teacher.html --- a/server/src/remie/templates/remie/iframe_teacher.html Wed Sep 09 18:08:32 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_teacher.html Wed Sep 09 18:10:04 2015 +0200 @@ -132,7 +132,7 @@ show_timecode: false, show_filters: true, show_header: true, - custom_header: "Contribution", + custom_header: "Travail du groupe", limit_count: false, start_visible: false, newest_first: true, @@ -148,7 +148,6 @@ selectable_annotations: true, copy_and_edit_button: true, show_header: true, - custom_header: "Dernière contributions" },{ type: "CurrentSegmentInfobox", annotation_type: "découpage",