From 69d2da6cf99d6d17e5d0e8b28faa38d4f493e388 Mon Sep 17 00:00:00 2001
From: Веталь <icemate.job@gmail.com>
Date: Wed, 11 May 2016 11:27:20 +0300
Subject: [PATCH] git

---
 frontend/views/projects/_projects_list_view.php | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
 frontend/web/css/style.css                      |  15 ++++++++++-----
 2 files changed, 79 insertions(+), 70 deletions(-)

diff --git a/frontend/views/projects/_projects_list_view.php b/frontend/views/projects/_projects_list_view.php
index 8b1e944..81a9c8b 100644
--- a/frontend/views/projects/_projects_list_view.php
+++ b/frontend/views/projects/_projects_list_view.php
@@ -12,86 +12,90 @@
     use yii\widgets\ListView;
     $chat = \Yii::$app->user->identity->getChat($model->project->user_id)->one();
 ?>
-<div class="left-left-proektant-cabinet">
-    <?php
-    echo Html::a($model->project->name, ['tender/view', 'tender_id' => $model->project->project_id], ['class' => 'srch-prof-title']);
-    ?>
-    <div class="srch-prof-budget">
-        <span></span>
-        Бюджет:
+<div style="position: relative" class="style">
+    <div class="left-left-proektant-cabinet">
         <?php
+        echo Html::a($model->project->name, ['tender/view', 'tender_id' => $model->project->project_id], ['class' => 'srch-prof-title']);
+        ?>
+        <div class="srch-prof-budget">
+            <span></span>
+            Бюджет:
+            <?php
             if($model->project->contractual) {
                 echo 'Договорной';
             } else {
                 echo $model->project->budget . ' ' . $model->project->budgetCurrency->label;
             }
-        ?>
-    </div>
-
-    <div class="srch-prof-text">
-        <?= $model->project->description ?>
-    </div>
-    <div class="srch-prof-params-wr">
-        <div class="srch-prof-params srch-prof-params-city">
-            <img src="/images/ico-city.png" alt=""/><span><?= $model->project->city ?></span>
+            ?>
         </div>
-        <div class="srch-prof-params srch-prof-params-clock">
-            <img src="/images/ico-clock.png" alt=""/><span><?= \Yii::$app->formatter->asDate(time($model->project->description), 'php:d.m.Y') ?></span>
+
+        <div class="srch-prof-text">
+            <?= $model->project->description ?>
         </div>
-        <div class="srch-prof-params srch-prof-params-comm">
-            <img src="/images/ico-comm.png" alt=""/><span><?= count($model->project->comments) ?> предложения</span>
+        <div class="srch-prof-params-wr">
+            <div class="srch-prof-params srch-prof-params-city">
+                <img src="/images/ico-city.png" alt=""/><span><?= $model->project->city ?></span>
+            </div>
+            <div class="srch-prof-params srch-prof-params-clock">
+                <img src="/images/ico-clock.png" alt=""/><span><?= \Yii::$app->formatter->asDate(time($model->project->description), 'php:d.m.Y') ?></span>
+            </div>
+            <div class="srch-prof-params srch-prof-params-comm">
+                <img src="/images/ico-comm.png" alt=""/><span><?= count($model->project->comments) ?> предложения</span>
+            </div>
         </div>
     </div>
-</div>
 
-<div class="right-proektant-cabinet">
-    <div class="right-proektant-cabinet-candidate">
-        <img src="/images/cabinet/ico-<?= $model->state ?>.png" alt=""/>
+    <div class="right-proektant-cabinet">
+        <div class="style">
+            <div class="right-proektant-cabinet-candidate">
+                <img src="/images/cabinet/ico-<?= $model->state ?>.png" alt=""/>
         <span>
             <?php
