# HG changeset patch # User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> # Date 1311762542 -7200 # Node ID b31aef9365a8c52ced8b7cdbce1852f2490c2571 # Parent ffb0a6d0800037d1a551de0bf3aa99da4521593a# Parent 06f908b0a793fb8955c60f92eb750e25b93428fe Merge with c89870738359d3f48fe813a807e78677263d7ddd diff -r ffb0a6d08000 -r b31aef9365a8 web/common.php --- a/web/common.php Wed Jul 27 12:25:45 2011 +0200 +++ b/web/common.php Wed Jul 27 12:29:02 2011 +0200 @@ -114,7 +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', + 'swfobject' => URL_ROOT.'res/metadataplayer/res/swfobject.js', ), 'cdn' => array( 'jquery' => 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js', @@ -153,7 +153,7 @@ '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", + 'jquery-ui' => URL_ROOT.'res/metadataplayer/res/css/jq-css/themes/base/jquery-ui.css', 'tabs-slideshow' => URL_ROOT.'res/css/tabs-slideshow.css', ), 'cdn' => array(