Commit

Yarik
1 parent 716f52bf
Showing 28 changed files with 59 additions and 40 deletions Show diff stats
frontend/views/company/_company_list_view.php
frontend/views/company/blog-list.php
frontend/views/company/common.php
frontend/views/company/gallery.php
frontend/views/company/portfolio-view.php
frontend/views/company/portfolio.php
frontend/views/company/project-list.php
frontend/views/company/review.php
frontend/views/company/team.php
frontend/views/company/vacancy-list.php
frontend/views/company/vacancy-view.php
frontend/views/layouts/gallery-company.php
frontend/views/layouts/gallery.php
frontend/views/performer/blog-list.php
frontend/views/performer/common.php
frontend/views/performer/gallery.php
frontend/views/performer/portfolio-view.php
frontend/views/performer/portfolio.php
frontend/views/performer/project-list.php
frontend/views/performer/review.php
@@ -11,9 +11,9 @@ $http_pattern = &#39;/^https?.*$/&#39;;
         <div class="command-block-foto">
             <?php
             if(empty( $model->link )) {
-                echo ( $model->photo ? Html::img($model->photo) : '' ) . '<div class="hover-command-bg"></div>';
+                echo ( Html::img(\Yii::$app->user->identity->minImg($model->photo, 220, 220)) ) . '<div class="hover-command-bg"></div>';
             } else {
-                echo Html::a(( $model->photo ? Html::img($model->photo) : '' ) . '<div class="hover-command-bg"></div>', (preg_match($http_pattern, $model->link))?$model->link:'http://'.$model->link);
+                echo Html::a((Html::img(\Yii::$app->user->identity->minImg($model->photo, 220, 220))) . '<div class="hover-command-bg"></div>', (preg_match($http_pattern, $model->link))?$model->link:'http://'.$model->link);
             }
             ?>
         </div>
@@ -12,7 +12,7 @@
     use yii\widgets\ListView;
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
@@ -15,7 +15,7 @@
     use yii\widgets\ListView;
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
 ?>
     <div class="company-performer-title style">О компании</div>
     <div class="company-performer-txt style">
 <?php
     use common\models\User;
-    use yii\widgets\LinkPager;
     use yii\widgets\ListView;
     /**
@@ -9,17 +8,18 @@
      */
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
     if(empty( $videos ) && empty( $gallery->getModels() )) {
         ?>
         <div class="gallery-performer-wrapper style">
-            <div>
+            <div class="gallery-performer-margin">
                 Галерей к просмотру не найдено
             </div>
         </div>
         <?php
     } else {
-        if(!empty( $videos )) { ?>
+        if(!empty( $videos )) {
+            ?>
             <div class="video-performer-wrapper style">
                 <div class="gallery-title">Видео: <?= count($videos) ?></div>
                 <div class="slider-video-wr">
@@ -42,7 +42,8 @@
                     </div>
                 </div>
             </div>
-        <?php }
+            <?php
+        }
         ?>
         <div class="gallery-performer-wrapper style">
             <div class="gallery-performer-margin">
@@ -56,6 +57,7 @@
         </div>
         <?php
     }
