From 6668b7fe8083f7e81a05411e31d7a2b3a3822ba3 Mon Sep 17 00:00:00 2001
From: Веталь <icemate.job@gmail.com>
Date: Mon, 25 Apr 2016 14:39:38 +0300
Subject: [PATCH] git

---
 common/modules/comment/widgets/views/_project_comment_view.php |  47 +++++++++++++++++++++++++----------------------
 frontend/views/tender/view.php                                 |  57 ++++++++++++++++++++++++++++++++++++++++++++-------------
 frontend/web/css/style.css                                     | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 frontend/web/js/script.js                                      | 175 ++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 4 files changed, 194 insertions(+), 215 deletions(-)

diff --git a/common/modules/comment/widgets/views/_project_comment_view.php b/common/modules/comment/widgets/views/_project_comment_view.php
index b023781..39d8b98 100644
--- a/common/modules/comment/widgets/views/_project_comment_view.php
+++ b/common/modules/comment/widgets/views/_project_comment_view.php
@@ -152,28 +152,31 @@
                 ?>
                 <div class="project_owner_control">
                     <span>Отметить как: </span>
-                    <?php
-                    echo Html::a('новый', [ '#' ], [
-                        'data-project-id' => $model->owner->project_id,
-                        'data-comment-id' => $model->comment_id,
-                        'class'           => 'artbox_project_make_new'.(($model->state == $model::STATE_NEW)?' active':''),
-                    ]);
-                    echo Html::a('кандидат', [ '#' ], [
-                        'data-project-id' => $model->owner->project_id,
-                        'data-comment-id' => $model->comment_id,
-                        'class'           => 'artbox_project_make_candidate'.(($model->state == $model::STATE_CANDIDATE)?' active':''),
-                    ]);
-                    echo Html::a('исполнитель', [ '#' ], [
-                        'data-project-id' => $model->owner->project_id,
-                        'data-comment-id' => $model->comment_id,
-                        'class'           => 'artbox_project_make_performer'.(($model->state == $model::STATE_PERFORMER)?' active':''),
-                    ]);
-                    echo Html::a('отказать', [ '#' ], [
-                        'data-project-id' => $model->owner->project_id,
-                        'data-comment-id' => $model->comment_id,
-                        'class'           => 'artbox_project_make_deny'.(($model->state == $model::STATE_DENY)?' active':''),
-                    ]);
-                    ?>
+                    <p class="new_mark_"></p>
+                    <div>
+                        <?php
+                        echo Html::a('новый', [ '#' ], [
+                            'data-project-id' => $model->owner->project_id,
+                            'data-comment-id' => $model->comment_id,
+                            'class'           => 'artbox_project_make_new'.(($model->state == $model::STATE_NEW)?' active':''),
+                        ]);
+                        echo Html::a('кандидат', [ '#' ], [
+                            'data-project-id' => $model->owner->project_id,
+                            'data-comment-id' => $model->comment_id,
+                            'class'           => 'artbox_project_make_candidate'.(($model->state == $model::STATE_CANDIDATE)?' active':''),
+                        ]);
+                        echo Html::a('исполнитель', [ '#' ], [
+                            'data-project-id' => $model->owner->project_id,
+                            'data-comment-id' => $model->comment_id,
+                            'class'           => 'artbox_project_make_performer'.(($model->state == $model::STATE_PERFORMER)?' active':''),
+                        ]);
+                        echo Html::a('отказать', [ '#' ], [
+                            'data-project-id' => $model->owner->project_id,
+                            'data-comment-id' => $model->comment_id,
+                            'class'           => 'artbox_project_make_deny'.(($model->state == $model::STATE_DENY)?' active':''),
+                        ]);
+                        ?>
+                    </div>
                 </div>
                 <?php
             }