-                switch($model->state) {
-                    case 1:
-                        echo 'Заказчик еще не рассмотрел Ваше предложение';
-                        break;
-                    case 2:
-                        echo 'Ваша кандидатура на рассмотрении';
-                        break;
-                    case 3:
-                        echo 'Вы назначены исполнителем';
-                        break;
-                    case 4:
-                        echo 'Заказчик отказал Вашему предложению';
-                        break;
-                    case 5:
-                        echo 'Вы отказались от данного предложения';
-                        break;
-                }
+            switch($model->state) {
+                case 1:
+                    echo 'Заказчик еще не рассмотрел Ваше предложение';
+                    break;
+                case 2:
+                    echo 'Ваша кандидатура на рассмотрении';
+                    break;
+                case 3:
+                    echo 'Вы назначены исполнителем';
+                    break;
+                case 4:
+                    echo 'Заказчик отказал Вашему предложению';
+                    break;
+                case 5:
+                    echo 'Вы отказались от данного предложения';
+                    break;
+            }
             ?>
         </span>
-    </div>
-    <div style="clear:both"></div>
-    <div class="right-proektant-cabinet-message-new">
-        <img src="/images/cabinet/ico-6.png" alt=""/>
-        <?php
-            echo Html::a((empty($chat))?0:count($chat->messages) . ' сообщения', [
-                'chat/message',
-                'user_id' => $model->project->user_id,
-            ]);
-            if($model->state == $model::STATE_DENY) {
-
-            } elseif($model->state == $model::STATE_TRASH) {
-                echo Html::a('Отменить', [ '#' ], [
-                    'data-project-id' => $model->project->project_id,
-                    'data-comment-id' => $model->comment_id,
-                    'class'           => 'artbox_project_make_new',
-                ]);
-            } else {
-                echo Html::a('Отказаться', [ '#' ], [
-                    'data-project-id' => $model->project->project_id,
-                    'data-comment-id' => $model->comment_id,
-                    'class'           => 'artbox_project_make_trash',
+            </div>
+<!--            <div style="clear:both"></div>-->
+            <div class="right-proektant-cabinet-message-new">
+                <img src="/images/cabinet/ico-6.png" alt=""/>
+                <?php
+                echo Html::a((empty($chat))?0:count($chat->messages) . ' сообщения', [
+                    'chat/message',
+                    'user_id' => $model->project->user_id,
                 ]);
-            }
-        ?>
+                if($model->state == $model::STATE_DENY) {
+
+                } elseif($model->state == $model::STATE_TRASH) {
+                    echo Html::a('Отменить', [ '#' ], [
+                        'data-project-id' => $model->project->project_id,
+                        'data-comment-id' => $model->comment_id,
+                        'class'           => 'artbox_project_make_new',
+                    ]);
+                } else {
+                    echo Html::a('Отказаться', [ '#' ], [
+                        'data-project-id' => $model->project->project_id,
+                        'data-comment-id' => $model->comment_id,
+                        'class'           => 'artbox_project_make_trash',
+                    ]);
+                }
+                ?>
+            </div>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 0005a91..73eb10e 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -5759,11 +5759,14 @@ ul.min_markers_two {
 }
 
 .right-proektant-cabinet {
-    width: 216px;
-    float: right;
+    width: 222px;
     box-sizing: border-box;
     padding-right: 9px;
-
+    padding-left: 20px;
+    position: absolute;
+    top:0;
+    right: 0;
+    height: 100%;
 }
 
 .left-proektant-cabinet .srch-prof-text {
@@ -5779,7 +5782,8 @@ ul.min_markers_two {
 }
 
 .left-proektant-cabinet .srch-prof-budget span {
-    margin-right: 9px
+    margin-right: 9px;
+    margin-left: 12px;
 }
 
 .left-proektant-cabinet .srch-prof-params-wr {
@@ -5789,7 +5793,8 @@ ul.min_markers_two {
 .left-proektant-cabinet .search-profile-blocks {
     margin-top: 26px;
     width: 100%;
-    padding-bottom: 19px
+    padding-bottom: 19px;
+    position: relative;
 }
 
 .left-proektant-cabinet .search-profile-blocks:first-child {
--
libgit2 0.21.4