Administrator / test_3

Commit 394d4a6ab332ea19fe6c707e4581715e597d3002

Authored by Yarik
1 parent 716f52bf

Commit

Showing 28 changed files with 59 additions and 40 deletions   Show diff stats
Inline Side-by-side
frontend/views/company/_company_list_view.php
  Show/Hide comments   View file @394d4a6
... ... @@ -11,9 +11,9 @@ $http_pattern = '/^https?.*$/';
11 11 <div class="command-block-foto">
12 12 <?php
13 13 if(empty( $model->link )) {
14   - echo ( $model->photo ? Html::img($model->photo) : '' ) . '<div class="hover-command-bg"></div>';
  14 + echo ( Html::img(\Yii::$app->user->identity->minImg($model->photo, 220, 220)) ) . '<div class="hover-command-bg"></div>';
15 15 } else {
16   - 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);
  16 + 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);
17 17 }
18 18 ?>
19 19 </div>
... ...
frontend/views/company/blog-list.php
  Show/Hide comments   View file @394d4a6
... ... @@ -12,7 +12,7 @@
12 12 use yii\widgets\ListView;
13 13  
14 14 $this->params[ 'company' ] = $company;
15   - $this->title = 'My Yii Application';
  15 + $this->title = 'Proektant.net';
16 16 ?>
17 17 <div class="performer-vacancy-vacant-title-reclam-wr style">
18 18  
... ...
frontend/views/company/common.php
  Show/Hide comments   View file @394d4a6
... ... @@ -15,7 +15,7 @@
15 15 use yii\widgets\ListView;
16 16  
17 17 $this->params[ 'company' ] = $company;
18   - $this->title = 'My Yii Application';
  18 + $this->title = 'Proektant.net';
19 19 ?>
20 20 <div class="company-performer-title style">О компании</div>
21 21 <div class="company-performer-txt style">
... ...
frontend/views/company/gallery.php
  Show/Hide comments   View file @394d4a6
1 1 <?php
2 2 use common\models\User;
3   - use yii\widgets\LinkPager;
4 3 use yii\widgets\ListView;
5 4  
6 5 /**
... ... @@ -9,17 +8,18 @@
9 8 */
10 9  
11 10 $this->params[ 'company' ] = $company;
12   - $this->title = 'My Yii Application';
  11 + $this->title = 'Proektant.net';
13 12 if(empty( $videos ) && empty( $gallery->getModels() )) {
14 13 ?>
15 14 <div class="gallery-performer-wrapper style">
16   - <div>
  15 + <div class="gallery-performer-margin">
17 16 Галерей к просмотру не найдено
18 17 </div>
19 18 </div>
20 19 <?php
21 20 } else {
22   - if(!empty( $videos )) { ?>
  21 + if(!empty( $videos )) {
  22 + ?>
23 23 <div class="video-performer-wrapper style">
24 24 <div class="gallery-title">Видео: <?= count($videos) ?></div>
25 25 <div class="slider-video-wr">
... ... @@ -42,7 +42,8 @@
42 42 </div>
43 43 </div>
44 44 </div>
45   - <?php }
  45 + <?php
  46 + }
46 47 ?>
47 48 <div class="gallery-performer-wrapper style">
48 49 <div class="gallery-performer-margin">
... ... @@ -56,6 +57,7 @@
56 57 </div>
57 58 <?php
58 59 }
  60 +
