Commit 3aea4f9cad999129d62febfe14f6cd9796dc9097
1 parent
8fe48e6f
git
Showing
2 changed files
with
48 additions
and
43 deletions
Show diff stats
common/modules/comment/widgets/views/_project_comment_view.php
@@ -117,9 +117,8 @@ | @@ -117,9 +117,8 @@ | ||
117 | <div class="tender-more-buttons-wr"> | 117 | <div class="tender-more-buttons-wr"> |
118 | <?= Html::a('Портфолио', $user->getLink('portfolio'), [ 'class' => 'get-project-new' ]) ?> | 118 | <?= Html::a('Портфолио', $user->getLink('portfolio'), [ 'class' => 'get-project-new' ]) ?> |
119 | <?= Html::a('Контакты', $user->link, [ 'class' => 'get-list-new' ]) ?> | 119 | <?= Html::a('Контакты', $user->link, [ 'class' => 'get-list-new' ]) ?> |
120 | - </div> | ||
121 | - <div style="clear:both"></div> | ||
122 | - <?php | 120 | + |
121 | + <?php | ||
123 | if($model->status == $model::STATUS_ANONYMOUS) { | 122 | if($model->status == $model::STATUS_ANONYMOUS) { |
124 | echo Html::tag('div', 'Анонимное предложение', [ 'class' => 'project_status' ]); | 123 | echo Html::tag('div', 'Анонимное предложение', [ 'class' => 'project_status' ]); |
125 | } | 124 | } |
@@ -128,23 +127,23 @@ | @@ -128,23 +127,23 @@ | ||
128 | <div class="project_owner_state"> | 127 | <div class="project_owner_state"> |
129 | <p> | 128 | <p> |
130 | <?php | 129 | <?php |
131 | - switch($model->state) { | ||
132 | - case 1: | ||
133 | - echo 'Предложение не рассмотрено'; | ||
134 | - break; | ||
135 | - case 2: | ||
136 | - echo 'Исполнитель поставлен на рассмотрение'; | ||
137 | - break; | ||
138 | - case 3: | ||
139 | - echo 'Исполнитель назначен исполнителем'; | ||
140 | - break; | ||
141 | - case 4: | ||
142 | - echo 'Вы отказали данному исполнителю'; | ||
143 | - break; | ||
144 | - case 5: | ||
145 | - echo 'Исполнитель отказался от данного предложения'; | ||
146 | - break; | ||
147 | - } | 130 | + switch($model->state) { |
131 | + case 1: | ||
132 | + echo 'Предложение не рассмотрено'; | ||
133 | + break; | ||
134 | + case 2: | ||
135 | + echo 'Исполнитель поставлен на рассмотрение'; | ||
136 | + break; | ||
137 | + case 3: | ||
138 | + echo 'Исполнитель назначен исполнителем'; | ||
139 | + break; | ||
140 | + case 4: | ||
141 | + echo 'Вы отказали данному исполнителю'; | ||
142 | + break; | ||
143 | + case 5: | ||
144 | + echo 'Исполнитель отказался от данного предложения'; | ||
145 | + break; | ||
146 | + } | ||
148 | ?> | 147 | ?> |
149 | </p> | 148 | </p> |
150 | </div> | 149 | </div> |
@@ -154,31 +153,33 @@ | @@ -154,31 +153,33 @@ | ||
154 | <div class="project_owner_control"> | 153 | <div class="project_owner_control"> |
155 | <span>Отметить как: </span> | 154 | <span>Отметить как: </span> |
156 | <?php | 155 | <?php |
157 | - echo Html::a('новый', [ '#' ], [ | ||
158 | - 'data-project-id' => $model->owner->project_id, | ||
159 | - 'data-comment-id' => $model->comment_id, | ||
160 | - 'class' => 'artbox_project_make_new', | ||
161 | - ]); | ||
162 | - echo Html::a('кандидат', [ '#' ], [ | ||
163 | - 'data-project-id' => $model->owner->project_id, | ||
164 | - 'data-comment-id' => $model->comment_id, | ||
165 | - 'class' => 'artbox_project_make_candidate', | ||
166 | - ]); | ||
167 | - echo Html::a('исполнитель', [ '#' ], [ | ||
168 | - 'data-project-id' => $model->owner->project_id, | ||
169 | - 'data-comment-id' => $model->comment_id, | ||
170 | - 'class' => 'artbox_project_make_performer', | ||
171 | - ]); | ||
172 | - echo Html::a('отказать', [ '#' ], [ | ||
173 | - 'data-project-id' => $model->owner->project_id, | ||
174 | - 'data-comment-id' => $model->comment_id, | ||
175 | - 'class' => 'artbox_project_make_deny', | ||
176 | - ]); | 156 | + echo Html::a('новый', [ '#' ], [ |
157 | + 'data-project-id' => $model->owner->project_id, | ||
158 | + 'data-comment-id' => $model->comment_id, | ||
159 | + 'class' => 'artbox_project_make_new', | ||
160 | + ]); | ||
161 | + echo Html::a('кандидат', [ '#' ], [ | ||
162 | + 'data-project-id' => $model->owner->project_id, | ||
163 | + 'data-comment-id' => $model->comment_id, | ||
164 | + 'class' => 'artbox_project_make_candidate', | ||
165 | + ]); | ||
166 | + echo Html::a('исполнитель', [ '#' ], [ | ||
167 | + 'data-project-id' => $model->owner->project_id, | ||
168 | + 'data-comment-id' => $model->comment_id, | ||
169 | + 'class' => 'artbox_project_make_performer', | ||
170 | + ]); | ||
171 | + echo Html::a('отказать', [ '#' ], [ | ||
172 | + 'data-project-id' => $model->owner->project_id, | ||
173 | + 'data-comment-id' => $model->comment_id, | ||
174 | + 'class' => 'artbox_project_make_deny', | ||
175 | + ]); | ||
177 | ?> | 176 | ?> |
178 | </div> | 177 | </div> |
179 | <?php | 178 | <?php |
180 | } | 179 | } |
181 | } | 180 | } |
182 | - ?> | 181 | + ?> |
182 | + </div> | ||
183 | + | ||
183 | 184 | ||
184 | </div> | 185 | </div> |
frontend/web/css/style.css
@@ -4437,7 +4437,7 @@ ul.min_markers_two | @@ -4437,7 +4437,7 @@ ul.min_markers_two | ||
4437 | .tender-offer-proj-block-left { | 4437 | .tender-offer-proj-block-left { |
4438 | width: 625px; | 4438 | width: 625px; |
4439 | float: left; | 4439 | float: left; |
4440 | - min-height: 387px; | 4440 | + min-height: 401px; |
4441 | box-sizing: border-box; | 4441 | box-sizing: border-box; |
4442 | padding-left: 18px; | 4442 | padding-left: 18px; |
4443 | } | 4443 | } |
@@ -4494,10 +4494,11 @@ ul.download-list-files li:first-child {margin-top: 0} | @@ -4494,10 +4494,11 @@ ul.download-list-files li:first-child {margin-top: 0} | ||
4494 | ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";} | 4494 | ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";} |
4495 | .tender-more-buttons-wr { | 4495 | .tender-more-buttons-wr { |
4496 | height: 29px; | 4496 | height: 29px; |
4497 | - width: 600px; | 4497 | + width: 100%; |
4498 | float: left; | 4498 | float: left; |
4499 | box-sizing: border-box; | 4499 | box-sizing: border-box; |
4500 | padding-left: 18px; | 4500 | padding-left: 18px; |
4501 | + position: relative; | ||
4501 | } | 4502 | } |
4502 | .tender-more-buttons-wr a:after{display: none} | 4503 | .tender-more-buttons-wr a:after{display: none} |
4503 | .tender-more-buttons-wr a{ | 4504 | .tender-more-buttons-wr a{ |
@@ -7085,6 +7086,9 @@ li.active-menu-admin:hover a .ico_num { | @@ -7085,6 +7086,9 @@ li.active-menu-admin:hover a .ico_num { | ||
7085 | border: 1px solid #0054a6 !important; | 7086 | border: 1px solid #0054a6 !important; |
7086 | color: #fff !important; | 7087 | color: #fff !important; |
7087 | } | 7088 | } |
7089 | +.project_owner_control a{ | ||
7090 | + color: #000; | ||
7091 | +} | ||
7088 | /*Rating glyphicon*/ | 7092 | /*Rating glyphicon*/ |
7089 | @font-face { | 7093 | @font-face { |
7090 | font-family: 'Glyphicons Halflings'; | 7094 | font-family: 'Glyphicons Halflings'; |