# HG changeset patch
# User rougeronj
# Date 1441889344 -7200
# Node ID d731c2917e76907a9667d49da69325f40e072034
# Parent  64a524142a7b72569d64130d896a5191de32d6f9# Parent  111a1333513a24f720249c59259d07b7e5401efa
Merge with 111a1333513a24f720249c59259d07b7e5401efa

diff -r 111a1333513a -r d731c2917e76 server/src/remie/static/remie/css/style.css
--- a/server/src/remie/static/remie/css/style.css	Thu Sep 10 12:21:01 2015 +0200
+++ b/server/src/remie/static/remie/css/style.css	Thu Sep 10 14:49:04 2015 +0200
@@ -22,9 +22,6 @@
     padding: 0 10px;
     font-family: Open-Sans-Light;
 }
-#player_container{
-    margin-top:40px;
-}
 
 #player_container{
 	height: 380px;
@@ -96,9 +93,9 @@
     font-family: Open-Sans-Light;
     position: absolute;
     left: -655px;
-    top: 0;
-    width: 640px;
-    margin:0;
+    top: 461;
+    width: 560px;
+    margin:0 0 0 40px;
     font-weight: normal;
     text-indent:10px;
 }
@@ -172,11 +169,19 @@
 .Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Content{
     font-family: Open-Sans-Light;
     color: #848484;
+    display: inline-block;
+}
+
+.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-CreationDate{
+     margin-top:10px;
 }
 
-.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-CreationDate,
+.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Title{
+     margin-top:8px;
+}
+
 .Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Content{
-    margin-top:7px;
+    font-size: 16px;
 }
 
 .Ldt-LatestAnnotation-box .Ldt-LatestAnnotation-CopyEditButton,
@@ -196,13 +201,14 @@
 .Ldt-LatestAnnotation-box .Ldt-LatestAnnotation-CopyEditButton:hover,
 .Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowAnnotationsListButton:hover,
 .Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowCreateAnnotationButton:hover,
-.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main input:hover {
+.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main input:hover,
+.Ldt-AnnotationsController-Button.selected {
     background-color: #b7b7b7;
 }
     
 .Ldt-LatestAnnotation-box .Ldt-LatestAnnotation-CopyEditButton{
     height: 22px;
-    margin-top: 1px;
+    margin-top: 3px;
     padding-top: 4px;
 }
 
@@ -299,9 +305,7 @@
     margin-top:0;
 }
 
-.Ldt-AnnotationsList-li .Ldt-AnnotationsList-ThumbContainer,
-.Ldt-AnnotationsList-li h3.Ldt-AnnotationsList-Title,
-.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Title{
+.Ldt-AnnotationsList-li .Ldt-AnnotationsList-ThumbContainer{
     display: none;
 }
 
@@ -318,9 +322,10 @@
 	white-space: nowrap; 
 	overflow: hidden; 
 	text-overflow: ellipsis; 
-	width: 70% !important;
+	width: 320px !important;
 	display: inline-block !important;
 	margin: 0px !important;
+	font-size: 12px !important;
 }
 
 .Ldt-AnnotationsList-li .Ldt-AnnotationsList-Title a,
@@ -333,15 +338,22 @@
     margin-right: 20px
 }
 
+.Ldt-AnnotationsList-li h3.Ldt-AnnotationsList-Title {
+    display: inline-block;
+    float: right;
+    margin: 0 2px 0 0;
+}
+
 /* ----------------------------------------------- */
 /* ----------------- Media Panel ----------------- */
 /* ----------------------------------------------- */
 
-#player_container_widget_Segments_7{
+#player_container #player_container_widget_Segments_7{
     width: 560px !important;
     height: 50px !important;
     margin: 0 40px !important;
     top: -31px;
+    background-color: #ffffff !important;
 }
 
 #player_container_widget_Segments_7 .Ldt-Segments-Position{
@@ -356,7 +368,6 @@
     background-color: #848484 !important;
     border: none;
     height: 50px !important;
-    outline: 5px solid #ffffff;
     cursor: pointer;
 }
 
diff -r 111a1333513a -r d731c2917e76 server/src/remie/static/remie/css/teacher.css
--- a/server/src/remie/static/remie/css/teacher.css	Thu Sep 10 12:21:01 2015 +0200
+++ b/server/src/remie/static/remie/css/teacher.css	Thu Sep 10 14:49:04 2015 +0200
@@ -26,7 +26,7 @@
 /* ----- Filter style ----- */
 
 .Ldt-AnnotationsListWidget .Ldt-AnnotationsList-Filters{
-    margin-top: 10px;
+    margin-top: 20px;
     display: block;
     padding-bottom: 38px;
 }
@@ -53,6 +53,7 @@
 
 .Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-date .Ldt-AnnotationsList-dateFilter{
     width: 100px;
+    height: 25px;
 }
 
 .Ldt-AnnotationsList-Filters .Ldt-AnnotationsList-filter-text{
diff -r 111a1333513a -r d731c2917e76 server/src/remie/templates/remie/iframe_tester.html
--- a/server/src/remie/templates/remie/iframe_tester.html	Thu Sep 10 12:21:01 2015 +0200
+++ b/server/src/remie/templates/remie/iframe_tester.html	Thu Sep 10 14:49:04 2015 +0200
@@ -113,8 +113,8 @@
   <br><label>Scénario: </label><br>
   <input id="segments_single" name="scenario" type="radio" value="segments_single" >Elève - Segments, individuel</input><br>
   <input id="segments_group" name="scenario" type="radio" value="segments_group">Elève - Segments, groupe</input><br>
-  <input id="markers" name="scenario" type="radio" value="markers">Elève - Marqueurs (design à faire)</input><br>
-  <input id="teacher" name="scenario" type="radio" value="teacher">Professeur - Segments (Segments modifiables, design à terminer)</input>
+  <input id="markers" name="scenario" type="radio" value="markers">Elève - Marqueurs</input><br>
+  <input id="teacher" name="scenario" type="radio" value="teacher">Professeur - Segments</input>
   <br><input id="iframe_update_button" type="button" value="Générer"></input>
 </div>
 <div hidden="true">