From fec9b208c6a0283fecd9c4de27451d03a9e4e4af Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Tue, 30 Aug 2011 06:59:09 +0000 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=B5=D1=84=D0=BE=D0=BB=D1=82=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20jquery=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.php | 73 +++++++++++-------- .../settings/config/config.php | 57 --------------- .../new-jquery/settings/config/config.php | 57 --------------- templates/skin/new/settings/config/config.php | 43 +++++++++++ 4 files changed, 85 insertions(+), 145 deletions(-) delete mode 100644 templates/skin/developer-jquery/settings/config/config.php delete mode 100644 templates/skin/new-jquery/settings/config/config.php create mode 100644 templates/skin/new/settings/config/config.php diff --git a/config/config.php b/config/config.php index 1e0fd462..b729f9b3 100644 --- a/config/config.php +++ b/config/config.php @@ -387,6 +387,11 @@ $config['block']['rule_talk_read'] = array( 'blocks' => array( 'right' => array('actions/ActionTalk/speakers.tpl') ), ); +$config['block']['rule_blogs'] = array( + 'action' => array( 'blogs' ), + 'blocks' => array( 'right' => array('stream') ), +); + $config['block']['userfeedBlogs'] = array( 'action' => array('feed'), 'blocks' => array( @@ -428,42 +433,48 @@ $config['head']['rules']['page'] =array( ); $config['head']['default']['js'] = array( - "___path.root.engine_lib___/external/JsHttpRequest/JsHttpRequest.js", - "___path.root.engine_lib___/external/MooTools_1.2/mootools-1.2.js?v=1.2.5", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/Roal/Roar.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/Autocompleter/Observer.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.Request.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/Piechart/moocanvas.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/Piechart/piechart.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/vlaCal-v2.1/jslib/vlaCal-v2.1.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/iFrameFormRequest/iFrameFormRequest.js", + "___path.root.engine_lib___/external/jquery/jquery.js", + "___path.root.engine_lib___/external/jquery/jquery-ui.js", + "___path.root.engine_lib___/external/jquery/jquery.notifier.js", + "___path.root.engine_lib___/external/jquery/jquery.jqmodal.js", + "___path.root.engine_lib___/external/jquery/jquery.scrollto.js", + "___path.root.engine_lib___/external/jquery/jquery.rich-array.min.js", + "___path.root.engine_lib___/external/jquery/markitup/jquery.markitup.js", + "___path.root.engine_lib___/external/jquery/jquery.form.js", + "___path.root.engine_lib___/external/jquery/jquery.jqplugin.js", + "___path.root.engine_lib___/external/jquery/jquery.cookie.js", + "___path.root.engine_lib___/external/jquery/jquery.serializejson.js", "___path.root.engine_lib___/external/prettify/prettify.js", + "___path.static.skin___/js/main.js", + "___path.static.skin___/js/favourite.js", + "___path.static.skin___/js/blocks.js", + "___path.static.skin___/js/talk.js", "___path.static.skin___/js/vote.js", - "___path.static.skin___/js/favourites.js", - "___path.static.skin___/js/questions.js", - "___path.static.skin___/js/block_loader.js", - "___path.static.skin___/js/friend.js", + "___path.static.skin___/js/poll.js", + "___path.static.skin___/js/comments.js", "___path.static.skin___/js/blog.js", - "___path.static.skin___/js/other.js", - "___path.static.skin___/js/login.js", - "___path.static.skin___/js/panel.js", - "___path.static.skin___/js/messages.js", - "___path.static.skin___/js/userfeed.js", - "___path.static.skin___/js/stream.js", - "___path.static.skin___/js/Autocompleter.LS.js", - "___path.root.engine_lib___/external/MooTools_1.2/plugs/Piechart/moocanvas.js"=>array('browser'=>'IE'), + "___path.static.skin___/js/friend.js", + "___path.static.skin___/js/userfeed.js", + "___path.static.skin___/js/stream.js", + "___path.static.skin___/js/photoset.js", + "___path.static.skin___/js/markup_settings.js", ); $config['head']['default']['css'] = array( - "___path.static.skin___/css/style.css?v=1", - "___path.static.skin___/css/Roar.css", - "___path.static.skin___/css/piechart.css", - "___path.static.skin___/css/Autocompleter.css", - "___path.static.skin___/css/prettify.css", - "___path.static.skin___/css/vlaCal-v2.1.css", - "___path.static.skin___/css/ie6.css?v=1"=>array('browser'=>'IE 6'), - "___path.static.skin___/css/ie7.css?v=1"=>array('browser'=>'gte IE 7'), - "___path.static.skin___/css/simple_comments.css"=>array('browser'=>'gt IE 6'), + "___path.static.skin___/css/reset.css", + "___path.root.engine_lib___/external/jquery/markitup/skins/simple/style.css", + "___path.root.engine_lib___/external/jquery/markitup/sets/default/style.css", + "___path.root.engine_lib___/external/prettify/prettify.css", + "___path.static.skin___/css/main.css", + "___path.static.skin___/css/grid.css", + "___path.static.skin___/css/common.css", + "___path.static.skin___/css/forms.css", + "___path.static.skin___/css/popups.css", + "___path.static.skin___/css/topic.css", + "___path.static.skin___/css/comments.css", + "___path.static.skin___/css/blocks.css", + "___path.static.skin___/css/jquery.jqmodal.css", + "___path.static.skin___/css/jquery.notifier.css", + "___path.static.skin___/css/smoothness/jquery-ui.css", ); /** diff --git a/templates/skin/developer-jquery/settings/config/config.php b/templates/skin/developer-jquery/settings/config/config.php deleted file mode 100644 index 83ff5af9..00000000 --- a/templates/skin/developer-jquery/settings/config/config.php +++ /dev/null @@ -1,57 +0,0 @@ - array( 'blogs', 'settings' ), - 'blocks' => array( 'right' => array('stream') ), -); - -return $config; -?> \ No newline at end of file diff --git a/templates/skin/new-jquery/settings/config/config.php b/templates/skin/new-jquery/settings/config/config.php deleted file mode 100644 index cffc7638..00000000 --- a/templates/skin/new-jquery/settings/config/config.php +++ /dev/null @@ -1,57 +0,0 @@ - array( 'blogs' ), - 'blocks' => array( 'right' => array('stream') ), -); - -return $config; -?> \ No newline at end of file diff --git a/templates/skin/new/settings/config/config.php b/templates/skin/new/settings/config/config.php new file mode 100644 index 00000000..240a540f --- /dev/null +++ b/templates/skin/new/settings/config/config.php @@ -0,0 +1,43 @@ +array('browser'=>'IE'), +); +$config['head']['default']['css'] = array( + "___path.static.skin___/css/style.css?v=1", + "___path.static.skin___/css/Roar.css", + "___path.static.skin___/css/piechart.css", + "___path.static.skin___/css/Autocompleter.css", + "___path.static.skin___/css/prettify.css", + "___path.static.skin___/css/vlaCal-v2.1.css", + "___path.static.skin___/css/ie6.css?v=1"=>array('browser'=>'IE 6'), + "___path.static.skin___/css/ie7.css?v=1"=>array('browser'=>'gte IE 7'), + "___path.static.skin___/css/simple_comments.css"=>array('browser'=>'gt IE 6'), +); + +return $config; +?> \ No newline at end of file