# HG changeset patch
# User hamidouk
# Date 1324034593 -3600
# Node ID 3e62fc730d8c3122086665fd38dbaf08cfd71d7f
# Parent  a6496f95e0fcc3d776058bee67096e6ef1936479
more integration.

diff -r a6496f95e0fc -r 3e62fc730d8c crea/imgs/menu_underline.gif
Binary file crea/imgs/menu_underline.gif has changed
diff -r a6496f95e0fc -r 3e62fc730d8c web/entretiens.txt
--- a/web/entretiens.txt	Fri Dec 16 11:46:21 2011 +0100
+++ b/web/entretiens.txt	Fri Dec 16 12:23:13 2011 +0100
@@ -2,10 +2,10 @@
 # it's a csv file with semicolon for separators 
 # format : title, stream id, date
 #
-Histoire et anthropologie de la confiance - Alain Mille et Bernard Stiegler;a972dbcc-26ff-11e1-8869-00145ea49a02;thumbnails/alain_mille.png;le 25 Mai 2011 10h00-12h01
-Confiance et politique - Albert Ogien;d715c4e0-26ff-11e1-a2ff-00145ea49a02;thumbnails/albert_ogien.png;le 27 mars 2014
-Bernard Stiegler;c609832e-b6e0-11e0-9f0f-00145ea49a02;thumbnails/bernard_stiegler.png;le 27 mars 2014
-Cécile Méadel;4fa4daa4-2700-11e1-b1b3-00145ea49a02;thumbnails/cecile_meadel.png;le 27 mars 2014
-Godefroy Dang Nguyen;921ff558-2700-11e1-9ac7-00145ea49a02;thumbnails/dang_nguyen.png;le 27 mars 2014
-Judith Simon;16e0bc56-2700-11e1-bb79-00145ea49a02;thumbnails/judith_simon.png;le 27 mars 2014
-Nicolas Aurray;d8e8b2d6-2700-11e1-81c9-00145ea49a02;thumbnails/nicolas_aurray.png;le 27 mars 2014
\ No newline at end of file
+Histoire et anthropologie de la confiance;Alain Mille et Bernard Stiegler;a972dbcc-26ff-11e1-8869-00145ea49a02;thumbnails/alain_mille.png;le 25 Mai 2011 10h00-12h01
+Confiance et politique;Albert Ogien;d715c4e0-26ff-11e1-a2ff-00145ea49a02;thumbnails/albert_ogien.png;le 27 mars 2014
+Vide;Bernard Stiegler;c609832e-b6e0-11e0-9f0f-00145ea49a02;thumbnails/bernard_stiegler.png;le 27 mars 2014
+Vide;Cécile Méadel;4fa4daa4-2700-11e1-b1b3-00145ea49a02;thumbnails/cecile_meadel.png;le 27 mars 2014
+Vide;Godefroy Dang Nguyen;921ff558-2700-11e1-9ac7-00145ea49a02;thumbnails/dang_nguyen.png;le 27 mars 2014
+Vide;Judith Simon;16e0bc56-2700-11e1-bb79-00145ea49a02;thumbnails/judith_simon.png;le 27 mars 2014
+Vide;Nicolas Aurray;d8e8b2d6-2700-11e1-81c9-00145ea49a02;thumbnails/nicolas_aurray.png;le 27 mars 2014
\ No newline at end of file
diff -r a6496f95e0fc -r 3e62fc730d8c web/index.php
--- a/web/index.php	Fri Dec 16 11:46:21 2011 +0100
+++ b/web/index.php	Fri Dec 16 12:23:13 2011 +0100
@@ -14,9 +14,13 @@
   
   <div id="outer_div">
   <img src="../crea/imgs/edition_2011.png" style="position: absolute; z-index: 3; margin-left: 12px;"></img>
-      <div id="banner">      
-      <a href=""><img src="../crea/imgs/enmi_logo.png"></img></a>
-      <div style="clear: both;"></div>
+  <div id="banner">      
+  <a href=""><img src="../crea/imgs/enmi_logo.png"></img></a>
+  <ul class="menu">
+    <li class="menuUnderline"><a href="" class="menuText">Accueil</a></li>
+    <li class="menuUnderline"><a class="menuText">A propos</a></li>
+  </ul>
+  <div style="clear: both;"></div>
   </div>
 
   <div id="inner_div">
@@ -32,7 +36,7 @@
           if ($line[0] == "#")
             continue;
           
-          list($title, $stream_id, $thumbnail, $date) = explode(";", $line);
+          list($title, $author, $stream_id, $thumbnail, $date) = explode(";", $line);
           if (strlen($title) >= 37) {            
             $title = substr($title, 0, 35) . "...";            
           }
@@ -40,6 +44,7 @@
           echo "<div class='thumb'>" .
                "<a href='player.php?stream=$stream_id'><img class='thumbnail' src=$thumbnail alt='thumbnail'></img></a>" .
                "<div class='title'>$title</div>" .
+               "<div class='author'>par $author</div>" .
                "<div class='date'>$date</div>" .
                "</div>";
         }
diff -r a6496f95e0fc -r 3e62fc730d8c web/style.css
--- a/web/style.css	Fri Dec 16 11:46:21 2011 +0100
+++ b/web/style.css	Fri Dec 16 12:23:13 2011 +0100
@@ -11,7 +11,7 @@
   width: 960px;
   border-bottom: 1px solid #fe4f76;
   padding-top: 10px;
-  padding-bottom: 13px;
+  padding-bottom: 9px;
   margin-top: 4px;  
 }
 
@@ -51,6 +51,33 @@
 
 /* index.php */
 
+.menu {
+  border-left: 1px solid #C3C3C3;
+  float: left;
+  height: 62px;
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  margin-left: 34px;
+}
+
+.menuUnderline {
+    background-image: url("../crea/imgs/menu_underline.gif");
+    background-position: left bottom;
+    background-repeat: no-repeat;
+    margin-left: 0px;
+    margin-top: 3px;
+    padding-left: 0;
+    width: 100px;
+}
+
+.menuText {
+    margin-left: 5px;
+    font-size: 14px;
+    text-decoration: none;
+    color: #000000;
+}
+
 #index_content {
   margin: 0 auto;
   width: 910px;
@@ -82,9 +109,16 @@
   white-space: nowrap;
 }
 
-.thumb .text {
+.thumb .author {
   overflow: hidden;
   white-space: nowrap;
+  font-size: 90%;
+}
+
+.thumb .date {
+  overflow: hidden;
+  white-space: nowrap;
+  font-size: 90%;
 }
 
 /* player.php */