From baba04c20e534cb160e65b69d01d02eadbb6cb03 Mon Sep 17 00:00:00 2001 From: Yarik Date: Wed, 16 Mar 2016 13:04:51 +0200 Subject: [PATCH] test --- common/modules/comment/models/Comment.php | 4 ++-- frontend/views/layouts/company.php | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- frontend/views/layouts/performer.php | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- 3 files changed, 202 insertions(+), 93 deletions(-) diff --git a/common/modules/comment/models/Comment.php b/common/modules/comment/models/Comment.php index 7275825..28d847e 100644 --- a/common/modules/comment/models/Comment.php +++ b/common/modules/comment/models/Comment.php @@ -173,7 +173,7 @@ 'comment.model' => $model, 'comment.model_id' => $model_id, 'comment.status' => 1, - ]); + ])->with('rating'); } public function postComment() @@ -310,7 +310,7 @@ 'model' => $this->className(), ]) ->one(); - if(!$rating instanceof \common\modules\comment\models\Rating) { + if(!$rating instanceof \common\modules\comment\models\Rating && !$this->isNewRecord) { $rating = new \common\modules\comment\models\Rating([ 'model' => $this->className(), 'model_id' => $this->comment_id, diff --git a/frontend/views/layouts/company.php b/frontend/views/layouts/company.php index 5deeee9..45d930c 100755 --- a/frontend/views/layouts/company.php +++ b/frontend/views/layouts/company.php @@ -1,20 +1,24 @@ beginContent('@app/views/layouts/main.php'); + $this->beginContent('@app/views/layouts/main.php'); ?>
-
+
-
Оставьте заявку
и мы вам перезвоним
+
Оставьте заявку
и мы вам перезвоним +
@@ -24,7 +28,7 @@ $this->beginContent('@app/views/layouts/main.php');
- +
@@ -40,38 +44,59 @@ $this->beginContent('@app/views/layouts/main.php');
[ + 'options' => [ 'class' => 'menu-content', ], 'activeCssClass' => 'active-menu-content', - 'items' => [ + 'items' => [ [ 'label' => 'Общее', - 'url' => ['company/common', 'company_id'=>$this->params['company']->id], + 'url' => [ + 'company/common', + 'company_id' => $this->params[ 'company' ]->id, + ], ], [ 'label' => 'Выполненные работы', - 'url' => ['company/portfolio', 'company_id'=>$this->params['company']->id], + 'url' => [ + 'company/portfolio', + 'company_id' => $this->params[ 'company' ]->id, + ], ], [ 'label' => 'Команда', - 'url' => ['company/team', 'company_id'=>$this->params['company']->id], + 'url' => [ + 'company/team', + 'company_id' => $this->params[ 'company' ]->id, + ], ], [ 'label' => 'Вакансии', - 'url' => ['company/vacancy-list', 'company_id'=>$this->params['company']->id], + 'url' => [ + 'company/vacancy-list', + 'company_id' => $this->params[ 'company' ]->id, + ], ], [ 'label' => 'Блог', - 'url' => ['company/blog-list', 'company_id'=>$this->params['company']->id], + 'url' => [ + 'company/blog-list', + 'company_id' => $this->params[ 'company' ]->id, + ], ], [ 'label' => 'Отзывы', - 'url' => ['company/review', 'company_id'=>$this->params['company']->id], + 'url' => [ + 'company/review', + 'company_id' => $this->params[ 'company' ]->id, + ], ], [ 'label' => 'Галерея', - 'url' => ['company/gallery', 'company_id'=>$this->params['company']->id], + 'url' => [ + 'company/gallery', + 'company_id' => $this->params[ 'company' ]->id, + ], ], ], ]); @@ -93,7 +118,8 @@ $this->beginContent('@app/views/layouts/main.php');
@@ -102,45 +128,71 @@ $this->beginContent('@app/views/layouts/main.php');
- + - +
-
30 отзывов
+
params[ 'company' ]->comments) ?> отзывов
написать отзыв
-
params['company']->userInfo->image);?>
+
params[ 'company' ]->userInfo->image); ?>
  • - params['company']->userInfo->social_fb],['target'=>'_blank'])?> + params[ 'company' ]->userInfo->social_fb ], [ 'target' => '_blank' ]) ?>
  • - params['company']->userInfo->social_t],['target'=>'_blank'])?> + params[ 'company' ]->userInfo->social_t ], [ 'target' => '_blank' ]) ?>
  • - params['company']->userInfo->social_in],['target'=>'_blank'])?> + params[ 'company' ]->userInfo->social_in ], [ 'target' => '_blank' ]) ?>
  • - params['company']->userInfo->social_vk],['target'=>'_blank'])?> + params[ 'company' ]->userInfo->social_vk ], [ 'target' => '_blank' ]) ?>
    -
  • params['company']->userInfo->view_count;?> просмотра
    • -
  • На сайте: params['company']->liveTime?>
    • -
  • Последний визит:
    params['company']->userInfo->lastVisit?>
    • -
  • Сотрудники:
    params['company']->companyInfo->staff?>
    • - params['company']->phones as $phone ):?> -
    • - - params['company']->site as $site ):?> -
  • Сайт
    • - -
  • Адрес:
    params['company']->address?>
    • +
  • +
    params[ 'company' ]->userInfo->view_count; ?> просмотра
    +
    • +
  • +
    + На сайте: params[ 'company' ]->liveTime ?> +
    +
    • +
  • +
    + Последний визит:
    params[ 'company' ]->userInfo->lastVisit ?> +
    +
    • +
  • +
    + Сотрудники:
    params[ 'company' ]->companyInfo->staff ?> +
    +
    • + params[ 'company' ]->phones as $phone): ?> +
  • +
    + +
    +
    • + + params[ 'company' ]->site as $site): ?> +
  • +
    + Сайт +
    +
    • + +
  • +
    + Адрес:
    params[ 'company' ]->address ?> +
    +
