Administrator / test_3

Commit 69d2da6cf99d6d17e5d0e8b28faa38d4f493e388

Authored by Виталий
1 parent d42eaf3d

git

Showing 2 changed files with 79 additions and 70 deletions   Show diff stats
Inline Side-by-side
frontend/views/projects/_projects_list_view.php
  Show/Hide comments   View file @69d2da6
... ... @@ -12,86 +12,90 @@
12 12 use yii\widgets\ListView;
13 13 $chat = \Yii::$app->user->identity->getChat($model->project->user_id)->one();
14 14 ?>
15   -<div class="left-left-proektant-cabinet">
16   - <?php
17   - echo Html::a($model->project->name, ['tender/view', 'tender_id' => $model->project->project_id], ['class' => 'srch-prof-title']);
18   - ?>
19   - <div class="srch-prof-budget">
20   - <span></span>
21   - Бюджет:
  15 +<div style="position: relative" class="style">
  16 + <div class="left-left-proektant-cabinet">
22 17 <?php
  18 + echo Html::a($model->project->name, ['tender/view', 'tender_id' => $model->project->project_id], ['class' => 'srch-prof-title']);
  19 + ?>
  20 + <div class="srch-prof-budget">
  21 + <span></span>
  22 + Бюджет:
  23 + <?php
23 24 if($model->project->contractual) {
24 25 echo 'Договорной';
25 26 } else {
26 27 echo $model->project->budget . ' ' . $model->project->budgetCurrency->label;
27 28 }
28   - ?>
29   - </div>
30   -
31   - <div class="srch-prof-text">
32   - <?= $model->project->description ?>
33   - </div>
34   - <div class="srch-prof-params-wr">
35   - <div class="srch-prof-params srch-prof-params-city">
36   - <img src="/images/ico-city.png" alt=""/><span><?= $model->project->city ?></span>
  29 + ?>
37 30 </div>
38   - <div class="srch-prof-params srch-prof-params-clock">
39   - <img src="/images/ico-clock.png" alt=""/><span><?= \Yii::$app->formatter->asDate(time($model->project->description), 'php:d.m.Y') ?></span>
  31 +
  32 + <div class="srch-prof-text">
  33 + <?= $model->project->description ?>
40 34 </div>
41   - <div class="srch-prof-params srch-prof-params-comm">
42   - <img src="/images/ico-comm.png" alt=""/><span><?= count($model->project->comments) ?> предложения</span>
  35 + <div class="srch-prof-params-wr">
  36 + <div class="srch-prof-params srch-prof-params-city">
  37 + <img src="/images/ico-city.png" alt=""/><span><?= $model->project->city ?></span>
  38 + </div>
  39 + <div class="srch-prof-params srch-prof-params-clock">
  40 + <img src="/images/ico-clock.png" alt=""/><span><?= \Yii::$app->formatter->asDate(time($model->project->description), 'php:d.m.Y') ?></span>
  41 + </div>
  42 + <div class="srch-prof-params srch-prof-params-comm">
  43 + <img src="/images/ico-comm.png" alt=""/><span><?= count($model->project->comments) ?> предложения</span>
  44 + </div>
43 45 </div>
44 46 </div>
45   -</div>
46 47  
47   -<div class="right-proektant-cabinet">
48   - <div class="right-proektant-cabinet-candidate">
49   - <img src="/images/cabinet/ico-<?= $model->state ?>.png" alt=""/>
  48 + <div class="right-proektant-cabinet">
  49 + <div class="style">
  50 + <div class="right-proektant-cabinet-candidate">
  51 + <img src="/images/cabinet/ico-<?= $model->state ?>.png" alt=""/>
50 52 <span>
51 53 <?php
52   - switch($model->state) {
53   - case 1:
54   - echo 'Заказчик еще не рассмотрел Ваше предложение';
55   - break;
56   - case 2:
57   - echo 'Ваша кандидатура на рассмотрении';
58   - break;
59   - case 3:
60   - echo 'Вы назначены исполнителем';
61   - break;
62   - case 4:
63   - echo 'Заказчик отказал Вашему предложению';
64   - break;
65   - case 5:
66   - echo 'Вы отказались от данного предложения';
67   - break;
68   - }
  54 + switch($model->state) {
  55 + case 1:
  56 + echo 'Заказчик еще не рассмотрел Ваше предложение';
  57 + break;
  58 + case 2:
  59 + echo 'Ваша кандидатура на рассмотрении';
  60 + break;
  61 + case 3:
  62 + echo 'Вы назначены исполнителем';
  63 + break;
  64 + case 4:
  65 + echo 'Заказчик отказал Вашему предложению';
  66 + break;
  67 + case 5:
  68 + echo 'Вы отказались от данного предложения';
  69 + break;
  70 + }
