diff -r d824146a9589 -r 0a2505c3b547 web/common.php --- a/web/common.php Sun Mar 04 14:13:39 2012 +0100 +++ b/web/common.php Mon Mar 05 18:41:11 2012 +0100 @@ -174,41 +174,44 @@ $js_registry = array( 'local' => array( + 'libdir' => URL_ROOT.'res/js/', 'jquery' => URL_ROOT.'res/js/jquery-1.4.3.min.js', - 'raphael' => URL_ROOT.'res/raphael/raphael-min.js', + 'raphael' => URL_ROOT.'res/js/raphael.js', 'jquery-ui' => URL_ROOT.'res/js/jquery-ui-1.8.13.min.js', - 'niceforms' => URL_ROOT.'res/niceforms/niceforms.js', + 'niceforms' => URL_ROOT.'res/js/niceforms.js', 'jquery-url' => URL_ROOT.'res/js/jquery.url.js', 'ldtplayer' => URL_ROOT.'res/metadataplayer/src/js/LdtPlayer.js', - 'fancybox' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js', - 'jquery-tools' => URL_ROOT.'res/metadataplayer/res/js/jquery.tools.min.js', + 'fancybox' => URL_ROOT.'res/js/fancybox/jquery.fancybox-1.3.4.pack.js', + 'jquery-tools' => URL_ROOT.'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' => URL_ROOT.'res/metadataplayer/res/js/swfobject.js', - 'json-js' => URL_ROOT.'res/douglascrockford-JSON-js/json2.js', - 'underscore' => URL_ROOT.'res/underscore/underscore-min.js' , - 'jquery-scrollto'=>URL_ROOT.'res/jquery.scrollto/jquery.scrollTo-1.4.2-min.js' , - 'twcx-main' => URL_ROOT.'res/js-tweetcast/live-polemic.js' , - 'semanticboard' => URL_ROOT.'res/js-tweetcast/semanticboard.js' , - + 'jquery-mousewheel' => URL_ROOT.'res/js/jquery.mousewheel-3.0.4.pack.js', + 'swfobject' => URL_ROOT.'res/js/swfobject.js', + 'json-js' => URL_ROOT.'res/js/json2.js', + 'underscore' => URL_ROOT.'res/js/underscore-min.js' , + 'jquery-scrollto'=>URL_ROOT.'res/js/jquery.scrollTo-1.4.2-min.js' , + 'twcx-main' => URL_ROOT.'res/js/live-polemic.js' , + 'semanticboard' => URL_ROOT.'res/js/semanticboard.js' , + 'metadataplayer'=> URL_ROOT.'res/js/LdtPlayer-release.js' , ), 'cdn' => array( + 'libdir' => URL_ROOT.'res/js/', 'jquery' => 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js', - 'raphael' => URL_ROOT.'res/raphael/raphael-min.js', + 'raphael' => URL_ROOT.'res/js/raphael.js', 'jquery-ui' => 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js', - 'niceforms' => URL_ROOT.'res/niceforms/niceforms.js', + 'niceforms' => URL_ROOT.'res/js/niceforms.js', 'jquery-url' => URL_ROOT.'res/js/jquery.url.js', 'ldtplayer' => URL_ROOT.'res/metadataplayer/src/js/LdtPlayer.js', - 'fancybox' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js', + 'fancybox' => URL_ROOT.'res/js/fancybox/jquery.fancybox-1.3.4.pack.js', 'jquery-tools' => 'http://cdn.jquerytools.org/1.2.4/all/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', + 'jquery-mousewheel' => URL_ROOT.'res/js/jquery.mousewheel-3.0.4.pack.js', 'swfobject' => 'http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js', - 'json-js' => URL_ROOT.'res/douglascrockford-JSON-js/json2.js', - 'underscore' => URL_ROOT.'res/underscore/underscore-min.js' , - 'jquery-scrollto'=>URL_ROOT.'res/jquery.scrollto/jquery.scrollTo-1.4.2-min.js' , - 'twcx-main' => URL_ROOT.'res/js-tweetcast/live-polemic.js' , - 'semanticboard' => URL_ROOT.'res/js-tweetcast/semanticboard.js' , + 'json-js' => URL_ROOT.'res/js/json2.js', + 'underscore' => URL_ROOT.'res/js/underscore-min.js' , + 'jquery-scrollto'=>URL_ROOT.'res/js/jquery.scrollTo-1.4.2-min.js' , + 'twcx-main' => URL_ROOT.'res/js/live-polemic.js' , + 'semanticboard' => URL_ROOT.'res/js/semanticboard.js' , + 'metadataplayer'=> URL_ROOT.'res/js/LdtPlayer-release.js' , ) ); @@ -229,23 +232,24 @@ $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', + 'blueprint-screen' => URL_ROOT.'res/css/blueprint-screen.css', + 'blueprint-print' => URL_ROOT.'res/css/blueprint-print.css', + 'blueprint-ie' => URL_ROOT.'res/css/blueprint-ie.css', + 'blueprint-plugins-fancy-type' => URL_ROOT.'res/css/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', + 'fancybox' => URL_ROOT.'res/js/fancybox/jquery.fancybox-1.3.4.css', 'jquery-ui' => URL_ROOT.'res/metadataplayer/res/css/jq-css/themes/base/jquery-ui.css', 'tabs-slideshow' => URL_ROOT.'res/css/tabs-slideshow.css', 'tweetcast' => URL_ROOT.'res/css/tweetcast.css', 'semanticboard' => URL_ROOT.'res/css/semanticboard.css', 'archives-iframe' => URL_ROOT.'res/css/archives-iframe.css', + 'metadataplayer' => URL_ROOT.'res/css/metadataplayer/LdtPlayer.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', + 'blueprint-screen' => URL_ROOT.'res/css/blueprint-screen.css', + 'blueprint-print' => URL_ROOT.'res/css/blueprint-print.css', + 'blueprint-ie' => URL_ROOT.'res/css/blueprint-ie.css', + 'blueprint-plugins-fancy-type' => URL_ROOT.'res/css/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", @@ -253,6 +257,7 @@ 'tweetcast' => URL_ROOT.'res/css/tweetcast.css', 'semanticboard' => URL_ROOT.'res/css/semanticboard.css', 'archives-iframe' => URL_ROOT.'res/css/archives-iframe.css', + 'metadataplayer' => URL_ROOT.'res/css/metadataplayer/LdtPlayer.css', ) );