# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1302103731 -7200
# Node ID 263ea20d9bfd4a45c5de717d0f5fbd144de9af90
# Parent  32898b2c8e9c9e56d24e8cf1c5b1b41ae9d00151
small changes

diff -r 32898b2c8e9c -r 263ea20d9bfd web/about.php
--- a/web/about.php	Wed Apr 06 16:45:22 2011 +0200
+++ b/web/about.php	Wed Apr 06 17:28:51 2011 +0200
@@ -14,8 +14,8 @@
     <!-- Import fancy-type plugin for the sample page. -->
     
 	<link rel="stylesheet" href="res/blueprint/plugins/fancy-type/screen.css" type="text/css" media="screen, projection">
-	<link rel="stylesheet" href="custom.css" type="text/css" media="screen, projection">
-	<link rel="stylesheet" href="tabs-slideshow.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="res/css/custom.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="res/css/tabs-slideshow.css" type="text/css" media="screen, projection">
 	<link rel="stylesheet" type="text/css" href="res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css" media="screen">
 	<link rel="stylesheet" type="text/css" href="res/niceforms/niceforms-custom.css" media="screen" >
 
diff -r 32898b2c8e9c -r 263ea20d9bfd web/client.php
--- a/web/client.php	Wed Apr 06 16:45:22 2011 +0200
+++ b/web/client.php	Wed Apr 06 17:28:51 2011 +0200
@@ -60,7 +60,7 @@
     <!-- Import fancy-type plugin for the sample page. -->
     
 	<link rel="stylesheet" href="res/blueprint/plugins/fancy-type/screen.css" type="text/css" media="screen, projection">
-	<link rel="stylesheet" href="custom.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="res/css/custom.css" type="text/css" media="screen, projection">
 	<link rel="stylesheet" type="text/css" href="res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css" media="screen">
 	<link rel="stylesheet" type="text/css" href="res/niceforms/niceforms-custom.css" media="screen" >
 
