Administrator / test_3

Commit 4920d7a3717e2eb91bcfb962826bdf14dd76211c

Authored by Yarik
2 parents 9a26e63d 7cfbdfc4

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 23 additions and 23 deletions   Show diff stats
Inline Side-by-side
frontend/views/company/_company_list_view.php
  Show/Hide comments   View file @4920d7a
1 <?php 1 <?php
2 - /**  
3 - * @var Team $model  
4 - */  
5 - use common\models\Team;  
6 - use yii\helpers\Html;  
7 - $http_pattern = '/^https?.*$/'; 2 +/**
  3 + * @var Team $model
  4 + */
  5 +use common\models\Team;
  6 +use yii\helpers\Html;
  7 +$http_pattern = '/^https?.*$/';
8 ?> 8 ?>
9 <div class="command-block-wrapper"> 9 <div class="command-block-wrapper">
10 <div class="command-block-wr-two"> 10 <div class="command-block-wr-two">
11 <div class="command-block-foto"> 11 <div class="command-block-foto">
12 <?php 12 <?php
13 - if(empty( $model->link )) {  
14 - echo ( $model->photo ? Html::img($model->photo) : '' ) . '<div class="hover-command-bg"></div>';  
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);  
17 - } 13 + if(empty( $model->link )) {
  14 + echo ( $model->photo ? Html::img($model->photo) : '' ) . '<div class="hover-command-bg"></div>';
  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);
  17 + }
18 ?> 18 ?>
19 </div> 19 </div>
20 <div class="command-block-name"> 20 <div class="command-block-name">
@@ -24,20 +24,21 @@ @@ -24,20 +24,21 @@
24 } 24 }
25 ?> 25 ?>
26 <?php 26 <?php
27 - if(!empty($model->firstname)) {  
28 - echo "<p>{$model->lastname}</p>";  
29 - } 27 + if(!empty($model->firstname)) {
  28 + echo "<p>{$model->lastname}</p>";
  29 + }
30 ?> 30 ?>
31 - <?php 31 + <?php
32 if(!empty( $model->department->name )) { 32 if(!empty( $model->department->name )) {
33 ?> 33 ?>
34 <div class="command-block-job"><?= $model->department->name ?></div> 34 <div class="command-block-job"><?= $model->department->name ?></div>
35 - <?php 35 + <?php
36 } 36 }
37 - ?>  
38 - <div class="command-block-line">  
39 - <div class="command-block-line-left"></div>  
40 - <div class="command-block-line-right"></div> 37 + ?>
  38 + <div class="command-block-line">
  39 + <div class="command-block-line-left"></div>
  40 + <div class="command-block-line-right"></div>
  41 + </div>
41 </div> 42 </div>
42 </div> 43 </div>
43 </div> 44 </div>
44 \ No newline at end of file 45 \ No newline at end of file
frontend/views/search/performer.php
  Show/Hide comments   View file @4920d7a
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 <label>Специализации</label> 60 <label>Специализации</label>
61 <div class="required"></div> 61 <div class="required"></div>
62 </div> 62 </div>
63 - <div class="style"> 63 + <div class="new-spec-block style">
64 <ul class="content-menu-first"> 64 <ul class="content-menu-first">
65 <?php foreach($specializations as $specialization): ?> 65 <?php foreach($specializations as $specialization): ?>
66 <li data-img="<?= $specialization->image ?>"> 66 <li data-img="<?= $specialization->image ?>">
@@ -108,7 +108,6 @@ @@ -108,7 +108,6 @@
108 <div class="admin-specialization-selected style"> 108 <div class="admin-specialization-selected style">
109 <ul></ul> 109 <ul></ul>
110 </div> 110 </div>
111 -  
112 <?php 111 <?php
113 // End of new specialization chooser 112 // End of new specialization chooser
114 ?> 113 ?>
@@ -212,7 +211,7 @@ @@ -212,7 +211,7 @@
212 <?= $form->field($model, 'additional_parameters') 211 <?= $form->field($model, 'additional_parameters')
213 ->checkboxList([ 212 ->checkboxList([
214 'with_portfolio' => 'Только с портфолио', 213 'with_portfolio' => 'Только с портфолио',
215 - 'with_comments' => 'Только с мнениями', 214 + 'with_comments' => 'Только с отзывами',
216 'only_free' => 'Только свободные', 215 'only_free' => 'Только свободные',
217 ], [ 216 ], [
218 'item' => function($index, $label, $name, $checked, $value) { 217 'item' => function($index, $label, $name, $checked, $value) {