Commit 222b0897ae8f88ac542b4e7e23210e2b28e9736b
1 parent
8c6aa8ad
Artbox comment created
Showing
32 changed files
with
25 additions
and
7 deletions
Show diff stats
common/config/bootstrap.php
| @@ -15,4 +15,7 @@ | @@ -15,4 +15,7 @@ | ||
| 15 | } | 15 | } |
| 16 | if (!Yii::getAlias('@artbox/weblog', false)) { | 16 | if (!Yii::getAlias('@artbox/weblog', false)) { |
| 17 | Yii::setAlias('@artbox/weblog', dirname(dirname(__DIR__)) . '/artweb/artbox-weblog'); | 17 | Yii::setAlias('@artbox/weblog', dirname(dirname(__DIR__)) . '/artweb/artbox-weblog'); |
| 18 | + } | ||
| 19 | + if (!Yii::getAlias('@artbox/webcomment', false)) { | ||
| 20 | + Yii::setAlias('@artbox/webcomment', dirname(dirname(__DIR__)) . '/artweb/artbox-webcomment'); | ||
| 18 | } | 21 | } |
| 19 | \ No newline at end of file | 22 | \ No newline at end of file |
common/config/main.php
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | return [ | 5 | return [ |
| 6 | 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', | 6 | 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', |
| 7 | 'modules' => [ | 7 | 'modules' => [ |
| 8 | - 'imagemanager' => [ | 8 | + 'imagemanager' => [ |
| 9 | 'class' => 'noam148\imagemanager\Module', | 9 | 'class' => 'noam148\imagemanager\Module', |
| 10 | 'canUploadImage' => true, | 10 | 'canUploadImage' => true, |
| 11 | 'canRemoveImage' => function () { | 11 | 'canRemoveImage' => function () { |
| @@ -16,6 +16,9 @@ | @@ -16,6 +16,9 @@ | ||
| 16 | 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', | 16 | 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css', |
| 17 | ], | 17 | ], |
| 18 | ], | 18 | ], |
| 19 | + 'artbox-comment' => [ | ||
| 20 | + 'class' => 'artbox\webcomment\Module', | ||
| 21 | + ], | ||
| 19 | ], | 22 | ], |
| 20 | 'components' => [ | 23 | 'components' => [ |
| 21 | 'cache' => [ | 24 | 'cache' => [ |
| @@ -23,26 +26,30 @@ | @@ -23,26 +26,30 @@ | ||
| 23 | ], | 26 | ], |
| 24 | 'i18n' => [ | 27 | 'i18n' => [ |
| 25 | 'translations' => [ | 28 | 'translations' => [ |
| 26 | - 'core' => [ | 29 | + 'core' => [ |
| 27 | 'class' => 'yii\i18n\PhpMessageSource', | 30 | 'class' => 'yii\i18n\PhpMessageSource', |
| 28 | 'basePath' => '@artbox/core/messages', | 31 | 'basePath' => '@artbox/core/messages', |
| 29 | ], | 32 | ], |
| 30 | - 'catalog' => [ | 33 | + 'catalog' => [ |
| 31 | 'class' => 'yii\i18n\PhpMessageSource', | 34 | 'class' => 'yii\i18n\PhpMessageSource', |
| 32 | 'basePath' => '@artbox/catalog/messages', | 35 | 'basePath' => '@artbox/catalog/messages', |
| 33 | ], | 36 | ], |
| 34 | - 'app' => [ | 37 | + 'app' => [ |
| 35 | 'class' => 'yii\i18n\PhpMessageSource', | 38 | 'class' => 'yii\i18n\PhpMessageSource', |
| 36 | 'basePath' => '@common/messages', | 39 | 'basePath' => '@common/messages', |
| 37 | ], | 40 | ], |
| 38 | - 'blog' => [ | 41 | + 'blog' => [ |
| 39 | 'class' => 'yii\i18n\PhpMessageSource', | 42 | 'class' => 'yii\i18n\PhpMessageSource', |
| 40 | 'basePath' => '@artbox/weblog/messages', | 43 | 'basePath' => '@artbox/weblog/messages', |
| 41 | ], | 44 | ], |
| 42 | - 'order' => [ | 45 | + 'order' => [ |
| 43 | 'class' => 'yii\i18n\PhpMessageSource', | 46 | 'class' => 'yii\i18n\PhpMessageSource', |
| 44 | 'basePath' => '@artbox/order/messages', | 47 | 'basePath' => '@artbox/order/messages', |
| 45 | ], | 48 | ], |
| 49 | + 'artbox-comment' => [ | ||
| 50 | + 'class' => 'yii\i18n\PhpMessageSource', | ||
| 51 | + 'basePath' => '@artbox/webcomment/messages', | ||
| 52 | + ], | ||
| 46 | ], | 53 | ], |
| 47 | ], | 54 | ], |
| 48 | 'filedb' => [ | 55 | 'filedb' => [ |
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | + use artbox\webcomment\widgets\CommentWidget; | ||
| 3 | use artbox\weblog\models\Article; | 4 | use artbox\weblog\models\Article; |
| 4 | use artbox\weblog\models\Tag; | 5 | use artbox\weblog\models\Tag; |
| 5 | use frontend\widgets\BlogSearch; | 6 | use frontend\widgets\BlogSearch; |
| @@ -160,11 +161,18 @@ _________________________________________________________ --> | @@ -160,11 +161,18 @@ _________________________________________________________ --> | ||
| 160 | <!-- /#comment-form --> | 161 | <!-- /#comment-form --> |
| 161 | */ | 162 | */ |
| 162 | ?> | 163 | ?> |
| 164 | + <?php | ||
| 165 | + echo CommentWidget::widget( | ||
| 166 | + [ | ||
| 167 | + 'model' => $model, | ||
| 168 | + ] | ||
| 169 | + ); | ||
| 170 | + ?> | ||
| 163 | </div> | 171 | </div> |
| 164 | <!-- /#blog-post --> | 172 | <!-- /#blog-post --> |
| 165 | 173 | ||
| 166 | <!-- *** LEFT COLUMN END *** --> | 174 | <!-- *** LEFT COLUMN END *** --> |
| 167 | - | 175 | + |
| 168 | <!-- *** RIGHT COLUMN *** | 176 | <!-- *** RIGHT COLUMN *** |
| 169 | _________________________________________________________ --> | 177 | _________________________________________________________ --> |
| 170 | 178 |
frontend/views/site/requestPasswordResetToken.php
100644 → 100755