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;