tokar commit

Виталий
1 parent 4bc945bc
Showing 6 changed files with 107 additions and 16 deletions Show diff stats
frontend/views/layouts/company.php
frontend/views/search/company.php
frontend/views/search/performer.php
frontend/views/site/forms-modal-offer.php
frontend/web/css/style.css
frontend/web/js/forms.js
@@ -16,10 +16,17 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                     <div class="performance-vacancy-call-back">
                         <div class="performance-vacancy-call-back-title">Оставьте заявку<br />и мы вам перезвоним</div>
                         <form class="callback" action="">
-                            <label for="callbac_name">Имя</label>
-                            <input id="callbac_name" type="text"/>
-                            <label for="callbac_phone">Телефон</label>
-                            <input id="callbac_phone"  type="text"/>
+
+                            <div class="input-blocks-wrapper">
+                                <label for="callbac_name">Имя</label>
+                                <input id="callbac_name" type="text"/>
+                            </div>
+
+                            <div class="input-blocks-wrapper">
+                                <label for="callbac_phone">Телефон</label>
+                                <input id="callbac_phone"  type="text"/>
+                            </div>
+
                             <input id="callbac_submit" type="submit" value="Перезвонить мне"/>
                         </form>
                         <div class="performance-vacancy-call-back-conf">Гарантируем конфидециальность</div>
@@ -100,6 +100,12 @@ use yii\widgets\ListView;
                             <input type="submit" value="Найти"/>
                         </div>
                     </form>
+                    <script>
+                        $('div.rating').rating({
+                            fx: 'full',
+                            url: 'rating.php'
+                        });
+                    </script>
                 </div>
                 <div class="right-search-work">
                     <div class="search-worker-title style">Найти исполнителя</div>
@@ -144,6 +150,14 @@ use yii\widgets\ListView;
                         ?>
                     </div>
+                    <script>
+                        $('div.rating-new').rating({
+                            fx: 'full',
+                            readOnly: 'true',
+                            url: 'rating.php'
+                        });
+                    </script>
+
                 </div>
             </div>
         </div>
@@ -159,6 +159,12 @@ $this-&gt;title = &#39;My Yii Application&#39;;
                             <input type="submit" value="Найти"/>
                         </div>
                     </form>
+                    <script>
+                        $('div.rating').rating({
+                            fx: 'full',
+                            url: 'rating.php'
+                        });
+                    </script>
                 </div>
                 <div class="right-search-work">
                     <div class="search-worker-title style">Найти исполнителя</div>
@@ -203,6 +209,14 @@ $this-&gt;title = &#39;My Yii Application&#39;;
                     </div>
+
+                    <script>
+                        $('div.rating-new').rating({
+                            fx: 'full',
+                            readOnly: 'true',
+                            url: 'rating.php'
+                        });
+                    </script>
                 </div>
             </div>
         </div>
@@ -44,7 +44,7 @@
         <div class="form-resume-sub style">Предложить проект</div>
         <form action="" class="offer-project">
-            <label>Выбрать проект</label><div style="clear:both;"></div>
+            <label>Выбрать проект</label>
             <div class="list_item title">
                 <div class="main_item">
                     <div class="pr_title"></div>
@@ -77,11 +77,6 @@
                 </div>
             </div>
-            <label for="off_name">Название проекта</label><input id="off_name" name="" type="text">
-
-            <label for="off_text">Описание</label><textarea id="off_text" name=""></textarea>
-
-            <label for="off_price">Цена</label><input id="off_price" name="" type="text">
             <input id="off_submit" type="submit" value="Предложить">
         </form>
@@ -89,5 +84,56 @@
     </div>
 </div>