@@ -154,26 +206,26 @@ $this->beginContent('@app/views/layouts/main.php');
blocks['our_objects'])) { - echo $this->blocks['our_objects']; + if(isset( $this->blocks[ 'our_objects' ] )) { + echo $this->blocks[ 'our_objects' ]; } - if(isset($this->blocks['blog'])) { - echo $this->blocks['blog']; + if(isset( $this->blocks[ 'blog' ] )) { + echo $this->blocks[ 'blog' ]; } - if(isset($this->blocks['team'])) { - echo $this->blocks['team']; + if(isset( $this->blocks[ 'team' ] )) { + echo $this->blocks[ 'team' ]; } - if(isset($this->blocks['review'])) { - echo $this->blocks['review']; + if(isset( $this->blocks[ 'review' ] )) { + echo $this->blocks[ 'review' ]; } /*====End of blocks created in view====*/ ?>
endContent() ?> \ No newline at end of file diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php index 67f2eeb..f692fe7 100755 --- a/frontend/views/layouts/performer.php +++ b/frontend/views/layouts/performer.php @@ -1,24 +1,30 @@ beginContent('@app/views/layouts/main.php'); + use common\models\User; + use yii\helpers\ArrayHelper; + use yii\helpers\Html; + use yii\helpers\Url; + use yii\web\View; + use yii\widgets\Menu; + \frontend\assets\AppAsset::register($this); + $this->beginContent('@app/views/layouts/main.php'); ?>
-
+
Предложить
проект - $this->params['user']->id]), ['class'=> 'blog-buttons-write'])?> + $this->params[ 'user' ]->id, + ]), [ 'class' => 'blog-buttons-write' ]) ?> Добавить
в закладки
@@ -36,27 +42,45 @@ $this->beginContent('@app/views/layouts/main.php'); 'items' => [ [ 'label' => 'Общее', - 'url' => ['performer/common', 'performer_id'=>$this->params['user']->id], + 'url' => [ + 'performer/common', + 'performer_id' => $this->params[ 'user' ]->id, + ], ], [ 'label' => 'Портфолио', - 'url' => ['performer/portfolio', 'performer_id'=>$this->params['user']->id], + 'url' => [ + 'performer/portfolio', + 'performer_id' => $this->params[ 'user' ]->id, + ], ], [ 'label' => 'Блог', - 'url' => ['performer/blog-list', 'performer_id'=>$this->params['user']->id], + 'url' => [ + 'performer/blog-list', + 'performer_id' => $this->params[ 'user' ]->id, + ], ], [ 'label' => 'Отзывы', - 'url' => ['performer/review', 'performer_id'=>$this->params['user']->id], + 'url' => [ + 'performer/review', + 'performer_id' => $this->params[ 'user' ]->id, + ], ], [ 'label' => 'Места работы', - 'url' => ['performer/workplace', 'performer_id'=>$this->params['user']->id], + 'url' => [ + 'performer/workplace', + 'performer_id' => $this->params[ 'user' ]->id, + ], ], [ 'label' => 'Галерея', - 'url' => ['performer/gallery', 'performer_id'=>$this->params['user']->id], + 'url' => [ + 'performer/gallery', + 'performer_id' => $this->params[ 'user' ]->id, + ], ], ], ]); @@ -78,7 +102,8 @@ $this->beginContent('@app/views/layouts/main.php');
@@ -87,45 +112,77 @@ $this->beginContent('@app/views/layouts/main.php');
- + - +
-
30 отзывов
+
params['user']->comments) ?> отзывов
написать отзыв
- params['user']->userInfo->image);?> + params[ 'user' ]->userInfo->image); ?>
  • - params['user']->userInfo->social_fb}",['target'=>'_blank'])?> + params['user']->userInfo->social_fb}", [ 'target' => '_blank' ]) ?>
  • - params['user']->userInfo->social_t}", ['target'=>'_blank'])?> + params['user']->userInfo->social_t}", [ 'target' => '_blank' ]) ?>
  • - params['user']->userInfo->social_in}",['target'=>'_blank'])?> + params['user']->userInfo->social_in}", [ 'target' => '_blank' ]) ?>
  • - params['user']->userInfo->social_vk}",['target'=>'_blank'])?> + params['user']->userInfo->social_vk}", [ 'target' => '_blank' ]) ?>
    -
  • params['user']->userInfo->view_count?> просмотра
    • -
  • Статус: params['user']->userInfo->busyText?>
    • -
  • На сайте: params['user']->liveTime?>
    • -
  • Последний визит:
    params['user']->userInfo->lastVisit?>
    • -
  • Трудовой стаж:
    params['user']->userInfo->experience?>
    • -
  • Звание в МФП:
    params['user']->userInfo->rank?>
    • -
  • Стоимость работ:
    params['user']->userInfo->salary?>
    • -
  • params['user']->payments,'name'))?>
    • -
  • Текущее место работы:
    params['user']->currentJob) ?$this->params['user']->currentJob->name : ""?>
    • +
  • +
    params[ 'user' ]->userInfo->view_count ?> просмотра
    +
    • +
  • +
    + Статус: params[ 'user' ]->userInfo->busyText ?> +
    +
    • +
  • +
    + На сайте: params[ 'user' ]->liveTime ?> +
    +
    • +
  • +
    + Последний визит:
    params[ 'user' ]->userInfo->lastVisit ?> +
    +
    • +
  • +
    + Трудовой стаж:
    params[ 'user' ]->userInfo->experience ?> +
    +
    • +
  • +
    + Звание в МФП:
    params[ 'user' ]->userInfo->rank ?> +
    +
    • +
  • +
    + Стоимость работ:
    params[ 'user' ]->userInfo->salary ?> +
    +
    • +
  • +
    params[ 'user' ]->payments, 'name')) ?>
    +
    • +
  • +
    + Текущее место работы:
    params[ 'user' ]->currentJob ) ? $this->params[ 'user' ]->currentJob->name : "" ?> +
    +
@@ -142,11 +199,11 @@ $this->beginContent('@app/views/layouts/main.php');
endContent() ?> \ No newline at end of file -- libgit2 0.21.4