Commit 6b42222ce1095e2e4c74413c58478fdd421b4386
1 parent
ca179ba8
git
Showing
4 changed files
with
80 additions
and
56 deletions
Show diff stats
common/modules/comment/resources/comment.js
| 1 | $(function() { | 1 | $(function() { |
| 2 | 2 | ||
| 3 | + function addRemoveBlocks(data) | ||
| 4 | + { | ||
| 5 | + $('#overlay, .succses_comm').remove(); | ||
| 6 | + $('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>'); | ||
| 7 | + $('#overlay').fadeIn( | ||
| 8 | + 400, function() | ||
| 9 | + { | ||
| 10 | + $('.succses_comm').css({display : 'block'}).animate({opacity : 1, top : '50%'}, 200); | ||
| 11 | + } | ||
| 12 | + ); | ||
| 13 | + function closeSuccsescomm() { | ||
| 14 | + $('.succses_comm') | ||
| 15 | + .animate( | ||
| 16 | + {opacity : 0, top : '30%'}, 200, function() | ||
| 17 | + { | ||
| 18 | + $(this).css('display', 'none') | ||
| 19 | + $('#overlay').fadeOut( | ||
| 20 | + 400, function() | ||
| 21 | + { | ||
| 22 | + $('#overlay, .succses_comm').remove() | ||
| 23 | + } | ||
| 24 | + ) | ||
| 25 | + } | ||
| 26 | + ) | ||
| 27 | + } | ||
| 28 | + $('body').on('click', '.closed-form, #overlay', function() { | ||
| 29 | + closeSuccsescomm() | ||
| 30 | + } | ||
| 31 | + ); | ||
| 32 | + | ||
| 33 | + setTimeout(closeSuccsescomm, 4000) | ||
| 34 | + } | ||
| 35 | + | ||
| 3 | $(document).on('click', '.artbox_comment_container .removeable', function(e) { | 36 | $(document).on('click', '.artbox_comment_container .removeable', function(e) { |
| 4 | e.preventDefault(); | 37 | e.preventDefault(); |
| 5 | $(this).parent().remove(); | 38 | $(this).parent().remove(); |
| @@ -25,8 +58,11 @@ $(function() { | @@ -25,8 +58,11 @@ $(function() { | ||
| 25 | { | 58 | { |
| 26 | if(!data.error) | 59 | if(!data.error) |
| 27 | { | 60 | { |
| 28 | - $(container).empty(); | ||
| 29 | - $(container).append('<p class="removeable">' + data.text + '</p>'); | 61 | + { |
| 62 | + $(container).remove(); | ||
| 63 | + addRemoveBlocks(data) | ||
| 64 | + // $(container).append('<p class="removeable">' + data.text + '</p>'); | ||
| 65 | + } | ||
| 30 | } else | 66 | } else |
| 31 | { | 67 | { |
| 32 | $(container).prepend('<p class="removeable error_message">' + data.error + '</p>') | 68 | $(container).prepend('<p class="removeable error_message">' + data.error + '</p>') |
| @@ -173,40 +209,7 @@ $(function() { | @@ -173,40 +209,7 @@ $(function() { | ||
| 173 | if(!data.error) | 209 | if(!data.error) |
| 174 | { | 210 | { |
| 175 | $(container).remove(); | 211 | $(container).remove(); |
| 176 | - addRemoveBlocks() | ||
| 177 | - function addRemoveBlocks() | ||
| 178 | - { | ||
| 179 | - $('#overlay, .succses_comm').remove(); | ||
| 180 | - $('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>'); | ||
| 181 | - $('#overlay').fadeIn( | ||
| 182 | - 400, function() | ||
| 183 | - { | ||
| 184 | - $('.succses_comm').css({display : 'block'}).animate({opacity : 1, top : '50%'}, 200); | ||
| 185 | - } | ||
| 186 | - ); | ||
| 187 | - function closeSuccsescomm() { | ||
| 188 | - $('.succses_comm') | ||
| 189 | - .animate( | ||
| 190 | - {opacity : 0, top : '30%'}, 200, function() | ||
| 191 | - { | ||
| 192 | - $(this).css('display', 'none') | ||
| 193 | - $('#overlay').fadeOut( | ||
| 194 | - 400, function() | ||
| 195 | - { | ||
| 196 | - $('#overlay, .succses_comm').remove() | ||
| 197 | - } | ||
| 198 | - ) | ||
| 199 | - } | ||
| 200 | - ) | ||
| 201 | - } | ||
| 202 | - $('body').on('click', '.closed-form, #overlay', function() { | ||
| 203 | - closeSuccsescomm() | ||
| 204 | - } | ||
| 205 | - ); | ||
| 206 | - | ||
| 207 | - setTimeout(closeSuccsescomm, 4000) | ||
| 208 | - } | ||
| 209 | - // $(container).append('<p class="removeable">' + data.text + '</p>'); | 212 | + addRemoveBlocks(data) |
| 210 | } else | 213 | } else |
| 211 | { | 214 | { |
| 212 | $(container).prepend('<p class="removeable error_message">' + data.error + '</p>') | 215 | $(container).prepend('<p class="removeable error_message">' + data.error + '</p>') |
common/modules/comment/widgets/views/form-comment.php
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | if($model->scenario == $model::SCENARIO_GUEST) { | 30 | if($model->scenario == $model::SCENARIO_GUEST) { |
| 31 | echo $form->field($model, 'user_name', [ | 31 | echo $form->field($model, 'user_name', [ |
| 32 | 'options' => [ | 32 | 'options' => [ |
| 33 | - 'class' => 'input-blocks-comm', | 33 | + 'class' => 'input-blocks-comm fix_marg_', |
| 34 | ], | 34 | ], |
| 35 | 'inputOptions' => [ | 35 | 'inputOptions' => [ |
| 36 | 'class' => 'custom-input-4', | 36 | 'class' => 'custom-input-4', |
common/modules/comment/widgets/views/project_comment_view.php
| @@ -28,12 +28,12 @@ | @@ -28,12 +28,12 @@ | ||
| 28 | if(!empty( $user ) && !empty( $user->userInfo->image )) { | 28 | if(!empty( $user ) && !empty( $user->userInfo->image )) { |
| 29 | echo "<img src='{$user->userInfo->image}' alt=''>"; | 29 | echo "<img src='{$user->userInfo->image}' alt=''>"; |
| 30 | } else { | 30 | } else { |
| 31 | - echo "<img src='/images/ded-ico.png' alt=''>"; | 31 | + echo "<img src='/images/ico-profile.png' alt=''>"; |
| 32 | } | 32 | } |
| 33 | ?> | 33 | ?> |
| 34 | </div> | 34 | </div> |
| 35 | - <div class="new-prof-wrapper-read"> | ||
| 36 | - <div class="new-portf-comm-read-title"> | 35 | + <div style="width: 500px; float: left; margin-left: 12px;"> |
| 36 | + <div class="comments-name style artbox_comment_author"> | ||
| 37 | <?php | 37 | <?php |
| 38 | if(!empty( $user )) { | 38 | if(!empty( $user )) { |
| 39 | echo Html::a('<span class="artbox_comment_author">' . $user->firstname . ' ' . $user->lastname . '</span>', [ | 39 | echo Html::a('<span class="artbox_comment_author">' . $user->firstname . ' ' . $user->lastname . '</span>', [ |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | } | 56 | } |
| 57 | ?> | 57 | ?> |
| 58 | </div> | 58 | </div> |
| 59 | - <div class="blog-post-date"> | 59 | + <div class="blog-post-date style"> |
| 60 | <span></span> | 60 | <span></span> |
| 61 | <p><?= date('d.m.Y', strtotime($model->date_add)) ?></p> | 61 | <p><?= date('d.m.Y', strtotime($model->date_add)) ?></p> |
| 62 | </div> | 62 | </div> |
frontend/web/css/style.css
| @@ -8148,7 +8148,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | @@ -8148,7 +8148,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | ||
| 8148 | } | 8148 | } |
| 8149 | 8149 | ||
| 8150 | .new-portf-comm-read:first-child { | 8150 | .new-portf-comm-read:first-child { |
| 8151 | - margin-top: 0 | 8151 | + /*margin-top: 0*/ |
| 8152 | } | 8152 | } |
| 8153 | 8153 | ||
| 8154 | .new-prof-wrapper-read { | 8154 | .new-prof-wrapper-read { |
| @@ -8238,6 +8238,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | @@ -8238,6 +8238,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + | ||
| 8238 | .new-portf-add-comm .help-block { | 8238 | .new-portf-add-comm .help-block { |
| 8239 | width: 230px; | 8239 | width: 230px; |
| 8240 | margin-left: 0; | 8240 | margin-left: 0; |
| 8241 | + padding: 16px 10px; | ||
| 8242 | + box-sizing: border-box; | ||
| 8241 | } | 8243 | } |
| 8242 | 8244 | ||
| 8243 | .new-portfolio-rating .rating { | 8245 | .new-portfolio-rating .rating { |
| @@ -10860,7 +10862,7 @@ li.active-menu-admin:hover a .ico_num { | @@ -10860,7 +10862,7 @@ li.active-menu-admin:hover a .ico_num { | ||
| 10860 | color: #fff !important; | 10862 | color: #fff !important; |
| 10861 | } | 10863 | } |
| 10862 | 10864 | ||
| 10863 | -.fix_te .artbox_comment_delete_answer:hover { | 10865 | +.fix_te .artbox_comment_delete_answer:hover, .new-portf-comm-read .artbox_comment_delete:hover { |
| 10864 | background: #f10b00; | 10866 | background: #f10b00; |
| 10865 | color: #fff !important; | 10867 | color: #fff !important; |
| 10866 | } | 10868 | } |
| @@ -10875,7 +10877,7 @@ li.active-menu-admin:hover a .ico_num { | @@ -10875,7 +10877,7 @@ li.active-menu-admin:hover a .ico_num { | ||
| 10875 | color: #fff !important; | 10877 | color: #fff !important; |
| 10876 | } | 10878 | } |
| 10877 | 10879 | ||
| 10878 | -.fix_te .artbox_comment_delete_answer:active { | 10880 | +.fix_te .artbox_comment_delete_answer:active, .new-portf-comm-read .artbox_comment_delete:active { |
| 10879 | background: #d60d04 !important; | 10881 | background: #d60d04 !important; |
| 10880 | border: 1px solid #d60d04 !important; | 10882 | border: 1px solid #d60d04 !important; |
| 10881 | color: #fff !important; | 10883 | color: #fff !important; |
| @@ -12111,22 +12113,27 @@ li.active-menu-admin:hover a .ico_num { | @@ -12111,22 +12113,27 @@ li.active-menu-admin:hover a .ico_num { | ||
| 12111 | margin-top: 20px | 12113 | margin-top: 20px |
| 12112 | } | 12114 | } |
| 12113 | 12115 | ||
| 12114 | -._tabs .comments-name { | 12116 | +.comments-name { |
| 12115 | font-weight: normal; | 12117 | font-weight: normal; |
| 12116 | - color: #0072bc; | 12118 | + |
| 12117 | margin-top: -3px; | 12119 | margin-top: -3px; |
| 12118 | } | 12120 | } |
| 12121 | +.comments-name span { | ||
| 12122 | + color: inherit; | ||
| 12123 | +} | ||
| 12119 | 12124 | ||
| 12120 | -._tabs .comments-name a { | ||
| 12121 | - color: inherit; | 12125 | +.comments-name a { |
| 12126 | + color: #0072bc; | ||
| 12122 | text-decoration: none; | 12127 | text-decoration: none; |
| 12123 | } | 12128 | } |
| 12124 | - | ||
| 12125 | -._tabs .comments-name a:hover { | 12129 | +.new-portf-comm-read .comments-name a, .new-portf-comm-read .comments-name span { |
| 12130 | + font-size: 13px; | ||
| 12131 | +} | ||
| 12132 | +.comments-name a:hover { | ||
| 12126 | text-decoration: underline | 12133 | text-decoration: underline |
| 12127 | } | 12134 | } |
| 12128 | 12135 | ||
| 12129 | -.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer { | 12136 | +.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .new-portf-comm-read .artbox_comment_delete { |
| 12130 | border-radius: 4px; | 12137 | border-radius: 4px; |
| 12131 | display: block; | 12138 | display: block; |
| 12132 | float: left; | 12139 | float: left; |
| @@ -12139,8 +12146,8 @@ li.active-menu-admin:hover a .ico_num { | @@ -12139,8 +12146,8 @@ li.active-menu-admin:hover a .ico_num { | ||
| 12139 | text-align: center; | 12146 | text-align: center; |
| 12140 | text-decoration: none; | 12147 | text-decoration: none; |
| 12141 | } | 12148 | } |
| 12142 | - | ||
| 12143 | -.fix_te .artbox_comment_delete_answer { | 12149 | +.new-portf-comm-read .artbox_comment_delete {font-size: 13px} |
| 12150 | +.fix_te .artbox_comment_delete_answer, .new-portf-comm-read .artbox_comment_delete { | ||
| 12144 | color: #f10b00; | 12151 | color: #f10b00; |
| 12145 | border: 1px solid #f10b00; | 12152 | border: 1px solid #f10b00; |
| 12146 | } | 12153 | } |
| @@ -12254,6 +12261,20 @@ li.active-menu-admin:hover a .ico_num { | @@ -12254,6 +12261,20 @@ li.active-menu-admin:hover a .ico_num { | ||
| 12254 | top: 50px; | 12261 | top: 50px; |
| 12255 | z-index: 10; | 12262 | z-index: 10; |
| 12256 | } | 12263 | } |
| 12257 | -/*.field-portfolio-cover.has-error.success_download .help-block {*/ | ||
| 12258 | - /*display: none;*/ | ||
| 12259 | -/*}*/ | ||
| 12260 | \ No newline at end of file | 12264 | \ No newline at end of file |
| 12265 | +.new-portf-comm-read .blog-post-date { | ||
| 12266 | + margin-top: 17px; | ||
| 12267 | +} | ||
| 12268 | + | ||
| 12269 | +.new-portf-add-comm .input-blocks-comm:first-child { | ||
| 12270 | + margin-left: 0; | ||
| 12271 | +} | ||
| 12272 | +.input-blocks-comm.fix_marg_ {margin-left: 0} | ||
| 12273 | +.new-portf-add-comm .field-comment-user_email .hint-block{ | ||
| 12274 | + position: absolute; | ||
| 12275 | + font-size: 13px; | ||
| 12276 | + color: #b7b7b7; | ||
| 12277 | + font-weight: normal; | ||
| 12278 | + top: 23px; | ||
| 12279 | + left: 240px; | ||
| 12280 | + width: 165px; | ||
| 12281 | +} | ||
| 12261 | \ No newline at end of file | 12282 | \ No newline at end of file |