From 0fd849642972394d357144340060799761130fe1 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Wed, 9 Mar 2016 17:39:45 +0200
Subject: [PATCH] test

---
 frontend/views/company/_vacancy_list_view.php | 38 ++++++++++++++++++++++++++++++--------
 frontend/views/company/vacancy-view.php       | 37 +++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/frontend/views/company/_vacancy_list_view.php b/frontend/views/company/_vacancy_list_view.php
index 020147a..c646222 100644
--- a/frontend/views/company/_vacancy_list_view.php
+++ b/frontend/views/company/_vacancy_list_view.php
@@ -1,17 +1,39 @@
 <?php
-use frontend\helpers\TextHelper;
-use yii\bootstrap\Html;
-use yii\helpers\Url;
-use yii\i18n\Formatter;
+    use frontend\helpers\TextHelper;
+    use yii\bootstrap\Html;
+    use yii\helpers\Url;
+    use yii\helpers\StringHelper;
 
 ?>
 
 <div class="performer-vacant-reclam-bl">
-    <?= Html::a($model->name, Url::toRoute( ['company/vacancy-view', 'company_id' => $model->user_id,'link' => $model->link]), ['class' => 'performer-vacant-reclam-bl-title']) ?>
-    <div class="performer-vacant-reclam-bl-title-two"> <?= $model->city ?>  <?= \Yii::$app->formatter->asDatetime($model->date_add, 'Y-MM-dd') ?>  <?=$model->salary ?> <?=$model->salaryCurrency->label ?> </div>
+    <?= Html::a($model->name, Url::toRoute([
+        'company/vacancy-view',
+        'company_id' => $model->user_id,
+        'link'       => $model->link,
+    ]), [ 'class' => 'performer-vacant-reclam-bl-title' ]) ?>
+    <div class="performer-vacant-reclam-bl-title-two">
+        <?= $model->city ?>
+        <?= \Yii::$app->formatter->asDatetime($model->date_add, 'Y-MM-dd') ?>
+        <?php
+            if(!empty( $model->salary )) {
+                ?>
+                <?= $model->salary ?>
+                <?= $model->salaryCurrency->label ?>
+                <?php
+            }
+        ?>
+    </div>
     <div class="performer-vacant-reclam-bl-content">
-        <span><?= TextHelper::truncateHtmlText($model->description, 200, '...') ?></span>
-         <?= Html::a('<img src="/images/performar_vacancy/arrow-post.png" alt=""/>', ['vacancy-view', 'company_id' => $model->user_id,'vacancy_id' => $model->vacancy_id], ['class' => 'performer-vacant-reclam-bl-content-read']) ?>
+        <span>
+            <?= StringHelper::truncateWords($model->description, 50, '...', false) ?>
+            <?php //TextHelper::truncateHtmlText($model->description, 200, '...') ?>
+        </span>
+        <?= Html::a('<img src="/images/performar_vacancy/arrow-post.png" alt=""/>', [
+            'company/vacancy-view',
+            'company_id' => $model->user_id,
+            'link'       => $model->link,
+        ], [ 'class' => 'performer-vacant-reclam-bl-content-read' ]) ?>
 
     </div>
 </div>
\ No newline at end of file
diff --git a/frontend/views/company/vacancy-view.php b/frontend/views/company/vacancy-view.php
index d931ad7..0108f2f 100755
--- a/frontend/views/company/vacancy-view.php
+++ b/frontend/views/company/vacancy-view.php
@@ -1,7 +1,7 @@
 <?php
     /**
-     * @var $this yii\web\View
-     * @var User $company
+     * @var         $this yii\web\View
+     * @var User    $company
      * @var Vacancy $vacancy
      */
 
@@ -10,12 +10,15 @@
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
 
-    $this->params[ 'company'] = $company;
-$this->title = 'My Yii Application';
+    $this->params[ 'company' ] = $company;
+    $this->title = 'My Yii Application';
 ?>
 <div class="performer-vacancy-list style">
     <?php
-    echo Html::a('к списку вакансий', ['vacancy-list', 'company_id' => $company->id]);
+        echo Html::a('к списку вакансий', [
+            'vacancy-list',
+            'company_id' => $company->id,
+        ]);
     ?>
 </div>
 <div class="performer-vacancy-blocks-desk-wr style">
@@ -24,24 +27,26 @@ $this->title = 'My Yii Application';
     <div class="performance-vacancy-page-options style">
         <ul>
             <?php
-            if(!empty($vacancy->user_name)) {
-                echo "<li><span>Контактное лицо:</span><p>{$vacancy->user_name}</p></li>";
-            }
+                if(!empty( $vacancy->user_name )) {
+                    echo "<li><span>Контактное лицо:</span><p>{$vacancy->user_name}</p></li>";
+                }
+                if(!empty( $vacancy->phone )) {
+                    echo "<li><span>Телефон:</span><p>{$vacancy->phone}</p></li>";
+                }
             ?>
-            <li><span>Телефон:</span><p>XXX XXX-XX-XX</p></li>
             <?php
-                if(!empty($vacancy->city)) {
+                if(!empty( $vacancy->city )) {
                     echo "<li><span>Город:</span><p>{$vacancy->city}</p></li>";
                 }
             ?>
             <?php
-                if(!empty($vacancy->employments)) {
-                    echo "<li><span>Вид занятости:</span><p>".implode(', ', ArrayHelper::getColumn($vacancy->employments, 'name'))."</p></li>";
+                if(!empty( $vacancy->employments )) {
+                    echo "<li><span>Вид занятости:</span><p>" . implode(', ', ArrayHelper::getColumn($vacancy->employments, 'name')) . "</p></li>";
                 }
             ?>
             <?php
-                if(!empty($vacancy->requirements)) {
-                    echo "<li><span>Требования:</span><p>".implode(', ', ArrayHelper::getColumn($vacancy->requirements, 'requirements'))."</p></li>";
+                if(!empty( $vacancy->requirements )) {
+                    echo "<li><span>Требования:</span><p>" . implode(', ', ArrayHelper::getColumn($vacancy->requirements, 'requirements')) . "</p></li>";
                 }
             ?>
         </ul>
@@ -49,7 +54,7 @@ $this->title = 'My Yii Application';
     <div class="performance-vacancy-description style">Описание вакансии</div>
     <div class="performance-vacancy-desc-txt style">
         <?php
-        echo $vacancy->description;
+            echo $vacancy->description;
         ?>
     </div>
     <div class="performance-vacancy-desc-form style">
@@ -67,7 +72,7 @@ $this->title = 'My Yii Application';
 
         <div class="performance-vacancy-similar-blocks-wr style">
             <a href="#" class="performer-vacant-reclam-bl-title">Разнорабочий (в Бровары)</a>
-            <div class="performer-vacant-reclam-bl-title-two">Наш Дом. Киев. </div>
+            <div class="performer-vacant-reclam-bl-title-two">Наш Дом. Киев.</div>
         </div>
 
         <div class="performance-vacancy-similar-blocks-wr style">
--
libgit2 0.21.4