Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/web/css/style.css

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/web/css/style.css
Yarik
2 parents 38ffb9db 6b42222c
Showing 5 changed files with 84 additions and 54 deletions Show diff stats
common/modules/comment/resources/comment.js
common/modules/comment/widgets/views/form-comment.php
common/modules/comment/widgets/views/project_comment_view.php
frontend/views/tender/view.php
frontend/web/css/style.css
 $(function() {
+    function addRemoveBlocks(data)
+    {
+        $('#overlay, .succses_comm').remove();
+        $('body').append('<div id="overlay" style="top:0; left:0;"></div>').append('<div class="succses_comm"><div class="closed-form"></div><div class="succses_comm-txt">'+data.text+'</div></div>');
+        $('#overlay').fadeIn(
+            400, function()
+            {
+                $('.succses_comm').css({display : 'block'}).animate({opacity : 1, top : '50%'}, 200);
+            }
+        );
+        function closeSuccsescomm() {
+            $('.succses_comm')
+                .animate(
+                    {opacity : 0, top : '30%'}, 200, function()
+                    {
+                        $(this).css('display', 'none')
+                        $('#overlay').fadeOut(
+                            400, function()
+                            {
+                                $('#overlay, .succses_comm').remove()
+                            }
+                        )
+                    }
+                )
+        }
+        $('body').on('click', '.closed-form, #overlay', function() {
+                closeSuccsescomm()
+            }
+        );
+
+        setTimeout(closeSuccsescomm, 4000)
+    }
+
     $(document).on('click', '.artbox_comment_container .removeable', function(e) {
         e.preventDefault();
         $(this).parent().remove();
@@ -25,8 +58,11 @@ $(function() {
                     {
                         if(!data.error)
                         {
-                            $(container).empty();
-                            $(container).append('<p class="removeable">' + data.text + '</p>');
+                            {
+                                $(container).remove();
+                                addRemoveBlocks(data)
+                                // $(container).append('<p class="removeable">' + data.text + '</p>');
+                            }
                         } else
                         {
                             $(container).prepend('<p class="removeable error_message">' + data.error + '</p>')
@@ -173,40 +209,7 @@ $(function() {
                         if(!data.error)
                         {
                             $(container).remove();
-                            addRemoveBlocks()
-                            function addRemoveBlocks()
-                            {
-                                $('#overlay, .succses_comm').remove();
-                                $('body').append('<div id="overlay" style="top:0; left:0;"></div>').append('<div class="succses_comm"><div class="closed-form"></div><div class="succses_comm-txt">'+data.text+'</div></div>');
-                                $('#overlay').fadeIn(
-                                    400, function()
-                                    {
-                                        $('.succses_comm').css({display : 'block'}).animate({opacity : 1, top : '50%'}, 200);
-                                    }
-                                );
-                                function closeSuccsescomm() {
-                                    $('.succses_comm')
-                                        .animate(
-                                            {opacity : 0, top : '30%'}, 200, function()
-                                            {
-                                                $(this).css('display', 'none')
-                                                $('#overlay').fadeOut(
-                                                    400, function()
-                                                    {
-                                                        $('#overlay, .succses_comm').remove()
-                                                    }
-                                                )
-                                            }
-                                        )
-                                }
-                                $('body').on('click', '.closed-form, #overlay', function() {
-                                        closeSuccsescomm()
-                                    }
-                                );
-
-                                setTimeout(closeSuccsescomm, 4000)
-                            }
-                            // $(container).append('<p class="removeable">' + data.text + '</p>');
+                            addRemoveBlocks(data)
                         } else
                         {
                             $(container).prepend('<p class="removeable error_message">' + data.error + '</p>')
@@ -30,7 +30,7 @@
         if($model->scenario == $model::SCENARIO_GUEST) {
             echo $form->field($model, 'user_name', [
                 'options'      => [
-                    'class' => 'input-blocks-comm',
+                    'class' => 'input-blocks-comm fix_marg_',
                 ],
                 'inputOptions' => [
                     'class' => 'custom-input-4',
@@ -28,12 +28,12 @@
                 if(!empty( $user ) && !empty( $user->userInfo->image )) {
                     echo "<img src='{$user->userInfo->image}' alt=''>";
                 } else {
-                    echo "<img src='/images/ded-ico.png' alt=''>";
+                    echo "<img src='/images/ico-profile.png' alt=''>";
                 }
             ?>
         </div>
-        <div class="new-prof-wrapper-read">
-            <div class="new-portf-comm-read-title">
+        <div style="width: 500px; float: left; margin-left: 12px;">
+            <div class="comments-name style artbox_comment_author">
                 <?php
                     if(!empty( $user )) {
                         echo Html::a('<span class="artbox_comment_author">' . $user->firstname . ' ' . $user->lastname . '</span>', [
@@ -56,7 +56,7 @@
                     }
                 ?>
             </div>
-            <div class="blog-post-date">
+            <div class="blog-post-date style">
                 <span></span>
                 <p><?= date('d.m.Y', strtotime($model->date_add)) ?></p>
             </div>
@@ -409,8 +409,11 @@
                         var tabs = $('._tabs')
                         tabs.css({display : 'none'})
                         $(tabs[index]).css({display : 'block'})
+                        var thisHash = $(this).find('a').attr('href')
+                        window.location.hash = thisHash;
                     }
                 )
+                
             }
             function tenderMark()
@@ -8151,7 +8151,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
 }
 .new-portf-comm-read:first-child {
-    margin-top: 0
+    /*margin-top: 0*/
 }
 .new-prof-wrapper-read {
@@ -8241,6 +8241,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
 .new-portf-add-comm .help-block {
     width: 230px;
     margin-left: 0;
+    padding: 16px 10px;
+    box-sizing: border-box;
 }
 .new-portfolio-rating .rating {
@@ -10863,7 +10865,7 @@ li.active-menu-admin:hover a .ico_num {
     color: #fff !important;
 }
-.fix_te .artbox_comment_delete_answer:hover {
+.fix_te .artbox_comment_delete_answer:hover, .new-portf-comm-read .artbox_comment_delete:hover {
     background: #f10b00;
     color: #fff !important;
 }
@@ -10878,7 +10880,7 @@ li.active-menu-admin:hover a .ico_num {
     color: #fff !important;
 }
-.fix_te .artbox_comment_delete_answer:active {
+.fix_te .artbox_comment_delete_answer:active, .new-portf-comm-read .artbox_comment_delete:active {
     background: #d60d04 !important;
     border: 1px solid #d60d04 !important;
     color: #fff !important;
@@ -12114,22 +12116,27 @@ li.active-menu-admin:hover a .ico_num {
     margin-top: 20px
 }
-._tabs .comments-name {
+.comments-name {
     font-weight: normal;
-    color: #0072bc;
+
     margin-top: -3px;
 }
+.comments-name span {
+   color: inherit;
+}
-._tabs .comments-name a {
-    color: inherit;
+.comments-name a {
+    color: #0072bc;
     text-decoration: none;
 }
-
-._tabs .comments-name a:hover {
+.new-portf-comm-read .comments-name a, .new-portf-comm-read .comments-name span {
+    font-size: 13px;
+}
+.comments-name a:hover {
     text-decoration: underline
 }
-.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer {
+.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .new-portf-comm-read .artbox_comment_delete {
     border-radius: 4px;
     display: block;
     float: left;
@@ -12142,8 +12149,8 @@ li.active-menu-admin:hover a .ico_num {
     text-align: center;
     text-decoration: none;
 }
-
-.fix_te .artbox_comment_delete_answer {
+.new-portf-comm-read .artbox_comment_delete {font-size: 13px}
+.fix_te .artbox_comment_delete_answer, .new-portf-comm-read .artbox_comment_delete {
     color: #f10b00;
     border: 1px solid #f10b00;
 }
@@ -12270,4 +12277,21 @@ li.active-menu-admin:hover a .ico_num {
 }
 /*.field-portfolio-cover.has-error.success_download .help-block {*/
     /*display: none;*/
-/*}*/
 \ No newline at end of file
+/*}*/
+.new-portf-comm-read .blog-post-date {
+    margin-top: 17px;
+}
+
+.new-portf-add-comm .input-blocks-comm:first-child {
+    margin-left: 0;
+}
+.input-blocks-comm.fix_marg_ {margin-left: 0}
+.new-portf-add-comm .field-comment-user_email .hint-block{
+    position: absolute;
+    font-size: 13px;
+    color: #b7b7b7;
+    font-weight: normal;
+    top: 23px;
+    left: 240px;
+    width: 165px;
+}
 \ No newline at end of file