+<!--<div id="modal_form_offer">-->
+<!--    <div class="closed-form"></div>-->
+<!--    <div class="form-resume-wr offer">-->
+<!--        <div class="form-resume-sub style">Предложить проект</div>-->
+<!--        <form action="" class="offer-project">-->
+<!---->
+<!--            <label>Выбрать проект</label><div style="clear:both;"></div>-->
+<!--            <div class="list_item title">-->
+<!--                <div class="main_item">-->
+<!--                    <div class="pr_title"></div>-->
+<!--                    <span></span>-->
+<!--                </div>-->
+<!--                <div class="arrow up"></div>-->
+<!--                <div class="off_list">-->
+<!--                    <ul class="content list-form-offer">-->
+<!--                        <li>-->
+<!--                            <div class="title1">Проект бассейна 1</div>-->
+<!--                            <div class="title2">Подряд: Вилла 1</div>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <div class="title1">Проект бассейна 2</div>-->
+<!--                            <div class="title2">Подряд: Вилла 2</div>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <div class="title1">Проект бассейна 3</div>-->
+<!--                            <div class="title2">Подряд: Вилла 3</div>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <div class="title1">Проект бассейна 4</div>-->
+<!--                            <div class="title2">Подряд: Вилла 4</div>-->
+<!--                        </li>-->
+<!--                        <li>-->
+<!--                            <div class="title1">Проект бассейна 5</div>-->
+<!--                            <div class="title2">Подряд: Вилла 5</div>-->
+<!--                        </li>-->
+<!--                    </ul>-->
+<!--                </div>-->
+<!--            </div>-->
+<!---->
+<!--            <label for="off_name">Название проекта</label><input id="off_name" name="" type="text">-->
+<!---->
+<!--            <label for="off_text">Описание</label><textarea id="off_text" name=""></textarea>-->
+<!---->
+<!--            <label for="off_price">Цена</label><input id="off_price" name="" type="text">-->
+<!---->
+<!--            <input id="off_submit" type="submit" value="Предложить">-->
+<!--        </form>-->
+<!--        <div class="res_form_line"></div>-->
+<!--    </div>-->
+<!--</div>-->
+
@@ -2886,6 +2886,7 @@ input[type=file]::-webkit-file-upload-button {
     left: 0;
 }
 .search-worker-blocks  .search-worker-blocks-jobs-portfolio {margin-bottom: 41px}
