From 222b0897ae8f88ac542b4e7e23210e2b28e9736b Mon Sep 17 00:00:00 2001 From: Yarik Date: Thu, 25 May 2017 18:03:34 +0300 Subject: [PATCH] Artbox comment created --- common/config/bootstrap.php | 3 +++ common/config/main.php | 19 +++++++++++++------ common/models/PasswordResetRequestForm.php | 0 common/models/ResetPasswordForm.php | 0 common/models/SignupForm.php | 0 frontend/controllers/AccountController.php | 0 frontend/controllers/BlogController.php | 0 frontend/controllers/SearchController.php | 0 frontend/models/Order.php | 0 frontend/views/account/_menu.php | 0 frontend/views/account/_product.php | 0 frontend/views/account/account.php | 0 frontend/views/account/index.php | 0 frontend/views/account/order.php | 0 frontend/views/account/wishlist.php | 0 frontend/views/blog/_article.php | 0 frontend/views/blog/category.php | 0 frontend/views/blog/index.php | 0 frontend/views/blog/tag.php | 0 frontend/views/blog/view.php | 10 +++++++++- frontend/views/checkout/confirm.php | 0 frontend/views/checkout/delivery.php | 0 frontend/views/checkout/index.php | 0 frontend/views/checkout/info.php | 0 frontend/views/checkout/payment.php | 0 frontend/views/search/category.php | 0 frontend/views/search/index.php | 0 frontend/views/site/login.php | 0 frontend/views/site/requestPasswordResetToken.php | 0 frontend/views/site/resetPassword.php | 0 frontend/widgets/BlogSearch.php | 0 frontend/widgets/views/_blog_search.php | 0 32 files changed, 25 insertions(+), 7 deletions(-) mode change 100644 => 100755 common/models/PasswordResetRequestForm.php mode change 100644 => 100755 common/models/ResetPasswordForm.php mode change 100644 => 100755 common/models/SignupForm.php mode change 100644 => 100755 frontend/controllers/AccountController.php mode change 100644 => 100755 frontend/controllers/BlogController.php mode change 100644 => 100755 frontend/controllers/SearchController.php mode change 100644 => 100755 frontend/models/Order.php mode change 100644 => 100755 frontend/views/account/_menu.php mode change 100644 => 100755 frontend/views/account/_product.php mode change 100644 => 100755 frontend/views/account/account.php mode change 100644 => 100755 frontend/views/account/index.php mode change 100644 => 100755 frontend/views/account/order.php mode change 100644 => 100755 frontend/views/account/wishlist.php mode change 100644 => 100755 frontend/views/blog/_article.php mode change 100644 => 100755 frontend/views/blog/category.php mode change 100644 => 100755 frontend/views/blog/index.php mode change 100644 => 100755 frontend/views/blog/tag.php mode change 100644 => 100755 frontend/views/blog/view.php mode change 100644 => 100755 frontend/views/checkout/confirm.php mode change 100644 => 100755 frontend/views/checkout/delivery.php mode change 100644 => 100755 frontend/views/checkout/index.php mode change 100644 => 100755 frontend/views/checkout/info.php mode change 100644 => 100755 frontend/views/checkout/payment.php mode change 100644 => 100755 frontend/views/search/category.php mode change 100644 => 100755 frontend/views/search/index.php mode change 100644 => 100755 frontend/views/site/login.php mode change 100644 => 100755 frontend/views/site/requestPasswordResetToken.php mode change 100644 => 100755 frontend/views/site/resetPassword.php mode change 100644 => 100755 frontend/widgets/BlogSearch.php mode change 100644 => 100755 frontend/widgets/views/_blog_search.php diff --git a/common/config/bootstrap.php b/common/config/bootstrap.php index 96cd3ab..ed3315a 100755 --- a/common/config/bootstrap.php +++ b/common/config/bootstrap.php @@ -15,4 +15,7 @@ } if (!Yii::getAlias('@artbox/weblog', false)) { Yii::setAlias('@artbox/weblog', dirname(dirname(__DIR__)) . '/artweb/artbox-weblog'); + } + if (!Yii::getAlias('@artbox/webcomment', false)) { + Yii::setAlias('@artbox/webcomment', dirname(dirname(__DIR__)) . '/artweb/artbox-webcomment'); } \ No newline at end of file diff --git a/common/config/main.php b/common/config/main.php index 03dcf3b..cc987a6 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -5,7 +5,7 @@ return [ 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'modules' => [ - 'imagemanager' => [ + 'imagemanager' => [ 'class' => 'noam148\imagemanager\Module', 'canUploadImage' => true, 'canRemoveImage' => function () { @@ -16,6 +16,9 @@ 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', ], ], + 'artbox-comment' => [ + 'class' => 'artbox\webcomment\Module', + ], ], 'components' => [ 'cache' => [ @@ -23,26 +26,30 @@ ], 'i18n' => [ 'translations' => [ - 'core' => [ + 'core' => [ 'class' => 'yii\i18n\PhpMessageSource', 'basePath' => '@artbox/core/messages', ], - 'catalog' => [ + 'catalog' => [ 'class' => 'yii\i18n\PhpMessageSource', 'basePath' => '@artbox/catalog/messages', ], - 'app' => [ + 'app' => [ 'class' => 'yii\i18n\PhpMessageSource', 'basePath' => '@common/messages', ], - 'blog' => [ + 'blog' => [ 'class' => 'yii\i18n\PhpMessageSource', 'basePath' => '@artbox/weblog/messages', ], - 'order' => [ + 'order' => [ 'class' => 'yii\i18n\PhpMessageSource', 'basePath' => '@artbox/order/messages', ], + 'artbox-comment' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => '@artbox/webcomment/messages', + ], ], ], 'filedb' => [ diff --git a/common/models/PasswordResetRequestForm.php b/common/models/PasswordResetRequestForm.php old mode 100644 new mode 100755 index f621b3e..f621b3e --- a/common/models/PasswordResetRequestForm.php +++ b/common/models/PasswordResetRequestForm.php diff --git a/common/models/ResetPasswordForm.php b/common/models/ResetPasswordForm.php old mode 100644 new mode 100755 index 358d36e..358d36e --- a/common/models/ResetPasswordForm.php +++ b/common/models/ResetPasswordForm.php diff --git a/common/models/SignupForm.php b/common/models/SignupForm.php old mode 100644 new mode 100755 index 867fe3d..867fe3d --- a/common/models/SignupForm.php +++ b/common/models/SignupForm.php diff --git a/frontend/controllers/AccountController.php b/frontend/controllers/AccountController.php old mode 100644 new mode 100755 index afba717..afba717 --- a/frontend/controllers/AccountController.php +++ b/frontend/controllers/AccountController.php diff --git a/frontend/controllers/BlogController.php b/frontend/controllers/BlogController.php old mode 100644 new mode 100755 index c29d635..c29d635 --- a/frontend/controllers/BlogController.php +++ b/frontend/controllers/BlogController.php diff --git a/frontend/controllers/SearchController.php b/frontend/controllers/SearchController.php old mode 100644 new mode 100755 index 9efaa67..9efaa67 --- a/frontend/controllers/SearchController.php +++ b/frontend/controllers/SearchController.php diff --git a/frontend/models/Order.php b/frontend/models/Order.php old mode 100644 new mode 100755 index 6d00822..6d00822 --- a/frontend/models/Order.php +++ b/frontend/models/Order.php diff --git a/frontend/views/account/_menu.php b/frontend/views/account/_menu.php old mode 100644 new mode 100755 index 7618957..7618957 --- a/frontend/views/account/_menu.php +++ b/frontend/views/account/_menu.php diff --git a/frontend/views/account/_product.php b/frontend/views/account/_product.php old mode 100644 new mode 100755 index f144f13..f144f13 --- a/frontend/views/account/_product.php +++ b/frontend/views/account/_product.php diff --git a/frontend/views/account/account.php b/frontend/views/account/account.php old mode 100644 new mode 100755 index 6262255..6262255 --- a/frontend/views/account/account.php +++ b/frontend/views/account/account.php diff --git a/frontend/views/account/index.php b/frontend/views/account/index.php old mode 100644 new mode 100755 index f577ffb..f577ffb --- a/frontend/views/account/index.php +++ b/frontend/views/account/index.php diff --git a/frontend/views/account/order.php b/frontend/views/account/order.php old mode 100644 new mode 100755 index dd4480b..dd4480b --- a/frontend/views/account/order.php +++ b/frontend/views/account/order.php diff --git a/frontend/views/account/wishlist.php b/frontend/views/account/wishlist.php old mode 100644 new mode 100755 index cd77234..cd77234 --- a/frontend/views/account/wishlist.php +++ b/frontend/views/account/wishlist.php diff --git a/frontend/views/blog/_article.php b/frontend/views/blog/_article.php old mode 100644 new mode 100755 index 7ee146f..7ee146f --- a/frontend/views/blog/_article.php +++ b/frontend/views/blog/_article.php diff --git a/frontend/views/blog/category.php b/frontend/views/blog/category.php old mode 100644 new mode 100755 index 136a48c..136a48c --- a/frontend/views/blog/category.php +++ b/frontend/views/blog/category.php diff --git a/frontend/views/blog/index.php b/frontend/views/blog/index.php old mode 100644 new mode 100755 index dd4ce4f..dd4ce4f --- a/frontend/views/blog/index.php +++ b/frontend/views/blog/index.php diff --git a/frontend/views/blog/tag.php b/frontend/views/blog/tag.php old mode 100644 new mode 100755 index d7c6723..d7c6723 --- a/frontend/views/blog/tag.php +++ b/frontend/views/blog/tag.php diff --git a/frontend/views/blog/view.php b/frontend/views/blog/view.php old mode 100644 new mode 100755 index 2f07d04..31e332a --- a/frontend/views/blog/view.php +++ b/frontend/views/blog/view.php @@ -1,5 +1,6 @@ */ ?> + $model, + ] + ); + ?> - + diff --git a/frontend/views/checkout/confirm.php b/frontend/views/checkout/confirm.php old mode 100644 new mode 100755 index fc801df..fc801df --- a/frontend/views/checkout/confirm.php +++ b/frontend/views/checkout/confirm.php diff --git a/frontend/views/checkout/delivery.php b/frontend/views/checkout/delivery.php old mode 100644 new mode 100755 index 8071e3b..8071e3b --- a/frontend/views/checkout/delivery.php +++ b/frontend/views/checkout/delivery.php diff --git a/frontend/views/checkout/index.php b/frontend/views/checkout/index.php old mode 100644 new mode 100755 index aa9b8bc..aa9b8bc --- a/frontend/views/checkout/index.php +++ b/frontend/views/checkout/index.php diff --git a/frontend/views/checkout/info.php b/frontend/views/checkout/info.php old mode 100644 new mode 100755 index 1ebc0a0..1ebc0a0 --- a/frontend/views/checkout/info.php +++ b/frontend/views/checkout/info.php diff --git a/frontend/views/checkout/payment.php b/frontend/views/checkout/payment.php old mode 100644 new mode 100755 index a3aa112..a3aa112 --- a/frontend/views/checkout/payment.php +++ b/frontend/views/checkout/payment.php diff --git a/frontend/views/search/category.php b/frontend/views/search/category.php old mode 100644 new mode 100755 index 7d3a6a6..7d3a6a6 --- a/frontend/views/search/category.php +++ b/frontend/views/search/category.php diff --git a/frontend/views/search/index.php b/frontend/views/search/index.php old mode 100644 new mode 100755 index 260a883..260a883 --- a/frontend/views/search/index.php +++ b/frontend/views/search/index.php diff --git a/frontend/views/site/login.php b/frontend/views/site/login.php old mode 100644 new mode 100755 index 26201e5..26201e5 --- a/frontend/views/site/login.php +++ b/frontend/views/site/login.php diff --git a/frontend/views/site/requestPasswordResetToken.php b/frontend/views/site/requestPasswordResetToken.php old mode 100644 new mode 100755 index 371742e..371742e --- a/frontend/views/site/requestPasswordResetToken.php +++ b/frontend/views/site/requestPasswordResetToken.php diff --git a/frontend/views/site/resetPassword.php b/frontend/views/site/resetPassword.php old mode 100644 new mode 100755 index 56acace..56acace --- a/frontend/views/site/resetPassword.php +++ b/frontend/views/site/resetPassword.php diff --git a/frontend/widgets/BlogSearch.php b/frontend/widgets/BlogSearch.php old mode 100644 new mode 100755 index d16a2fb..d16a2fb --- a/frontend/widgets/BlogSearch.php +++ b/frontend/widgets/BlogSearch.php diff --git a/frontend/widgets/views/_blog_search.php b/frontend/widgets/views/_blog_search.php old mode 100644 new mode 100755 index 576a1eb..576a1eb --- a/frontend/widgets/views/_blog_search.php +++ b/frontend/widgets/views/_blog_search.php -- libgit2 0.21.4