Commit 04e9879ff2aa85caa24290a0d7733aac9ccf24a7
1 parent
69d2da6c
git
Showing
3 changed files
with
97 additions
and
71 deletions
Show diff stats
common/modules/comment/widgets/views/_project_comment_view.php
| @@ -103,7 +103,10 @@ | @@ -103,7 +103,10 @@ | ||
| 103 | ?> | 103 | ?> |
| 104 | <li> | 104 | <li> |
| 105 | <span></span> | 105 | <span></span> |
| 106 | - <?= Html::a($file->name, $file->dir, [ 'class' => 'download-link-file' ]) ?> | 106 | + <?= Html::a($file->name, $file->dir, [ |
| 107 | + 'class' => 'download-link-file', | ||
| 108 | + 'download' => 'download' | ||
| 109 | + ]) ?> | ||
| 107 | <?= Html::a('Скачать', $file->dir, [ | 110 | <?= Html::a('Скачать', $file->dir, [ |
| 108 | 'class' => 'download-link', | 111 | 'class' => 'download-link', |
| 109 | 'download' => 'download', | 112 | 'download' => 'download', |
frontend/views/projects/_projects_list_view.php
| @@ -46,56 +46,79 @@ | @@ -46,56 +46,79 @@ | ||
| 46 | </div> | 46 | </div> |
| 47 | 47 | ||
| 48 | <div class="right-proektant-cabinet"> | 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=""/> | ||
| 52 | - <span> | ||
| 53 | - <?php | ||
| 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 | - } | ||
| 71 | - ?> | ||
| 72 | - </span> | ||
| 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, | ||
| 81 | - ]); | ||
| 82 | - if($model->state == $model::STATE_DENY) { | ||
| 83 | 49 | ||
| 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> | 50 | + <table border="0" cellpadding="0" cellspacing="0" style="position: absolute;width: 100%; height: 100%; top:0; left: 0;"> |
| 51 | + <tr> | ||
| 52 | + <td> | ||
| 53 | + <table border="0" cellpadding="0" cellspacing="0" style="border-left: 1px solid #e8e8e8; box-sizing: border-box;padding-right: 9px; padding-left: 20px;"> | ||
| 54 | + <tr> | ||
| 55 | + <td> | ||
| 56 | + <div class="style right-proektant-cabinet-candidate"> | ||
| 57 | + <table cellspacing="0" cellpadding="0" border="0"> | ||
| 58 | + <tr> | ||
| 59 | + <td width="19" valign="middle"><img style="vertical-align: middle;" src="/images/cabinet/ico-<?= $model->state ?>.png" alt=""/></td> | ||
| 60 | + <td valign="middle" style="line-height: 12px;"> | ||
| 61 | + <span> | ||
| 62 | + <?php | ||
| 63 | + switch($model->state) { | ||
| 64 | + case 1: | ||
| 65 | + echo 'Заказчик еще не рассмотрел Ваше предложение'; | ||
| 66 | + break; | ||
| 67 | + case 2: | ||
| 68 | + echo 'Ваша кандидатура на рассмотрении'; | ||
| 69 | + break; | ||
| 70 | + case 3: | ||
| 71 | + echo 'Вы назначены исполнителем'; | ||
| 72 | + break; | ||
| 73 | + case 4: | ||
| 74 | + echo 'Заказчик отказал Вашему предложению'; | ||
| 75 | + break; | ||
| 76 | + case 5: | ||
| 77 | + echo 'Вы отказались от данного предложения'; | ||
| 78 | + break; | ||
| 79 | + } | ||
| 80 | + ?> | ||
| 81 | + </span> | ||
| 82 | + </td> | ||
| 83 | + </tr> | ||
| 84 | + </table> | ||
| 85 | + | ||
| 86 | + | ||
| 87 | + </div> | ||
| 88 | + | ||
| 89 | + <div class="style right-proektant-cabinet-message-new"> | ||
| 90 | + <img src="/images/cabinet/ico-6.png" alt=""/> | ||
| 91 | + <?php | ||
| 92 | + echo Html::a((empty($chat))?0:count($chat->messages) . ' сообщения', [ | ||
| 93 | + 'chat/message', | ||
| 94 | + 'user_id' => $model->project->user_id, | ||
| 95 | + ]); | ||
| 96 | + ?> | ||
| 97 | + </div> | ||
| 98 | + <div class="style" style="margin-top: 22px;"> | ||
| 99 | + <?php | ||
| 100 | + if($model->state == $model::STATE_DENY) { | ||
| 101 | + | ||
| 102 | + } elseif($model->state == $model::STATE_TRASH) { | ||
| 103 | + echo Html::a('Отменить', [ '#' ], [ | ||
| 104 | + 'data-project-id' => $model->project->project_id, | ||
| 105 | + 'data-comment-id' => $model->comment_id, | ||
| 106 | + 'class' => 'artbox_project_make_new', | ||
| 107 | + ]); | ||
| 108 | + } else { | ||
| 109 | + echo Html::a('Отказаться', [ '#' ], [ | ||
| 110 | + 'data-project-id' => $model->project->project_id, | ||
| 111 | + 'data-comment-id' => $model->comment_id, | ||
| 112 | + 'class' => 'artbox_project_make_trash', | ||
| 113 | + ]); | ||
| 114 | + } | ||
| 115 | + ?> | ||
| 116 | + </div> | ||
| 117 | + </td> | ||
| 118 | + </tr> | ||
| 119 | + </table> | ||
| 120 | + </td> | ||
| 121 | + </tr> | ||
| 122 | + </table> | ||
| 100 | </div> | 123 | </div> |
| 101 | </div> | 124 | </div> |
| 102 | \ No newline at end of file | 125 | \ No newline at end of file |
frontend/web/css/style.css
| @@ -3454,7 +3454,8 @@ input[type=file]::-webkit-file-upload-button { | @@ -3454,7 +3454,8 @@ input[type=file]::-webkit-file-upload-button { | ||
| 3454 | } | 3454 | } |
| 3455 | 3455 | ||
| 3456 | .section-box-22 { | 3456 | .section-box-22 { |
| 3457 | - margin-top: 30px | 3457 | + margin-top: 30px; |
| 3458 | + padding-bottom: 50px; | ||
| 3458 | } | 3459 | } |
| 3459 | 3460 | ||
| 3460 | .left-search-work { | 3461 | .left-search-work { |
| @@ -5311,7 +5312,8 @@ form.offer-project { | @@ -5311,7 +5312,8 @@ form.offer-project { | ||
| 5311 | 5312 | ||
| 5312 | /***search-profile***/ | 5313 | /***search-profile***/ |
| 5313 | .search-profile-blocks { | 5314 | .search-profile-blocks { |
| 5314 | - background: #fcfcfc; | 5315 | + /*background: #fcfcfc;*/ |
| 5316 | + background: #f1f1f1; | ||
| 5315 | margin-top: 30px; | 5317 | margin-top: 30px; |
| 5316 | box-sizing: border-box; | 5318 | box-sizing: border-box; |
| 5317 | border-radius: 4px; | 5319 | border-radius: 4px; |
| @@ -5760,9 +5762,6 @@ ul.min_markers_two { | @@ -5760,9 +5762,6 @@ ul.min_markers_two { | ||
| 5760 | 5762 | ||
| 5761 | .right-proektant-cabinet { | 5763 | .right-proektant-cabinet { |
| 5762 | width: 222px; | 5764 | width: 222px; |
| 5763 | - box-sizing: border-box; | ||
| 5764 | - padding-right: 9px; | ||
| 5765 | - padding-left: 20px; | ||
| 5766 | position: absolute; | 5765 | position: absolute; |
| 5767 | top:0; | 5766 | top:0; |
| 5768 | right: 0; | 5767 | right: 0; |
| @@ -5793,7 +5792,7 @@ ul.min_markers_two { | @@ -5793,7 +5792,7 @@ ul.min_markers_two { | ||
| 5793 | .left-proektant-cabinet .search-profile-blocks { | 5792 | .left-proektant-cabinet .search-profile-blocks { |
| 5794 | margin-top: 26px; | 5793 | margin-top: 26px; |
| 5795 | width: 100%; | 5794 | width: 100%; |
| 5796 | - padding-bottom: 19px; | 5795 | + /*padding-bottom: 19px;*/ |
| 5797 | position: relative; | 5796 | position: relative; |
| 5798 | } | 5797 | } |
| 5799 | 5798 | ||
| @@ -5842,25 +5841,21 @@ ul.min_markers_two { | @@ -5842,25 +5841,21 @@ ul.min_markers_two { | ||
| 5842 | margin-bottom: 50px | 5841 | margin-bottom: 50px |
| 5843 | } | 5842 | } |
| 5844 | 5843 | ||
| 5845 | -.right-proektant-cabinet-candidate, .right-proektant-cabinet-message, .right-proektant-cabinet-message-new { | 5844 | +.right-proektant-cabinet-message { |
| 5846 | float: right; | 5845 | float: right; |
| 5847 | } | 5846 | } |
| 5848 | 5847 | ||
| 5849 | .right-proektant-cabinet-candidate { | 5848 | .right-proektant-cabinet-candidate { |
| 5850 | - margin-top: 3px; | ||
| 5851 | -} | 5849 | + width: 100%; |
| 5852 | 5850 | ||
| 5853 | -.right-proektant-cabinet-candidate img { | ||
| 5854 | - float: left; | ||
| 5855 | - margin-top: 10px; | ||
| 5856 | - margin-right: 6px; | ||
| 5857 | } | 5851 | } |
| 5858 | 5852 | ||
| 5853 | + | ||
| 5854 | + | ||
| 5859 | .right-proektant-cabinet-candidate span { | 5855 | .right-proektant-cabinet-candidate span { |
| 5860 | font-size: 11px; | 5856 | font-size: 11px; |
| 5861 | color: #0072bc; | 5857 | color: #0072bc; |
| 5862 | border-bottom: 1px solid #0072bc; | 5858 | border-bottom: 1px solid #0072bc; |
| 5863 | - padding-bottom: 2px; | ||
| 5864 | } | 5859 | } |
| 5865 | 5860 | ||
| 5866 | .right-proektant-cabinet-message { | 5861 | .right-proektant-cabinet-message { |
| @@ -5870,7 +5865,8 @@ ul.min_markers_two { | @@ -5870,7 +5865,8 @@ ul.min_markers_two { | ||
| 5870 | } | 5865 | } |
| 5871 | 5866 | ||
| 5872 | .right-proektant-cabinet-message-new { | 5867 | .right-proektant-cabinet-message-new { |
| 5873 | - margin-top: 2px | 5868 | + width: 100%; |
| 5869 | + margin-top: 12px; | ||
| 5874 | } | 5870 | } |
| 5875 | 5871 | ||
| 5876 | .right-proektant-cabinet-message-new img { | 5872 | .right-proektant-cabinet-message-new img { |
| @@ -10883,7 +10879,7 @@ li.active-menu-admin:hover a .ico_num { | @@ -10883,7 +10879,7 @@ li.active-menu-admin:hover a .ico_num { | ||
| 10883 | color: #0072bc !important; | 10879 | color: #0072bc !important; |
| 10884 | } | 10880 | } |
| 10885 | 10881 | ||
| 10886 | -._fix_errors_tender .get-list-new:hover, .fix_te .artbox_comment_reply_answer:hover { | 10882 | +._fix_errors_tender .get-list-new:hover, .fix_te .artbox_comment_reply_answer:hover, .artbox_project_make_trash:hover, .artbox_project_make_new:hover { |
| 10887 | background: #148ad6 !important; | 10883 | background: #148ad6 !important; |
| 10888 | border: 1px solid #148ad6 !important; | 10884 | border: 1px solid #148ad6 !important; |
| 10889 | color: #fff !important; | 10885 | color: #fff !important; |
| @@ -10898,7 +10894,7 @@ li.active-menu-admin:hover a .ico_num { | @@ -10898,7 +10894,7 @@ li.active-menu-admin:hover a .ico_num { | ||
| 10898 | box-shadow: none | 10894 | box-shadow: none |
| 10899 | } | 10895 | } |
| 10900 | 10896 | ||
| 10901 | -._fix_errors_tender .get-list-new:active, .fix_te .artbox_comment_reply_answer:active { | 10897 | +._fix_errors_tender .get-list-new:active, .fix_te .artbox_comment_reply_answer:active, .artbox_project_make_trash:active, .artbox_project_make_new:active { |
| 10902 | background: #0054a6 !important; | 10898 | background: #0054a6 !important; |
| 10903 | border: 1px solid #0054a6 !important; | 10899 | border: 1px solid #0054a6 !important; |
| 10904 | color: #fff !important; | 10900 | color: #fff !important; |
| @@ -12160,7 +12156,7 @@ li.active-menu-admin:hover a .ico_num { | @@ -12160,7 +12156,7 @@ li.active-menu-admin:hover a .ico_num { | ||
| 12160 | text-decoration: underline | 12156 | text-decoration: underline |
| 12161 | } | 12157 | } |
| 12162 | 12158 | ||
| 12163 | -.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .artbox_comment_delete { | 12159 | +.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .artbox_comment_delete, .artbox_project_make_trash, .artbox_project_make_new { |
| 12164 | border-radius: 4px; | 12160 | border-radius: 4px; |
| 12165 | display: block; | 12161 | display: block; |
| 12166 | float: left; | 12162 | float: left; |
| @@ -12173,6 +12169,9 @@ li.active-menu-admin:hover a .ico_num { | @@ -12173,6 +12169,9 @@ li.active-menu-admin:hover a .ico_num { | ||
| 12173 | text-align: center; | 12169 | text-align: center; |
| 12174 | text-decoration: none; | 12170 | text-decoration: none; |
| 12175 | } | 12171 | } |
| 12172 | +.artbox_project_make_trash, .artbox_project_make_new { | ||
| 12173 | + margin-left: 0; | ||
| 12174 | +} | ||
| 12176 | .artbox_comment_delete {font-size: 13px; | 12175 | .artbox_comment_delete {font-size: 13px; |
| 12177 | margin-top:15px;} | 12176 | margin-top:15px;} |
| 12178 | .fix_te .artbox_comment_delete_answer, .artbox_comment_delete { | 12177 | .fix_te .artbox_comment_delete_answer, .artbox_comment_delete { |
| @@ -12323,10 +12322,11 @@ li.active-menu-admin:hover a .ico_num { | @@ -12323,10 +12322,11 @@ li.active-menu-admin:hover a .ico_num { | ||
| 12323 | .fix_onions .comments-name{ | 12322 | .fix_onions .comments-name{ |
| 12324 | font-weight: 700; | 12323 | font-weight: 700; |
| 12325 | } | 12324 | } |
| 12326 | -.empty { | 12325 | +.empty, .left-proektant-cabinet .summary { |
| 12327 | width: 100%; | 12326 | width: 100%; |
| 12328 | float: left; | 12327 | float: left; |
| 12329 | margin-top: 10px; | 12328 | margin-top: 10px; |
| 12330 | color: #b7b7b7;; | 12329 | color: #b7b7b7;; |
| 12331 | font-size: 13px; | 12330 | font-size: 13px; |
| 12332 | -} | ||
| 12333 | \ No newline at end of file | 12331 | \ No newline at end of file |
| 12332 | +} | ||
| 12333 | +.left-proektant-cabinet .summary {color: inherit;margin-top: 0} |