69 71 ?>
70 72 </span>
71   - </div>
72   - <div style="clear:both"></div>
73   - <div class="right-proektant-cabinet-message-new">
74   - <img src="/images/cabinet/ico-6.png" alt=""/>
75   - <?php
76   - echo Html::a((empty($chat))?0:count($chat->messages) . ' сообщения', [
77   - 'chat/message',
78   - 'user_id' => $model->project->user_id,
79   - ]);
80   - if($model->state == $model::STATE_DENY) {
81   -
82   - } elseif($model->state == $model::STATE_TRASH) {
83   - echo Html::a('Отменить', [ '#' ], [
84   - 'data-project-id' => $model->project->project_id,
85   - 'data-comment-id' => $model->comment_id,
86   - 'class' => 'artbox_project_make_new',
87   - ]);
88   - } else {
89   - echo Html::a('Отказаться', [ '#' ], [
90   - 'data-project-id' => $model->project->project_id,
91   - 'data-comment-id' => $model->comment_id,
92   - 'class' => 'artbox_project_make_trash',
  73 + </div>
  74 +<!-- <div style="clear:both"></div>-->
  75 + <div class="right-proektant-cabinet-message-new">
  76 + <img src="/images/cabinet/ico-6.png" alt=""/>
  77 + <?php
  78 + echo Html::a((empty($chat))?0:count($chat->messages) . ' сообщения', [
  79 + 'chat/message',
  80 + 'user_id' => $model->project->user_id,
93 81 ]);
94   - }
95   - ?>
  82 + if($model->state == $model::STATE_DENY) {
  83 +
  84 + } elseif($model->state == $model::STATE_TRASH) {
  85 + echo Html::a('Отменить', [ '#' ], [
  86 + 'data-project-id' => $model->project->project_id,
  87 + 'data-comment-id' => $model->comment_id,
  88 + 'class' => 'artbox_project_make_new',
  89 + ]);
  90 + } else {
  91 + echo Html::a('Отказаться', [ '#' ], [
  92 + 'data-project-id' => $model->project->project_id,
  93 + 'data-comment-id' => $model->comment_id,
  94 + 'class' => 'artbox_project_make_trash',
  95 + ]);
  96 + }
  97 + ?>
  98 + </div>
  99 + </div>
96 100 </div>
97 101 </div>
98 102 \ No newline at end of file
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @69d2da6
... ... @@ -5759,11 +5759,14 @@ ul.min_markers_two {
5759 5759 }
5760 5760  
5761 5761 .right-proektant-cabinet {
5762   - width: 216px;
5763   - float: right;
  5762 + width: 222px;
5764 5763 box-sizing: border-box;
5765 5764 padding-right: 9px;
5766   -
  5765 + padding-left: 20px;
  5766 + position: absolute;
  5767 + top:0;
  5768 + right: 0;
  5769 + height: 100%;
5767 5770 }
5768 5771  
5769 5772 .left-proektant-cabinet .srch-prof-text {
... ... @@ -5779,7 +5782,8 @@ ul.min_markers_two {
5779 5782 }
5780 5783  
5781 5784 .left-proektant-cabinet .srch-prof-budget span {
5782   - margin-right: 9px
  5785 + margin-right: 9px;
  5786 + margin-left: 12px;
5783 5787 }
5784 5788  
5785 5789 .left-proektant-cabinet .srch-prof-params-wr {
... ... @@ -5789,7 +5793,8 @@ ul.min_markers_two {
5789 5793 .left-proektant-cabinet .search-profile-blocks {
5790 5794 margin-top: 26px;
5791 5795 width: 100%;
5792   - padding-bottom: 19px
  5796 + padding-bottom: 19px;
  5797 + position: relative;
5793 5798 }
5794 5799  
5795 5800 .left-proektant-cabinet .search-profile-blocks:first-child {
... ...