Administrator / test_3

Commit 4ab2c4752990a170e363e5cb4863a95fbcb5767c

Authored by Yarik
1 parent b4b45984

Commit

Showing 4 changed files with 46 additions and 16 deletions   Show diff stats
Inline Side-by-side
common/models/Job.php
  Show/Hide comments   View file @4ab2c47
... ... @@ -48,7 +48,7 @@
48 48 $this->date_end = \Yii::$app->formatter->asDatetime($this->date_end, 'Y-MM-d HH:mm:ss');
49 49 }
50 50  
51   - return parent::beforeSave($insert); // TODO: Change the autogenerated stub
  51 + return parent::beforeSave($insert);
52 52 }
53 53  
54 54 /**
... ...
frontend/views/layouts/performer.php
  Show/Hide comments   View file @4ab2c47
... ... @@ -3,7 +3,7 @@
3 3 * @var string $content
4 4 * @var View $this
5 5 */
6   -
  6 +
7 7 use common\models\User;
8 8 use kartik\rating\StarRating;
9 9 use yii\helpers\ArrayHelper;
... ... @@ -11,7 +11,7 @@
11 11 use yii\helpers\Url;
12 12 use yii\web\View;
13 13 use yii\widgets\Menu;
14   -
  14 +
15 15 \frontend\assets\AppAsset::register($this);
16 16 $this->beginContent('@app/views/layouts/main.php');
17 17 ?>
... ... @@ -93,14 +93,14 @@
93 93 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false,
94 94 ],
95 95 [
96   - 'label' => 'Блог',
97   - 'url' => [
  96 + 'label' => 'Блог',
  97 + 'url' => [
98 98 'performer/blog-list',
99 99 'performer_id' => $this->params[ 'user' ]->id,
100 100 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
101 101 ],
102 102 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
103   - 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
  103 + 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
104 104 ],
105 105 [
106 106 'label' => 'Мнения',
... ... @@ -111,8 +111,8 @@
111 111 ],
112 112 ],
113 113 [
114   - 'label' => 'Места работы',
115   - 'url' => [
  114 + 'label' => 'Места работы',
  115 + 'url' => [
116 116 'performer/workplace',
117 117 'performer_id' => $this->params[ 'user' ]->id,
118 118 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
... ... @@ -120,8 +120,8 @@
120 120 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
121 121 ],
122 122 [
123   - 'label' => 'Галерея',
124   - 'url' => [
  123 + 'label' => 'Галерея',
  124 + 'url' => [
125 125 'performer/gallery',
126 126 'performer_id' => $this->params[ 'user' ]->id,
127 127 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
... ... @@ -229,7 +229,18 @@
229 229 <li><img src="/images/sidebar-ico/ico-1.png" alt=""/>
230 230 <div class="sidebarvievstxt"><?= $this->params[ 'user' ]->userInfo->view_count ?> просмотра</div>
231 231 </li>
232   - <li><img src="/images/sidebar-ico/ico-9.png" alt=""/>
  232 + <li>
  233 + <?php
  234 + if($this->params[ 'user' ]->userInfo->busy) {
  235 + ?>
  236 + <img src="/images/sidebar-ico/ico_work_01.png" alt=""/>
  237 + <?php
  238 + } else {
  239 + ?>
  240 + <img src="/images/sidebar-ico/ico-9.png" alt=""/>
  241 + <?php
  242 + }
  243 + ?>
233 244 <div class="sidebarvievstxt">
234 245 <span class="sidebar-views-txt">Статус: </span><?= $this->params[ 'user' ]->userInfo->busyText ?>
235 246 </div>
... ... @@ -309,7 +320,20 @@
309 320 <li>
310 321 <img src="/images/sidebar-ico/ico-14.png" alt=""/>
311 322 <div class="sidebarvievstxt">
312   - <span class="sidebar-views-txt">Текущее место работы:<br/></span><?= $this->params[ 'user' ]->currentJob->name ?>
  323 + <span class="sidebar-views-txt">
  324 + Текущее место работы:<br/>
  325 + </span>
  326 + <?php
  327 + if(!empty( $this->params[ 'user' ]->currentJob->link )) {
  328 + ?>
  329 + <a href="<?= $this->params[ 'user' ]->currentJob->link ?>">
  330 + <?= $this->params[ 'user' ]->currentJob->name ?>
  331 + </a>
  332 + <?php
  333 + } else {
  334 + echo $this->params[ 'user' ]->currentJob->name;
  335 + }
  336 + ?>
313 337 </div>
314 338 </li>
315 339 <?php
... ... @@ -325,9 +349,9 @@
325 349 </div>
326 350 </div>
327 351 </div>
328   -
  352 +
329 353 </div>
330   -
  354 +
331 355 </div>
332 356 <script>
333 357 $('div.rating').rating(
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @4ab2c47
... ... @@ -12269,7 +12269,7 @@ li.active-menu-admin:hover a .ico_num {
12269 12269 text-decoration: underline
12270 12270 }
12271 12271  
12272   -.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .artbox_comment_delete, .artbox_project_make_trash, .artbox_project_make_new {
  12272 +.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 {
12273 12273 border-radius: 4px;
12274 12274 display: block;
12275 12275 float: left;
... ... @@ -12287,7 +12287,7 @@ li.active-menu-admin:hover a .ico_num {
12287 12287 margin-left: 0;
12288 12288 }
12289 12289  
12290   -.artbox_comment_delete {
  12290 +.artbox_comment_delete, .artbox_comment_update {
12291 12291 font-size: 13px;
12292 12292 margin-top: 15px;
12293 12293 }
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @4ab2c47
... ... @@ -1092,6 +1092,12 @@ $(document).ready(
1092 1092 var firstPost = $('.blog-post-wr');
1093 1093 $(firstPost[0]).css({marginTop:-1})
1094 1094 }
  1095 +
  1096 + $(document).on('click', '.scroll-img img', function(e) {
  1097 + e.preventDefault();
  1098 + var url = $(this).attr('src');
  1099 + $('.new-portfolio-bg img').attr('src', url);
  1100 + });
1095 1101  
1096 1102 }
1097 1103 );
1098 1104 \ No newline at end of file
... ...