--- a/sbin/sync/sync_live Mon Jul 25 18:56:21 2011 +0200
+++ b/sbin/sync/sync_live Tue Jul 26 16:49:36 2011 +0200
@@ -12,7 +12,6 @@
cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/tweet_live_V$1/web/ iri@www.iri.centrepompidou.fr:/home/polemictweet/
+ core
P config.php
-P CPV/config.php
P .htaccess
EOT
fi
--- a/web/about.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/about.php Tue Jul 26 16:49:36 2011 +0200
@@ -14,51 +14,22 @@
<title>ENMI 2010 - Live Video and Annotation</title>
<!-- Framework CSS -->
- <link rel="stylesheet" href="res/blueprint/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="res/blueprint/print.css" type="text/css" media="print">
- <!--[if lt IE 8]><link rel="stylesheet" href="blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
- <!-- 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="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" >
-
- <!-- JAVASCRIPT -->
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
- <!--<script type="text/javascript" src="res/jquery.tools/jquery.tools.min.js"></script>-->
- <script src="http://cdn.jquerytools.org/1.2.5/all/jquery.tools.min.js"></script>
- <script type="text/javascript" src="res/jquery.fancybox/fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
- <script type="text/javascript" src="res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
- <script type="text/javascript" src="res/niceforms/niceforms.js"></script>
- <script src="http://widgets.twimg.com/j/2/widget.js"></script>
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-screen','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-print','css'));?>" type="text/css" media="print"/>
+ <!--[if lt IE 8]><link rel="stylesheet" href="<?php echo(registry_url('blueprint-ie','css'));?>" type="text/css" media="screen, projection"><![endif]-->
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-plugins-fancy-type','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('custom','css'));?>" type="text/css" media="screen, projection"/>
<!-- FONT -->
<link href='http://fonts.googleapis.com/css?family=PT+Sans+Narrow&subset=latin' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Geo&subset=latin' rel='stylesheet' type='text/css'>
-
- <script type="text/javascript">
- $(document).ready(function() {
+
+ <style type="text/css">
+ .archivesTitle {margin-left:10px;}
+ .footer {margin-top:980px;}
+ </style>
-
- $(".archivesVideoBox").mouseover(function() {
- //$(this).animate({'backgroundColor'});
- //$(this).css({'backgroundColor':'#d6d6d6'});
- $(this).css({'backgroundColor':'#fff'});
- $(this).cursor = "pointer";
- }).mouseout(function(){
- //$(this).css({'backgroundColor':'#f6f6f6'});
- $(this).css({'backgroundColor':'#f2f2f2'});
- });
- });
-
-
-
-
- </script>
<script type="text/javascript">
var _gaq = _gaq || [];
@@ -77,22 +48,26 @@
<div class="container">
<a href="index.php"> <img src="images/ENMI_2010_logo.gif" class="logo"></a>
<ul class="menu">
- <li class="menuUnderline"><a href="index.php" class="menuLink">
- <?php print $translate->_("Accueil"); ?></a></li>
- <li class="menuUnderline"><a href="<?php URL_ROOT ?>?CONNECT=true" class="menuLink">
- <?php print $translate->_("S'identifier"); ?></a></li>
+ <li class="menuUnderline"><a href="<?php echo(URL_ROOT.$C_default_rep); ?>/client.php?CONNECT=true" class="menuLink">
+ <?php print $translate->_("S'identifier"); ?></a></li>
+ <li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>about.php" class="menuLink">
+ <?php print $translate->_("A propos"); ?></a></li>
<li ><a href="mailto:contact@iri.centrepompidou.fr" class="menuLink" >
- <?php print $translate->_("Contact"); ?></a></li>
+ <?php print $translate->_("Contact"); ?></a></li>
+ </ul>
+ <ul class="menu">
+ <li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>archives.php" class="menuLink">
+ <?php print $translate->_("Archives"); ?></a></li>
</ul>
- <ul class="menu lang" >
- <li class="menuUnderline"><a href="<?php URL_ROOT ?>?lang=ja_JP" class="menuLink" >
+ <ul class="menu lang" >
+ <li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>about.php?lang=ja_JP" class="menuLink" >
<img src='images/flag_jp.gif'<?php if($actual!="ja_JP"){echo("style='opacity: .5;'"); } ?> />
<?php print $translate->_("Japonais"); ?></a></li>
- <li class="menuUnderline"><a href="<?php URL_ROOT ?>?lang=fr" class="menuLink">
+ <li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>about.php?lang=fr" class="menuLink">
<img src='images/flag_fr.gif' <?php if($actual!="fr"){echo("style='opacity: .5;'"); } ?> />
<?php print $translate->_("Français"); ?></a></li>
- <li ><a href="<?php URL_ROOT ?>?lang=en" class="menuLink">
+ <li ><a href="<?php echo(URL_ROOT); ?>about.php?lang=en" class="menuLink">
<img src='images/flag_en.gif' <?php if($actual!="en"){echo("style='opacity: .5;'"); } ?> />
<?php print $translate->_("Anglais"); ?></a></li>
</ul>
@@ -127,7 +102,6 @@
<div class="archivesBoxClear"></div>
<div class="archivesBoxFooter"></div>
</div>
- <!--
<div class="footer">
<hr>
<a href="http://www.iri.centrepompidou.fr/" class="footerLink"> Tweet polemic </a>
@@ -140,27 +114,9 @@
?>
<input type="text" id="txt" size="3" style="visibility:hidden;"/>
</div>
- -->
</div>
- <!-- LIGHTBOX -->
- <div style="display:none;">
- <div id="Aboutbox" >
- <div class="lightBorder">
- <div class="lightTitle">ENMI 2010</div>
- <div class="lightSubTitle">Annotation critique par tweet </div>
- <div class="lightDescription">À partir de cette interface ou de votre client twitter habituel, vous pouvez réagir en direct aux conférences en twittant. Vos tweets seront synchronisés avec l'enregistrement des conférences. Vous pourrez qualifier vos tweets en y intégrant la syntaxe ci-contre.
- </div>
- <div>
- <br/>
- <a class="button_b" href="#" id="IDENTIFIER"><span>S'identifier</span></a> <br/><br/>
- <a class="button_w" href="#" id="ACCES"><span>Libre accès</span></a>
- </div>
- </div>
- </div>
- </div>
-
</body>
</html>
--- a/web/archives.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/archives.php Tue Jul 26 16:49:36 2011 +0200
@@ -16,43 +16,40 @@
<title>Polemic tweet - Live Video and Annotation</title>
<!-- Framework CSS -->
- <link rel="stylesheet" href="res/blueprint/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="res/blueprint/print.css" type="text/css" media="print">
- <!--[if lt IE 8]><link rel="stylesheet" href="blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
- <!-- 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="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" >
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-screen','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-print','css'));?>" type="text/css" media="print"/>
+ <!--[if lt IE 8]><link rel="stylesheet" href="<?php echo(registry_url('blueprint-ie','css'));?>" type="text/css" media="screen, projection"><![endif]-->
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-plugins-fancy-type','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('custom','css'));?>" type="text/css" media="screen, projection"/>
<!-- JAVASCRIPT -->
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
- <!--<script type="text/javascript" src="res/jquery.tools/jquery.tools.min.js"></script>-->
- <script src="http://cdn.jquerytools.org/1.2.5/all/jquery.tools.min.js"></script>
- <script type="text/javascript" src="res/jquery.fancybox/fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
- <script type="text/javascript" src="res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
- <script type="text/javascript" src="res/niceforms/niceforms.js"></script>
- <script src="http://widgets.twimg.com/j/2/widget.js"></script>
-
+ <script type="text/javascript" src="<?php echo(registry_url('jquery','js'));?>"></script>
+
<!-- FONT -->
- <link href='http://fonts.googleapis.com/css?family=PT+Sans+Narrow&subset=latin' rel='stylesheet' type='text/css'>
- <link href='http://fonts.googleapis.com/css?family=PT+Sans&subset=latin' rel='stylesheet' type='text/css'>
- <link href='http://fonts.googleapis.com/css?family=Geo&subset=latin' rel='stylesheet' type='text/css'>
+ <link href='<?php echo(registry_url('PT-Sans_Narrow','font'));?>' rel='stylesheet' type='text/css'>
+ <link href='<?php echo(registry_url('PT-Sans','font'));?>' rel='stylesheet' type='text/css'>
+ <link href='<?php echo(registry_url('Geo','font'));?>' rel='stylesheet' type='text/css'>
<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-23581291-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+
+ $(function() {
+ $(".archivesVideoBox").mouseover(function() {
+ $(this).css({'backgroundColor':'#fff'});
+ $(this).cursor = "pointer";
+ }).mouseout(function() {
+ $(this).css({'backgroundColor':'#f2f2f2'});
+ });
+ });
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-23581291-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
</script>
</head>
@@ -62,11 +59,16 @@
<ul class="menu">
<li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>" class="menuLink">
<?php print $translate->_("Accueil"); ?></a></li>
- <li class="menuUnderline"><a href="about.php" class="menuLink">
+ <li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>about.php" class="menuLink">
<?php print $translate->_("A propos"); ?></a></li>
<li ><a href="mailto:contact@iri.centrepompidou.fr" class="menuLink" >
<?php print $translate->_("Contact"); ?></a></li>
</ul>
+ <ul class="menu">
+ <li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>archives.php" class="menuLink">
+ <?php print $translate->_("Archives"); ?></a></li>
+ </ul>
+
<ul class="menu lang" >
<li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>archives.php?lang=ja_JP" class="menuLink" >
--- a/web/callback.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/callback.php Tue Jul 26 16:49:36 2011 +0200
@@ -4,7 +4,14 @@
* include some common code (like we did in the 90s)
* People still do this? ;)
*/
-include_once './common.php';
+include_once 'common.php';
+if(!isset($_REQUEST['rep'])) {
+ $rep = $C_default_rep;
+}
+else {
+ $rep = $_REQUEST['rep'];
+}
+
/**
* Someone's knocking at the door using the Callback URL - if they have
@@ -25,7 +32,7 @@
/**
* With Access Token in hand, let's try accessing the client again
*/
- header('Location: ' . URL_ROOT . 'client.php' );
+ header('Location: ' . URL_ROOT . "$rep/client.php" );
} else {
/**
* Mistaken request? Some malfeasant trying something?
--- a/web/clear.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/clear.php Tue Jul 26 16:49:36 2011 +0200
@@ -4,7 +4,14 @@
* include some common code (like we did in the 90s)
* People still do this? ;)
*/
-include_once './common.php';
+include_once 'common.php';
+if(!isset($_REQUEST['rep'])) {
+ $rep = $C_default_rep;
+}
+else {
+ $rep = $_REQUEST['rep'];
+}
+
/**
* Clear the Access Token to force the OAuth protocol to rerun
@@ -14,4 +21,4 @@
/**
* Redirect back to index and the protocol legs should run once again
*/
-header('Location: ' . URL_ROOT . 'client.php');
+header('Location: ' . URL_ROOT . "$rep/client.php");
--- a/web/client.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/client.php Tue Jul 26 16:49:36 2011 +0200
@@ -1,7 +1,7 @@
<?php
if(!isset($_REQUEST['rep'])) {
- include_once dirname(__FILE__).'/config.php';
+ include_once dirname(__FILE__).'/common.php';
header('Location: ' . URL_ROOT . "$C_default_rep/client.php" );
exit();
}
@@ -51,19 +51,17 @@
<meta http-equiv="X-UA-Compatible" content="IE=8" />
<!-- Framework CSS -->
- <link rel="stylesheet" href="<?php echo(URL_ROOT); ?>res/blueprint/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="<?php echo(URL_ROOT); ?>res/blueprint/print.css" type="text/css" media="print">
- <!--[if lt IE 8]><link rel="stylesheet" href="<?php echo(URL_ROOT); ?>res/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
- <link rel="stylesheet" href="<?php echo(URL_ROOT); ?>res/blueprint/plugins/fancy-type/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="<?php echo(URL_ROOT); ?>res/css/custom.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" type="text/css" href="<?php echo(URL_ROOT); ?>res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css" media="screen">
- <link rel="stylesheet" type="text/css" href="<?php echo(URL_ROOT); ?>res/niceforms/niceforms-custom.css" media="screen" >
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-screen','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-print','css'));?>" type="text/css" media="print"/>
+ <!--[if lt IE 8]><link rel="stylesheet" href="<?php echo(registry_url('blueprint-ie','css'));?>" type="text/css" media="screen, projection"><![endif]-->
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-plugins-fancy-type','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('custom','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('fancybox','css'));?>" type="text/css" media="screen">
<!-- JAVASCRIPT -->
<script type="text/javascript" src="<?php echo(registry_url('jquery','js'))?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('fancybox','js'))?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('jquery-tools','js'))?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('niceforms','js'))?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('tw-widget','js'))?>"></script>
<!-- FONT -->
@@ -141,16 +139,7 @@
$(".timeFrame").tooltip();
/*
* Lightbox button
- */
- $("#About").fancybox({
- 'titlePosition' : 'inside',
- 'transitionIn' : 'none',
- 'transitionOut' : 'none',
- 'enableEscapeButton': 'none',
- 'margin' : 1,
- 'padding' : 0
- }<?php if (!isset($_SESSION['TWITTER_ACCESS_TOKEN'])){echo(").trigger('click');");}else{echo(");");} ?>
-
+ */
$("#Program").fancybox({
'width' : '75%',
@@ -160,15 +149,6 @@
'transitionOut' : 'none',
'type' : 'iframe'
});
-
- $("#Video_ldt").fancybox({
- 'width' : 1021,
- 'height' : 661,
- 'autoScale' : false,
- 'transitionIn' : 'none',
- 'transitionOut' : 'none',
- 'type' : 'iframe'
- });
$("#ACCES").click(function() {
$.fancybox.close();
@@ -257,7 +237,7 @@
<body>
<div class="container">
<img src="<?php echo($head_logo); ?>" class="Producteur logo">
- <div id="minilogo" style="margin-left:85px;height:5px;top:5px;"></div>
+ <div id="minilogo" style="margin-left:85px;height:5px;top:5px;"></div>
<ul class="menu">
<li class="menuUnderline"><a href="<?php echo(URL_ROOT); ?>" class="menuLink">
<?php print $translate->_("Accueil"); ?> </a></li>
@@ -433,23 +413,5 @@
</div>
- <!-- LIGHTBOX -->
- <div style="display:none;">
- <div id="Aboutbox" >
- <div class="lightBorder">
- <div class="lightTitle" style="height:45px;"> </div>
- <div class="lightSubTitle"><?php print $translate->_("splatchPageTitle"); ?></div>
- <div class="lightDescription"><?php print $translate->_("splatchPageText"); ?></div>
- <div>
- <br/>
- <a class="button_b" href="#" id="IDENTIFIER"><span><?php print $translate->_("S'identifier"); ?></span></a> <br/><br/>
- <a class="button_w" href="#" id="ACCES"><span><?php print $translate->_("Libre accès"); ?></span></a>
- </div>
- </div>
- </div>
- </div>
- <!-- END LIGHTBOX -->
-
-
</body>
</html>
--- a/web/client_live.php Mon Jul 25 18:56:21 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,434 +0,0 @@
-<?php
-
-/**
- * include some common code (like we did in the 90s)
- * People still do this? ;)
- */
-include_once './common.php';
-
-/**
- * Do we already have a valid Access Token or need to go get one?
- */
-if (!isset($_SESSION['TWITTER_ACCESS_TOKEN']) && isset($_GET['CONNECT']) ) {
- /**
- * Guess we need to go get one!
- */
- $token = $consumer->getRequestToken();
- $_SESSION['TWITTER_REQUEST_TOKEN'] = serialize($token);
-
- /**
- * Now redirect user to Twitter site so they can log in and
- * approve our access
- */
- $consumer->redirect();
-}
-
-/* CLIENT VAR LIVE */
-
-$C_hashtag= "#THD12";
-$C_link = "http://www.portailthd.fr/";
-$C_title = "Bilan du projet Plateforme THD";
-$C_REP = "thd/";
-$C_description = "12 mai 2011<br/>
-Centre Pompidou<br/>
-<br/>
-Les acteurs de la plateforme THD et les organismes qui ont soutenu le projet se retrouvent le 12 mai 2011 pour faire le bilan de trois années d’actions prospectives et d’études d’usages autour de plus de 30 expérimentations de nouveaux services.
-";
-
-$C_partenaires = "
- <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'>
- IRI </a>
- | <a href='http://www.capdigital.com/' class='footerLink' target='_blank'>Cap Digital</a>
- | <a href='http://www.portailthd.fr/' class='footerLink' target='_blank'>Portail THD</a>";
-
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="<?php echo($actual); ?>">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Bilan du projet Plateforme THD</title>
- <meta http-equiv="X-UA-Compatible" content="IE=8" />
-
- <!-- Framework CSS -->
- <link rel="stylesheet" href="res/blueprint/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="res/blueprint/print.css" type="text/css" media="print">
- <!--[if lt IE 8]><link rel="stylesheet" href="blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
- <link rel="stylesheet" href="res/blueprint/plugins/fancy-type/screen.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" >
-
- <!-- JAVASCRIPT -->
- <script type="text/javascript" src="<?php echo(registry_url('jquery','js'))?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('fancybox','js'))?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('jquery-tools','js'))?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('niceforms','js'))?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('tw-widget','js'))?>"></script>
-
- <!-- FONT -->
- <link href='<?php echo(registry_url('PT-Sans_Narrow','font'))?>' rel='stylesheet' type='text/css'>
- <link href='<?php echo(registry_url('PT-Sans','font'))?>' rel='stylesheet' type='text/css'>
- <link href='<?php echo(registry_url('Geo','font'))?>' rel='stylesheet' type='text/css'>
-
- <script type="text/javascript">
- $(document).ready(function() {
-
- doTimer();
- //$("txt").hide();
- $(".loginbutton").click(function() {
- document.location.href="<?php URL_ROOT ?>client.php?CONNECT=true";
- });
- $("#IDENTIFIER").click(function() {
- document.location.href="<?php URL_ROOT ?>client.php?CONNECT=true";
- });
-
- $("#messageSuccess").hide();
- $("#messageFailed").hide();
- $("#txt").hide();
-
- // BUTTONS
- $("#positive").click(function(){
- var MyValue = $('#status').attr("value");
- $('#status').attr("value",MyValue+"++ ");
- });
- $("#negative").click(function(){
- var MyValue = $('#status').attr("value");
- $('#status').attr("value",MyValue+"-- ");
- });
- $("#reference").click(function(){
- var MyValue = $('#status').attr("value");
- $('#status').attr("value",MyValue+"== ");
- });
- $("#question").click(function(){
- var MyValue = $('#status').attr("value");
- $('#status').attr("value",MyValue+"?? ");
- });
-
- // SEND TWEETS
- $("#sendTweet").click(function(){
- var MyStatus = $('#status').attr("value");
- $.post('tweet_ajax.php', {status:MyStatus}
- ,function(data) {
-
- if(data=="true"){
- $("#messageSuccess").show('fast');
- $("#messageSuccess").delay(800).hide('slow');
- $('#status').attr("value","#THD12");
- }else{
- $("#error").text(data);
- $("#messageFailed").show('fast');
- $("#messageFailed").delay(800).hide('slow');
- }
-
- });
-
- });
-
- $(".timeFrame").tooltip();
- /*
- * Lightbox button
- */
- $("#About").fancybox({
- 'titlePosition' : 'inside',
- 'transitionIn' : 'none',
- 'transitionOut' : 'none',
- 'enableEscapeButton': 'none',
- 'margin' : 1,
- 'padding' : 0
- }<?php if (!isset($_SESSION['TWITTER_ACCESS_TOKEN'])){echo(").trigger('click');");}else{echo(");");} ?>
-
-
- $("#Program").fancybox({
- 'width' : '75%',
- 'height' : '75%',
- 'autoScale' : false,
- 'transitionIn' : 'none',
- 'transitionOut' : 'none',
- 'type' : 'iframe'
- });
-
- $("#Video_ldt").fancybox({
- 'width' : 1021,
- 'height' : 661,
- 'autoScale' : false,
- 'transitionIn' : 'none',
- 'transitionOut' : 'none',
- 'type' : 'iframe'
- });
-
- $("#ACCES").click(function() {
- $.fancybox.close();
- });
-
- // Buttons
-
-
- });
-
-
- <!-- LIMIT TEXTAREA:
- function imposemax(Object)
- {
- return (Object.value.length <= 140);
- }
- // End -->
-
- <!-- TIMER
- var c=0;
- var t;
- var timer_is_on=0;
-
- function timedCount()
- {
- document.getElementById('txt').value=c;
- c = c+1;
- t = window.setTimeout("timedCount()",1000);
- $(".twtr-ft").hide();
- $(".twtr-hd").hide();
- //twtr-tweet
- $(".twtr-tweet").each(colorTweetings);
-
- }
-
- function colorTweetings (){
- var tweettemp = $(this).html();
- if (tweettemp.search(/\x3F\x3F/)!=-1){
- $(this).css({'background-color': '#bfdbec','color':"#000"});
- }
- if (tweettemp.search(/\x2B\x2B/)!=-1){
- $(this).css({'background-color': '#c5e7cd','color':"#fff"});
- }
- if (tweettemp.search(/\x2D\x2D/)!=-1){
- $(this).css({'background-color': '#f6ced0','color':"#fff"});
- }
- if (tweettemp.search(/\x3D\x3D/)!=-1){
- $(this).css({'background-color': '#ecedc1','color':"#000"});
- }
- };
-
-
-
- function doTimer()
- {
- if (!timer_is_on)
- {
- timer_is_on=1;
- timedCount();
- }
- }
-
- function stopCount()
- {
- clearTimeout(t);
- timer_is_on=0;
- }
- //
- //-->
- </script>
-
- <script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-23581291-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
- </script>
-
- </head>
- <body>
- <div class="container">
- <img src="images/ENMI_2010_logo.gif" class="Producteur logo">
- <div id="minilogo" style="margin-left:85px;height:5px;top:5px;"></div>
- <ul class="menu">
- <li class="menuUnderline"><a href="index.php" class="menuLink">
- <?php print $translate->_("Accueil"); ?> </a></li>
- <li class="menuUnderline" ><a href="<?php echo($C_link); ?>" class="menuLink" target="_blank" id='Program'>
- <?php print $translate->_("Programme"); ?></a></li>
- <li ><a href="about.php" class="menuLink" >
- <?php print $translate->_("A propos"); ?></a></li>
-
- </ul>
-
- <ul class="menu" >
- <li class="menuUnderline"><a href="<?php URL_ROOT ?>client.php?lang=ja_JP" class="menuLink" >
- <img src='images/flag_jp.gif'<?php if($actual!="ja_JP"){echo("style='opacity: .5;'"); } ?> />
- <?php print $translate->_("Japonais"); ?></a></li>
- <li class="menuUnderline"><a href="<?php URL_ROOT ?>client.php?lang=fr" class="menuLink">
- <img src='images/flag_fr.gif' <?php if($actual!="fr"){echo("style='opacity: .5;'"); } ?> />
- <?php print $translate->_("Français"); ?></a></li>
- <li ><a href="<?php URL_ROOT ?>client.php?lang=en" class="menuLink">
- <img src='images/flag_en.gif' <?php if($actual!="en"){echo("style='opacity: .5;'"); } ?> />
- <?php print $translate->_("Anglais"); ?></a></li>
- </ul>
-
-
- <div class="videoLive">
- <div class="videoLivePlayer">
- <object id="player" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" name="player" width="500" height="375">
- <param name="movie" value="res/mediaplayer/player.swf" />
- <param name="allowfullscreen" value="true" />
- <param name="allowscriptaccess" value="always" />
- <param name="wmode" value="transparent" />
- <param name="flashvars" value="autostart=true&live=true&image=images/bgd_player_thd.png&provider=rtmp&streamer=rtmp://media.iri.centrepompidou.fr/ddc_player/&file=livestream&controlbar=none&autostart=true" />
- <embed
- type="application/x-shockwave-flash"
- id="player2"
- name="player2"
- src="res/mediaplayer/player.swf"
- width="500"
- height="375"
- allowscriptaccess="always"
- allowfullscreen="true"
- wmode="transparent"
- flashvars="autostart=true&live=true&provider=rtmp&streamer=rtmp://media.iri.centrepompidou.fr/ddc_player/&file=livestream&image=images/bgd_player_thd.png&controlbar=none&autostart=true"
-
- />
- </object>
-
- </div>
-
- </div>
-
- <div class="videoLiveProgram">
-
- <div class="arrowContainer">
- <div class="arrow"> </div>
- </div>
- <div class="videoLiveProgramTitle">
- <b><?php echo($C_title); ?></b></div>
- <div class="videoLiveProgramDescription">
- <br><?php echo($C_description); ?></div>
-
-
- </div>
-
- <div class="tweetWriter">
- <h3 class="tweetWriterTitle"><?php print $translate->_("ClientTitle1 :"); ?></h3>
- <form action="tweet.php" method="post" id="statusform" >
- <?php if (!isset($_SESSION['TWITTER_ACCESS_TOKEN'])){
- echo("<div class='loginbutton' ><a href='".URL_ROOT."client.php?CONNECT=true' class='loginlink'>
- ".$translate->_("Vous n'êtes pas connecté.")."</a></div>");
- }else{
- echo("<textarea name='status' id='status' rows='3' cols='50' onkeypress='return imposemax(this);'>".$C_hashtag."</textarea>");
- }
- ?>
-
-
- <div id="messageSuccess" style="background-color:lightgreen;">
- <?php print $translate->_("Envoyé"); ?><br><br>
- </div>
-
- <div id="messageFailed" style="background-color:red;">
- <?php print $translate->_("Erreur1"); ?><div id="error"> </div><br/><br>
- </div>
-
-
-
- <a class="button_w" href="#" id="sendTweet" style="float:right;margin-right:15px;margin-left:35px;width:70px;" >
- <span><?php print $translate->_("Envoyer"); ?></span></a>
- <!--<button name="s" type="button" id="sendTweet"
- style="float:right;margin-right:15px;margin-left:35px;width:70px;" >Envoyer</button>-->
- <a
-
- id="positive"
- title="accord"
- class="tweetButton">++</a>
- <a
-
- id="negative"
- title="désaccord"
- class="tweetButton">--</a>
- <a
-
- id="reference"
- title="reference"
- class="tweetButton">==</a>
- <a
-
- id="question"
- title="question"
- class="tweetButton"> ??</a>
- </form>
- </div>
-
- <div class="tweetReader">
- <script>
- new TWTR.Widget({
- version: 2,
- type: 'search',
- search: '<?php echo($C_hashtag); ?>',
- interval: 1000,
- title: '',
- subject: '',
- width: 377,
- height: 450,
- theme: {
- shell: {
- background: '#ffffff',
- color: '#ffffff'
- },
- tweets: {
- background: '#ffffff',
- color: '#444444',
- links: '#1985b5'
- }
- },
- features: {
- scrollbar: false,
- loop: true,
- live: true,
- hashtags: true,
- timestamp: true,
- avatars: true,
- toptweets: true,
- behavior: 'default'
- }
- }).render().start();
- </script>
- </div>
-
- <div class="footer">
- <hr>
- <?php
- echo($C_partenaires);
-
- if (isset($_SESSION['TWITTER_ACCESS_TOKEN'])){
- echo("| <a href='clear.php' class='footerLink'>".$translate->_("Déconnexion")."</a>");
- }
- ?>
- <input type="text" id="txt" size="3"/>
-
- </div>
-
-
- </div>
-
- <!-- LIGHTBOX -->
- <div style="display:none;">
- <div id="Aboutbox" >
- <div class="lightBorder">
- <div class="lightTitle" style="height:45px;"> </div>
- <div class="lightSubTitle"><?php print $translate->_("splatchPageTitle"); ?></div>
- <div class="lightDescription"><?php print $translate->_("splatchPageText"); ?></div>
- <div>
- <br/>
- <a class="button_b" href="#" id="IDENTIFIER"><span><?php print $translate->_("S'identifier"); ?></span></a> <br/><br/>
- <a class="button_w" href="#" id="ACCES"><span><?php print $translate->_("Libre accès"); ?></span></a>
- </div>
- </div>
- </div>
- </div>
- <!-- END LIGHTBOX -->
-
-
- </body>
-</html>
--- a/web/common.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/common.php Tue Jul 26 16:49:36 2011 +0200
@@ -10,10 +10,26 @@
. PATH_SEPARATOR . get_include_path()
);
+/**
+* Base configuration
+*/
+$C_default_rep = 'sig-chi-paris-2011';
+
+$configuration = array(
+ 'siteUrl' => 'http://twitter.com/oauth',
+ 'consumerKey' => '***REMOVED***',
+ 'consumerSecret' => '***REMOVED***'
+);
+
+
+$req_rep = $C_default_rep;
+if(isset($config) && isset($config['rep'])) {
+ $req_rep = $config['rep'];
+}
include_once dirname(__FILE__).'/traduction.php';
-if(isset($config) && isset($config['rep']) && file_exists(dirname(__FILE__).'/'.$config['rep'].'/traduction.php')) {
- include_once dirname(__FILE__).'/'.$config['rep'].'/traduction.php';
+if(file_exists(dirname(__FILE__)."/$req_rep/traduction.php")) {
+ include_once dirname(__FILE__)."/$req_rep/traduction.php";
}
@@ -37,6 +53,10 @@
* Include the configuration data for our OAuth Client (array $configuration)
*/
include_once dirname(__FILE__).'/config.php';
+
+
+$configuration['callbackUrl'] = URL_ROOT."$req_rep/callback.php";
+
/**
* Setup an instance of the Consumer for use
@@ -94,6 +114,7 @@
'jquery-tools' => URL_ROOT.'res/metadataplayer/res/js/jquery.tools.min.js',
'tw-widget' => URL_ROOT.'res/js/tw_widget.js',
'jquery-mousewheel' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.mousewheel-3.0.4.pack.js',
+ 'swfobject' => 'http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js',
),
'cdn' => array(
'jquery' => 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js',
@@ -106,6 +127,7 @@
'jquery-tools' => 'http://cdn.jquerytools.org/1.2.5/jquery.tools.min.js',
'tw-widget' => 'http://widgets.twimg.com/j/2/widget.js',
'jquery-mousewheel' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.mousewheel-3.0.4.pack.js',
+ 'swfobject' => 'http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js',
)
);
@@ -122,15 +144,39 @@
)
);
+
+$css_registry = array(
+ 'local' => array(
+ 'blueprint-screen' => URL_ROOT.'res/blueprint/screen.css',
+ 'blueprint-print' => URL_ROOT.'res/blueprint/print.css',
+ 'blueprint-ie' => URL_ROOT.'res/blueprint/ie.css',
+ 'blueprint-plugins-fancy-type' => URL_ROOT.'res/blueprint/plugins/fancy-type/screen.css',
+ 'custom' => URL_ROOT.'res/css/custom.css',
+ 'fancybox' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css',
+ 'jquery-ui' => "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css",
+ 'tabs-slideshow' => URL_ROOT.'res/css/tabs-slideshow.css',
+ ),
+ 'cdn' => array(
+ 'blueprint-screen' => URL_ROOT.'res/blueprint/screen.css',
+ 'blueprint-print' => URL_ROOT.'res/blueprint/print.css',
+ 'blueprint-ie' => URL_ROOT.'res/blueprint/ie.css',
+ 'blueprint-plugins-fancy-type' => URL_ROOT.'res/blueprint/plugins/fancy-type/screen.css',
+ 'custom' => URL_ROOT.'res/css/custom.css',
+ 'fancybox' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css',
+ 'jquery-ui' => "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css",
+ 'tabs-slideshow' => URL_ROOT.'res/css/tabs-slideshow.css',
+ )
+);
+
$archives_list = array(
-"rsln", "rsln-opendata", "rsln-mercedes-bunz",
-"enmi2011-technologie-confiance", "CPV", "fens_FabLab_Design_Metadata",
-array("mashup","conference"), array("mashup","tableronde"), "sig-chi-paris-2011"
+ "rsln", "rsln-opendata", "rsln-mercedes-bunz",
+ "enmi2011-technologie-confiance", "CPV", "fens_FabLab_Design_Metadata",
+ array("mashup","conference"), array("mashup","tableronde"), "sig-chi-paris-2011"
);
function registry_url($key, $type, $registry_def=null) {
- global $js_registry, $font_registry, $C_default_registry;
+ global $js_registry, $font_registry, $css_registry, $C_default_registry;
if($registry_def != null) {
$registry = $registry_def;
--- a/web/config.php.tmpl Mon Jul 25 18:56:21 2011 +0200
+++ b/web/config.php.tmpl Tue Jul 26 16:49:36 2011 +0200
@@ -8,10 +8,4 @@
//define('URL_ROOT', 'http://127.0.0.1/IRI/REPO_TWEET_LIVE/web/');
define('URL_ROOT', 'http://127.0.0.1/IRI/REPO_TWEET_LIVE/web/client.php');
-$configuration = array(
- // 'callbackUrl' => 'http://amateur.iri.centrepompidou.fr/live/callback.php',
- 'callbackUrl' => 'http://127.0.0.1/IRI/REPO_TWEET_LIVE/web/callback.php',
- 'siteUrl' => 'http://twitter.com/oauth',
- 'consumerKey' => '***REMOVED***',
- 'consumerSecret' => '***REMOVED***'
-);
+$C_default_registry = 'cdn';
--- a/web/embed_form.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/embed_form.php Tue Jul 26 16:49:36 2011 +0200
@@ -15,7 +15,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>embed Configuration</title>
- <link rel="stylesheet" href="<?php echo(URL_ROOT); ?>res/css/custom.css" type="text/css" media="screen, projection">
+ <link rel="stylesheet" href="<?php echo(registry_url('custom', 'css')); ?>" type="text/css" media="screen, projection">
<!-- FONT -->
<link href='<?php echo(registry_url('PT-Sans_Narrow','font'))?>' rel='stylesheet' type='text/css'>
--- a/web/index.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/index.php Tue Jul 26 16:49:36 2011 +0200
@@ -6,9 +6,9 @@
* People still do this? ;)
*/
-include_once dirname(__FILE__).'/config.php';
+include_once dirname(__FILE__).'/common.php';
include_once dirname(__FILE__).'/'.$C_default_rep.'/config.php';
-include_once dirname(__FILE__).'/common.php';
+
/**
* Do we already have a valid Access Token or need to go get one?
@@ -36,25 +36,17 @@
<title>Polemic tweet - Live Video and Annotation</title>
<!-- Framework CSS -->
- <link rel="stylesheet" href="res/blueprint/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="res/blueprint/print.css" type="text/css" media="print">
- <!--[if lt IE 8]><link rel="stylesheet" href="blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-
- <!-- 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="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" >
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-screen','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-print','css'));?>" type="text/css" media="print"/>
+ <!--[if lt IE 8]><link rel="stylesheet" href="<?php echo(registry_url('blueprint-ie','css'));?>" type="text/css" media="screen, projection"><![endif]-->
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-plugins-fancy-type','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('custom','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('tabs-slideshow','css'));?>" type="text/css" media="screen, projection">
<!-- JAVASCRIPT -->
<script type="text/javascript" src="<?php echo(registry_url('jquery','js'));?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('jquery-tools','js'));?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('jquery-mousewheel','js'));?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('fancybox','js'));?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('niceforms','js'));?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('tw-widget','js'));?>"></script>
<!-- FONT -->
<link href='<?php echo(registry_url('PT-Sans_Narrow','font'));?>' rel='stylesheet' type='text/css'>
@@ -73,12 +65,9 @@
document.location.href="<?php echo(URL_ROOT.$C_default_rep); ?>/client.php";
});
$(".archivesVideoBox").mouseover(function() {
- //$(this).animate({'backgroundColor'});
- //$(this).css({'backgroundColor':'#d6d6d6'});
$(this).css({'backgroundColor':'#fff'});
$(this).cursor = "pointer";
}).mouseout(function() {
- //$(this).css({'backgroundColor':'#f6f6f6'});
$(this).css({'backgroundColor':'#f2f2f2'});
});
--- a/web/player_embed.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/player_embed.php Tue Jul 26 16:49:36 2011 +0200
@@ -23,6 +23,9 @@
<!-- JAVASCRIPT -->
<script type="text/javascript" src="<?php echo(registry_url('jquery','js'))?>"></script>
+ <script type="text/javascript">
+ $.noConflict();
+ </script>
<script type="text/javascript" src="<?php echo(registry_url('jquery-ui','js'))?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('raphael','js'))?>"></script>
@@ -111,7 +114,12 @@
</script>
<script type='text/javascript' src='<?php echo(URL_ROOT.$config['player']);?>'></script>
<script type="text/javascript">
- $.extend(__IriSP.lib,{jQueryToolTip:"<?php echo(URL_ROOT);?>res/metadataplayer/res/js/jquery.tools.min.js"});
+ jQuery.extend(__IriSP.lib,{
+ jQueryToolTip:"<?php echo(registry_url('jquery-tools','js'));?>",
+ jQueryUI:"<?php echo(registry_url('jquery-ui','js'));?>",
+ swfObject:"<?php echo(registry_url('swfobject','js'));?>",
+ cssjQueryUI:"<?php echo(registry_url('jquery-ui','css'));?>"
+ });
</script>
<div id="player_project_843fff80-6b50-11e0-8aef-00145ea49a02_embed" class="iri_player_embed"> </div>
--- a/web/polemicaltimeline.php Mon Jul 25 18:56:21 2011 +0200
+++ b/web/polemicaltimeline.php Tue Jul 26 16:49:36 2011 +0200
@@ -16,7 +16,7 @@
$div_height = $config['div_height'];
}
$tweet_explain_background = URL_ROOT.'images/tweetExplainBgd.gif';
-if(file_exists($rep.'/images/tweetExplainBgd.gif')) {
+if(file_exists(dirname(__FILE__)."/$rep/images/tweetExplainBgd.gif")) {
$tweet_explain_background = URL_ROOT.$rep.'/images/tweetExplainBgd.gif';
}
@@ -42,21 +42,21 @@
</script>
<script type="text/javascript" src="<?php echo(registry_url('raphael','js'));?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('fancybox','js'));?>"></script>
- <script type="text/javascript" src="<?php echo(registry_url('niceforms','js'));?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('jquery-url','js'));?>"></script>
<script type="text/javascript" src="<?php echo(registry_url('ldtplayer','js'));?>"></script>
<!-- Framework CSS -->
- <link rel="stylesheet" href="<?php echo($baseurl) ?>res/blueprint/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="<?php echo($baseurl) ?>res/blueprint/print.css" type="text/css" media="print">
- <link rel="stylesheet" href="<?php echo($baseurl) ?>res/blueprint/plugins/fancy-type/screen.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="<?php echo($baseurl) ?>res/css/custom.css" type="text/css" media="screen, projection">
- <link rel="stylesheet" href="<?php echo($baseurl) ?>res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.css" media="screen">
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-screen','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-print','css'));?>" type="text/css" media="print"/>
+ <!--[if lt IE 8]><link rel="stylesheet" href="<?php echo(registry_url('blueprint-ie','css'));?>" type="text/css" media="screen, projection"><![endif]-->
+ <link rel="stylesheet" href="<?php echo(registry_url('blueprint-plugins-fancy-type','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('custom','css'));?>" type="text/css" media="screen, projection"/>
+ <link rel="stylesheet" href="<?php echo(registry_url('fancybox','css'));?>" media="screen"/>
<!-- FONT -->
- <link href='<?php echo(registry_url('PT-Sans_Narrow','font'));?>' rel='stylesheet' type='text/css'>
- <link href='<?php echo(registry_url('PT-Sans','font'));?>' rel='stylesheet' type='text/css'>
- <link href='<?php echo(registry_url('Geo','font'));?>' rel='stylesheet' type='text/css'>
+ <link href='<?php echo(registry_url('PT-Sans_Narrow','font'));?>' rel='stylesheet' type='text/css'/>
+ <link href='<?php echo(registry_url('PT-Sans','font'));?>' rel='stylesheet' type='text/css'/>
+ <link href='<?php echo(registry_url('Geo','font'));?>' rel='stylesheet' type='text/css'/>
<style type="text/css">
.tweetButton{float:left;margin-right:5px;}
@@ -126,7 +126,12 @@
</script>
<script type='text/javascript' src='<?php echo(URL_ROOT);?>res/metadataplayer.polemic/src/js/polemic.js'></script>
<script type="text/javascript">
- jQuery.extend(__IriSP.lib,{jQueryToolTip:"<?php echo(URL_ROOT);?>res/metadataplayer/res/js/jquery.tools.min.js"});
+ jQuery.extend(__IriSP.lib,{
+ jQueryToolTip:"<?php echo(registry_url('jquery-tools','js'));?>",
+ jQueryUI:"<?php echo(registry_url('jquery-ui','js'));?>",
+ swfObject:"<?php echo(registry_url('swfobject','js'));?>",
+ cssjQueryUI:"<?php echo(registry_url('jquery-ui','css'));?>"
+ });
jQuery(document).ready(function() {
jQuery("#mdselect_"+metadata_key).attr("selected","selected");
@@ -174,6 +179,7 @@
<div class="container">
<img src="<?php echo($config['head_logo']);?>" class="logo">
+ <div id="minilogo" style="margin-left:85px;height:5px;top:5px;"></div>
<ul class="menu">
<li class="menuUnderline"><a href="<?php echo(URL_ROOT)?>" class="menuLink" id="Accueil">
<?php print $translate->_("Accueil"); ?></a></li>
--- a/web/res/css/custom.css Mon Jul 25 18:56:21 2011 +0200
+++ b/web/res/css/custom.css Tue Jul 26 16:49:36 2011 +0200
@@ -136,8 +136,9 @@
.archivesTitleContainer{float:left;margin-left: 10px;}
.archivesActionsContainer{width:45px;height:30px; float:right;}
.archivesTitleActionsContainer{overflow: auto; width: 100%;}
-.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;}
+.archivesVideoBox{margin:5px;padding:5px;position:relative;display:inline-block;float:left;border: solid 1px #ccc;background:#f2f2f2;cursor:pointer;width:270px;overflow:hidden;}
+.AVBtitle{font-weight:bold;font-family: 'PT Sans Narrow', arial, serif; font-size:18px;white-space:nowrap;overflow:hidden;}
+.AVBtext{white-space:nowrap;overflow:hidden;}
.slideTitle{font-size:20px;}
.slideText{font-size:15px;}