59 61 ?>
60 62 <script>
61 63 $(
... ...
frontend/views/company/portfolio-view.php
  Show/Hide comments   View file @394d4a6
... ... @@ -18,7 +18,7 @@
18 18 */
19 19 $this->params[ 'company' ] = $user;
20 20  
21   - $this->title = 'My Yii Application';
  21 + $this->title = 'Proektant.net';
22 22 $rating = $portfolio->getRatingValue();
23 23 if(!empty( $portfolio_user )) {
24 24 $portfolio_user_gallery = $portfolio->ShowGallery($portfolio_user->gallery->photo);
... ...
frontend/views/company/portfolio.php
  Show/Hide comments   View file @394d4a6
... ... @@ -16,7 +16,7 @@
16 16 * @var int $filter_id
17 17 */
18 18 $this->params[ 'company' ] = $company;
19   - $this->title = 'My Yii Application';
  19 + $this->title = 'Proektant.net';
20 20 ?>
21 21 <div class="performer-vacancy-vacant-title-reclam-wr style">
22 22  
... ...
frontend/views/company/project-list.php
  Show/Hide comments   View file @394d4a6
... ... @@ -12,7 +12,7 @@
12 12 */
13 13 $this->params[ 'company' ] = $company;
14 14  
15   - $this->title = 'My Yii Application';
  15 + $this->title = 'Proektant.net';
16 16 ?>
17 17 <div class="proektant-profile-content" style="width:100%">
18 18 <div class="search-worker-title style">Сейчас <?= $dataProvider->totalCount ?> предложений</div>
... ...
frontend/views/company/review.php
  Show/Hide comments   View file @394d4a6
... ... @@ -8,7 +8,8 @@
8 8 use yii\web\View;
9 9  
10 10 $this->params[ 'company' ] = $company;
11   - $this->title = 'My Yii Application';
  11 + $this->title = 'Proektant.net';
  12 +
12 13 ?>
13 14 <div class="performer-vacancy-vacant-title-reclam-wr style">
14 15 <?php
... ...
frontend/views/company/team.php
  Show/Hide comments   View file @394d4a6
... ... @@ -13,7 +13,8 @@
13 13 use yii\widgets\ListView;
14 14  
15 15 $this->params[ 'company' ] = $company;
16   - $this->title = 'My Yii Application';
  16 + $this->title = 'Proektant.net';
  17 +
17 18 ?>
18 19 <div class="command-blocks-wr style">
19 20 <?= ListView::widget([
... ...
frontend/views/company/vacancy-list.php
  Show/Hide comments   View file @394d4a6
... ... @@ -11,7 +11,8 @@
11 11 use yii\widgets\ListView;
12 12  
13 13 $this->params[ 'company' ] = $company;
14   - $this->title = 'My Yii Application';
  14 + $this->title = 'Proektant.net';
  15 +
15 16 ?>
16 17 <div class="performer-vacancy-vacant-title style">Вакансии</div>
17 18  
... ...
frontend/views/company/vacancy-view.php
  Show/Hide comments   View file @394d4a6
... ... @@ -13,7 +13,8 @@
13 13 use yii\helpers\Url;
14 14  
15 15 $this->params[ 'company' ] = $company;
16   - $this->title = 'My Yii Application';
  16 + $this->title = 'Proektant.net';
  17 +
17 18 ?>
18 19 <div class="performer-vacancy-list style">
19 20 <?php
... ...
frontend/views/layouts/gallery-company.php
  Show/Hide comments   View file @394d4a6
... ... @@ -3,10 +3,9 @@
3 3 use kartik\rating\StarRating;
4 4 use yii\helpers\Html;
5 5 use yii\helpers\Url;
6   - use yii\widgets\Breadcrumbs;
7 6 use yii\widgets\Menu;
8 7  
9   - \frontend\assets\AdminAsset::register($this);
  8 + \frontend\assets\AppAsset::register($this);
10 9 /* @var $content string */
11 10 $this->beginContent('@app/views/layouts/main.php');
12 11 ?>
... ...
frontend/views/layouts/gallery.php
  Show/Hide comments   View file @394d4a6
... ... @@ -3,7 +3,6 @@
3 3 use kartik\rating\StarRating;
4 4 use yii\helpers\Html;
5 5 use yii\helpers\Url;
6   - use yii\widgets\Breadcrumbs;
7 6 use yii\widgets\Menu;
8 7  
9 8 \frontend\assets\AppAsset::register($this);
... ...
frontend/views/performer/blog-list.php
  Show/Hide comments   View file @394d4a6
... ... @@ -10,7 +10,8 @@
10 10 use yii\widgets\ListView;
11 11  
12 12 $this->params[ 'user' ] = $user;
13   - $this->title = 'My Yii Application';
  13 + $this->title = 'Proektant.net';
  14 +
14 15 ?>
15 16 <div class="performer-vacancy-vacant-title-reclam-wr style">
16 17  
... ...
frontend/views/performer/common.php
  Show/Hide comments   View file @394d4a6
... ... @@ -12,8 +12,8 @@
12 12 * @var int[] $geography
13 13 */
14 14 $this->params[ 'user' ] = $user;
15   -
16   - $this->title = 'My Yii Application';
  15 +
  16 + $this->title = 'Proektant.net';
17 17  
18 18 $geographyString = '';
19 19  
... ...
frontend/views/performer/gallery.php
  Show/Hide comments   View file @394d4a6
1 1 <?php
2   -
  2 + use common\models\User;
3 3 use yii\widgets\ListView;
4 4  
5 5 /**
... ... @@ -7,7 +7,8 @@
7 7 */
8 8  
9 9 $this->params[ 'user' ] = $user;
10   - $this->title = 'My Yii Application';
  10 + $this->title = 'Proektant.net';
  11 +
11 12 if(empty( $videos ) && empty( $gallery->getModels() )) {
12 13 ?>
13 14 <div class="gallery-performer-wrapper style">
... ... @@ -29,7 +30,6 @@
29 30 <div class="iframe-video">
30 31 <iframe width="560" height="320" src="<?= $video[ 'youtube' ] ?>" frameborder="0" allowfullscreen></iframe>
31 32 </div>
32   -
33 33 <a href="#"></a><span></span>
34 34 </li>
35 35 <?php endforeach; ?>
... ...
frontend/views/performer/portfolio-view.php
  Show/Hide comments   View file @394d4a6
... ... @@ -19,8 +19,8 @@
19 19 * @var PortfolioUser $portfolio_user
20 20 */
21 21 $this->params[ 'user' ] = $user;
  22 + $this->title = 'Proektant.net';
22 23  
23   - $this->title = 'My Yii Application';
24 24 $rating = $portfolio->getRatingValue();
25 25 if(!empty( $portfolio_user )) {
26 26 $portfolio_user_gallery = $portfolio->ShowGallery($portfolio_user->gallery->photo);
... ...
frontend/views/performer/portfolio.php
  Show/Hide comments   View file @394d4a6
... ... @@ -10,7 +10,8 @@
10 10 * @var $portfolio yii\data\ArrayDataProvider
11 11 */
12 12 $this->params[ 'user' ] = $user;
13   - $this->title = 'My Yii Application';
  13 + $this->title = 'Proektant.net';
  14 +
14 15 ?>
15 16 <div class="performer-vacancy-vacant-title-reclam-wr style">
16 17  
... ...
frontend/views/performer/project-list.php
  Show/Hide comments   View file @394d4a6
... ... @@ -11,8 +11,8 @@
11 11 * @var ActiveDataProvider $dataProvider
12 12 */
13 13 $this->params[ 'user' ] = $user;
  14 + $this->title = 'Proektant.net';
14 15  
15   - $this->title = 'My Yii Application';
16 16 ?>
17 17 <div class="proektant-profile-content" style="width:100%">
18 18 <div class="search-worker-title style">Сейчас <?= $dataProvider->totalCount ?> предложений</div>
... ...
frontend/views/performer/review.php
  Show/Hide comments   View file @394d4a6
... ... @@ -8,7 +8,8 @@
8 8 use yii\web\View;
9 9  
10 10 $this->params[ 'user' ] = $user;
11   - $this->title = 'My Yii Application';
  11 + $this->title = 'Proektant.net';
  12 +
12 13 ?>
13 14 <div class="performer-vacancy-vacant-title-reclam-wr style">
14 15 <?php
... ...
frontend/views/performer/workplace.php
  Show/Hide comments   View file @394d4a6
... ... @@ -6,7 +6,8 @@
6 6 use common\models\User;
7 7  
8 8 $this->params[ 'user' ] = $user;
9   - $this->title = 'My Yii Application';
  9 + $this->title = 'Proektant.net';
  10 +
10 11 ?>
11 12 <div class="performer-vacancy-vacant-title-reclam-wr style">
12 13 <div class="workplace-wr">
... ...
frontend/views/search/performer.php
  Show/Hide comments   View file @394d4a6
... ... @@ -20,7 +20,8 @@
20 20 $active_key = array_keys($sort_array)[ 0 ];
21 21 $active_value = $sort_array[ $active_key ];
22 22 $sort_name = ( ( $active_value == 4 ) ? '-' : '' ) . $active_key;
23   - $this->title = 'My Yii Application';
  23 + $this->title = 'Proektant.net';
  24 +
24 25 ?>
25 26  
26 27 <div class="section-box content">
... ...
frontend/views/search/project.php
  Show/Hide comments   View file @394d4a6
... ... @@ -16,8 +16,8 @@
16 16 use yii\web\View;
17 17 use yii\widgets\ActiveForm;
18 18 use yii\widgets\ListView;
  19 + $this->title = 'Proektant.net';
19 20  
20   - $this->title = 'My Yii Application';
21 21 ?>
22 22  
23 23 <div class="section-box content">
... ... @@ -181,7 +181,7 @@
181 181 </div>
182 182 <div>
183 183 <?php
184   -
  184 + /*
185 185 ?>
186 186 <div class="section-box" style="height: 720px; overflow: hidden">
187 187 <div class="map-settings-opacity"></div>
... ... @@ -367,7 +367,7 @@
367 367 </div>
368 368 <div id="map_canvas" style="width: 100%; height:100%;"></div>
369 369 <?php
370   -
  370 + */
371 371 /* Решено убрать нижний слайдер
372 372 ?>
373 373 <div class="slider_map-wr">
... ...
frontend/views/search/vacancy.php
  Show/Hide comments   View file @394d4a6
... ... @@ -9,8 +9,8 @@
9 9 use yii\widgets\ListView;
10 10  
11 11 /* @var $this yii\web\View */
  12 + $this->title = 'Proektant.net';
12 13  
13   - $this->title = 'My Yii Application';
14 14 ?>
15 15  
16 16 <div class="section-box content">
... ...
frontend/views/site/index.php
  Show/Hide comments   View file @394d4a6
... ... @@ -7,7 +7,8 @@
7 7 * @var $this yii\web\View
8 8 * @var $specializations common\models\Specialization
9 9 */
10   - $this->title = 'My Yii Application';
  10 + $this->title = 'Proektant.net';
  11 +
11 12 ?>
12 13 <?php
13 14 CustomizeBootstrapAsset::register($this);
... ... @@ -60,6 +61,9 @@
60 61 </div>
61 62 </div>
62 63 </div>
  64 +<?php
  65 +/*
  66 +?>
63 67 <div class="section-box-2">
64 68 <div class="box-wr">
65 69 <div class="box-all">
... ... @@ -113,7 +117,9 @@
113 117 <div id="map_main" style="width: 100%; height:100%;"></div>
114 118 </div>
115 119 </div>
116   -
  120 +<?php
  121 +*/
  122 +?>
117 123 <div class="section-box-4">
118 124 <div class="box-wr">
119 125 <div class="box-all">
... ...
frontend/views/site/options.php
  Show/Hide comments   View file @394d4a6
1 1 <?php
2 2  
3 3 /* @var $this yii\web\View */
  4 + $this->title = 'Proektant.net';
4 5  
5   -$this->title = 'My Yii Application';
6 6 ?>
7 7 <div id="content">
8 8 <form action="" method="post">
... ...
frontend/views/tender/view.php
  Show/Hide comments   View file @394d4a6
... ... @@ -12,8 +12,8 @@
12 12 use yii\web\View;
13 13 use yii\widgets\DetailView;
14 14 use yii\widgets\Pjax;
  15 + $this->title = 'Proektant.net';
15 16  
16   - $this->title = 'My Yii Application';
17 17 ?>
18 18 <div class="section-box content">
19 19 <div class="section-box-tender">
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @394d4a6
... ... @@ -894,8 +894,12 @@ $(document).ready(
894 894 $('.video-slider ul li').click(
895 895 function(e)
896 896 {
897   - $('.video-full').append('<div class="closed-form"></div>')
898 897 e.preventDefault()
  898 + if(!$('#overlay').length) {
  899 + $('body').append('<div id="overlay"></div>');
  900 + }
  901 + $('.video-full').append('<div class="closed-form"></div>')
  902 +
899 903 $('#overlay').fadeIn(
900 904 400, function()
901 905 {
... ...