# HG changeset patch # User verrierj # Date 1321977929 -3600 # Node ID 3661b2741f3fa729171e393b03f528cccd9b5c0a # Parent 691a394a7afdc4a1f2ea4df610e8201bb46f7c5e# Parent a79a94e14d4dd310aa878234a4b6284fd602a719 Merge with a79a94e14d4dd310aa878234a4b6284fd602a719 diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/css/ldt-commun.css --- a/crea/inte-crea/css/ldt-commun.css Tue Nov 22 17:04:12 2011 +0100 +++ b/crea/inte-crea/css/ldt-commun.css Tue Nov 22 17:05:29 2011 +0100 @@ -60,7 +60,7 @@ } h3 { - font-family: "DIN-Bold", Helvetica, Arial, sans-serif; font-weight: 800; font-size: 18px; color: #0068c4; + font-size: 18px; color: #0068c4; } h4 { @@ -68,7 +68,7 @@ } h5 { - float: left; clear: left; font-weight: bold; margin: 2px 0; width: 70px; font-size: 13px; padding: 0; + float: left; clear: left; font-weight: bold; margin: 2px 0; min-width: 70px; font-size: 13px; padding: 0; } p { @@ -97,11 +97,11 @@ float: left; } -div.fl, li.fl, p.fl { +div.fl, li.fl, p.fl, img.fl { float: left; } -div.fr, li.fr, p.fr { +div.fr, li.fr, p.fr, img.fr { float: right; } @@ -157,6 +157,10 @@ background: url(../img/bulle_people.png); } +.font_16 { + font-size: 16px; +} + .font_11 { font-size: 11px; } diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/css/ldt-player.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/inte-crea/css/ldt-player.css Tue Nov 22 17:05:29 2011 +0100 @@ -0,0 +1,65 @@ +#player_col_g { + float: left; width: 550px; +} + +#top_media { + width: 550px; border-bottom: 1px solid #484848; +} + +#media_share { + float: right; margin-top: 5px; +} + +li.share_li { + padding: 5px 0 0 5px; height: 20px; +} + +#ann_fleche_cont { + width: 550px; height: 21px; overflow: hidden; position: relative; +} + +#ann_fleche { + width: 1100px; height: 21px; position: absolute; margin-left: -550px; +} + +#ann_fleche div { + float: left; width: 550px; height: 21px; +} + +#ann_fl_left { + background:url(../img/anarl.png); +} + +#ann_fl_right { + background:url(../img/anarr.png); +} + +#annotation_bas { + float: left; width: 550px; background: url(../img/annot_bg.png); margin: 0 0 25px; +} + +/* COLONNE DE DROITE */ + +#player_col_d { + float: left; width: 410px; +} + +#player_col_d .li_h2 { + width: 400px; margin-left: 10px; +} + +#annot_media { + width: 400px; margin: 5px 0 10px 10px; max-height: 400px; overflow: auto; +} + +#annot_media li { + padding: 5px 0; +} + +#annot_media li.selected { + background: url(../img/annot_bg.png); +} + +div.une_annot { + width: 280px; +} diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/css/ldt-recherche.css --- a/crea/inte-crea/css/ldt-recherche.css Tue Nov 22 17:04:12 2011 +0100 +++ b/crea/inte-crea/css/ldt-recherche.css Tue Nov 22 17:05:29 2011 +0100 @@ -48,7 +48,7 @@ } .h3_result_media h3 { - margin: 2px 0 0 2px; + font-family: "DIN-Bold", Helvetica, Arial, sans-serif; font-weight: 800; margin: 2px 0 0 2px; } div.duree_result_media { diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/groupe.html --- a/crea/inte-crea/groupe.html Tue Nov 22 17:04:12 2011 +0100 +++ b/crea/inte-crea/groupe.html Tue Nov 22 17:05:29 2011 +0100 @@ -1,7 +1,8 @@ - + + Plateforme LDT : Groupe "Nom du Groupe" diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/home.html --- a/crea/inte-crea/home.html Tue Nov 22 17:04:12 2011 +0100 +++ b/crea/inte-crea/home.html Tue Nov 22 17:05:29 2011 +0100 @@ -1,7 +1,8 @@ - + + Plateforme LDT : Home diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/img/anarl.png Binary file crea/inte-crea/img/anarl.png has changed diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/img/anarr.png Binary file crea/inte-crea/img/anarr.png has changed diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/img/annot_bg.png Binary file crea/inte-crea/img/annot_bg.png has changed diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/img/main_bg.png Binary file crea/inte-crea/img/main_bg.png has changed diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/player.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/crea/inte-crea/player.html Tue Nov 22 17:05:29 2011 +0100 @@ -0,0 +1,226 @@ + + + + + + Plateforme LDT : Player + + + + + +
+ + + + + + + +
+ + +
+
+
+
+
+
+
+

Titre d'annotation (00:12:12 - 00:14:03)

+

Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam volu ptatem quia voluptas sit aspernatur aut?

+
Mots-clés
+

: lorem , ipsum , quia , dolor +

Groupes
+

: IRI , Ars Industrialis , RSLN +

+
+ +
+
+

Créer une annotation

+
+
+ + + + +
+ +
+

Toutes les annotations sur ce média

+
+ + +
+ + + + +
+
+ + + diff -r 691a394a7afd -r 3661b2741f3f crea/inte-crea/recherche.html --- a/crea/inte-crea/recherche.html Tue Nov 22 17:04:12 2011 +0100 +++ b/crea/inte-crea/recherche.html Tue Nov 22 17:05:29 2011 +0100 @@ -1,7 +1,8 @@ - + + Plateforme LDT : Résultats de Recherche