diff -r 32898b2c8e9c -r 263ea20d9bfd web/custom.css
--- a/web/custom.css	Wed Apr 06 16:45:22 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- IRI - Live tweet annotation CSS 
- http://www.iri.centrepompidou.fr
-
-   * Copyright (c) 2010-Present. See LICENSE for more info. (cecill-C)
-   * Contributor : Samuel Huron 
-
------------------------------------------------------------------------ */
-
-body {background-image:url(images/bgd.jpg);background-repeat:repeat-x;background-color:#f7f6f6;font-family: 'PT Sans', arial, serif; }
-textarea {margin-left:3px;height: 60px;width: 330px;padding:5px;background-image:url(images/tweetWriterBgdTxtArea.gif);background-repeat:no-repeat;border: none;}
-.loginbutton{margin-left:3px;height: 60px;width: 330px;padding:5px;background-image:url(images/tweetWriterBgdUnconnect.gif);background-repeat:no-repeat;border: none;margin-bottom:10px;color:#fff;}
-.loginlink{text-decoration:none;color:#fff;}
-.menuLink:active {text-decoration:none;}
-.menuLink:visited {text-decoration:none;}
-h3{font-size: 1.5em;line-height: 1;margin-bottom: 0.3em;}
-
-#Aboutbox{background-image:url(images/about_bgd.jpg);background-repeat:no-repeat;width:600px;height:360px;overflow:auto; border:1px solid #fff;}
-.lightBorder{padding:20px;}
-.lightTitle{font-size: 48px;font-weight:900;color:#e6e6e6;font-family: 'Geo', arial, serif;line-height:80%}
-.lightSubTitle{font-size: 24px;font-weight:bold;color:#262626; width:250px;line-height:80%}
-.lightDescription{font-size: 12px;color:#000; width:288px;text-align:justify;margin-top:15px;}
-.lightButton{width:134px;height:22px;background-image:url(images/bt_bgd_grey.jpg);background-repeat:no-repeat;}
-.lightButton:active{width:134px;height:22px;background-image:url(images/bt_bgd_grey.jpg);background-repeat:no-repeat;}
-.lightButton:over{text-decoration:none;background-image:url(images/bt_bgd_grey.jpg);background-repeat:no-repeat;}
-
-
-.logo{padding-right:10px;float:left;}
-.menu{float:left;height:62px;border-left:1px solid #c3c3c3;list-style-type:none;padding:0px;margin:0px;}
-.menuUnderline{margin-left:0px;padding-left:0px;background-image:url(images/menu_underline.gif);background-repeat:no-repeat;background-position:left bottom; width:205px;margin-top:3px;}
-.menuLink{text-decoration:none; margin:5px; color:#000}
-.menuLink:active {text-decoration:none;}
-.menuLink:visited {text-decoration:none;}
-
-.tweetContainer{position:absolute; margin-top:70px;}
-.tweetWriter{background-image:url(images/tweetWriterBgd.gif);width:359px;height:136px;padding:10px;position:absolute; margin-top:70px;}
-.tweetWriterTitle{color:4b4b4b;font-family: 'PT Sans Narrow', arial, serif;}
-.tweetExplain{background-image:url(images/tweetExplainBgd.gif);width:359px;height:510px;padding:10px;position:absolute; margin-top:70px;}
-
-.tweetReader{width:377px;height:450px;position:absolute; margin-top:225px;border:1px solid #c3c3c3;background:#ffffff;}
-.tweetButton{float:right;margin-right:5px;}
-
-.timelinePlayer{border:1px solid #c3c3c3;width:650px;height:650px;}
-.videoLivePlayer{border:1px solid #c3c3c3;width:500px;height:375px;}
-.videoLive{width:500px;height:378px;background:#fff;float:left;margin-top:20px;padding:5px;}
-.videoLiveProgram{width:500px;margin-top:425px;margin-left:392px;position:absolute;}
-.videoLiveProgram2{width:500px;margin-top:470px;margin-left:392px;position:absolute;}
-
-.videoLiveProgramTitle{color:#4b4b4b;font-family: 'PT Sans Narrow', arial, serif;font-size: 1.5em;padding:5px;border:1px solid #c3c3c3;background-color:#efefef;background-image:url(images/bgdTitle.jpg);background-repeat:no-repeat;}
-.videoLiveProgramDescription{padding:5px;border:1px solid #c3c3c3;padding:5px;border-top:none;background-color:#fff;background-image:url(images/bgdDescription.jpg);background-repeat:no-repeat;height:193px;overflow:scroll;}
-
-
-.footer{margin-top:770px;width:900px;height:20px;position:absolute;text-align:center;}
-.footerLink{text-decoration:none; margin:5px; color:#000;font-family: 'PT Sans Narrow', arial, serif;font-size: 1.1em;}
-.footerLink:active {text-decoration:none;}
-.footerLink:visited {text-decoration:none;}
-
-.tooltip {display:none;background:transparent url(images/white_arrow.png);font-size:12px;height:70px;width:160px;padding:25px;color:#000;}
-
-.timeline{height:28px;border: 1px solid #ccc;}
-.timeFragment {float:left;position:relative;float:left;}
-.timeFrame {border-left: 1px solid #AAA;border-right: 1px solid #AAA;height:10px;float:left;position:relative;}
-.bigTimeFrame {border-right: 1px solid #ccc;float:left;position:relative;}
-
-.arrowContainer{height:10px;width:100%;}
-
-.cleaner {clear:both;} 
-.txt{visibility:hidden;}
-
-
-.clear { /* generic container (i.e. div) for floating buttons */
-    overflow: hidden;
-    width: 100%;
-}
-
-a.button_w { background: transparent url('images/bg_button_a_w.png') no-repeat scroll top right; color: #444;display: block;float: left;font: normal 12px arial, sans-serif;height: 24px;margin-right: 6px;padding-right: 18px; text-decoration: none;}
-a.button_w span { background: transparent url('images/bg_button_span_w.png') no-repeat; display: block;line-height: 14px; padding: 5px 0 5px 18px;} 
-
-a.button_b { background: transparent url('images/bg_button_a_b.png') no-repeat scroll top right; color: #fff;display: block;float: left;font: bold 12px arial, sans-serif;height: 24px;margin-right: 6px;padding-right: 18px; text-decoration: none;}
-a.button_b span { background: transparent url('images/bg_button_span_b.png') no-repeat; display: block;line-height: 14px; padding: 5px 0 5px 18px;} 
-
-#question{background: transparent url('images/bt_blue.png') no-repeat; width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
-#question:active {text-decoration:none;}
-#question:visited {text-decoration:none;}
-#reference{background: transparent url('images/bt_yellow.png') no-repeat;width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
-#reference:active {text-decoration:none;}
-#reference:visited {text-decoration:none;}
-#positive{background: transparent url('images/bt_green.png') no-repeat;width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
-#positive:active {text-decoration:none;}
-#positive:visited {text-decoration:none;}
-#negative{background: transparent url('images/bt_red.png') no-repeat;width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
-#negative:active {text-decoration:none;}
-#negative:visited {text-decoration:none;}
-
-.introBox{width:880px;height:280px;padding:10px;position:absolute; margin-top:70px;}
-.aboutBox{background-image:url(images/archivesBoxBody.gif);width:900px;position:absolute; margin-top:70px;}
-.archivesBox{background-image:url(images/archivesBoxBody.gif);width:900px;position:absolute; margin-top:450px;}
-.archivesBoxContainer{padding:10px;width:880px;padding-bottom:0px;display:block; }
-.archivesBoxClear { /* generic container (i.e. div) for floating buttons */
-    overflow: hidden;
-    width: 100%;
-	background-image:url(images/archivesBoxBody.gif);
-	height:10px;
-}
-.archivesBoxFooter{background-repeat:no-repeat;background-position:left bottom;background-image:url(images/archivesBoxFooter.gif);width:100%;height:3px;}
-.archivesBoxHeader{background-repeat:no-repeat;background-position:left top;background-image:url(images/archivesBoxHeader.gif);width:100%;height:3px;}
-
-.archivesTitle{color:4b4b4b;font-family: 'PT Sans Narrow', arial, serif;font-size:24px;}
-.archivesVideoBox{margin:5px;padding:5px;position:relative;display:inline-block;float:left;border: solid 1px #ccc;background:#f2f2f2;cursor:pointer;}
-.AVBtitle{font-weight:bold;font-family: 'PT Sans Narrow', arial, serif; font-size:18px;}
-
-.slideTitle{font-size:20px;}
-.slideText{font-size:15px;}
-.slides{background-repeat:no-repeat;background-position:right top;}
-#minilogo{background-repeat:no-repeat;background-position:left top;background-image:url(images/pol_color.gif);width:46px;height:10px;margin-top:50px;z-index:9;position:absolute;margin-left:100px;}}
\ No newline at end of file
diff -r 32898b2c8e9c -r 263ea20d9bfd web/index.php
--- a/web/index.php	Wed Apr 06 16:45:22 2011 +0200
+++ b/web/index.php	Wed Apr 06 17:28:51 2011 +0200
@@ -39,8 +39,8 @@
     <!-- Import fancy-type plugin for the sample page. -->
     
 	<link rel="stylesheet" href="res/blueprint/plugins/fancy-type/screen.css" type="text/css" media="screen, projection">
-	<link rel="stylesheet" href="custom.css" type="text/css" media="screen, projection">
-	<link rel="stylesheet" href="tabs-slideshow.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="res/css/custom.css" type="text/css" media="screen, projection">
+	<link rel="stylesheet" href="res/css/tabs-slideshow.css" type="text/css" media="screen, projection">
 	<link rel="stylesheet" type="text/css" href="res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css" media="screen">
 	<link rel="stylesheet" type="text/css" href="res/niceforms/niceforms-custom.css" media="screen" >
 
@@ -199,10 +199,12 @@
 			<!-- -->
 			<h3 class="archivesTitle">Les derniers événements qui ont utilisé le tweet polemic : </h3>
 			<div id="AVB1" class="archivesVideoBox">
-				<img src="images/tail_enmi2010.jpg" width="270" height="150"/>
+			    <a href="http://amateur.iri.centrepompidou.fr/nouveaumonde/enmi/conf/program/2010_2" target="_blank">
+					<img src="images/tail_enmi2010.jpg" width="270" height="150"/>
+				</a>
 				<div class="AVBtitle">ENMI 2010</div>
 				<div class="AVBtext">
-					par <a href="#">IRI</a> au Centre Pompidou
+					par <a href="http://www.iri.centrepompidou.fr">IRI</a> au Centre Pompidou
 					<br/>le lundi 31 janvier · 08:30 - 10:30
 				</div>
 			</div>
@@ -213,7 +215,7 @@
 				</a>
 				<div class="AVBtitle">Clay Shirky le net, le surplus cognitif</div>
 				<div class="AVBtext">
-					par <a href="#">RSLN</a> à Micorsoft France
+					par <a href="http://www.rslnmag.fr/">RSLN</a> à Micorsoft France
 					<br/>le lundi 31 janvier · 08:30 - 10:30
 				</div>
 			</div>
@@ -224,7 +226,7 @@
 				</a>
 				<div class="AVBtitle">OPENDATA</div>
 				<div class="AVBtext">
-					par <a href="#">RSLN</a> à Micorsoft France
+					par <a href="http://www.rslnmag.fr/">RSLN</a> à Micorsoft France
 					<br/>le lundi 31 janvier · 08:30 - 10:30
 				</div>
 			</div>
diff -r 32898b2c8e9c -r 263ea20d9bfd web/res/css/custom.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/res/css/custom.css	Wed Apr 06 17:28:51 2011 +0200
@@ -0,0 +1,117 @@
+/* -----------------------------------------------------------------------
+
+
+ IRI - Live tweet annotation CSS 
+ http://www.iri.centrepompidou.fr
+
+   * Copyright (c) 2010-Present. See LICENSE for more info. (cecill-C)
+   * Contributor : Samuel Huron 
+
+----------------------------------------------------------------------- */
+
+body {background-image:url(images/bgd.jpg);background-repeat:repeat-x;background-color:#f7f6f6;font-family: 'PT Sans', arial, serif; }
+textarea {margin-left:3px;height: 60px;width: 330px;padding:5px;background-image:url(images/tweetWriterBgdTxtArea.gif);background-repeat:no-repeat;border: none;}
+.loginbutton{margin-left:3px;height: 60px;width: 330px;padding:5px;background-image:url(images/tweetWriterBgdUnconnect.gif);background-repeat:no-repeat;border: none;margin-bottom:10px;color:#fff;}
+.loginlink{text-decoration:none;color:#fff;}
+.menuLink:active {text-decoration:none;}
+.menuLink:visited {text-decoration:none;}
+h3{font-size: 1.5em;line-height: 1;margin-bottom: 0.3em;}
+
+#Aboutbox{background-image:url(images/about_bgd.jpg);background-repeat:no-repeat;width:600px;height:360px;overflow:auto; border:1px solid #fff;}
+.lightBorder{padding:20px;}
+.lightTitle{font-size: 48px;font-weight:900;color:#e6e6e6;font-family: 'Geo', arial, serif;line-height:80%}
+.lightSubTitle{font-size: 24px;font-weight:bold;color:#262626; width:250px;line-height:80%}
+.lightDescription{font-size: 12px;color:#000; width:288px;text-align:justify;margin-top:15px;}
+.lightButton{width:134px;height:22px;background-image:url(images/bt_bgd_grey.jpg);background-repeat:no-repeat;}
+.lightButton:active{width:134px;height:22px;background-image:url(images/bt_bgd_grey.jpg);background-repeat:no-repeat;}
+.lightButton:over{text-decoration:none;background-image:url(images/bt_bgd_grey.jpg);background-repeat:no-repeat;}
+
+
+.logo{padding-right:10px;float:left;}
+.menu{float:left;height:62px;border-left:1px solid #c3c3c3;list-style-type:none;padding:0px;margin:0px;}
+.menuUnderline{margin-left:0px;padding-left:0px;background-image:url(images/menu_underline.gif);background-repeat:no-repeat;background-position:left bottom; width:205px;margin-top:3px;}
+.menuLink{text-decoration:none; margin:5px; color:#000}
+.menuLink:active {text-decoration:none;}
+.menuLink:visited {text-decoration:none;}
+
+.tweetContainer{position:absolute; margin-top:70px;}
+.tweetWriter{background-image:url(images/tweetWriterBgd.gif);width:359px;height:136px;padding:10px;position:absolute; margin-top:70px;}
+.tweetWriterTitle{color:4b4b4b;font-family: 'PT Sans Narrow', arial, serif;}
+.tweetExplain{background-image:url(images/tweetExplainBgd.gif);width:359px;height:510px;padding:10px;position:absolute; margin-top:70px;}
+
+.tweetReader{width:377px;height:450px;position:absolute; margin-top:225px;border:1px solid #c3c3c3;background:#ffffff;}
+.tweetButton{float:right;margin-right:5px;}
+
+.timelinePlayer{border:1px solid #c3c3c3;width:650px;height:650px;}
+.videoLivePlayer{border:1px solid #c3c3c3;width:500px;height:375px;}
+.videoLive{width:500px;height:378px;background:#fff;float:left;margin-top:20px;padding:5px;}
+.videoLiveProgram{width:500px;margin-top:425px;margin-left:392px;position:absolute;}
+.videoLiveProgram2{width:500px;margin-top:470px;margin-left:392px;position:absolute;}
+
+.videoLiveProgramTitle{color:#4b4b4b;font-family: 'PT Sans Narrow', arial, serif;font-size: 1.5em;padding:5px;border:1px solid #c3c3c3;background-color:#efefef;background-image:url(images/bgdTitle.jpg);background-repeat:no-repeat;}
+.videoLiveProgramDescription{padding:5px;border:1px solid #c3c3c3;padding:5px;border-top:none;background-color:#fff;background-image:url(images/bgdDescription.jpg);background-repeat:no-repeat;height:193px;overflow:scroll;}
+
+
+.footer{margin-top:770px;width:900px;height:20px;position:absolute;text-align:center;}
+.footerLink{text-decoration:none; margin:5px; color:#000;font-family: 'PT Sans Narrow', arial, serif;font-size: 1.1em;}
+.footerLink:active {text-decoration:none;}
+.footerLink:visited {text-decoration:none;}
+
+.tooltip {display:none;background:transparent url(images/white_arrow.png);font-size:12px;height:70px;width:160px;padding:25px;color:#000;}
+
+.timeline{height:28px;border: 1px solid #ccc;}
+.timeFragment {float:left;position:relative;float:left;}
+.timeFrame {border-left: 1px solid #AAA;border-right: 1px solid #AAA;height:10px;float:left;position:relative;}
+.bigTimeFrame {border-right: 1px solid #ccc;float:left;position:relative;}
+
+.arrowContainer{height:10px;width:100%;}
+
+.cleaner {clear:both;} 
+.txt{visibility:hidden;}
+
+
+.clear { /* generic container (i.e. div) for floating buttons */
+    overflow: hidden;
+    width: 100%;
+}
+
+a.button_w { background: transparent url('images/bg_button_a_w.png') no-repeat scroll top right; color: #444;display: block;float: left;font: normal 12px arial, sans-serif;height: 24px;margin-right: 6px;padding-right: 18px; text-decoration: none;}
+a.button_w span { background: transparent url('images/bg_button_span_w.png') no-repeat; display: block;line-height: 14px; padding: 5px 0 5px 18px;} 
+
+a.button_b { background: transparent url('images/bg_button_a_b.png') no-repeat scroll top right; color: #fff;display: block;float: left;font: bold 12px arial, sans-serif;height: 24px;margin-right: 6px;padding-right: 18px; text-decoration: none;}
+a.button_b span { background: transparent url('images/bg_button_span_b.png') no-repeat; display: block;line-height: 14px; padding: 5px 0 5px 18px;} 
+
+#question{background: transparent url('images/bt_blue.png') no-repeat; width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
+#question:active {text-decoration:none;}
+#question:visited {text-decoration:none;}
+#reference{background: transparent url('images/bt_yellow.png') no-repeat;width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
+#reference:active {text-decoration:none;}
+#reference:visited {text-decoration:none;}
+#positive{background: transparent url('images/bt_green.png') no-repeat;width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
+#positive:active {text-decoration:none;}
+#positive:visited {text-decoration:none;}
+#negative{background: transparent url('images/bt_red.png') no-repeat;width:32px;height:20px;text-decoration: none;font: normal 12px;color: #444;text-align:center; }
+#negative:active {text-decoration:none;}
+#negative:visited {text-decoration:none;}
+
+.introBox{width:880px;height:280px;padding:10px;position:absolute; margin-top:70px;}
+.aboutBox{background-image:url(images/archivesBoxBody.gif);width:900px;position:absolute; margin-top:70px;}
+.archivesBox{background-image:url(images/archivesBoxBody.gif);width:900px;position:absolute; margin-top:450px;}
+.archivesBoxContainer{padding:10px;width:880px;padding-bottom:0px;display:block; }
+.archivesBoxClear { /* generic container (i.e. div) for floating buttons */
+    overflow: hidden;
+    width: 100%;
+	background-image:url(images/archivesBoxBody.gif);
+	height:10px;
+}
+.archivesBoxFooter{background-repeat:no-repeat;background-position:left bottom;background-image:url(images/archivesBoxFooter.gif);width:100%;height:3px;}
+.archivesBoxHeader{background-repeat:no-repeat;background-position:left top;background-image:url(images/archivesBoxHeader.gif);width:100%;height:3px;}
+
+.archivesTitle{color:4b4b4b;font-family: 'PT Sans Narrow', arial, serif;font-size:24px;}
+.archivesVideoBox{margin:5px;padding:5px;position:relative;display:inline-block;float:left;border: solid 1px #ccc;background:#f2f2f2;cursor:pointer;}
+.AVBtitle{font-weight:bold;font-family: 'PT Sans Narrow', arial, serif; font-size:18px;}
+
+.slideTitle{font-size:20px;}
+.slideText{font-size:15px;}
+.slides{background-repeat:no-repeat;background-position:right top;}
+#minilogo{background-repeat:no-repeat;background-position:left top;background-image:url(images/pol_color.gif);width:46px;height:10px;margin-top:50px;z-index:9;position:absolute;margin-left:100px;}}
\ No newline at end of file