From 4ab2c4752990a170e363e5cb4863a95fbcb5767c Mon Sep 17 00:00:00 2001
From: yarik <yarik.nechyporuk@gmail.com>
Date: Mon, 29 Aug 2016 12:34:20 +0300
Subject: [PATCH] Commit

---
 common/models/Job.php                |  2 +-
 frontend/views/layouts/performer.php | 50 +++++++++++++++++++++++++++++++++++++-------------
 frontend/web/css/style.css           |  4 ++--
 frontend/web/js/script.js            |  6 ++++++
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/common/models/Job.php b/common/models/Job.php
index e2e1af4..42660cd 100755
--- a/common/models/Job.php
+++ b/common/models/Job.php
@@ -48,7 +48,7 @@
                 $this->date_end = \Yii::$app->formatter->asDatetime($this->date_end, 'Y-MM-d HH:mm:ss');
             }
 
-            return parent::beforeSave($insert); // TODO: Change the autogenerated stub
+            return parent::beforeSave($insert);
         }
 
         /**
diff --git a/frontend/views/layouts/performer.php b/frontend/views/layouts/performer.php
index 23737fb..38260c4 100755
--- a/frontend/views/layouts/performer.php
+++ b/frontend/views/layouts/performer.php
@@ -3,7 +3,7 @@
      * @var string $content
      * @var View   $this
      */
-
+    
     use common\models\User;
     use kartik\rating\StarRating;
     use yii\helpers\ArrayHelper;
@@ -11,7 +11,7 @@
     use yii\helpers\Url;
     use yii\web\View;
     use yii\widgets\Menu;
-
+    
     \frontend\assets\AppAsset::register($this);
     $this->beginContent('@app/views/layouts/main.php');
 ?>
@@ -93,14 +93,14 @@
                                     'active'  => preg_match('/^projects.*$/', $this->context->action->id) ? true : false,
                                 ],
                                 [
-                                    'label'  => 'Блог',
-                                    'url'    => [
+                                    'label'   => 'Блог',
+                                    'url'     => [
                                         'performer/blog-list',
                                         'performer_id' => $this->params[ 'user' ]->id,
                                         'type'         => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
                                     ],
                                     'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
-                                    'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
+                                    'active'  => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
                                 ],
                                 [
                                     'label' => 'Мнения',
@@ -111,8 +111,8 @@
                                     ],
                                 ],
                                 [
-                                    'label' => 'Места работы',
-                                    'url'   => [
+                                    'label'   => 'Места работы',
+                                    'url'     => [
                                         'performer/workplace',
                                         'performer_id' => $this->params[ 'user' ]->id,
                                         'type'         => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
@@ -120,8 +120,8 @@
                                     'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
                                 ],
                                 [
-                                    'label' => 'Галерея',
-                                    'url'   => [
+                                    'label'   => 'Галерея',
+                                    'url'     => [
                                         'performer/gallery',
                                         'performer_id' => $this->params[ 'user' ]->id,
                                         'type'         => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
@@ -229,7 +229,18 @@
                                         <li><img src="/images/sidebar-ico/ico-1.png" alt=""/>
                                             <div class="sidebarvievstxt"><?= $this->params[ 'user' ]->userInfo->view_count ?> просмотра</div>
                                         </li>
-                                        <li><img src="/images/sidebar-ico/ico-9.png" alt=""/>
+                                        <li>
+                                            <?php
+                                                if($this->params[ 'user' ]->userInfo->busy) {
+                                                    ?>
+                                                    <img src="/images/sidebar-ico/ico_work_01.png" alt=""/>
+                                                    <?php
+                                                } else {
+                                                    ?>
+                                                    <img src="/images/sidebar-ico/ico-9.png" alt=""/>
+                                                    <?php
+                                                }
+                                            ?>
                                             <div class="sidebarvievstxt">
                                                 <span class="sidebar-views-txt">Статус: </span><?= $this->params[ 'user' ]->userInfo->busyText ?>
                                             </div>
@@ -309,7 +320,20 @@
                                                 <li>
                                                     <img src="/images/sidebar-ico/ico-14.png" alt=""/>
                                                     <div class="sidebarvievstxt">
-                                                        <span class="sidebar-views-txt">Текущее место работы:<br/></span><?= $this->params[ 'user' ]->currentJob->name ?>
+                                                        <span class="sidebar-views-txt">
+                                                            Текущее место работы:<br/>
+                                                        </span>
+                                                        <?php
+                                                            if(!empty( $this->params[ 'user' ]->currentJob->link )) {
+                                                                ?>
+                                                                <a href="<?= $this->params[ 'user' ]->currentJob->link ?>">
+                                                                    <?= $this->params[ 'user' ]->currentJob->name ?>
+                                                                </a>
+                                                                <?php
+                                                            } else {
+                                                                echo $this->params[ 'user' ]->currentJob->name;
+                                                            }
+                                                        ?>
                                                     </div>
                                                 </li>
                                                 <?php
@@ -325,9 +349,9 @@
                     </div>
                 </div>
             </div>
-
+        
         </div>
-
+    
     </div>
     <script>
         $('div.rating').rating(
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index ac0b353..ee50b7d 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -12269,7 +12269,7 @@ li.active-menu-admin:hover a .ico_num {
     text-decoration: underline
 }
 
-.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .artbox_comment_delete, .artbox_project_make_trash, .artbox_project_make_new {
+.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .artbox_comment_delete, .artbox_project_make_trash, .artbox_project_make_new, .artbox_comment_update {
     border-radius: 4px;
     display: block;
     float: left;
@@ -12287,7 +12287,7 @@ li.active-menu-admin:hover a .ico_num {
     margin-left: 0;
 }
 
-.artbox_comment_delete {
+.artbox_comment_delete, .artbox_comment_update {
     font-size: 13px;
     margin-top: 15px;
 }
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js
index b0a5d02..bf0b230 100755
--- a/frontend/web/js/script.js
+++ b/frontend/web/js/script.js
@@ -1092,6 +1092,12 @@ $(document).ready(
             var firstPost = $('.blog-post-wr');
             $(firstPost[0]).css({marginTop:-1})
         }
+
+        $(document).on('click', '.scroll-img img', function(e) {
+            e.preventDefault();
+            var url = $(this).attr('src');
+            $('.new-portfolio-bg img').attr('src', url);
+        });
         
     }
 );
\ No newline at end of file
--
libgit2 0.21.4