From d7f5a86c4b5e1dfa55053d3de91b6187872c7d08 Mon Sep 17 00:00:00 2001 From: Yarik Date: Fri, 22 Apr 2016 11:51:42 +0300 Subject: [PATCH] test --- common/modules/comment/Controller.php | 28 ++++++++++++++++++++++++++++ common/modules/comment/models/CommentProjectAnswer.php | 8 +++----- common/modules/comment/resources/comment.js | 47 +++++++++++++++++++++++++++++++++++++++++++++-- common/modules/comment/widgets/views/_question_comment_view.php | 11 +++++++---- common/modules/comment/widgets/views/form-comment-answer.php | 4 ++-- common/modules/comment/widgets/views/form-comment-review.php | 23 +++++------------------ composer.json | 3 ++- composer.lock | 350 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------- frontend/web/css/style.css | 6 ------ 9 files changed, 319 insertions(+), 161 deletions(-) diff --git a/common/modules/comment/Controller.php b/common/modules/comment/Controller.php index 5e65752..1d7e87b 100644 --- a/common/modules/comment/Controller.php +++ b/common/modules/comment/Controller.php @@ -205,5 +205,33 @@ return [ 'error' => 'Missing comment_id' ]; } } + + public function actionDeleteAnswer() + { + \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON; + $post = \Yii::$app->request->post('CommentProjectAnswer'); + $get = \Yii::$app->request->get(); + if(empty( $post[ 'comment_id' ] ) && !empty( $get[ 'comment_id' ] )) { + $post[ 'comment_id' ] = $get[ 'comment_id' ]; + } + if(!empty( $post[ 'comment_id' ] )) { + if($model = \common\modules\comment\models\CommentProjectAnswer::findOne($post[ 'comment_id' ])) { + /** + * @var \common\modules\comment\models\Comment $model + */ + $model->scenario = is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\CommentProjectAnswer::SCENARIO_USER : \common\modules\comment\models\CommentProjectAnswer::SCENARIO_GUEST; + if($model->deleteComment()) { + \Yii::$app->response->data = [ 'text' => 'Comment marked as deleted and will be check by administrators' ]; + } else { + \Yii::$app->response->data = [ 'error' => $model->hasErrors('comment_id') ? $model->getFirstError('comment_id') : 'Cannot delete message' ]; + } + } else { + \Yii::$app->response->data = [ 'error' => 'Comment not found' ]; + }; + } else { + \Yii::$app->response->data = [ 'error' => 'Missing comment_id' ]; + } + \Yii::$app->response->send(); + } } \ No newline at end of file diff --git a/common/modules/comment/models/CommentProjectAnswer.php b/common/modules/comment/models/CommentProjectAnswer.php index b66d963..2b4c5c5 100644 --- a/common/modules/comment/models/CommentProjectAnswer.php +++ b/common/modules/comment/models/CommentProjectAnswer.php @@ -108,12 +108,10 @@ public function beforeDelete() { - if(parent::beforeDelete()) { - - return false; - } else { - return false; + if(!empty($this->child)) { + $this->child->delete(); } + return parent::beforeDelete(); // TODO: Change the autogenerated stub } public function checkCreate() diff --git a/common/modules/comment/resources/comment.js b/common/modules/comment/resources/comment.js index b0f3954..b689e2f 100644 --- a/common/modules/comment/resources/comment.js +++ b/common/modules/comment/resources/comment.js @@ -2,8 +2,9 @@ $(function() { $(document).on('click', '.artbox_comment_container .removeable', function(e) { e.preventDefault(); - var container = $(this).parents('.artbox_comment_container'); - $(container).remove(); + $(this).remove(); +// var container = $(this).parents('.artbox_comment_container'); +// $(container).remove(); }); $(document).on( @@ -152,4 +153,46 @@ $(function() { ) } ); + + $(document).on( + 'click', '.artbox_comment_delete_answer', function(e) + { + e.preventDefault(); + var container = $(this).parents('.artbox_comment_container'); + var comment_id = $(container).data('key'); + var form_name = $(container).data('form'); + if(confirm("Уверены, что хотите удалить вопрос?")) + { + $.post( + '/artbox-comment/delete-answer', { + CommentProjectAnswer : { + comment_id : comment_id + } + }, function(data, textStatus, jqXHR) + { + if(!data.error) + { + $(container).empty(); + $(container).append('

' + data.text + '

'); + } else + { + $(container).prepend('

' + data.error + '

') + } + } + ); + } + } + ); + + $(document).on('click', '.artbox_comment_reply_answer', function(e) { + e.preventDefault(); + var widget = $(this).parents('.artbox_comment_widget'); + $(widget).find('.artbox_comment_answer_label').text('Ответ'); + }); + + $(document).on('click', '.artbox_comment_reply_answer_block', function(e) { + var form = $(this).parents('.artbox_comment_form'); + $(form).find('.artbox_comment_answer_label').text('Вопрос'); + }); + }); diff --git a/common/modules/comment/widgets/views/_question_comment_view.php b/common/modules/comment/widgets/views/_question_comment_view.php index 4d5a1c0..eb4859b 100644 --- a/common/modules/comment/widgets/views/_question_comment_view.php +++ b/common/modules/comment/widgets/views/_question_comment_view.php @@ -14,8 +14,11 @@ * @var User $user */ $user = $model->user; - if(empty($model->comment_pid)) { - $model->buildButtons([ 'reply', 'delete' ]); + if(empty( $model->comment_pid )) { + $model->buildButtons([ + 'reply', + 'delete', + ]); } ?>
@@ -51,13 +54,13 @@
buttons[ 'delete' ] )) { - echo Html::a(( $model->user_id != NULL && $model->user_id == \Yii::$app->user->id ) ? 'Удалить' : 'Пожаловаться ', $model->buttons[ 'delete' ], [ 'class' => CommentWidget::$baseClass[ 'comment_delete' ] ]); + echo Html::a(( $model->user_id != NULL && $model->user_id == \Yii::$app->user->id ) ? 'Удалить' : 'Пожаловаться ', $model->buttons[ 'delete' ], [ 'class' => 'artbox_comment_delete_answer' ]); } if(!empty( $model->buttons[ 'update' ] )) { echo Html::a('Редактировать', $model->buttons[ 'update' ], [ 'class' => 'artbox_comment_update_answer' ]); } if(!empty( $model->buttons[ 'reply' ] )) { - echo Html::a('Ответить', $model->buttons[ 'reply' ], [ 'class' => CommentWidget::$baseClass[ 'comment_reply' ] ]); + echo Html::a('Ответить', $model->buttons[ 'reply' ], [ 'class' => CommentWidget::$baseClass[ 'comment_reply' ].' artbox_comment_reply_answer' ]); } ?>
diff --git a/common/modules/comment/widgets/views/form-comment-answer.php b/common/modules/comment/widgets/views/form-comment-answer.php index 248ae6b..482336e 100644 --- a/common/modules/comment/widgets/views/form-comment-answer.php +++ b/common/modules/comment/widgets/views/form-comment-answer.php @@ -55,7 +55,7 @@ } ?> -
+
field($model, 'text', [ @@ -66,7 +66,7 @@ 'class' => 'custom-area-4', ], ]) - ->label($model->isNewRecord?'Вопрос':'Ответ') + ->label($model->isNewRecord?'Вопрос':'Ответ', ['class' => 'artbox_comment_answer_label']) ->textarea(); ?>
diff --git a/common/modules/comment/widgets/views/form-comment-review.php b/common/modules/comment/widgets/views/form-comment-review.php index c6c3209..8136aaa 100644 --- a/common/modules/comment/widgets/views/form-comment-review.php +++ b/common/modules/comment/widgets/views/form-comment-review.php @@ -7,10 +7,13 @@ * @var null|\common\modules\comment\models\Rating $rating */ use common\modules\comment\widgets\CommentWidget; + use kartik\rating\StarRating; + use yii\bootstrap\BootstrapAsset; + use yii\bootstrap\BootstrapPluginAsset; use yii\web\View; use yii\widgets\ActiveForm; use yii\helpers\Html; - + $this->registerLinkTag(['rel' => 'stylesheet', 'href' => 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css']); ?> field(( !empty( $model->rating ) ? $model->rating : $rating ), 'value') ->label(false) - ->radioList([ - 1 => 1, - 2 => 2, - 3 => 3, - 4 => 4, - 5 => 5, - ], [ - 'item' => function($index, $label, $name, $checked, $value) { - $return = '
'; - $return .= ''; - $return .= ''; - $return .= '
'; - return $return; - }, - ]); + ->widget(StarRating::className(), ['pluginOptions' => ['size'=>'xxs', 'step' => 1, 'value' => 2, 'showCaption' => false]]); if($model->scenario == $model::SCENARIO_GUEST) { echo $form->field($model, 'user_name', [ 'options' => [ diff --git a/composer.json b/composer.json index 1e929e9..0ab422c 100755 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ "rmrevin/yii2-comments": "1.4.*", "codeception/codeception":"*", "yiisoft/yii2-codeception": "~2.0.0", - "bower-asset/fancybox": "^2.1" + "bower-asset/fancybox": "^2.1", + "kartik-v/yii2-widget-rating": "*" }, "require-dev": { "yiisoft/yii2-debug": "*", diff --git a/composer.lock b/composer.lock index e7530a4..d409974 100755 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "663167525967cc58c1d361d1e98c002f", - "content-hash": "f093c935fec42d8be127e4a2cf8fe95f", + "hash": "552b1bcc377d6e0a838b4d23617e7729", + "content-hash": "48ff5bec6d2f7d829630cc03d2d12f2e", "packages": [ { "name": "2amigos/yii2-transliterator-helper", @@ -216,16 +216,16 @@ }, { "name": "bower-asset/fontawesome", - "version": "v4.5.0", + "version": "v4.6.1", "source": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "fddd2c240452e6c8990c4ef75e0265b455aa7968" + "reference": "6535013c330e801ecf0b23c437865a7fb344486d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/fddd2c240452e6c8990c4ef75e0265b455aa7968", - "reference": "fddd2c240452e6c8990c4ef75e0265b455aa7968", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/6535013c330e801ecf0b23c437865a7fb344486d", + "reference": "6535013c330e801ecf0b23c437865a7fb344486d", "shasum": "" }, "type": "bower-asset-library", @@ -541,12 +541,12 @@ "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "8d4d11c900effead558d6b474ca5a9e1b651722e" + "reference": "061cd3b6bece7cdd32456079b5217734342aeda9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/8d4d11c900effead558d6b474ca5a9e1b651722e", - "reference": "8d4d11c900effead558d6b474ca5a9e1b651722e", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/061cd3b6bece7cdd32456079b5217734342aeda9", + "reference": "061cd3b6bece7cdd32456079b5217734342aeda9", "shasum": "" }, "require": { @@ -618,7 +618,7 @@ "functional testing", "unit testing" ], - "time": "2016-04-04 08:29:59" + "time": "2016-04-20 22:27:36" }, { "name": "developeruz/yii2-db-rbac", @@ -862,12 +862,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "8e4e5ef9fbcc6ced335f398b32dcf2a0e4a24acb" + "reference": "85cb758d7367f3aaaa8ffc9269e777919c5f68bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8e4e5ef9fbcc6ced335f398b32dcf2a0e4a24acb", - "reference": "8e4e5ef9fbcc6ced335f398b32dcf2a0e4a24acb", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/85cb758d7367f3aaaa8ffc9269e777919c5f68bb", + "reference": "85cb758d7367f3aaaa8ffc9269e777919c5f68bb", "shasum": "" }, "require": { @@ -916,7 +916,7 @@ "rest", "web service" ], - "time": "2016-04-01 05:52:09" + "time": "2016-04-06 17:59:33" }, { "name": "guzzlehttp/promises", @@ -971,16 +971,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.2.3", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b" + "reference": "31382fef2889136415751badebbd1cb022a4ed72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b", - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72", + "reference": "31382fef2889136415751badebbd1cb022a4ed72", "shasum": "" }, "require": { @@ -1025,7 +1025,7 @@ "stream", "uri" ], - "time": "2016-02-18 21:54:00" + "time": "2016-04-13 19:56:01" }, { "name": "imagine/imagine", @@ -1085,17 +1085,61 @@ "time": "2014-06-13 10:54:04" }, { + "name": "kartik-v/bootstrap-star-rating", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/kartik-v/bootstrap-star-rating.git", + "reference": "2443b49d33139a59e6e40aa60872bfb4fd76fa59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/2443b49d33139a59e6e40aa60872bfb4fd76fa59", + "reference": "2443b49d33139a59e6e40aa60872bfb4fd76fa59", + "shasum": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kartik Visweswaran", + "email": "kartikv2@gmail.com", + "homepage": "http://www.krajee.com/" + } + ], + "description": "A simple yet powerful JQuery star rating plugin for Bootstrap.", + "homepage": "https://github.com/kartik-v/bootstrap-star-rating", + "keywords": [ + "Rating", + "awesome", + "bootstrap", + "font", + "glyphicon", + "star", + "svg" + ], + "time": "2016-03-22 14:58:18" + }, + { "name": "kartik-v/yii2-krajee-base", "version": "dev-master", "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-krajee-base.git", - "reference": "3e491e51ed742663b239cd6e0b7f76d403bed7e1" + "reference": "a46d88d937f914b71bee85d181687b8f2098e6fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/3e491e51ed742663b239cd6e0b7f76d403bed7e1", - "reference": "3e491e51ed742663b239cd6e0b7f76d403bed7e1", + "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/a46d88d937f914b71bee85d181687b8f2098e6fa", + "reference": "a46d88d937f914b71bee85d181687b8f2098e6fa", "shasum": "" }, "require": { @@ -1133,7 +1177,7 @@ "widget", "yii2" ], - "time": "2016-03-03 12:24:13" + "time": "2016-04-21 17:23:21" }, { "name": "kartik-v/yii2-widget-colorinput", @@ -1141,12 +1185,12 @@ "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-colorinput.git", - "reference": "18537fcdab0f5491d5eebff8e2464ef6a616ee4c" + "reference": "1a10c5e9a528270e22dc8a5eba404c72f417665a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/18537fcdab0f5491d5eebff8e2464ef6a616ee4c", - "reference": "18537fcdab0f5491d5eebff8e2464ef6a616ee4c", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/1a10c5e9a528270e22dc8a5eba404c72f417665a", + "reference": "1a10c5e9a528270e22dc8a5eba404c72f417665a", "shasum": "" }, "require": { @@ -1187,7 +1231,63 @@ "widget", "yii2" ], - "time": "2016-02-02 14:28:12" + "time": "2016-04-07 11:58:28" + }, + { + "name": "kartik-v/yii2-widget-rating", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/kartik-v/yii2-widget-rating.git", + "reference": "69b192bc2b26a435618e17eed7c56294ef805fab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-rating/zipball/69b192bc2b26a435618e17eed7c56294ef805fab", + "reference": "69b192bc2b26a435618e17eed7c56294ef805fab", + "shasum": "" + }, + "require": { + "kartik-v/bootstrap-star-rating": "*", + "kartik-v/yii2-krajee-base": "*" + }, + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "kartik\\rating\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD 3-Clause" + ], + "authors": [ + { + "name": "Kartik Visweswaran", + "email": "kartikv2@gmail.com", + "homepage": "http://www.krajee.com/" + } + ], + "description": "A Yii2 widget for the simple yet powerful bootstrap-star-rating plugin with fractional rating support (sub repo split from yii2-widgets)", + "homepage": "https://github.com/kartik-v/yii2-widget-rating", + "keywords": [ + "Rating", + "bootstrap", + "extension", + "form", + "input", + "jquery", + "plugin", + "star", + "widget", + "yii2" + ], + "time": "2016-02-17 19:13:26" }, { "name": "kartik-v/yii2-widget-select2", @@ -1195,12 +1295,12 @@ "source": { "type": "git", "url": "https://github.com/kartik-v/yii2-widget-select2.git", - "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af" + "reference": "6919d5096ca83ab4a1b163fcd09fb023814d1003" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/cb2a5992cb96bd2939e30ec1c76eba418d6a30af", - "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/6919d5096ca83ab4a1b163fcd09fb023814d1003", + "reference": "6919d5096ca83ab4a1b163fcd09fb023814d1003", "shasum": "" }, "require": { @@ -1240,7 +1340,7 @@ "widget", "yii2" ], - "time": "2016-03-10 11:33:59" + "time": "2016-04-19 13:22:56" }, { "name": "lusitanian/oauth", @@ -1663,12 +1763,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9b2a050b8ee982bf4132fa5c8b381f33c7416f2b" + "reference": "6d3b505cb3a6143adcd58375870eb0b4b98636bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9b2a050b8ee982bf4132fa5c8b381f33c7416f2b", - "reference": "9b2a050b8ee982bf4132fa5c8b381f33c7416f2b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6d3b505cb3a6143adcd58375870eb0b4b98636bc", + "reference": "6d3b505cb3a6143adcd58375870eb0b4b98636bc", "shasum": "" }, "require": { @@ -1682,17 +1782,17 @@ }, "require-dev": { "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^5.4" }, "suggest": { "ext-dom": "*", - "ext-xdebug": ">=2.2.1", + "ext-xdebug": ">=2.4.0", "ext-xmlwriter": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1718,7 +1818,7 @@ "testing", "xunit" ], - "time": "2016-03-09 13:32:21" + "time": "2016-04-21 05:23:34" }, { "name": "phpunit/php-file-iterator", @@ -1904,12 +2004,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "1206dd340c6f02b1322025bfaa2a3c2b244e874f" + "reference": "9b5b99b3da70e3eea5294712bc5843910ad2bad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/beb7683ca88fd9901dccf296806d1e484bd00d11", - "reference": "1206dd340c6f02b1322025bfaa2a3c2b244e874f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b5b99b3da70e3eea5294712bc5843910ad2bad6", + "reference": "9b5b99b3da70e3eea5294712bc5843910ad2bad6", "shasum": "" }, "require": { @@ -1921,11 +2021,11 @@ "myclabs/deep-copy": "~1.3", "php": "^5.6 || ^7.0", "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "^3.3.0", + "phpunit/php-code-coverage": "^4.0", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.1", + "phpunit/phpunit-mock-objects": "^3.2", "sebastian/comparator": "~1.1", "sebastian/diff": "~1.2", "sebastian/environment": "~1.3", @@ -1971,7 +2071,7 @@ "testing", "xunit" ], - "time": "2016-04-04 14:34:35" + "time": "2016-04-19 17:48:13" }, { "name": "phpunit/phpunit-mock-objects", @@ -1979,12 +2079,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "7b18bbdad9880e09740959e90eec4b91c35a4aa9" + "reference": "5d8c2a839d2c77757b7499eb135f34f9f5f07e6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/7b18bbdad9880e09740959e90eec4b91c35a4aa9", - "reference": "7b18bbdad9880e09740959e90eec4b91c35a4aa9", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5d8c2a839d2c77757b7499eb135f34f9f5f07e6f", + "reference": "5d8c2a839d2c77757b7499eb135f34f9f5f07e6f", "shasum": "" }, "require": { @@ -1994,7 +2094,7 @@ "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^5.4" }, "suggest": { "ext-soap": "*" @@ -2002,7 +2102,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "3.2.x-dev" } }, "autoload": { @@ -2027,7 +2127,7 @@ "mock", "xunit" ], - "time": "2016-03-24 06:24:17" + "time": "2016-04-20 14:39:30" }, { "name": "psr/http-message", @@ -2131,20 +2231,20 @@ }, { "name": "rmrevin/yii2-fontawesome", - "version": "2.13.0", + "version": "2.14.0", "source": { "type": "git", "url": "https://github.com/rmrevin/yii2-fontawesome.git", - "reference": "2efbfacb22be59f373d11a7e3dfa9213e2ba18a9" + "reference": "baac28412963974940cbfb6b83940b3aa179b0ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/2efbfacb22be59f373d11a7e3dfa9213e2ba18a9", - "reference": "2efbfacb22be59f373d11a7e3dfa9213e2ba18a9", + "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/baac28412963974940cbfb6b83940b3aa179b0ee", + "reference": "baac28412963974940cbfb6b83940b3aa179b0ee", "shasum": "" }, "require": { - "bower-asset/fontawesome": "4.5.*", + "bower-asset/fontawesome": "4.6.*", "php": ">=5.4.0", "yiisoft/yii2": "2.0.*" }, @@ -2179,7 +2279,7 @@ "font", "yii" ], - "time": "2015-11-26 15:24:53" + "time": "2016-04-21 11:55:25" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2810,12 +2910,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd" + "reference": "8e6292db6e77aa7fec40aaf12ae4bdee6b5b8007" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/6b1175135bc2a74c08a28d89761272de8beed8cd", - "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd", + "url": "https://api.github.com/repos/symfony/console/zipball/8e6292db6e77aa7fec40aaf12ae4bdee6b5b8007", + "reference": "8e6292db6e77aa7fec40aaf12ae4bdee6b5b8007", "shasum": "" }, "require": { @@ -2862,7 +2962,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-03-16 17:00:50" + "time": "2016-04-20 18:53:54" }, { "name": "symfony/css-selector", @@ -2923,12 +3023,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f" + "reference": "49b588841225b205700e5122fa01911cabada857" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/18a06d7a9af41718c20764a674a0ebba3bc40d1f", - "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/49b588841225b205700e5122fa01911cabada857", + "reference": "49b588841225b205700e5122fa01911cabada857", "shasum": "" }, "require": { @@ -2971,7 +3071,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-03-23 13:23:25" + "time": "2016-04-12 18:09:53" }, { "name": "symfony/event-dispatcher", @@ -2979,12 +3079,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39" + "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9002dcf018d884d294b1ef20a6f968efc1128f39", - "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/17b04e6b1ede45b57d3ad5146abe50df6c3968b4", + "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4", "shasum": "" }, "require": { @@ -3031,7 +3131,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-03-10 10:34:12" + "time": "2016-04-12 18:09:53" }, { "name": "symfony/finder", @@ -3088,12 +3188,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "1289d16209491b584839022f29257ad859b8532d" + "reference": "6bab34bbffa5f5ac079fdc4a68e143f158e87b7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", - "reference": "1289d16209491b584839022f29257ad859b8532d", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6bab34bbffa5f5ac079fdc4a68e143f158e87b7d", + "reference": "6bab34bbffa5f5ac079fdc4a68e143f158e87b7d", "shasum": "" }, "require": { @@ -3139,7 +3239,7 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-04-15 07:04:29" }, { "name": "symfony/yaml", @@ -3196,12 +3296,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "3fa8254dd475aa0979e1ab2a4a7d83aaf5acdfc8" + "reference": "10db2b4a2c361fc0e5824640f48781d24e304358" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/4efd28591c92be5f16d3456bbb5e1f1ea5ca96c0", - "reference": "3fa8254dd475aa0979e1ab2a4a7d83aaf5acdfc8", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/10db2b4a2c361fc0e5824640f48781d24e304358", + "reference": "10db2b4a2c361fc0e5824640f48781d24e304358", "shasum": "" }, "require": { @@ -3282,7 +3382,7 @@ "framework", "yii2" ], - "time": "2016-04-05 09:54:22" + "time": "2016-04-21 20:58:36" }, { "name": "yiisoft/yii2-bootstrap", @@ -3290,12 +3390,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-bootstrap.git", - "reference": "4dd9f52e2a376a875d998de6ab4c381291b0c69e" + "reference": "61ff14445779b225baa8e60cf4eddbc46cc14504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/4dd9f52e2a376a875d998de6ab4c381291b0c69e", - "reference": "4dd9f52e2a376a875d998de6ab4c381291b0c69e", + "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/61ff14445779b225baa8e60cf4eddbc46cc14504", + "reference": "61ff14445779b225baa8e60cf4eddbc46cc14504", "shasum": "" }, "require": { @@ -3332,7 +3432,7 @@ "bootstrap", "yii2" ], - "time": "2016-03-30 22:44:25" + "time": "2016-04-18 20:34:24" }, { "name": "yiisoft/yii2-codeception", @@ -3340,12 +3440,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-codeception.git", - "reference": "e01b3c46917b3f00c42f6a4aabf612cc36d792e6" + "reference": "572a6d46d942cc5733c45931fdbd1d60228f3c89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/e01b3c46917b3f00c42f6a4aabf612cc36d792e6", - "reference": "e01b3c46917b3f00c42f6a4aabf612cc36d792e6", + "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/572a6d46d942cc5733c45931fdbd1d60228f3c89", + "reference": "572a6d46d942cc5733c45931fdbd1d60228f3c89", "shasum": "" }, "require": { @@ -3377,7 +3477,7 @@ "codeception", "yii2" ], - "time": "2016-03-21 19:11:26" + "time": "2016-04-14 08:46:27" }, { "name": "yiisoft/yii2-composer", @@ -3385,12 +3485,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-composer.git", - "reference": "348122de0b2c2e343b579f93fcda1da78cab4912" + "reference": "f5fe6ba58dbc92b37daed5d9bd94cda777852ee4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/348122de0b2c2e343b579f93fcda1da78cab4912", - "reference": "348122de0b2c2e343b579f93fcda1da78cab4912", + "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/f5fe6ba58dbc92b37daed5d9bd94cda777852ee4", + "reference": "f5fe6ba58dbc92b37daed5d9bd94cda777852ee4", "shasum": "" }, "require": { @@ -3424,7 +3524,7 @@ "extension installer", "yii2" ], - "time": "2016-03-21 19:11:44" + "time": "2016-04-14 08:46:37" }, { "name": "yiisoft/yii2-imagine", @@ -3432,12 +3532,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-imagine.git", - "reference": "a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99" + "reference": "3be1ecc324aa156a97f03e3fc59045c8d61be1f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", - "reference": "a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", + "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/3be1ecc324aa156a97f03e3fc59045c8d61be1f8", + "reference": "3be1ecc324aa156a97f03e3fc59045c8d61be1f8", "shasum": "" }, "require": { @@ -3472,7 +3572,7 @@ "imagine", "yii2" ], - "time": "2016-03-21 19:13:31" + "time": "2016-04-14 08:48:05" }, { "name": "yiisoft/yii2-jui", @@ -3480,12 +3580,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-jui.git", - "reference": "69cd9763b4807dbbce367d599dc615c5b8a8ef4f" + "reference": "9ab9a2cb17cd7f13921339e11e5146295cf39083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/69cd9763b4807dbbce367d599dc615c5b8a8ef4f", - "reference": "69cd9763b4807dbbce367d599dc615c5b8a8ef4f", + "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/9ab9a2cb17cd7f13921339e11e5146295cf39083", + "reference": "9ab9a2cb17cd7f13921339e11e5146295cf39083", "shasum": "" }, "require": { @@ -3522,7 +3622,7 @@ "jQuery UI", "yii2" ], - "time": "2016-03-29 21:32:13" + "time": "2016-04-14 08:48:18" }, { "name": "yiisoft/yii2-swiftmailer", @@ -3530,12 +3630,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-swiftmailer.git", - "reference": "20775fef1047cd927908270a8d7983580304eb57" + "reference": "163b9c6273e133c43a596aef46a9f5b1537731f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/20775fef1047cd927908270a8d7983580304eb57", - "reference": "20775fef1047cd927908270a8d7983580304eb57", + "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/163b9c6273e133c43a596aef46a9f5b1537731f9", + "reference": "163b9c6273e133c43a596aef46a9f5b1537731f9", "shasum": "" }, "require": { @@ -3572,7 +3672,7 @@ "swiftmailer", "yii2" ], - "time": "2016-03-21 19:16:09" + "time": "2016-04-14 08:50:13" } ], "packages-dev": [ @@ -3609,16 +3709,16 @@ "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4" + "reference": "1c33e894fbbad6cf65bd42871719cd33227ed6a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", - "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/1c33e894fbbad6cf65bd42871719cd33227ed6a7", + "reference": "1c33e894fbbad6cf65bd42871719cd33227ed6a7", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3|^7.0" }, "require-dev": { "ext-intl": "*", @@ -3651,7 +3751,7 @@ "faker", "fixtures" ], - "time": "2016-03-29 16:49:43" + "time": "2016-04-13 06:45:05" }, { "name": "phpspec/php-diff", @@ -3659,15 +3759,20 @@ "source": { "type": "git", "url": "https://github.com/phpspec/php-diff.git", - "reference": "30e103d19519fe678ae64a60d77884ef3d71b28a" + "reference": "0464787bfa7cd13576c5a1e318709768798bec6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/php-diff/zipball/30e103d19519fe678ae64a60d77884ef3d71b28a", - "reference": "30e103d19519fe678ae64a60d77884ef3d71b28a", + "url": "https://api.github.com/repos/phpspec/php-diff/zipball/0464787bfa7cd13576c5a1e318709768798bec6a", + "reference": "0464787bfa7cd13576c5a1e318709768798bec6a", "shasum": "" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-0": { "Diff": "lib/" @@ -3680,12 +3785,11 @@ "authors": [ { "name": "Chris Boulton", - "homepage": "http://github.com/chrisboulton", - "role": "Original developer" + "homepage": "http://github.com/chrisboulton" } ], "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).", - "time": "2013-11-01 13:02:21" + "time": "2016-04-07 12:29:16" }, { "name": "yiisoft/yii2-debug", @@ -3693,12 +3797,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-debug.git", - "reference": "081795536b31d29106b0d1de0cb3aefa3e05e995" + "reference": "e26905af4bc1ca5ecbababac112c7f7f722cabd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/081795536b31d29106b0d1de0cb3aefa3e05e995", - "reference": "081795536b31d29106b0d1de0cb3aefa3e05e995", + "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/e26905af4bc1ca5ecbababac112c7f7f722cabd2", + "reference": "e26905af4bc1ca5ecbababac112c7f7f722cabd2", "shasum": "" }, "require": { @@ -3732,7 +3836,7 @@ "debugger", "yii2" ], - "time": "2016-03-21 19:12:39" + "time": "2016-04-14 08:47:01" }, { "name": "yiisoft/yii2-faker", @@ -3740,12 +3844,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-faker.git", - "reference": "a8daa97749e7154d91676405a1c59ed81e1ca999" + "reference": "6e6eb430809e3f9c05e367303909a05a4912d4c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/a8daa97749e7154d91676405a1c59ed81e1ca999", - "reference": "a8daa97749e7154d91676405a1c59ed81e1ca999", + "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/6e6eb430809e3f9c05e367303909a05a4912d4c0", + "reference": "6e6eb430809e3f9c05e367303909a05a4912d4c0", "shasum": "" }, "require": { @@ -3779,7 +3883,7 @@ "faker", "yii2" ], - "time": "2016-03-21 19:13:03" + "time": "2016-04-14 08:47:34" }, { "name": "yiisoft/yii2-gii", @@ -3787,12 +3891,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-gii.git", - "reference": "0d93a9dbd55f2d0921b8e153554379bb213a2c7f" + "reference": "62eddfcbf377353777742b3ceaf2b75dc81178e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/0d93a9dbd55f2d0921b8e153554379bb213a2c7f", - "reference": "0d93a9dbd55f2d0921b8e153554379bb213a2c7f", + "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/62eddfcbf377353777742b3ceaf2b75dc81178e3", + "reference": "62eddfcbf377353777742b3ceaf2b75dc81178e3", "shasum": "" }, "require": { @@ -3832,7 +3936,7 @@ "gii", "yii2" ], - "time": "2016-04-05 09:53:13" + "time": "2016-04-21 13:19:47" } ], "aliases": [], diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index d055d12..7e7c9f2 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -1085,12 +1085,6 @@ input[type=file]::-webkit-file-upload-button { #modal_form_contacts .res_form_line { top: 411px; } -/***rating***/ -.section-box-15 .rating {padding-left: 0;margin-left: -4px} -.section-box-15 .vote-stars, .section-box-15 .vote-active {cursor: default !important} -.section-box-15 .rating .vote-result, .section-box-15 .rating .vote-success {display: none} -.rating{width:150px; overflow: hidden; height:16px;float:left;box-sizing: border-box;padding-left: 9px;}div.vote-wrap{overflow:hidden}div.vote-block{position:relative}div.vote-hover{float:left;cursor:default}div.vote-stars,div.vote-active{position:absolute;left:0;top:0;cursor:pointer}div.vote-result{color:#ccc;font-size:14px;margin-top:12px;padding-left:190px}div.vote-success{clear:both;color:#ccc;font-size:14px;margin:10px 0 0 10px} -/***end-rating***/ .section-box-9 .vote-success, .section-box-9 .vote-result{display: none} /****pagination****/ .navi-buttons-wr { -- libgit2 0.21.4