+.search-company-block-left  .search-worker-blocks-jobs-portfolio {margin-bottom: 31px}
 .gallery-box-search {
     width: 100%;
@@ -3265,10 +3266,13 @@ ul.proektant-comments {margin-top: 15px}
 .search-company-block-left {
     width: 400px;
     float: left;
+    min-height: 320px;
+    position: relative;
 }
 .search-company-block-right {
     width: 320px;
     float: right;
+    min-height: 320px;
 }
 .search-company-block-left .search-worker-blocks-title-wr {float: left; width: 100% !important;}
 .search-company-block-left .land-stars-pro, .land-stars-new {margin-right: 11px}
@@ -3429,7 +3433,8 @@ ul.proektant-comments {margin-top: 15px}
 .favorite-user-profile-add span{line-height: 18px}
 form.offer-project {
-    height: 531px;
+    /*height: 531px;*/
+    height: 211px;
 }
 #off_submit {
     bottom: 25px;
@@ -4121,7 +4126,8 @@ ul.min_markers_two
 /*** message-read***/
 .comments_block{width:938px;height:498px;background-color:#fcfcfc;border:1px solid #b7b7b7;border-right:none;margin-bottom:57px;color:#333;font-family:Roboto;font-size:13px;position:relative;overflow:hidden;outline:none}.comment_type{width:940px}.comment_type .pole{width:660px;margin:0 auto;position:relative}.comment_type .mes_title{font-size:18px;color:#333;margin:18px 0}.message_text{width:638px;height:78px;resize:none;border:1px solid #c2c2c2;margin:0 auto;margin-bottom:26px;margin-top:18px;padding:10px;font-family:Roboto}.send_mess_but{outline:none;border:none;cursor:pointer;font-size:12px!important;padding-top:2px;width:170px;height:43px;text-align:center;text-transform:uppercase;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr = '#148ad6',endColorstr = '#0072bc');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr = '#148ad6',endColorstr = '#0072bc')";background-image:-moz-linear-gradient(top,#148ad6,#0072bc);background-image:-ms-linear-gradient(top,#148ad6,#0072bc);background-image:-o-linear-gradient(top,#148ad6,#0072bc);background-image:-webkit-gradient(linear,center top,center bottom,from(#148ad6),to(#0072bc));background-image:-webkit-linear-gradient(top,#148ad6,#0072bc);background-image:linear-gradient(top,#148ad6,#0072bc);color:#fff;border-bottom:2px solid #0054a6;border-radius:4px;transition:.1s;top:170px;line-height:3.5}.send_mess_but:hover{opacity:.9}.send_mess_but:active{line-height:3.7}.pick_file{position:absolute;top:170px;right:0;width:130px}.pick_file .link:after{content:'';background:url(/images/skrpk.png) left center no-repeat;position:absolute;width:19px;height:21px;left:-28px;top:0}.pick_file .link{text-transform:uppercase;color:#0276c0;font-size:13px;cursor:pointer;text-decoration:none;border-bottom:1px solid #70b2db;position:relative}.pick_file .capt{color:#c2c2c2;font-size:11px;line-height:16px;margin-top:3px}.comment_text{position:relative;padding:12px 13px;width:602px;border:1px solid #c2c2c2;min-height:74px;left:10px;line-height:1.3;background-color:#fff}.comment.left .comment_text{float:left}.comment.right .comment_text{float:right}.comment.left .comment_text:before{content:'';background:url(/images/mes_bord_left.png);position:absolute;width:11px;height:11px;top:-1px;left:-11px}.comment.right .comment_text:before{content:'';background:url(/images/mes_bord_right.png);position:absolute;width:11px;height:11px;top:-1px;right:-11px}.comment.left .author_pic{float:left;margin:0 10px}.comment.right .author_pic{float:right;margin:0 25px 0 30px}.comment_time{color:#c6c6c6;font-family:Roboto;font-size:13px;font-weight:600;line-height:32px;position:absolute}.comment.left .comment_time{top: 17px;  right: -120px;  width: 100px;}.comment.right .comment_time{    top: 18px;  left: -88px; width: 100px;}.comment{position:relative;margin:30px 21px 30px 1px}.comment .offer_link a{color:#0173bd;display:block; height:25px; position:relative}.comment .offer_link a:before{content:'';position:absolute;background:url(/images/skrpk_sm.png) left center no-repeat;width:19px;height:21px;left:-26px;top:-3px}.comment.right .offer_link{float:right;margin-right:94px;margin-top:12px;margin-bottom:-17px}.comment.left .offer_link{left:104px;bottom:-27px}.comment_block .content{overflow:auto;width:938px;height:498px}.fileform{background-color:#FFF;border:1px solid #CCC;border-radius:2px;cursor:pointer;height:26px;overflow:hidden;padding:2px;position:relative;text-align:left;vertical-align:middle;width:230px}.comment_type form{width:660px;margin:0 auto}.comment_type form label{color:#333;font-family:Roboto;font-size:18px}.input_file_text{color:#c2c2c2;font-size:11px;font-family:Roboto;width:125px;position:absolute;right:0;line-height:16px;top:18px;overflow:hidden;text-overflow:ellipsis;white-space:pre-line}.inputfile{float:right;position:relative;width:153px;padding-bottom:10px;background-repeat:no-repeat}.input_file{opacity:0;cursor:pointer;width:160px}.inputfile .file_input_title{position:absolute;color:#0276c0;border-bottom:1px solid #0276c0;text-transform:uppercase;font-family:Roboto;font-size:13px;right:0}.jspArrow{background-color:#0173bd;width:20px;height:20px}.jspVerticalBar{width:20px}.jspVerticalBar .jspArrow{height:20px}.jspTrack{background:#ebebeb;position:relative}.jspDrag{background:#c2c2c2;position:relative;top:0;left:0;cursor:pointer;border-left:2px solid #ebebeb;border-right:2px solid #ebebeb}.jspVerticalBar{background:#ebebeb}.jspArrowUp{background:#0173bd url(/images/scroll_up.png) center center no-repeat}.jspArrowUp:hover{opacity:.8}.jspArrowUp:active{background-position-y:1px!important}.jspDisabled.jspArrowUp{background:#80808d url(/images/scroll_up_grey.png) center center no-repeat}.jspArrowDown{background:#0173bd url(/images/scroll_down.png) center center no-repeat}.jspArrowDown:hover{opacity:.8}.jspArrowDown:active{background-position-y:1px!important}.jspArrowDown{background:#0173bd url(/images/scroll_down.png) center center no-repeat}.jspDisabled.jspArrowDown{background:#80808d url(/images/scroll_down_grey.png) center center no-repeat}.jspContainer{outline:none;border:none}
 /***form-order***/
-#modal_form_offer {height: 505px;}
+#modal_form_offer {  /*height: 505px;*/  height: 309px;  }
+#modal_form_offer .form-resume-wr {overflow: visible}
 #modal_form_offer,#modal_form_question, #modal_form_question{margin-top: 70px;}
 .form-resume-wr form input[type="submit"]{margin-left: 55px;}
 .form-resume-wr form{top:72px;}
@@ -4147,6 +4153,7 @@ ul.min_markers_two
     border: 1px solid #dcdcdc;
     position: relative;
     cursor:pointer;
+    z-index: 2;
 }
 .list_item.title{margin-bottom: 15px;}
 .list_item .arrow{
@@ -4176,14 +4183,13 @@ ul.min_markers_two
     border: 4px solid transparent;
     border-top-color: white;
 }
-form.offer-project {height: 406px;}
+
 .list_item .main_item{padding: 10px 37px 12px 12px;transition:0.3s;}
 .off_list ul li:hover{background-color: #fffccc;	}
 .act-offer-li{opacity: 0.6; cursor: default }
 .act-offer-li:hover{background-color: #fff !important; }
 .off_list{
     position: absolute;
-    width: 100%;
     width: 238px;
     background-color: white;
     border: 1px solid #dcdcdc;
@@ -6631,8 +6637,8 @@ input[disabled], select[disabled] {
 .rating_search_performer .vote-success, .rating_search_performer .vote-result {
     display: none;
 }
-.rating_search_performer .vote-active {
-    background: url("/images/stars.png") 0px 14px !important;
+.vote-active {
+    top: -1px !important;
 }
 .rating_search_performer .div.vote-stars, .rating_search_performer div.vote-active {
     cursor: default;
@@ -6670,3 +6676,5 @@ input[disabled], select[disabled] {
    margin-bottom: 19px;
 }
 .form_site_logn-wr input.custom-check + label span {margin-top: 1px; margin-right: 6px}
+.callback .input-blocks-wrapper {margin-top: 0}
+.list_item.title {margin-top: 20px}
 \ No newline at end of file
@@ -54,6 +54,7 @@ $(document).ready(function(){
                 var newMarg = $(window).scrollTop();
                 $('#overlay').fadeIn(400,
                     function(){
+                        $('body').css({overflowY:'hidden'})
                         $('.forms-modal-hide>div')
                             .css({display:'block', marginTop:-230+newMarg})
                             .animate({opacity: 1, top: '50%'}, 200);
@@ -110,6 +111,7 @@ $(document).ready(function(){
     clocseModalForms()
     function clocseModalForms(){
         $('body').on('click','.closed-form, #overlay', function(){
+            $('body').css({overflowY:'visible'})
             $('.forms-modal-hide>div')
                 .animate({opacity: 0, top: '30%'}, 200,
                 function(){