Bilan du projet Plateforme THD

# HG changeset patch # User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> # Date 1311691776 -7200 # Node ID 10d6fd6ce9ab2e06d1777d73e852e0f1ae6b1a5f # Parent 460acd0e366767d564626dba1b676d9e75cfa3c1 - put all in a registry - put default rep in common.php - general cleaning diff -r 460acd0e3667 -r 10d6fd6ce9ab sbin/sync/sync_live --- 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 <ENMI 2010 - Live Video and Annotation - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - + + - - - + ' rel='stylesheet' type='text/css'> + ' rel='stylesheet' type='text/css'> + ' rel='stylesheet' type='text/css'> @@ -62,11 +59,16 @@ + +

diff -r 460acd0e3667 -r 10d6fd6ce9ab web/callback.php --- 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? diff -r 460acd0e3667 -r 10d6fd6ce9ab web/clear.php --- 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"); diff -r 460acd0e3667 -r 10d6fd6ce9ab web/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 @@ - - - - - - - + + + + + + - @@ -141,16 +139,7 @@ $(".timeFrame").tooltip(); /* * Lightbox button - */ - $("#About").fancybox({ - 'titlePosition' : 'inside', - 'transitionIn' : 'none', - 'transitionOut' : 'none', - 'enableEscapeButton': 'none', - 'margin' : 1, - 'padding' : 0 - } - + */ $("#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 @@
-
+

_("Accueil"); ?>
@@ -433,23 +413,5 @@
- -
-
-
-

-
_("splatchPageTitle"); ?>
-
_("splatchPageText"); ?>
-
-
- _("S'identifier"); ?>

- _("Libre accès"); ?> -
-
-
-
- - - diff -r 460acd0e3667 -r 10d6fd6ce9ab web/client_live.php --- 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 @@ -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
-Centre Pompidou
-
-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 = " - - IRI - | Cap Digital - | Portail THD"; - -?> - - - - - - - Bilan du projet Plateforme THD - - - - - - - - - - - - - - - - - - - - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> - - - - - - - -
- -
-
- - _("Accueil"); ?>
- - _("Programme"); ?>
- - _("A propos"); ?>
- -
- - -
-
- - -
- -
- -
- -
-

-
-
-
-
-
- - -
- -
-
_("ClientTitle1 :"); ?>
-
- - ".$translate->_("Vous n'êtes pas connecté.")."
"); - }else{ - echo("".$C_hashtag.""); - } - ?> - - -
- _("Envoyé"); ?>

-
- -
- _("Erreur1"); ?>

-
- - - - - _("Envoyer"); ?> - - ++ - -- - == - ?? - -
- -
- -
- -
-
- ".$translate->_("Déconnexion").""); - } - ?> - - -
- - - - - -
-
-
-

-
_("splatchPageTitle"); ?>
-
_("splatchPageText"); ?>
-
-
- _("S'identifier"); ?>

- _("Libre accès"); ?> -
-
-
-
- - - - - diff -r 460acd0e3667 -r 10d6fd6ce9ab web/common.php --- 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; diff -r 460acd0e3667 -r 10d6fd6ce9ab web/config.php.tmpl --- 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'; diff -r 460acd0e3667 -r 10d6fd6ce9ab web/embed_form.php --- 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 @@ embed Configuration - + ' rel='stylesheet' type='text/css'> diff -r 460acd0e3667 -r 10d6fd6ce9ab web/index.php --- 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 @@ Polemic tweet - Live Video and Annotation - - - - - - - - - - - + + + + + + - - - ' rel='stylesheet' type='text/css'> @@ -73,12 +65,9 @@ document.location.href="/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'}); }); diff -r 460acd0e3667 -r 10d6fd6ce9ab web/player_embed.php --- 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 @@ + @@ -111,7 +114,12 @@

diff -r 460acd0e3667 -r 10d6fd6ce9ab web/polemicaltimeline.php --- 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 @@ - - - - - - + + + + + + - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> - ' rel='stylesheet' type='text/css'> + ' rel='stylesheet' type='text/css'/> + ' rel='stylesheet' type='text/css'/> + ' rel='stylesheet' type='text/css'/>

_("ClientTitle1 :"); ?>