Administrator / test_3

Commit 718ec4d174a66b64a855bacffa761c470d8ef99d

Authored by Yarik
2 parents 38ffb9db 6b42222c

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	frontend/web/css/style.css
Showing 5 changed files with 84 additions and 54 deletions   Show diff stats
Inline Side-by-side
common/modules/comment/resources/comment.js
  Show/Hide comments   View file @718ec4d
1 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 36 $(document).on('click', '.artbox_comment_container .removeable', function(e) {
4 37 e.preventDefault();
5 38 $(this).parent().remove();
... ... @@ -25,8 +58,11 @@ $(function() {
25 58 {
26 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 66 } else
31 67 {
32 68 $(container).prepend('<p class="removeable error_message">' + data.error + '</p>')
... ... @@ -173,40 +209,7 @@ $(function() {
173 209 if(!data.error)
174 210 {
175 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 213 } else
211 214 {
212 215 $(container).prepend('<p class="removeable error_message">' + data.error + '</p>')
... ...
common/modules/comment/widgets/views/form-comment.php
  Show/Hide comments   View file @718ec4d
... ... @@ -30,7 +30,7 @@
30 30 if($model->scenario == $model::SCENARIO_GUEST) {
31 31 echo $form->field($model, 'user_name', [
32 32 'options' => [
33   - 'class' => 'input-blocks-comm',
  33 + 'class' => 'input-blocks-comm fix_marg_',
34 34 ],
35 35 'inputOptions' => [
36 36 'class' => 'custom-input-4',
... ...
common/modules/comment/widgets/views/project_comment_view.php
  Show/Hide comments   View file @718ec4d
... ... @@ -28,12 +28,12 @@
28 28 if(!empty( $user ) && !empty( $user->userInfo->image )) {
29 29 echo "<img src='{$user->userInfo->image}' alt=''>";
30 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 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 37 <?php
38 38 if(!empty( $user )) {
39 39 echo Html::a('<span class="artbox_comment_author">' . $user->firstname . ' ' . $user->lastname . '</span>', [
... ... @@ -56,7 +56,7 @@
56 56 }
57 57 ?>
58 58 </div>
59   - <div class="blog-post-date">
  59 + <div class="blog-post-date style">
60 60 <span></span>
61 61 <p><?= date('d.m.Y', strtotime($model->date_add)) ?></p>
62 62 </div>
... ...
frontend/views/tender/view.php
  Show/Hide comments   View file @718ec4d
... ... @@ -409,8 +409,11 @@
409 409 var tabs = $('._tabs')
410 410 tabs.css({display : 'none'})
411 411 $(tabs[index]).css({display : 'block'})
  412 + var thisHash = $(this).find('a').attr('href')
  413 + window.location.hash = thisHash;
412 414 }
413 415 )
  416 +
414 417 }
415 418  
416 419 function tenderMark()
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @718ec4d
... ... @@ -8151,7 +8151,7 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
8151 8151 }
8152 8152  
8153 8153 .new-portf-comm-read:first-child {
8154   - margin-top: 0
  8154 + /*margin-top: 0*/
8155 8155 }
8156 8156  
8157 8157 .new-prof-wrapper-read {
... ... @@ -8241,6 +8241,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
8241 8241 .new-portf-add-comm .help-block {
8242 8242 width: 230px;
8243 8243 margin-left: 0;
  8244 + padding: 16px 10px;
  8245 + box-sizing: border-box;
8244 8246 }
8245 8247  
8246 8248 .new-portfolio-rating .rating {
... ... @@ -10863,7 +10865,7 @@ li.active-menu-admin:hover a .ico_num {
10863 10865 color: #fff !important;
10864 10866 }
10865 10867  
10866   -.fix_te .artbox_comment_delete_answer:hover {
  10868 +.fix_te .artbox_comment_delete_answer:hover, .new-portf-comm-read .artbox_comment_delete:hover {
10867 10869 background: #f10b00;
10868 10870 color: #fff !important;
10869 10871 }
... ... @@ -10878,7 +10880,7 @@ li.active-menu-admin:hover a .ico_num {
10878 10880 color: #fff !important;
10879 10881 }
10880 10882  
10881   -.fix_te .artbox_comment_delete_answer:active {
  10883 +.fix_te .artbox_comment_delete_answer:active, .new-portf-comm-read .artbox_comment_delete:active {
10882 10884 background: #d60d04 !important;
10883 10885 border: 1px solid #d60d04 !important;
10884 10886 color: #fff !important;
... ... @@ -12114,22 +12116,27 @@ li.active-menu-admin:hover a .ico_num {
12114 12116 margin-top: 20px
12115 12117 }
12116 12118  
12117   -._tabs .comments-name {
  12119 +.comments-name {
12118 12120 font-weight: normal;
12119   - color: #0072bc;
  12121 +
12120 12122 margin-top: -3px;
12121 12123 }
  12124 +.comments-name span {
  12125 + color: inherit;
  12126 +}
12122 12127  
12123   -._tabs .comments-name a {
12124   - color: inherit;
  12128 +.comments-name a {
  12129 + color: #0072bc;
12125 12130 text-decoration: none;
12126 12131 }
12127   -
12128   -._tabs .comments-name a:hover {
  12132 +.new-portf-comm-read .comments-name a, .new-portf-comm-read .comments-name span {
  12133 + font-size: 13px;
  12134 +}
  12135 +.comments-name a:hover {
12129 12136 text-decoration: underline
12130 12137 }
12131 12138  
12132   -.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer {
  12139 +.fix_te .artbox_comment_reply_answer, .fix_te .artbox_comment_delete_answer, .new-portf-comm-read .artbox_comment_delete {
12133 12140 border-radius: 4px;
12134 12141 display: block;
12135 12142 float: left;
... ... @@ -12142,8 +12149,8 @@ li.active-menu-admin:hover a .ico_num {
12142 12149 text-align: center;
12143 12150 text-decoration: none;
12144 12151 }
12145   -
12146   -.fix_te .artbox_comment_delete_answer {
  12152 +.new-portf-comm-read .artbox_comment_delete {font-size: 13px}
  12153 +.fix_te .artbox_comment_delete_answer, .new-portf-comm-read .artbox_comment_delete {
12147 12154 color: #f10b00;
12148 12155 border: 1px solid #f10b00;
12149 12156 }
... ... @@ -12270,4 +12277,21 @@ li.active-menu-admin:hover a .ico_num {
12270 12277 }
12271 12278 /*.field-portfolio-cover.has-error.success_download .help-block {*/
12272 12279 /*display: none;*/
12273   -/*}*/
12274 12280 \ No newline at end of file
  12281 +/*}*/
  12282 +.new-portf-comm-read .blog-post-date {
  12283 + margin-top: 17px;
  12284 +}
  12285 +
  12286 +.new-portf-add-comm .input-blocks-comm:first-child {
  12287 + margin-left: 0;
  12288 +}
  12289 +.input-blocks-comm.fix_marg_ {margin-left: 0}
  12290 +.new-portf-add-comm .field-comment-user_email .hint-block{
  12291 + position: absolute;
  12292 + font-size: 13px;
  12293 + color: #b7b7b7;
  12294 + font-weight: normal;
  12295 + top: 23px;
  12296 + left: 240px;
  12297 + width: 165px;
  12298 +}
12275 12299 \ No newline at end of file
... ...