diff --git a/frontend/views/tender/view.php b/frontend/views/tender/view.php
index 73399cb..6a4e948 100755
--- a/frontend/views/tender/view.php
+++ b/frontend/views/tender/view.php
@@ -316,26 +316,57 @@ $this->title = 'My Yii Application';
 </div>
 <script>
     $(document).ready(function () {
-        tabs_()
-        inputNumber()
+        tabs_();
+        inputNumber();
+        tenderMark();
         function inputNumber() {
             $("#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})
         }
 
         function tabs_() {
+            $('.tabs_list').css('display','block')
+            $('._tabs').css({display:'none'})
+            $('._tabs:first-child').css({display:'block'})
+            $('.tabs_list ul li').click(function () {
+                $('.tabs_list ul li').removeClass('active')
+                $(this).addClass('active')
+                var index = $(this).index()
+                var tabs = $('._tabs')
+                tabs.css({display:'none'})
+                $(tabs[index]).css({display:'block'})
+            })
+        }
+        function tenderMark() {
+            var markParrent = $('.project_owner_control')
+            markParrent.addClass('_on')
+            for(var i=0; i<markParrent.length;i++) {
+                var markTxt = $(markParrent[i]).find('a.active')
+                console.log(markTxt.text())
+                $(markParrent[i]).find('p.new_mark_').html(markTxt.text())
+                markTxt.css({display:'none'})
+            }
+
+
+
+            markParrent.click(function () {
+                $(this).toggleClass('focus')
+                if($(this).hasClass('focus')) {
+                    $(this).addClass('shadow_')
+                    var height = $(this).height()
+                    var newHeight = ($(this).find('div').height())+2
+                    $(this).css({height:(height+newHeight)})
+                    markParrent.find('a').click(function () {
+                        $(this).parent().prev().html($(this).text())
+
+                    })
+                } else {
+                    $(this).removeClass('shadow_')
+                    $(this).css({height:29})
+                }
+            })
 
         }
-        $('.tabs_list').css('display','block')
-        $('._tabs').css({display:'none'})
-        $('._tabs:first-child').css({display:'block'})
-        $('.tabs_list ul li').click(function () {
-            $('.tabs_list ul li').removeClass('active')
-            $(this).addClass('active')
-            var index = $(this).index()
-            var tabs = $('._tabs')
-            tabs.css({display:'none'})
-            $(tabs[index]).css({display:'block'})
-        })
+
     })
 </script>
 <script>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index d31e905..e322c31 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -1696,6 +1696,16 @@ input[type=file]::-webkit-file-upload-button {
     max-width: 180px;
     max-height: 180px;
 }
+.tender-offer-proj-blocks .performer-vacancy-sidebar-img {
+    height:180px;
+    width: 200px;
+    float: none;
+    display: table-cell;
+    padding: 0 10px;
+    vertical-align: middle;
+    text-align: center;
+}
+.tender-offer-proj-blocks .performer-vacancy-sidebar-img img {vertical-align: middle}
 .performer-vacancy-sidebar-soc {
 
 }
@@ -4390,7 +4400,7 @@ ul.min_markers_two
 .tender-map {margin-top: 15px}
 .tender-offer-proj-title-all {text-align: center; font-size: 20px; margin-top: 78px;}
 .tender-offer-proj-blocks-wr {padding-bottom: 50px}
-.tender-offer-proj-blocks .performer-vacancy-sidebar-left {top: -10px}
+.tender-offer-proj-blocks .performer-vacancy-sidebar-left {top: -10px; padding-top: 10px}
 .tender-offer-proj-blocks {padding-bottom: 17px; border-bottom: 1px solid #bababa; margin-top: 50px}
 .tender-offer-proj-blocks:first-child{margin-top: 47px}
 .tender-see-profile {
@@ -4437,7 +4447,7 @@ ul.min_markers_two
 .tender-offer-proj-block-left {
     width: 625px;
     float: left;
-    min-height: 401px;
+    min-height: 398px;
     box-sizing: border-box;
     padding-left: 18px;
 }
@@ -4451,6 +4461,19 @@ ul.min_markers_two
     float: left;
     margin-right: 30px;
 }
+.tender-offer-proj-blocks-wr .search-worker-blocks-title-title {
+    width: 100%;
+}
+.tender-offer-proj-blocks-wr .rating-container {
+    width: 100%;
+    float: left;
+    margin-top: 13px;
+}
+.tender-offer-proj-blocks-wr .link-to-comm {
+    width: 100%;
+    float: left;
+    margin-top: 10px;
+}
 .tender-offer-proj-block-left .rating-new {
     margin-right: 30px;
 }
@@ -6805,10 +6828,7 @@ input[disabled], select[disabled] {
 .search_customer_image {
     height: 100%;
 }
-.project_owner_control a {
-    display: inline-block;
-    margin: 0 10px;
-}
+
 .proektant-profile-courses-content {
     margin-bottom: 10px;
 }
@@ -7086,9 +7106,105 @@ li.active-menu-admin:hover a .ico_num {
     border: 1px solid #0054a6 !important;
     color: #fff !important;
 }
+.project_owner_control {
+    position: relative;
+    float: right;
+    width: 103px;
+    background: #fff;
+    z-index: 2;
+}
+.project_owner_control._on {
+    height: 29px;
+    border: 1px solid #dcdcdc;
+    padding: 0 0 0 10px;
+    width: 148px;
+    box-sizing: border-box;
+    position: relative;
+    cursor: pointer;
+}
+
+.project_owner_control span {
+    position: absolute;
+    top:-23px;
+    left: 0;
+    color: inherit;
+    font-size: 13px;
+    font-weight: 700;
+}
+.project_owner_control > div {
+    float: left;
+    background: #fff;
+}
+.project_owner_control._on > div {
+    position: absolute;
+    top: 27px;
+    display: none;
+    width: 100%;
+    left: 0;
+}
+.project_owner_control._on.focus > div {
+    display: block;
+}
+.project_owner_control p{display: none}
+.project_owner_control._on p{display: block;height: 28px;line-height: 28px; font-size: 13px; position: relative;}
+.project_owner_control._on.focus p {cursor: default}
+.project_owner_control._on p:before {
+    width: 8px;
+    height: 4px;
+    position: absolute;
+    content: '';
+    top:50%;
+    margin-top: -2px;
+    right:8px;
+    background: url("../images/arrow-select.png") no-repeat;
+}
+.project_owner_control._on.focus p:before {
+    transform: rotate(180deg);
+}
 .project_owner_control a{
-    color: #000;
+    padding: 0;
+    margin: 0;
+    height: auto;
+    line-height: normal;
+    text-align: left;
+    border: 0;
+    width: 100%;
+    text-decoration: underline;
+    float: left;
+    font-size: 13px;
+    color: inherit;
+}
+._on.project_owner_control a {
+    text-decoration: none;
+    float: left;
+    height: 28px;
+    border-top: 1px solid #dcdcdc;
+    border-radius: 0;
+    line-height: 28px;
+    background: #fff;
+    box-sizing: border-box;
+    padding-left: 10px;
+}
+._on.project_owner_control a:hover {background: #62b8ef; color: #fff}
+.project_owner_state {
+    font-size: 13px;
+    color: #f10b00;
+    float: left;
+    height: 29px;
 }
+.project_owner_state p {
+    display: table-cell;
+    vertical-align: middle;
+    height: 29px;
+    width: 212px;
+    text-align: right;
+    box-sizing: border-box;
+    padding-left: 40px;
+}
+.shadow_ {
+    box-shadow: 0px 0px 5px 0px rgba(149, 149, 149, 0.75);
+}
+
 /*Rating glyphicon*/
 @font-face {
     font-family: 'Glyphicons Halflings';
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js
index 64abc1d..c904077 100755
--- a/frontend/web/js/script.js
+++ b/frontend/web/js/script.js
@@ -28,7 +28,7 @@ $(document).ready(
         featuresTags();
         inputNumber();
         videoFull();
-        fixMenuRadius()
+        fixMenuRadius();
         function resizeWindow()
         {
             $(window).resize(
@@ -451,178 +451,6 @@ $(document).ready(
             );
         }
 
-        //    function validationForms(){
-        //        var jVal_two = {
-        //
-        //            'comments' : function() {
-        //                var ele = $('#comments_two');
-        //                if(ele.val().length < 6) {
-        //                    jVal_two.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //            'phone' : function (){
-        //                var ele = $('#phone_two');
-        //                var patt = /[0-9]/g;
-        //                if(!patt.test(ele.val())) {
-        //                    jVal_two.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //
-        //            'email' : function() {
-        //                var ele = $('#email_two');
-        //                var patt = /^.+@.+[.].{2,}$/i;
-        //                if(!patt.test(ele.val())) {
-        //                    jVal_two.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //
-        //            'sendIt' : function (){
-        //                if(!jVal_two.errors) {
-        //                    $('.form-questions').submit();
-        //                }
-        //            }
-        //        };
-        //// ====================================================== //
-        //        $('#send_two').click(function (){
-        //            var obj = $('body, html');
-        //            obj.animate({ scrollTop: $('.form-questions').offset().top-151 }, 750, function (){
-        //                jVal_two.errors = false;
-        //                jVal_two.comments();
-        //                jVal_two.phone();
-        //                jVal_two.email();
-        //                jVal_two.sendIt();
-        //            });
-        //            return false;
-        //        });
-        //
-        //        $('#comments_two').focusout(function(){
-        //            jVal_two.comments();
-        //        });
-        //        $('#phone_two').focusout(function(){
-        //            jVal_two.phone();
-        //        });
-        //        $('#email_two').focusout(function(){
-        //            jVal_two.email();
-        //        });
-        //
-        //        var jVal_cb = {
-        //
-        //            'cbName' : function() {
-        //                var ele = $('#callbac_name');
-        //                if(ele.val().length < 2) {
-        //                    jVal_cb.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //            'cbPhone' : function (){
-        //                var ele = $('#callbac_phone');
-        //                var patt = /[0-9]/g;
-        //                if(!patt.test(ele.val())) {
-        //                    jVal_cb.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //            'cbSendIt' : function (){
-        //                if(!jVal_cb.errors) {
-        //                    $('.callback').submit();
-        //                }
-        //            }
-        //        };
-        //// ====================================================== //
-        //        $('#callbac_submit').click(function (){
-        //            var obj = $('body, html');
-        //            obj.animate({ scrollTop: $('.callback').offset().top-151 }, 750, function (){
-        //                jVal_cb.errors = false;
-        //                jVal_cb.cbName();
-        //                jVal_cb.cbPhone();
-        //                jVal_cb.cbSendIt();
-        //            });
-        //            return false;
-        //        });
-        //        $('#callbac_name').focusout(function(){
-        //            jVal_cb.cbName();
-        //        });
-        //        $('#callbac_phone').focusout(function(){
-        //            jVal_cb.cbPhone();
-        //        });
-        //
-        //        var jVal_res = {
-        //            'resNsme' : function() {
-        //                var ele = $('#res_name');
-        //                if(ele.val().length < 2) {
-        //                    jVal_res.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //            'resPhone' : function (){
-        //                var ele = $('#res_phone');
-        //                var patt = /[0-9]/g;
-        //                if(!patt.test(ele.val())) {
-        //                    jVal_res.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //            'resComm' : function() {
-        //                var ele = $('#res_text');
-        //                if(ele.val().length < 6) {
-        //                    jVal_res.errors = true;
-        //                    ele.removeClass('normal').addClass('wrong');
-        //                } else {
-        //                    ele.removeClass('wrong').addClass('normal');
-        //                }
-        //            },
-        //            'resSendIt' : function (){
-        //                if(!jVal_res.errors) {
-        //                    $('.resforms').submit();
-        //                }
-        //            }
-        //        };
-        //// ====================================================== //
-        //        $('#res_submit').click(function (){
-        //            jVal_res.errors = false;
-        //            jVal_res.resNsme();
-        //            jVal_res.resPhone();
-        //            jVal_res.resComm();
-        //            jVal_res.resSendIt();
-        //            return false;
-        //        });
-        //
-        //        $('#res_name').focusout(function(){
-        //            jVal_res.resNsme();
-        //        });
-        //        $('#res_phone').focusout(function(){
-        //            jVal_res.resPhone();
-        //        });
-        //        $('#res_text').focusout(function(){
-        //            jVal_res.resComm();
-        //        });
-        //    }
-
-        //function menuContent(){
-        //    $('.menu-content li a').click(function(e){
-        //        e.preventDefault()
-        //        $('.menu-content li').removeClass('active-menu-content')
-        //        $(this).parent().addClass('active-menu-content')
-        //    });
-        //}
-
         function jobClick()
         {
 
@@ -1263,5 +1091,6 @@ $(document).ready(
             var radiusLenght = (newRadius.length)-1
             $(newRadius[radiusLenght]).addClass('_fix_radius_')
         }
+        
     }
 );
\ No newline at end of file
--
libgit2 0.21.4