Administrator / test_3

Commit d931c15f15333a4b45b3e7528dd52a5c8dfced2c

Authored by Yarik
2 parents eb780746 6668b7fe

Merge remote-tracking branch 'origin/master'

Showing 4 changed files with 194 additions and 215 deletions   Show diff stats
Inline Side-by-side
common/modules/comment/widgets/views/_project_comment_view.php
  Show/Hide comments   View file @d931c15
@@ -152,28 +152,31 @@ @@ -152,28 +152,31 @@
152 ?> 152 ?>
153 <div class="project_owner_control"> 153 <div class="project_owner_control">
154 <span>Отметить как: </span> 154 <span>Отметить как: </span>
155 - <?php  
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'.(($model->state == $model::STATE_NEW)?' active':''),  
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'.(($model->state == $model::STATE_CANDIDATE)?' active':''),  
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'.(($model->state == $model::STATE_PERFORMER)?' active':''),  
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'.(($model->state == $model::STATE_DENY)?' active':''),  
175 - ]);  
176 - ?> 155 + <p class="new_mark_"></p>
  156 + <div>
  157 + <?php
  158 + echo Html::a('новый', [ '#' ], [
  159 + 'data-project-id' => $model->owner->project_id,
  160 + 'data-comment-id' => $model->comment_id,
  161 + 'class' => 'artbox_project_make_new'.(($model->state == $model::STATE_NEW)?' active':''),
  162 + ]);
  163 + echo Html::a('кандидат', [ '#' ], [
  164 + 'data-project-id' => $model->owner->project_id,
  165 + 'data-comment-id' => $model->comment_id,
  166 + 'class' => 'artbox_project_make_candidate'.(($model->state == $model::STATE_CANDIDATE)?' active':''),
  167 + ]);
  168 + echo Html::a('исполнитель', [ '#' ], [
  169 + 'data-project-id' => $model->owner->project_id,
  170 + 'data-comment-id' => $model->comment_id,
  171 + 'class' => 'artbox_project_make_performer'.(($model->state == $model::STATE_PERFORMER)?' active':''),
  172 + ]);
  173 + echo Html::a('отказать', [ '#' ], [
  174 + 'data-project-id' => $model->owner->project_id,
  175 + 'data-comment-id' => $model->comment_id,
  176 + 'class' => 'artbox_project_make_deny'.(($model->state == $model::STATE_DENY)?' active':''),
  177 + ]);
  178 + ?>
  179 + </div>
177 </div> 180 </div>
178 <?php 181 <?php
179 } 182 }
frontend/views/tender/view.php
  Show/Hide comments   View file @d931c15
