From 9df6d48208a4440659ea34c973dea96b931ce909 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Wed, 7 Aug 2013 22:51:51 +0700 Subject: [PATCH] fix --- application/config/config.php | 48 +++++++++---------- .../frontend/common/js}/admin.js | 0 .../frontend/common/js}/admin.userfield.js | 0 .../frontend/common/js}/blocks.js | 0 .../frontend/common/js}/blog.js | 0 .../frontend/common/js}/captcha.js | 2 +- .../frontend/common/js}/comments.js | 0 .../frontend/common/js}/editor.js | 0 .../frontend/common/js}/favourite.js | 0 .../frontend/common/js}/geo.js | 0 .../frontend/common/js}/init.js | 0 .../frontend/common/js}/pagination.js | 0 .../frontend/common/js}/photoset.js | 0 .../frontend/common/js}/poll.js | 0 .../frontend/common/js}/settings.js | 0 .../frontend/common/js}/stream.js | 0 .../frontend/common/js}/subscribe.js | 0 .../frontend/common/js}/talk.js | 0 .../frontend/common/js}/toolbar.js | 0 .../frontend/common/js}/topic.js | 0 .../frontend/common/js}/user.js | 0 .../frontend/common/js}/userfeed.js | 0 .../frontend/common/js}/usernote.js | 0 .../frontend/common/js}/vote.js | 0 .../frontend/common/js}/wall.js | 0 framework/config/config.php | 28 +---------- 26 files changed, 26 insertions(+), 52 deletions(-) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/admin.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/admin.userfield.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/blocks.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/blog.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/captcha.js (87%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/comments.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/editor.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/favourite.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/geo.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/init.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/pagination.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/photoset.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/poll.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/settings.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/stream.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/subscribe.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/talk.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/toolbar.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/topic.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/user.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/userfeed.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/usernote.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/vote.js (100%) rename {framework/frontend/framework/js/livestreet => application/frontend/common/js}/wall.js (100%) diff --git a/application/config/config.php b/application/config/config.php index 1986227f..04bd6d39 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -442,30 +442,30 @@ $config['head']['default']['js'] = array( "___path.static.framework___/js/ui/toolbar.js", /* LiveStreet */ - "___path.static.framework___/js/livestreet/favourite.js", - "___path.static.framework___/js/livestreet/blocks.js", - "___path.static.framework___/js/livestreet/pagination.js", - "___path.static.framework___/js/livestreet/editor.js", - "___path.static.framework___/js/livestreet/talk.js", - "___path.static.framework___/js/livestreet/vote.js", - "___path.static.framework___/js/livestreet/poll.js", - "___path.static.framework___/js/livestreet/subscribe.js", - "___path.static.framework___/js/livestreet/geo.js", - "___path.static.framework___/js/livestreet/wall.js", - "___path.static.framework___/js/livestreet/usernote.js", - "___path.static.framework___/js/livestreet/comments.js", - "___path.static.framework___/js/livestreet/blog.js", - "___path.static.framework___/js/livestreet/user.js", - "___path.static.framework___/js/livestreet/userfeed.js", - "___path.static.framework___/js/livestreet/stream.js", - "___path.static.framework___/js/livestreet/photoset.js", - "___path.static.framework___/js/livestreet/toolbar.js", - "___path.static.framework___/js/livestreet/settings.js", - "___path.static.framework___/js/livestreet/topic.js", - "___path.static.framework___/js/livestreet/admin.js", - "___path.static.framework___/js/livestreet/admin.userfield.js", - "___path.static.framework___/js/livestreet/captcha.js", - "___path.static.framework___/js/livestreet/init.js", + "___path.root.web___/application/frontend/common/js/favourite.js", + "___path.root.web___/application/frontend/common/js/blocks.js", + "___path.root.web___/application/frontend/common/js/pagination.js", + "___path.root.web___/application/frontend/common/js/editor.js", + "___path.root.web___/application/frontend/common/js/talk.js", + "___path.root.web___/application/frontend/common/js/vote.js", + "___path.root.web___/application/frontend/common/js/poll.js", + "___path.root.web___/application/frontend/common/js/subscribe.js", + "___path.root.web___/application/frontend/common/js/geo.js", + "___path.root.web___/application/frontend/common/js/wall.js", + "___path.root.web___/application/frontend/common/js/usernote.js", + "___path.root.web___/application/frontend/common/js/comments.js", + "___path.root.web___/application/frontend/common/js/blog.js", + "___path.root.web___/application/frontend/common/js/user.js", + "___path.root.web___/application/frontend/common/js/userfeed.js", + "___path.root.web___/application/frontend/common/js/stream.js", + "___path.root.web___/application/frontend/common/js/photoset.js", + "___path.root.web___/application/frontend/common/js/toolbar.js", + "___path.root.web___/application/frontend/common/js/settings.js", + "___path.root.web___/application/frontend/common/js/topic.js", + "___path.root.web___/application/frontend/common/js/admin.js", + "___path.root.web___/application/frontend/common/js/admin.userfield.js", + "___path.root.web___/application/frontend/common/js/captcha.js", + "___path.root.web___/application/frontend/common/js/init.js", "http://yandex.st/share/share.js" => array('merge'=>false), ); diff --git a/framework/frontend/framework/js/livestreet/admin.js b/application/frontend/common/js/admin.js similarity index 100% rename from framework/frontend/framework/js/livestreet/admin.js rename to application/frontend/common/js/admin.js diff --git a/framework/frontend/framework/js/livestreet/admin.userfield.js b/application/frontend/common/js/admin.userfield.js similarity index 100% rename from framework/frontend/framework/js/livestreet/admin.userfield.js rename to application/frontend/common/js/admin.userfield.js diff --git a/framework/frontend/framework/js/livestreet/blocks.js b/application/frontend/common/js/blocks.js similarity index 100% rename from framework/frontend/framework/js/livestreet/blocks.js rename to application/frontend/common/js/blocks.js diff --git a/framework/frontend/framework/js/livestreet/blog.js b/application/frontend/common/js/blog.js similarity index 100% rename from framework/frontend/framework/js/livestreet/blog.js rename to application/frontend/common/js/blog.js diff --git a/framework/frontend/framework/js/livestreet/captcha.js b/application/frontend/common/js/captcha.js similarity index 87% rename from framework/frontend/framework/js/livestreet/captcha.js rename to application/frontend/common/js/captcha.js index 93214123..a51a8e99 100644 --- a/framework/frontend/framework/js/livestreet/captcha.js +++ b/application/frontend/common/js/captcha.js @@ -41,7 +41,7 @@ ls.captcha = (function ($) { * @return {String} URL каптчи */ this.getCaptchaUrl = function () { - return DIR_ENGINE_LIBS + '/external/kcaptcha/index.php?' + SESSION_NAME + '=' + SESSION_ID + '&n=' + Math.random(); + return DIR_ENGINE_LIBS + '/vendor/kcaptcha/index.php?' + SESSION_NAME + '=' + SESSION_ID + '&n=' + Math.random(); }; /** diff --git a/framework/frontend/framework/js/livestreet/comments.js b/application/frontend/common/js/comments.js similarity index 100% rename from framework/frontend/framework/js/livestreet/comments.js rename to application/frontend/common/js/comments.js diff --git a/framework/frontend/framework/js/livestreet/editor.js b/application/frontend/common/js/editor.js similarity index 100% rename from framework/frontend/framework/js/livestreet/editor.js rename to application/frontend/common/js/editor.js diff --git a/framework/frontend/framework/js/livestreet/favourite.js b/application/frontend/common/js/favourite.js similarity index 100% rename from framework/frontend/framework/js/livestreet/favourite.js rename to application/frontend/common/js/favourite.js diff --git a/framework/frontend/framework/js/livestreet/geo.js b/application/frontend/common/js/geo.js similarity index 100% rename from framework/frontend/framework/js/livestreet/geo.js rename to application/frontend/common/js/geo.js diff --git a/framework/frontend/framework/js/livestreet/init.js b/application/frontend/common/js/init.js similarity index 100% rename from framework/frontend/framework/js/livestreet/init.js rename to application/frontend/common/js/init.js diff --git a/framework/frontend/framework/js/livestreet/pagination.js b/application/frontend/common/js/pagination.js similarity index 100% rename from framework/frontend/framework/js/livestreet/pagination.js rename to application/frontend/common/js/pagination.js diff --git a/framework/frontend/framework/js/livestreet/photoset.js b/application/frontend/common/js/photoset.js similarity index 100% rename from framework/frontend/framework/js/livestreet/photoset.js rename to application/frontend/common/js/photoset.js diff --git a/framework/frontend/framework/js/livestreet/poll.js b/application/frontend/common/js/poll.js similarity index 100% rename from framework/frontend/framework/js/livestreet/poll.js rename to application/frontend/common/js/poll.js diff --git a/framework/frontend/framework/js/livestreet/settings.js b/application/frontend/common/js/settings.js similarity index 100% rename from framework/frontend/framework/js/livestreet/settings.js rename to application/frontend/common/js/settings.js diff --git a/framework/frontend/framework/js/livestreet/stream.js b/application/frontend/common/js/stream.js similarity index 100% rename from framework/frontend/framework/js/livestreet/stream.js rename to application/frontend/common/js/stream.js diff --git a/framework/frontend/framework/js/livestreet/subscribe.js b/application/frontend/common/js/subscribe.js similarity index 100% rename from framework/frontend/framework/js/livestreet/subscribe.js rename to application/frontend/common/js/subscribe.js diff --git a/framework/frontend/framework/js/livestreet/talk.js b/application/frontend/common/js/talk.js similarity index 100% rename from framework/frontend/framework/js/livestreet/talk.js rename to application/frontend/common/js/talk.js diff --git a/framework/frontend/framework/js/livestreet/toolbar.js b/application/frontend/common/js/toolbar.js similarity index 100% rename from framework/frontend/framework/js/livestreet/toolbar.js rename to application/frontend/common/js/toolbar.js diff --git a/framework/frontend/framework/js/livestreet/topic.js b/application/frontend/common/js/topic.js similarity index 100% rename from framework/frontend/framework/js/livestreet/topic.js rename to application/frontend/common/js/topic.js diff --git a/framework/frontend/framework/js/livestreet/user.js b/application/frontend/common/js/user.js similarity index 100% rename from framework/frontend/framework/js/livestreet/user.js rename to application/frontend/common/js/user.js diff --git a/framework/frontend/framework/js/livestreet/userfeed.js b/application/frontend/common/js/userfeed.js similarity index 100% rename from framework/frontend/framework/js/livestreet/userfeed.js rename to application/frontend/common/js/userfeed.js diff --git a/framework/frontend/framework/js/livestreet/usernote.js b/application/frontend/common/js/usernote.js similarity index 100% rename from framework/frontend/framework/js/livestreet/usernote.js rename to application/frontend/common/js/usernote.js diff --git a/framework/frontend/framework/js/livestreet/vote.js b/application/frontend/common/js/vote.js similarity index 100% rename from framework/frontend/framework/js/livestreet/vote.js rename to application/frontend/common/js/vote.js diff --git a/framework/frontend/framework/js/livestreet/wall.js b/application/frontend/common/js/wall.js similarity index 100% rename from framework/frontend/framework/js/livestreet/wall.js rename to application/frontend/common/js/wall.js diff --git a/framework/config/config.php b/framework/config/config.php index 80317577..21cc9f57 100644 --- a/framework/config/config.php +++ b/framework/config/config.php @@ -55,7 +55,7 @@ if (isset($_SERVER['HTTP_HOST'])) { $config['path']['root']['server'] = dirname(dirname(dirname(__FILE__))); // полный путь до сайта в файловой системе $config['path']['root']['application'] = '___path.root.server___/application'; // полный путь до сайта в файловой системе $config['path']['root']['engine'] = LS_FRAMEWORK_PATH; // полный путь до сайта в файловой системе; -$config['path']['root']['engine_lib'] = '___path.root.engine___/libs'; // полный путь до сайта в файловой системе +$config['path']['root']['engine_lib'] = '___path.root.web___/framework/libs'; // полный путь до сайта в файловой системе $config['path']['root']['framework'] = '___path.root.engine___'; $config['path']['static']['root'] = '___path.root.web___'; // чтоб можно было статику засунуть на отдельный сервер $config['path']['static']['skin'] = '___path.static.root___/application/frontend/skin/___view.skin___'; @@ -250,32 +250,6 @@ $config['head']['default']['js'] = array( "___path.static.framework___/js/ui/tab.js", "___path.static.framework___/js/ui/modal.js", "___path.static.framework___/js/ui/toolbar.js", - - /* LiveStreet */ - "___path.static.framework___/js/livestreet/favourite.js", - "___path.static.framework___/js/livestreet/blocks.js", - "___path.static.framework___/js/livestreet/pagination.js", - "___path.static.framework___/js/livestreet/editor.js", - "___path.static.framework___/js/livestreet/talk.js", - "___path.static.framework___/js/livestreet/vote.js", - "___path.static.framework___/js/livestreet/poll.js", - "___path.static.framework___/js/livestreet/subscribe.js", - "___path.static.framework___/js/livestreet/geo.js", - "___path.static.framework___/js/livestreet/wall.js", - "___path.static.framework___/js/livestreet/usernote.js", - "___path.static.framework___/js/livestreet/comments.js", - "___path.static.framework___/js/livestreet/blog.js", - "___path.static.framework___/js/livestreet/user.js", - "___path.static.framework___/js/livestreet/userfeed.js", - "___path.static.framework___/js/livestreet/stream.js", - "___path.static.framework___/js/livestreet/photoset.js", - "___path.static.framework___/js/livestreet/toolbar.js", - "___path.static.framework___/js/livestreet/settings.js", - "___path.static.framework___/js/livestreet/topic.js", - "___path.static.framework___/js/livestreet/admin.js", - "___path.static.framework___/js/livestreet/admin.userfield.js", - "___path.static.framework___/js/livestreet/captcha.js", - "___path.static.framework___/js/livestreet/init.js", ); $config['head']['default']['css'] = array(