Commit 9a56c0e3356414b5f4b876dd72603b45c66129a3
1 parent
869aec6f
git
Showing
5 changed files
with
202 additions
and
62 deletions
Show diff stats
common/modules/comment/widgets/views/form-project-comment.php
| @@ -10,12 +10,12 @@ | @@ -10,12 +10,12 @@ | ||
| 10 | 10 | ||
| 11 | $currencies = Currency::getCurrencyDropdown(); | 11 | $currencies = Currency::getCurrencyDropdown(); |
| 12 | ?> | 12 | ?> |
| 13 | +<div class="tender-add-answer-title fix_tender_answer"><?= Yii::t('app', 'add_answer') ?></div> | ||
| 14 | +<div class="new-portf-add-comm style fix-portf_"> | ||
| 13 | 15 | ||
| 14 | -<div class="new-portf-add-comm style"> | ||
| 15 | - <div class="box-wr"> | ||
| 16 | - <div class="box-all"> | ||
| 17 | - <div class="tender-add-answer-title"><?= Yii::t('app', 'add_answer') ?></div> | ||
| 18 | - <div class="form-tender-answer style"> | 16 | + |
| 17 | + | ||
| 18 | + <div class="form-tender-answer _fix_errors_tender style"> | ||
| 19 | <?php | 19 | <?php |
| 20 | $form = ActiveForm::begin([ 'options' => [ 'class' => 'resformsfile MultiFile-intercepted', 'enctype' => 'multipart/form-data' ] ]); | 20 | $form = ActiveForm::begin([ 'options' => [ 'class' => 'resformsfile MultiFile-intercepted', 'enctype' => 'multipart/form-data' ] ]); |
| 21 | ?> | 21 | ?> |
| @@ -96,6 +96,6 @@ | @@ -96,6 +96,6 @@ | ||
| 96 | $form->end(); | 96 | $form->end(); |
| 97 | ?> | 97 | ?> |
| 98 | </div> | 98 | </div> |
| 99 | - </div> | ||
| 100 | - </div> | 99 | + |
| 100 | + | ||
| 101 | </div> | 101 | </div> |
| 102 | \ No newline at end of file | 102 | \ No newline at end of file |
frontend/views/company/_portfolio_list_view.php
| @@ -53,5 +53,5 @@ | @@ -53,5 +53,5 @@ | ||
| 53 | <div class="portfolio-project-views-txt">14</div> | 53 | <div class="portfolio-project-views-txt">14</div> |
| 54 | </div> | 54 | </div> |
| 55 | </div> | 55 | </div> |
| 56 | - <div class="portfolio-project-blocks-tags"><?= StringHelper::truncate(implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')), 20) ?></div> | 56 | + <div title="<?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?>" class="portfolio-project-blocks-tags"><?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?></div> |
| 57 | </div> | 57 | </div> |
| 58 | \ No newline at end of file | 58 | \ No newline at end of file |
frontend/views/performer/_portfolio_list_view.php
| @@ -54,5 +54,5 @@ | @@ -54,5 +54,5 @@ | ||
| 54 | <div class="portfolio-project-views-txt">14</div> | 54 | <div class="portfolio-project-views-txt">14</div> |
| 55 | </div> | 55 | </div> |
| 56 | </div> | 56 | </div> |
| 57 | - <div class="portfolio-project-blocks-tags"><?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?></div> | 57 | + <div title="<?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?>" class="portfolio-project-blocks-tags"><?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?></div> |
| 58 | </div> | 58 | </div> |
| 59 | \ No newline at end of file | 59 | \ No newline at end of file |
frontend/views/tender/view.php
| @@ -222,59 +222,114 @@ $this->title = 'My Yii Application'; | @@ -222,59 +222,114 @@ $this->title = 'My Yii Application'; | ||
| 222 | </div> | 222 | </div> |
| 223 | <div id="map_canvas" style="width: 100%; height:100%;"></div> | 223 | <div id="map_canvas" style="width: 100%; height:100%;"></div> |
| 224 | </div> | 224 | </div> |
| 225 | - <?php | ||
| 226 | - echo \common\modules\comment\widgets\CommentWidget::widget([ | ||
| 227 | - 'context' => $this, | ||
| 228 | - 'model' => $model->className(), | ||
| 229 | - 'model_id' => $model->project_id, | ||
| 230 | - 'comment_class' => \common\modules\comment\models\CommentProjectAnswer::className(), | ||
| 231 | - 'class_options' => [ | ||
| 232 | - 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST, | ||
| 233 | - 'user_id' => \Yii::$app->user->getId(), | ||
| 234 | - 'guestComment' => false, | ||
| 235 | - 'status' => \common\modules\comment\models\Comment::STATUS_ACTIVE, | ||
| 236 | - ], | ||
| 237 | - 'list_options' => [ | ||
| 238 | - 'view' => 'list-comment-question', | ||
| 239 | - ], | ||
| 240 | - 'form_options' => [ | ||
| 241 | - 'view' => 'form-comment-answer', | ||
| 242 | - 'tag' => 'span', | ||
| 243 | - ], | ||
| 244 | - 'options' => [ | ||
| 245 | - 'class' => 'proektant-comments-wr style', | ||
| 246 | - ], | ||
| 247 | - ]); | ||
| 248 | - ?> | ||
| 249 | - <?php | ||
| 250 | - echo \common\modules\comment\widgets\CommentWidget::widget([ | ||
| 251 | - 'context' => $this, | ||
| 252 | - 'model' => $model::className(), | ||
| 253 | - 'model_id' => $model->project_id, | ||
| 254 | - 'comment_class' => \common\modules\comment\models\CommentProject::className(), | ||
| 255 | - 'class_options' => [ | ||
| 256 | - 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST, | ||
| 257 | - 'user_id' => \Yii::$app->user->getId(), | ||
| 258 | - 'guestComment' => false, | ||
| 259 | - 'status' => \common\modules\comment\models\CommentProject::STATUS_ACTIVE, | ||
| 260 | - ], | ||
| 261 | - 'list_options' => [ | ||
| 262 | - 'view' => 'list-project-comment', | ||
| 263 | - 'class' => 'section box tender-offer-proj-wr', | ||
| 264 | - ], | ||
| 265 | - 'form_options' => [ | ||
| 266 | - 'view' => 'form-project-comment', | ||
| 267 | - 'tag' => 'div', | ||
| 268 | - 'class' => 'artbox_comment_form section-box tender-add-answer', | ||
| 269 | - ], | ||
| 270 | - 'options' => [ | ||
| 271 | - 'tag' => false, | ||
| 272 | - ], | ||
| 273 | - ]); | ||
| 274 | - ?> | 225 | + <div class="tabs_1 style"> |
| 226 | + <div class="tabs_list style" style="display: none"> | ||
| 227 | + <div class="box-wr"> | ||
| 228 | + <div class="box-all"> | ||
| 229 | + <ul> | ||
| 230 | + <li class="active">Заявки</li> | ||
| 231 | + <li>Вопрос-Ответ</li> | ||
| 232 | + </ul> | ||
| 233 | + </div> | ||
| 234 | + </div> | ||
| 235 | + | ||
| 236 | + </div> | ||
| 237 | + | ||
| 238 | + <div class="tabs_views-wr"> | ||
| 239 | + <div class="_tabs style"> | ||
| 240 | + <div class="box-wr"> | ||
| 241 | + <div class="box-all"> | ||
| 242 | + <?php | ||
| 243 | + echo \common\modules\comment\widgets\CommentWidget::widget([ | ||
| 244 | + 'context' => $this, | ||
| 245 | + 'model' => $model::className(), | ||
| 246 | + 'model_id' => $model->project_id, | ||
| 247 | + 'comment_class' => \common\modules\comment\models\CommentProject::className(), | ||
| 248 | + 'class_options' => [ | ||
| 249 | + 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST, | ||
| 250 | + 'user_id' => \Yii::$app->user->getId(), | ||
| 251 | + 'guestComment' => false, | ||
| 252 | + 'status' => \common\modules\comment\models\CommentProject::STATUS_ACTIVE, | ||
| 253 | + ], | ||
| 254 | + 'list_options' => [ | ||
| 255 | + 'view' => 'list-project-comment', | ||
| 256 | + 'class' => 'section box tender-offer-proj-wr', | ||
| 257 | + ], | ||
| 258 | + 'form_options' => [ | ||
| 259 | + 'view' => 'form-project-comment', | ||
| 260 | + 'tag' => 'div', | ||
| 261 | + 'class' => 'artbox_comment_form section-box tender-add-answer', | ||
| 262 | + ], | ||
| 263 | + 'options' => [ | ||
| 264 | + 'tag' => false, | ||
| 265 | + ], | ||
| 266 | + ]); | ||
| 267 | + ?> | ||
| 268 | + </div> | ||
| 269 | + </div> | ||
| 270 | + </div> | ||
| 271 | + <div class="_tabs style"> | ||
| 272 | + <div class="box-wr"> | ||
| 273 | + <div class="box-all"> | ||
| 274 | + <?php | ||
| 275 | + echo \common\modules\comment\widgets\CommentWidget::widget([ | ||
| 276 | + 'context' => $this, | ||
| 277 | + 'model' => $model->className(), | ||
| 278 | + 'model_id' => $model->project_id, | ||
| 279 | + 'comment_class' => \common\modules\comment\models\CommentProjectAnswer::className(), | ||
| 280 | + 'class_options' => [ | ||
| 281 | + 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST, | ||
| 282 | + 'user_id' => \Yii::$app->user->getId(), | ||
| 283 | + 'guestComment' => false, | ||
| 284 | + 'status' => \common\modules\comment\models\Comment::STATUS_ACTIVE, | ||
| 285 | + ], | ||
| 286 | + 'list_options' => [ | ||
| 287 | + 'view' => 'list-comment-question', | ||
| 288 | + ], | ||
| 289 | + 'form_options' => [ | ||
| 290 | + 'view' => 'form-comment-answer', | ||
| 291 | + 'tag' => 'span', | ||
| 292 | + ], | ||
| 293 | + 'options' => [ | ||
| 294 | + 'class' => 'proektant-comments-wr style', | ||
| 295 | + ], | ||
| 296 | + ]); | ||
| 297 | + ?> | ||
| 298 | + </div> | ||
| 299 | + </div> | ||
| 300 | + </div> | ||
| 301 | + </div> | ||
| 302 | + </div> | ||
| 303 | + | ||
| 304 | + | ||
| 305 | + | ||
| 275 | 306 | ||
| 276 | </div> | 307 | </div> |
| 277 | <script> | 308 | <script> |
| 309 | + $(document).ready(function () { | ||
| 310 | + tabs_() | ||
| 311 | + inputNumber() | ||
| 312 | + function inputNumber() { | ||
| 313 | + $("#commentproject-budget_from, #commentproject-budget_to, #commentproject-term_from, #commentproject-term_to").keypress(function(e){return 8==e.which||e.which>47&&e.which<58?void 0:!1}) | ||
| 314 | + } | ||
| 315 | + | ||
| 316 | + function tabs_() { | ||
| 317 | + | ||
| 318 | + } | ||
| 319 | + $('.tabs_list').css('display','block') | ||
| 320 | + $('._tabs').css({display:'none'}) | ||
| 321 | + $('._tabs:first-child').css({display:'block'}) | ||
| 322 | + $('.tabs_list ul li').click(function () { | ||
| 323 | + $('.tabs_list ul li').removeClass('active') | ||
| 324 | + $(this).addClass('active') | ||
| 325 | + var index = $(this).index() | ||
| 326 | + var tabs = $('._tabs') | ||
| 327 | + tabs.css({display:'none'}) | ||
| 328 | + $(tabs[index]).css({display:'block'}) | ||
| 329 | + }) | ||
| 330 | + }) | ||
| 331 | +</script> | ||
| 332 | +<script> | ||
| 278 | $('div.rating, div.rating-new').rating({ | 333 | $('div.rating, div.rating-new').rating({ |
| 279 | fx: 'full', | 334 | fx: 'full', |
| 280 | readOnly: 'true', | 335 | readOnly: 'true', |
frontend/web/css/style.css
| @@ -3121,11 +3121,11 @@ input[type=file]::-webkit-file-upload-button { | @@ -3121,11 +3121,11 @@ input[type=file]::-webkit-file-upload-button { | ||
| 3121 | position: relative; | 3121 | position: relative; |
| 3122 | } | 3122 | } |
| 3123 | .portfolio-project-blocks-tags:before { | 3123 | .portfolio-project-blocks-tags:before { |
| 3124 | - ontent: ''; | 3124 | + content: ''; |
| 3125 | position: absolute; | 3125 | position: absolute; |
| 3126 | width: 7px; | 3126 | width: 7px; |
| 3127 | height: 100%; | 3127 | height: 100%; |
| 3128 | - right: 14px; | 3128 | + right: 19px; |
| 3129 | top: 0; | 3129 | top: 0; |
| 3130 | opacity: 1; | 3130 | opacity: 1; |
| 3131 | background: -moz-linear-gradient(left, rgba(255,255,255,0.5) 0%, rgba(255,255,255,1) 100%); | 3131 | background: -moz-linear-gradient(left, rgba(255,255,255,0.5) 0%, rgba(255,255,255,1) 100%); |
| @@ -4722,7 +4722,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m | @@ -4722,7 +4722,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m | ||
| 4722 | outline: none; | 4722 | outline: none; |
| 4723 | } | 4723 | } |
| 4724 | .custom-input-2.fix-input-2 {width: 100%} | 4724 | .custom-input-2.fix-input-2 {width: 100%} |
| 4725 | -.custom-input-2:focus, .selectize-input input:focus, .search-work-form select:focus, input.hasDatepicker:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none} | 4725 | +.custom-input-2:focus, .selectize-input input:focus, .search-work-form select:focus, input.hasDatepicker:focus, ._fix_errors_tender input:focus, ._fix_errors_tender select:focus, ._fix_errors_tender textarea:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none} |
| 4726 | .input-blocks select {margin-top: 5px} | 4726 | .input-blocks select {margin-top: 5px} |
| 4727 | .input-blocks label, .skills-title { | 4727 | .input-blocks label, .skills-title { |
| 4728 | font-size: 13px; | 4728 | font-size: 13px; |
| @@ -6968,4 +6968,89 @@ li.active-menu-admin:hover a .ico_num { | @@ -6968,4 +6968,89 @@ li.active-menu-admin:hover a .ico_num { | ||
| 6968 | float: left; | 6968 | float: left; |
| 6969 | margin-bottom: 16px; | 6969 | margin-bottom: 16px; |
| 6970 | 6970 | ||
| 6971 | +} | ||
| 6972 | +.tabs_list { | ||
| 6973 | + border-bottom: 1px solid #dcdcdc; | ||
| 6974 | +} | ||
| 6975 | +.tabs_list ul{ | ||
| 6976 | + width: 100%; | ||
| 6977 | + float: left; | ||
| 6978 | + height: 42px; | ||
| 6979 | +} | ||
| 6980 | +.tabs_list ul li { | ||
| 6981 | + list-style: none; | ||
| 6982 | + float: left; | ||
| 6983 | + background: #f1f1f1; | ||
| 6984 | + height: 42px; | ||
| 6985 | + line-height: 42px; | ||
| 6986 | + color: inherit; | ||
| 6987 | + font-size: 15px; | ||
| 6988 | + padding: 0 20px; | ||
| 6989 | + cursor: pointer; | ||
| 6990 | + border-top: 3px solid #f1f1f1; | ||
| 6991 | + box-sizing: border-box; | ||
| 6992 | +} | ||
| 6993 | +.tabs_list ul li.active { | ||
| 6994 | + background: #fff; | ||
| 6995 | + border-top: 3px solid #0072bc; | ||
| 6996 | + color: #0072bc; | ||
| 6997 | + position: relative; | ||
| 6998 | +} | ||
| 6999 | + | ||
| 7000 | + | ||
| 7001 | +.tabs_list ul li.active:before { | ||
| 7002 | + width: 100%; | ||
| 7003 | + height: 40px; | ||
| 7004 | + border-right: 1px solid #dcdcdc; | ||
| 7005 | + border-bottom: 1px solid #fff; | ||
| 7006 | + position: absolute; | ||
| 7007 | + left: 0; | ||
| 7008 | + bottom: -1px; | ||
| 7009 | + content: ''; | ||
| 7010 | + box-sizing: border-box; | ||
| 7011 | +} | ||
| 7012 | +.tabs_list ul li:first-child:before { | ||
| 7013 | + border-left: 1px solid #dcdcdc; | ||
| 7014 | + border-right: 0; | ||
| 7015 | +} | ||
| 7016 | +.tabs_1 { | ||
| 7017 | + margin-top: 40px; | ||
| 7018 | +} | ||
| 7019 | +.fix_tender_answer { | ||
| 7020 | + text-align: left; | ||
| 7021 | + font-size: 18px; | ||
| 7022 | +} | ||
| 7023 | +.form-tender-answer .form-value-wr { | ||
| 7024 | + margin-top: 15px; | ||
| 7025 | +} | ||
| 7026 | +.new-portf-add-comm.fix-portf_ {padding-top: 0} | ||
| 7027 | +#commentproject-budget_from, #commentproject-budget_to, #commentproject-term_from, #commentproject-term_to { | ||
| 7028 | + -webkit-appearance: none; | ||
| 7029 | + -moz-appearance:textfield; | ||
| 7030 | + appearance: none; | ||
| 7031 | +} | ||
| 7032 | +#commentproject-budget_from::-webkit-inner-spin-button, #commentproject-budget_to::-webkit-inner-spin-button, #commentproject-term_from::-webkit-inner-spin-button, #commentproject-term_to::-webkit-inner-spin-button { | ||
| 7033 | + -webkit-appearance: none; | ||
| 7034 | +} | ||
| 7035 | +._fix_errors_tender .help-block{ | ||
| 7036 | + display: none; | ||
| 7037 | +} | ||
| 7038 | +._fix_errors_tender .has-error input, ._fix_errors_tender .has-error textarea { | ||
| 7039 | + border:1px solid #f10b00; | ||
| 7040 | +} | ||
| 7041 | +._fix_errors_tender .form-price-wr span {margin-left: 10px; display: block; width: 55px; float: left} | ||
| 7042 | +._fix_errors_tender .form-price-wr span:first-child {margin-left: 0} | ||
| 7043 | +._fix_errors_tender select {background: #fff; padding-left: 5px} | ||
| 7044 | +._fix_errors_tender .get-project-new { | ||
| 7045 | + height: 29px !important; | ||
| 7046 | + line-height: 29px !important; | ||
| 7047 | + background: #087dc8 !important; | ||
| 7048 | + border-bottom: 1px solid #0054a6; | ||
| 7049 | +} | ||
| 7050 | +._fix_errors_tender .get-list-new { | ||
| 7051 | + height: 29px !important; | ||
| 7052 | + line-height: 29px !important; | ||
| 7053 | + background: none !important; | ||
| 7054 | + border: 1px solid #0072bc !important; | ||
| 7055 | + color: #0072bc !important; | ||
| 6971 | } | 7056 | } |
| 6972 | \ No newline at end of file | 7057 | \ No newline at end of file |