diff --git a/common/modules/comment/widgets/views/_project_comment_view.php b/common/modules/comment/widgets/views/_project_comment_view.php index 39d8b98..42edb06 100644 --- a/common/modules/comment/widgets/views/_project_comment_view.php +++ b/common/modules/comment/widgets/views/_project_comment_view.php @@ -103,7 +103,10 @@ ?>
  • - name, $file->dir, [ 'class' => 'download-link-file' ]) ?> + name, $file->dir, [ + 'class' => 'download-link-file', + 'download' => 'download' + ]) ?> dir, [ 'class' => 'download-link', 'download' => 'download', diff --git a/frontend/views/projects/_projects_list_view.php b/frontend/views/projects/_projects_list_view.php index 81a9c8b..594aa24 100644 --- a/frontend/views/projects/_projects_list_view.php +++ b/frontend/views/projects/_projects_list_view.php @@ -46,56 +46,79 @@
    -
    -
    - - - state) { - case 1: - echo 'Заказчик еще не рассмотрел Ваше предложение'; - break; - case 2: - echo 'Ваша кандидатура на рассмотрении'; - break; - case 3: - echo 'Вы назначены исполнителем'; - break; - case 4: - echo 'Заказчик отказал Вашему предложению'; - break; - case 5: - echo 'Вы отказались от данного предложения'; - break; - } - ?> - -
    - -
    - - 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', - ]); - } - ?> -
    -
    + + + + +
    + + + + +
    +
    + + + + + +
    + + state) { + case 1: + echo 'Заказчик еще не рассмотрел Ваше предложение'; + break; + case 2: + echo 'Ваша кандидатура на рассмотрении'; + break; + case 3: + echo 'Вы назначены исполнителем'; + break; + case 4: + echo 'Заказчик отказал Вашему предложению'; + break; + case 5: + echo 'Вы отказались от данного предложения'; + break; + } + ?> + +
    + + +
    + +
    + + messages) . ' сообщения', [ + 'chat/message', + 'user_id' => $model->project->user_id, + ]); + ?> +
    +
    + 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', + ]); + } + ?> +
    +
    +
    \ No newline at end of file diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 73eb10e..47bd4bc 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -3454,7 +3454,8 @@ input[type=file]::-webkit-file-upload-button { } .section-box-22 { - margin-top: 30px + margin-top: 30px; + padding-bottom: 50px; } .left-search-work { @@ -5311,7 +5312,8 @@ form.offer-project { /***search-profile***/ .search-profile-blocks { - background: #fcfcfc; + /*background: #fcfcfc;*/ + background: #f1f1f1; margin-top: 30px; box-sizing: border-box; border-radius: 4px; @@ -5760,9 +5762,6 @@ ul.min_markers_two { .right-proektant-cabinet { width: 222px; - box-sizing: border-box; - padding-right: 9px; - padding-left: 20px; position: absolute; top:0; right: 0; @@ -5793,7 +5792,7 @@ ul.min_markers_two { .left-proektant-cabinet .search-profile-blocks { margin-top: 26px; width: 100%; - padding-bottom: 19px; + /*padding-bottom: 19px;*/ position: relative; } @@ -5842,25 +5841,21 @@ ul.min_markers_two { margin-bottom: 50px } -.right-proektant-cabinet-candidate, .right-proektant-cabinet-message, .right-proektant-cabinet-message-new { +.right-proektant-cabinet-message { float: right; } .right-proektant-cabinet-candidate { - margin-top: 3px; -} + width: 100%; -.right-proektant-cabinet-candidate img { - float: left; - margin-top: 10px; - margin-right: 6px; } + + .right-proektant-cabinet-candidate span { font-size: 11px; color: #0072bc; border-bottom: 1px solid #0072bc; - padding-bottom: 2px; } .right-proektant-cabinet-message { @@ -5870,7 +5865,8 @@ ul.min_markers_two { } .right-proektant-cabinet-message-new { - margin-top: 2px + width: 100%; + margin-top: 12px; } .right-proektant-cabinet-message-new img { @@ -10883,7 +10879,7 @@ li.active-menu-admin:hover a .ico_num { color: #0072bc !important; } -._fix_errors_tender .get-list-new:hover, .fix_te .artbox_comment_reply_answer:hover { +._fix_errors_tender .get-list-new:hover, .fix_te .artbox_comment_reply_answer:hover, .artbox_project_make_trash:hover, .artbox_project_make_new:hover { background: #148ad6 !important; border: 1px solid #148ad6 !important; color: #fff !important; @@ -10898,7 +10894,7 @@ li.active-menu-admin:hover a .ico_num { box-shadow: none } -._fix_errors_tender .get-list-new:active, .fix_te .artbox_comment_reply_answer:active { +._fix_errors_tender .get-list-new:active, .fix_te .artbox_comment_reply_answer:active, .artbox_project_make_trash:active, .artbox_project_make_new:active { background: #0054a6 !important; border: 1px solid #0054a6 !important; color: #fff !important; @@ -12160,7 +12156,7 @@ li.active-menu-admin:hover a .ico_num { text-decoration: underline } -.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .artbox_comment_delete { +.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .artbox_comment_delete, .artbox_project_make_trash, .artbox_project_make_new { border-radius: 4px; display: block; float: left; @@ -12173,6 +12169,9 @@ li.active-menu-admin:hover a .ico_num { text-align: center; text-decoration: none; } +.artbox_project_make_trash, .artbox_project_make_new { + margin-left: 0; +} .artbox_comment_delete {font-size: 13px; margin-top:15px;} .fix_te .artbox_comment_delete_answer, .artbox_comment_delete { @@ -12323,10 +12322,11 @@ li.active-menu-admin:hover a .ico_num { .fix_onions .comments-name{ font-weight: 700; } -.empty { +.empty, .left-proektant-cabinet .summary { width: 100%; float: left; margin-top: 10px; color: #b7b7b7;; font-size: 13px; -} \ No newline at end of file +} +.left-proektant-cabinet .summary {color: inherit;margin-top: 0} -- libgit2 0.21.4