@@ -316,26 +316,57 @@ $this-&gt;title = &#39;My Yii Application&#39;; @@ -316,26 +316,57 @@ $this-&gt;title = &#39;My Yii Application&#39;;
316 </div> 316 </div>
317 <script> 317 <script>
318 $(document).ready(function () { 318 $(document).ready(function () {
319 - tabs_()  
320 - inputNumber() 319 + tabs_();
  320 + inputNumber();
  321 + tenderMark();
321 function inputNumber() { 322 function inputNumber() {
322 $("#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}) 323 $("#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})
323 } 324 }
324 325
325 function tabs_() { 326 function tabs_() {
  327 + $('.tabs_list').css('display','block')
  328 + $('._tabs').css({display:'none'})
  329 + $('._tabs:first-child').css({display:'block'})
  330 + $('.tabs_list ul li').click(function () {
  331 + $('.tabs_list ul li').removeClass('active')
  332 + $(this).addClass('active')
  333 + var index = $(this).index()
  334 + var tabs = $('._tabs')
  335 + tabs.css({display:'none'})
  336 + $(tabs[index]).css({display:'block'})
  337 + })
  338 + }
  339 + function tenderMark() {
  340 + var markParrent = $('.project_owner_control')
  341 + markParrent.addClass('_on')
  342 + for(var i=0; i<markParrent.length;i++) {
  343 + var markTxt = $(markParrent[i]).find('a.active')
  344 + console.log(markTxt.text())
  345 + $(markParrent[i]).find('p.new_mark_').html(markTxt.text())
  346 + markTxt.css({display:'none'})
  347 + }
  348 +
  349 +
  350 +
  351 + markParrent.click(function () {
  352 + $(this).toggleClass('focus')
  353 + if($(this).hasClass('focus')) {
  354 + $(this).addClass('shadow_')
  355 + var height = $(this).height()
  356 + var newHeight = ($(this).find('div').height())+2
  357 + $(this).css({height:(height+newHeight)})
  358 + markParrent.find('a').click(function () {
  359 + $(this).parent().prev().html($(this).text())
  360 +
  361 + })
  362 + } else {
  363 + $(this).removeClass('shadow_')
  364 + $(this).css({height:29})
  365 + }
  366 + })
326 367
327 } 368 }
328 - $('.tabs_list').css('display','block')  
329 - $('._tabs').css({display:'none'})  
330 - $('._tabs:first-child').css({display:'block'})  
331 - $('.tabs_list ul li').click(function () {  
332 - $('.tabs_list ul li').removeClass('active')  
333 - $(this).addClass('active')  
334 - var index = $(this).index()  
335 - var tabs = $('._tabs')  
336 - tabs.css({display:'none'})  
337 - $(tabs[index]).css({display:'block'})  
338 - }) 369 +
339 }) 370 })
340 </script> 371 </script>
341 <script> 372 <script>
frontend/web/css/style.css
  Show/Hide comments   View file @d931c15
@@ -1696,6 +1696,16 @@ input[type=file]::-webkit-file-upload-button { @@ -1696,6 +1696,16 @@ input[type=file]::-webkit-file-upload-button {
1696 max-width: 180px; 1696 max-width: 180px;
1697 max-height: 180px; 1697 max-height: 180px;
1698 } 1698 }
  1699 +.tender-offer-proj-blocks .performer-vacancy-sidebar-img {
  1700 + height:180px;
  1701 + width: 200px;
  1702 + float: none;
  1703 + display: table-cell;
  1704 + padding: 0 10px;
  1705 + vertical-align: middle;
  1706 + text-align: center;
  1707 +}
  1708 +.tender-offer-proj-blocks .performer-vacancy-sidebar-img img {vertical-align: middle}
1699 .performer-vacancy-sidebar-soc { 1709 .performer-vacancy-sidebar-soc {
1700 1710
1701 } 1711 }
@@ -4390,7 +4400,7 @@ ul.min_markers_two @@ -4390,7 +4400,7 @@ ul.min_markers_two
4390 .tender-map {margin-top: 15px} 4400 .tender-map {margin-top: 15px}
4391 .tender-offer-proj-title-all {text-align: center; font-size: 20px; margin-top: 78px;} 4401 .tender-offer-proj-title-all {text-align: center; font-size: 20px; margin-top: 78px;}
4392 .tender-offer-proj-blocks-wr {padding-bottom: 50px} 4402 .tender-offer-proj-blocks-wr {padding-bottom: 50px}
4393 -.tender-offer-proj-blocks .performer-vacancy-sidebar-left {top: -10px} 4403 +.tender-offer-proj-blocks .performer-vacancy-sidebar-left {top: -10px; padding-top: 10px}
4394 .tender-offer-proj-blocks {padding-bottom: 17px; border-bottom: 1px solid #bababa; margin-top: 50px} 4404 .tender-offer-proj-blocks {padding-bottom: 17px; border-bottom: 1px solid #bababa; margin-top: 50px}
4395 .tender-offer-proj-blocks:first-child{margin-top: 47px} 4405 .tender-offer-proj-blocks:first-child{margin-top: 47px}
4396 .tender-see-profile { 4406 .tender-see-profile {
@@ -4437,7 +4447,7 @@ ul.min_markers_two @@ -4437,7 +4447,7 @@ ul.min_markers_two
4437 .tender-offer-proj-block-left { 4447 .tender-offer-proj-block-left {
4438 width: 625px; 4448 width: 625px;
4439 float: left; 4449 float: left;
4440 - min-height: 401px; 4450 + min-height: 398px;
4441 box-sizing: border-box; 4451 box-sizing: border-box;
4442 padding-left: 18px; 4452 padding-left: 18px;
4443 } 4453 }
@@ -4451,6 +4461,19 @@ ul.min_markers_two @@ -4451,6 +4461,19 @@ ul.min_markers_two
4451 float: left; 4461 float: left;
4452 margin-right: 30px; 4462 margin-right: 30px;
4453 } 4463 }
  4464 +.tender-offer-proj-blocks-wr .search-worker-blocks-title-title {
  4465 + width: 100%;
  4466 +}
  4467 +.tender-offer-proj-blocks-wr .rating-container {
  4468 + width: 100%;
  4469 + float: left;
  4470 + margin-top: 13px;
  4471 +}
  4472 +.tender-offer-proj-blocks-wr .link-to-comm {
  4473 + width: 100%;
  4474 + float: left;
  4475 + margin-top: 10px;
  4476 +}
4454 .tender-offer-proj-block-left .rating-new { 4477 .tender-offer-proj-block-left .rating-new {
4455 margin-right: 30px; 4478 margin-right: 30px;
4456 } 4479 }
@@ -6805,10 +6828,7 @@ input[disabled], select[disabled] { @@ -6805,10 +6828,7 @@ input[disabled], select[disabled] {
6805 .search_customer_image { 6828 .search_customer_image {
6806 height: 100%; 6829 height: 100%;
6807 } 6830 }
6808 -.project_owner_control a {  
6809 - display: inline-block;  
6810 - margin: 0 10px;  
6811 -} 6831 +
6812 .proektant-profile-courses-content { 6832 .proektant-profile-courses-content {
6813 margin-bottom: 10px; 6833 margin-bottom: 10px;
6814 } 6834 }
@@ -7086,9 +7106,105 @@ li.active-menu-admin:hover a .ico_num { @@ -7086,9 +7106,105 @@ li.active-menu-admin:hover a .ico_num {
7086 border: 1px solid #0054a6 !important; 7106 border: 1px solid #0054a6 !important;
7087 color: #fff !important; 7107 color: #fff !important;
7088 } 7108 }
  7109 +.project_owner_control {
  7110 + position: relative;
  7111 + float: right;
  7112 + width: 103px;
  7113 + background: #fff;
  7114 + z-index: 2;
  7115 +}
  7116 +.project_owner_control._on {
  7117 + height: 29px;
  7118 + border: 1px solid #dcdcdc;
  7119 + padding: 0 0 0 10px;
  7120 + width: 148px;
  7121 + box-sizing: border-box;
  7122 + position: relative;
  7123 + cursor: pointer;
  7124 +}
  7125 +
  7126 +.project_owner_control span {
  7127 + position: absolute;
  7128 + top:-23px;
  7129 + left: 0;
  7130 + color: inherit;
  7131 + font-size: 13px;
  7132 + font-weight: 700;
  7133 +}
  7134 +.project_owner_control > div {
  7135 + float: left;
  7136 + background: #fff;
  7137 +}
  7138 +.project_owner_control._on > div {
  7139 + position: absolute;
  7140 + top: 27px;
  7141 + display: none;
  7142 + width: 100%;
  7143 + left: 0;
  7144 +}
  7145 +.project_owner_control._on.focus > div {
  7146 + display: block;
  7147 +}
  7148 +.project_owner_control p{display: none}
  7149 +.project_owner_control._on p{display: block;height: 28px;line-height: 28px; font-size: 13px; position: relative;}
  7150 +.project_owner_control._on.focus p {cursor: default}
  7151 +.project_owner_control._on p:before {
  7152 + width: 8px;
  7153 + height: 4px;
  7154 + position: absolute;
  7155 + content: '';
  7156 + top:50%;
  7157 + margin-top: -2px;
  7158 + right:8px;
  7159 + background: url("../images/arrow-select.png") no-repeat;
  7160 +}
  7161 +.project_owner_control._on.focus p:before {
  7162 + transform: rotate(180deg);
  7163 +}
7089 .project_owner_control a{ 7164 .project_owner_control a{
7090 - color: #000; 7165 + padding: 0;
  7166 + margin: 0;
  7167 + height: auto;
  7168 + line-height: normal;
  7169 + text-align: left;
  7170 + border: 0;
  7171 + width: 100%;
  7172 + text-decoration: underline;
  7173 + float: left;
  7174 + font-size: 13px;
  7175 + color: inherit;
  7176 +}
  7177 +._on.project_owner_control a {
  7178 + text-decoration: none;
  7179 + float: left;
  7180 + height: 28px;
  7181 + border-top: 1px solid #dcdcdc;
  7182 + border-radius: 0;
  7183 + line-height: 28px;
  7184 + background: #fff;
  7185 + box-sizing: border-box;
  7186 + padding-left: 10px;
  7187 +}
  7188 +._on.project_owner_control a:hover {background: #62b8ef; color: #fff}
  7189 +.project_owner_state {
  7190 + font-size: 13px;
  7191 + color: #f10b00;
  7192 + float: left;
  7193 + height: 29px;
7091 } 7194 }
  7195 +.project_owner_state p {
  7196 + display: table-cell;
  7197 + vertical-align: middle;
  7198 + height: 29px;
  7199 + width: 212px;
  7200 + text-align: right;
  7201 + box-sizing: border-box;
  7202 + padding-left: 40px;
  7203 +}
  7204 +.shadow_ {
  7205 + box-shadow: 0px 0px 5px 0px rgba(149, 149, 149, 0.75);
  7206 +}
  7207 +
7092 /*Rating glyphicon*/ 7208 /*Rating glyphicon*/
7093 @font-face { 7209 @font-face {
7094 font-family: 'Glyphicons Halflings'; 7210 font-family: 'Glyphicons Halflings';
frontend/web/js/script.js
  Show/Hide comments   View file @d931c15
@@ -28,7 +28,7 @@ $(document).ready( @@ -28,7 +28,7 @@ $(document).ready(
28 featuresTags(); 28 featuresTags();
29 inputNumber(); 29 inputNumber();
30 videoFull(); 30 videoFull();
31 - fixMenuRadius() 31 + fixMenuRadius();
32 function resizeWindow() 32 function resizeWindow()
33 { 33 {
34 $(window).resize( 34 $(window).resize(
@@ -451,178 +451,6 @@ $(document).ready( @@ -451,178 +451,6 @@ $(document).ready(
451 ); 451 );
452 } 452 }
453 453
454 - // function validationForms(){  
455 - // var jVal_two = {  
456 - //  
457 - // 'comments' : function() {  
458 - // var ele = $('#comments_two');  
459 - // if(ele.val().length < 6) {  
460 - // jVal_two.errors = true;  
461 - // ele.removeClass('normal').addClass('wrong');  
462 - // } else {  
463 - // ele.removeClass('wrong').addClass('normal');  
464 - // }  
465 - // },  
466 - // 'phone' : function (){  
467 - // var ele = $('#phone_two');  
468 - // var patt = /[0-9]/g;  
469 - // if(!patt.test(ele.val())) {  
470 - // jVal_two.errors = true;  
471 - // ele.removeClass('normal').addClass('wrong');  
472 - // } else {  
473 - // ele.removeClass('wrong').addClass('normal');  
474 - // }  
475 - // },  
476 - //  
477 - // 'email' : function() {  
478 - // var ele = $('#email_two');  
479 - // var patt = /^.+@.+[.].{2,}$/i;  
480 - // if(!patt.test(ele.val())) {  
481 - // jVal_two.errors = true;  
482 - // ele.removeClass('normal').addClass('wrong');  
483 - // } else {  
484 - // ele.removeClass('wrong').addClass('normal');  
485 - // }  
486 - // },  
487 - //  
488 - // 'sendIt' : function (){  
489 - // if(!jVal_two.errors) {  
490 - // $('.form-questions').submit();  
491 - // }  
492 - // }  
493 - // };  
494 - //// ====================================================== //  
495 - // $('#send_two').click(function (){  
496 - // var obj = $('body, html');  
497 - // obj.animate({ scrollTop: $('.form-questions').offset().top-151 }, 750, function (){  
498 - // jVal_two.errors = false;  
499 - // jVal_two.comments();  
500 - // jVal_two.phone();  
501 - // jVal_two.email();  
502 - // jVal_two.sendIt();  
503 - // });  
504 - // return false;  
505 - // });  
506 - //  
507 - // $('#comments_two').focusout(function(){  
508 - // jVal_two.comments();  
509 - // });  
510 - // $('#phone_two').focusout(function(){  
511 - // jVal_two.phone();  
512 - // });  
513 - // $('#email_two').focusout(function(){  
514 - // jVal_two.email();  
515 - // });  
516 - //  
517 - // var jVal_cb = {  
518 - //  
519 - // 'cbName' : function() {  
520 - // var ele = $('#callbac_name');  
521 - // if(ele.val().length < 2) {  
522 - // jVal_cb.errors = true;  
523 - // ele.removeClass('normal').addClass('wrong');  
524 - // } else {  
525 - // ele.removeClass('wrong').addClass('normal');  
526 - // }  
527 - // },  
528 - // 'cbPhone' : function (){  
529 - // var ele = $('#callbac_phone');  
530 - // var patt = /[0-9]/g;  
531 - // if(!patt.test(ele.val())) {  
532 - // jVal_cb.errors = true;  
533 - // ele.removeClass('normal').addClass('wrong');  
534 - // } else {  
535 - // ele.removeClass('wrong').addClass('normal');  
536 - // }  
537 - // },  
538 - // 'cbSendIt' : function (){  
539 - // if(!jVal_cb.errors) {  
540 - // $('.callback').submit();  
541 - // }  
542 - // }  
543 - // };  
544 - //// ====================================================== //  
545 - // $('#callbac_submit').click(function (){  
546 - // var obj = $('body, html');  
547 - // obj.animate({ scrollTop: $('.callback').offset().top-151 }, 750, function (){  
548 - // jVal_cb.errors = false;  
549 - // jVal_cb.cbName();  
550 - // jVal_cb.cbPhone();  
551 - // jVal_cb.cbSendIt();  
552 - // });  
553 - // return false;  
554 - // });  
555 - // $('#callbac_name').focusout(function(){  
556 - // jVal_cb.cbName();  
557 - // });  
558 - // $('#callbac_phone').focusout(function(){  
559 - // jVal_cb.cbPhone();  
560 - // });  
561 - //  
562 - // var jVal_res = {  
563 - // 'resNsme' : function() {  
564 - // var ele = $('#res_name');  
565 - // if(ele.val().length < 2) {  
566 - // jVal_res.errors = true;  
567 - // ele.removeClass('normal').addClass('wrong');  
568 - // } else {  
569 - // ele.removeClass('wrong').addClass('normal');  
570 - // }  
571 - // },  
572 - // 'resPhone' : function (){  
573 - // var ele = $('#res_phone');  
574 - // var patt = /[0-9]/g;  
575 - // if(!patt.test(ele.val())) {  
576 - // jVal_res.errors = true;  
577 - // ele.removeClass('normal').addClass('wrong');  
578 - // } else {  
579 - // ele.removeClass('wrong').addClass('normal');  
580 - // }  
581 - // },  
582 - // 'resComm' : function() {  
583 - // var ele = $('#res_text');  
584 - // if(ele.val().length < 6) {  
585 - // jVal_res.errors = true;  
586 - // ele.removeClass('normal').addClass('wrong');  
587 - // } else {  
588 - // ele.removeClass('wrong').addClass('normal');  
589 - // }  
590 - // },  
591 - // 'resSendIt' : function (){  
592 - // if(!jVal_res.errors) {  
593 - // $('.resforms').submit();  
594 - // }  
595 - // }  
596 - // };  
597 - //// ====================================================== //  
598 - // $('#res_submit').click(function (){  
599 - // jVal_res.errors = false;  
600 - // jVal_res.resNsme();  
601 - // jVal_res.resPhone();  
602 - // jVal_res.resComm();  
603 - // jVal_res.resSendIt();  
604 - // return false;  
605 - // });  
606 - //  
607 - // $('#res_name').focusout(function(){  
608 - // jVal_res.resNsme();  
609 - // });  
610 - // $('#res_phone').focusout(function(){  
611 - // jVal_res.resPhone();  
612 - // });  
613 - // $('#res_text').focusout(function(){  
614 - // jVal_res.resComm();  
615 - // });  
616 - // }  
617 -  
618 - //function menuContent(){  
619 - // $('.menu-content li a').click(function(e){  
620 - // e.preventDefault()  
621 - // $('.menu-content li').removeClass('active-menu-content')  
622 - // $(this).parent().addClass('active-menu-content')  
623 - // });  
624 - //}  
625 -  
626 function jobClick() 454 function jobClick()
627 { 455 {
628 456
@@ -1263,5 +1091,6 @@ $(document).ready( @@ -1263,5 +1091,6 @@ $(document).ready(
1263 var radiusLenght = (newRadius.length)-1 1091 var radiusLenght = (newRadius.length)-1
1264 $(newRadius[radiusLenght]).addClass('_fix_radius_') 1092 $(newRadius[radiusLenght]).addClass('_fix_radius_')
1265 } 1093 }
  1094 +
1266 } 1095 }
1267 ); 1096 );
1268 \ No newline at end of file 1097 \ No newline at end of file