diff --git a/common/widgets/views/image_sizer.php b/common/widgets/views/image_sizer.php index e7ebaf2..0d9c86a 100755 --- a/common/widgets/views/image_sizer.php +++ b/common/widgets/views/image_sizer.php @@ -37,13 +37,15 @@ $id = $model::tableName().'_id'; $(function(){ $("#").fileupload({ - dataType: 'json', formData: {width: ,height:}, done: function (e, data) { if($("#_buttons_block").length){ $("#_buttons_block").remove() } + + $("#").parent().prev().find('.admin-ava-wr').remove() + var host = window.location.host.toString(); var img = '
'+ '
'+ diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 9805ae7..6838234 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -29,11 +29,11 @@ class AppAsset extends AssetBundle '/js/slider.js', '/js/jquery.rating.js', '/admin/js/option.js', - '/js/jmousewhell.js', +// '/js/jmousewhell.js', '/js/autoresize.jquery.js', '/js/jquery.MultiFile.js', '/js/myGallery_min.js', - '/js/forms.js', +// '/js/forms.js', 'js/fieldWidget.js' ]; public $depends = [ diff --git a/frontend/views/site/forms-contacts.php b/frontend/views/site/forms-contacts.php new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/frontend/views/site/forms-contacts.php diff --git a/frontend/views/site/forms-modal-fav.php b/frontend/views/site/forms-modal-fav.php new file mode 100644 index 0000000..0860559 --- /dev/null +++ b/frontend/views/site/forms-modal-fav.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/frontend/views/site/forms-modal-help.php b/frontend/views/site/forms-modal-help.php new file mode 100644 index 0000000..1bb512a --- /dev/null +++ b/frontend/views/site/forms-modal-help.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/frontend/views/site/forms-modal-offer.php b/frontend/views/site/forms-modal-offer.php new file mode 100644 index 0000000..7b22422 --- /dev/null +++ b/frontend/views/site/forms-modal-offer.php @@ -0,0 +1,93 @@ + + + + + + diff --git a/frontend/views/site/forms-modal.php b/frontend/views/site/forms-modal.php deleted file mode 100755 index 6d6a31f..0000000 --- a/frontend/views/site/forms-modal.php +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - diff --git a/frontend/web/js/forms.js b/frontend/web/js/forms.js index f9a5a2a..1c546ab 100755 --- a/frontend/web/js/forms.js +++ b/frontend/web/js/forms.js @@ -1,67 +1,92 @@ $(document).ready(function(){ - console.log('fdfd') - //if($('.blog-buttons-add-favorite, .performance-vacancy-add-favorite a, .get-list, .blog-buttons-offer, .get-project, .main-menu-icons-home, .main-menu-icons-copy').length>0) { - //if($('a.contactsLinkModal').length>0) { - // console.log('here qqq'); + //if($('a.contactsLinkModal, .blog-buttons-add-favorite, .performance-vacancy-add-favorite a, .get-list, .blog-buttons-offer, .get-project, .main-menu-icons-home, .main-menu-icons-copy').length>0) { + // + // $('.forms-modal-hide').remove(); + // $("#overlay").remove(); + // $("body").append('
'); + // $("body").append('
'); + // // $.post("site/forms-modal", function (data) { - // if ( !($('#overlay').length)>0 ){ - // $("body").append('
'); - // } - // $("body").append(data); + // + // $(".forms-modal-hide").append(data); + // // }).complete(function() { - // $('.closed-form, #overlay').on('click', function(){ + // $('body').on('click','.closed-form, #overlay', function(){ // $('#modal_form_favorite, #modal_form_offer, #modal_form_question') // .animate({opacity: 0, top: '30%'}, 200, // function(){ // $(this).css('display', 'none'); // $('#overlay').fadeOut(400); + // $('.forms-modal-hide').empty(); // } // ); // }); // }); //} - // - //addToFavorites(); - //addToOffer(); - ////addQuestions(); - // - //function addToFavorites(){ - // $('.blog-buttons-add-favorite, .performance-vacancy-add-favorite a, .get-list/*, .main-menu-icons-copy*/').click(function(e){ - // var newMarg = $(window).scrollTop(); - // e.preventDefault() - // $('#overlay').fadeIn(400, - // function(){ - // $('#modal_form_favorite') - // .css({display:'block', marginTop:-230+newMarg}) - // .animate({opacity: 1, top: '50%'}, 200); - // }); - // }) - //} - // - //function addToOffer(){ - // $('.blog-buttons-offer, .get-project/*,.main-menu-icons-home*/').click(function(e){ - // var newMarg = $(window).scrollTop(); - // e.preventDefault() - // $('#overlay').fadeIn(400, - // function(){ - // $('#modal_form_offer') - // .css({display:'block', marginTop:-313+newMarg}) - // .animate({opacity: 1, top: '50%'}, 200); - // }); - // }) - //} - // - //function addQuestions() { - // $('.header-contacts-menu li:last-child').click(function(e){ - // alert('df') - // var newMarg = $(window).scrollTop(); - // e.preventDefault() - // $('#overlay').fadeIn(400, - // function(){ - // $('#modal_form_question') - // .css({display:'block', marginTop:-230+newMarg}) - // .animate({opacity: 1, top: '50%'}, 200); - // }); - // }) - //} -}); \ No newline at end of file + + + function addRemoveBlocks(){ + $('#overlay, .forms-modal-hide').remove(); + $('body').append('
').append('
'); + } + addToFavorites(); + addToOffer(); + + + function addToFavorites(){ + $('.blog-buttons-add-favorite, .performance-vacancy-add-favorite a, .get-list/*, .main-menu-icons-copy*/').click(function(e){ + var newMarg = $(window).scrollTop(); + e.preventDefault() + $('#overlay').fadeIn(400, + function(){ + $('#modal_form_favorite') + .css({display:'block', marginTop:-230+newMarg}) + .animate({opacity: 1, top: '50%'}, 200); + }); + }) + } + + function addToOffer(){ + $('.blog-buttons-offer, .get-project/*,.main-menu-icons-home*/').click(function(e){ + var newMarg = $(window).scrollTop(); + e.preventDefault() + $('#overlay').fadeIn(400, + function(){ + $('#modal_form_offer') + .css({display:'block', marginTop:-313+newMarg}) + .animate({opacity: 1, top: '50%'}, 200); + }); + }) + } + + + + + + + $('a.contactsLinkModal').click(function(e){ + e.preventDefault() + addRemoveBlocks() + addQuestions(); + }) + + + function addQuestions() { + + $.post("site/forms-modal-help", function (data) { + $('.forms-modal-hide').append(data); + }) + + + //$('sdsds').click(function(e){ + // var newMarg = $(window).scrollTop(); + // + // $('#overlay').fadeIn(400, + // function(){ + // $('#modal_form_question') + // .css({display:'block', marginTop:-230+newMarg}) + // .animate({opacity: 1, top: '50%'}, 200); + // }); + //}) + } +}) \ No newline at end of file diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index 2ffb32b..ea95833 100755 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -695,9 +695,9 @@ $(document).ready(function(){ script.src = url; document.getElementsByTagName('head')[0].appendChild(script); } - //include("/js/forms.js"); - //include("/js/jmousewhell.js"); - //include("/js/jscroll.js"); + include("/js/forms.js"); + include("/js/jmousewhell.js"); + include("/js/jscroll.js"); function inputNumber(){ $('.form-price-wr input').keypress(function(e) { -- libgit2 0.21.4