+
 ?>
 <script>
     $(
@@ -18,7 +18,7 @@
      */
     $this->params[ 'company' ] = $user;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
     $rating = $portfolio->getRatingValue();
     if(!empty( $portfolio_user )) {
         $portfolio_user_gallery = $portfolio->ShowGallery($portfolio_user->gallery->photo);
@@ -16,7 +16,7 @@
      * @var int                $filter_id
      */
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
@@ -12,7 +12,7 @@
      */
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
 ?>
 <div class="proektant-profile-content" style="width:100%">
     <div class="search-worker-title style">Сейчас <?= $dataProvider->totalCount ?> предложений</div>
@@ -8,7 +8,8 @@
     use yii\web\View;
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
     <?php
@@ -13,7 +13,8 @@
     use yii\widgets\ListView;
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+    
 ?>
     <div class="command-blocks-wr style">
         <?= ListView::widget([
@@ -11,7 +11,8 @@
     use yii\widgets\ListView;
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+    
 ?>
 <div class="performer-vacancy-vacant-title style">Вакансии</div>
@@ -13,7 +13,8 @@
     use yii\helpers\Url;
     $this->params[ 'company' ] = $company;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
     <div class="performer-vacancy-list style">
         <?php
@@ -3,10 +3,9 @@
     use kartik\rating\StarRating;
     use yii\helpers\Html;
     use yii\helpers\Url;
-    use yii\widgets\Breadcrumbs;
     use yii\widgets\Menu;
-    \frontend\assets\AdminAsset::register($this);
+    \frontend\assets\AppAsset::register($this);
     /* @var $content string */
     $this->beginContent('@app/views/layouts/main.php');
 ?>
@@ -3,7 +3,6 @@
     use kartik\rating\StarRating;
     use yii\helpers\Html;
     use yii\helpers\Url;
-    use yii\widgets\Breadcrumbs;
     use yii\widgets\Menu;
     \frontend\assets\AppAsset::register($this);
@@ -10,7 +10,8 @@
     use yii\widgets\ListView;
     $this->params[ 'user' ] = $user;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
@@ -12,8 +12,8 @@
      * @var int[] $geography
      */
     $this->params[ 'user' ] = $user;
-
-    $this->title = 'My Yii Application';
+    
+    $this->title = 'Proektant.net';
     $geographyString = '';
 <?php
-    
+    use common\models\User;
     use yii\widgets\ListView;
     /**
@@ -7,7 +7,8 @@
      */
     $this->params[ 'user' ] = $user;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+    
     if(empty( $videos ) && empty( $gallery->getModels() )) {
         ?>
         <div class="gallery-performer-wrapper style">
@@ -29,7 +30,6 @@
                                     <div class="iframe-video">
                                         <iframe width="560" height="320" src="<?= $video[ 'youtube' ] ?>" frameborder="0" allowfullscreen></iframe>
                                     </div>
-
                                     <a href="#"></a><span></span>
                                 </li>
                             <?php endforeach; ?>
@@ -19,8 +19,8 @@
      * @var PortfolioUser $portfolio_user
      */
     $this->params[ 'user' ] = $user;
+    $this->title = 'Proektant.net';
-    $this->title = 'My Yii Application';
     $rating = $portfolio->getRatingValue();
     if(!empty( $portfolio_user )) {
         $portfolio_user_gallery = $portfolio->ShowGallery($portfolio_user->gallery->photo);
@@ -10,7 +10,8 @@
      * @var $portfolio yii\data\ArrayDataProvider
      */
     $this->params[ 'user' ] = $user;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
@@ -11,8 +11,8 @@
      * @var ActiveDataProvider $dataProvider
      */
     $this->params[ 'user' ] = $user;
+    $this->title = 'Proektant.net';
-    $this->title = 'My Yii Application';
 ?>
 <div class="proektant-profile-content" style="width:100%">
     <div class="search-worker-title style">Сейчас <?= $dataProvider->totalCount ?> предложений</div>
@@ -8,7 +8,8 @@
     use yii\web\View;
     $this->params[ 'user' ] = $user;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
     <?php
@@ -6,7 +6,8 @@
     use common\models\User;
     $this->params[ 'user' ] = $user;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
     <div class="workplace-wr">
@@ -20,7 +20,8 @@
     $active_key = array_keys($sort_array)[ 0 ];
     $active_value = $sort_array[ $active_key ];
     $sort_name = ( ( $active_value == 4 ) ? '-' : '' ) . $active_key;
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
 <div class="section-box content">
@@ -16,8 +16,8 @@
     use yii\web\View;
     use yii\widgets\ActiveForm;
     use yii\widgets\ListView;
+    $this->title = 'Proektant.net';
-    $this->title = 'My Yii Application';
 ?>
 <div class="section-box content">
@@ -181,7 +181,7 @@
     </div>
     <div>
         <?php
-
+            /*
             ?>
         <div class="section-box" style="height: 720px; overflow: hidden">
             <div class="map-settings-opacity"></div>
@@ -367,7 +367,7 @@
             </div>
             <div id="map_canvas" style="width: 100%; height:100%;"></div>
             <?php
-
+                */
             /* Решено убрать нижний слайдер
             ?>
             <div class="slider_map-wr">
@@ -9,8 +9,8 @@
     use yii\widgets\ListView;
     /* @var $this yii\web\View */
+    $this->title = 'Proektant.net';
-    $this->title = 'My Yii Application';
 ?>
 <div class="section-box content">
@@ -7,7 +7,8 @@
      * @var $this            yii\web\View
      * @var $specializations common\models\Specialization
      */
-    $this->title = 'My Yii Application';
+    $this->title = 'Proektant.net';
+
 ?>
 <?php
     CustomizeBootstrapAsset::register($this);
@@ -60,6 +61,9 @@
         </div>
     </div>
 </div>
+<?php
+/*
+?>
 <div class="section-box-2">
     <div class="box-wr">
         <div class="box-all">
@@ -113,7 +117,9 @@
         <div id="map_main" style="width: 100%; height:100%;"></div>
     </div>
 </div>
-
+<?php
+*/
+?>
 <div class="section-box-4">
     <div class="box-wr">
         <div class="box-all">
 <?php
 /* @var $this yii\web\View */
+	$this->title = 'Proektant.net';
-$this->title = 'My Yii Application';
 ?>
 <div id="content">
     <form action="" method="post">
@@ -12,8 +12,8 @@
     use yii\web\View;
     use yii\widgets\DetailView;
     use yii\widgets\Pjax;
+    $this->title = 'Proektant.net';
-    $this->title = 'My Yii Application';
 ?>
 <div class="section-box content">
     <div class="section-box-tender">
@@ -894,8 +894,12 @@ $(document).ready(
                 $('.video-slider ul li').click(
                     function(e)
                     {
-                        $('.video-full').append('<div class="closed-form"></div>')
                         e.preventDefault()
+                        if(!$('#overlay').length) {
+                            $('body').append('<div id="overlay"></div>');
+                        }
+                        $('.video-full').append('<div class="closed-form"></div>')
+
                         $('#overlay').fadeIn(
                             400, function()
                             {