From 2acd8ee8366160a431090b1a8042fae55988d85f Mon Sep 17 00:00:00 2001 From: icemate Date: Tue, 23 Feb 2016 14:31:27 +0200 Subject: [PATCH] tokar commit --- frontend/assets/AppAsset.php | 4 ++-- frontend/views/layouts/main.php | 3 +-- frontend/views/site/forms-modal.php | 114 ------------------------------------------------------------------------------------------------------------------ frontend/web/css/style.css | 15 ++++++++++----- frontend/web/images/loading-plugin-new.gif | Bin 0 -> 5669 bytes frontend/web/js/forms.js | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------- frontend/web/js/myGallery_min.js | 6 +++++- frontend/web/js/script.js | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------ 8 files changed, 251 insertions(+), 355 deletions(-) create mode 100644 frontend/web/images/loading-plugin-new.gif diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 6c5924b..9805ae7 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -19,7 +19,7 @@ class AppAsset extends AssetBundle public $css = [ 'css/style.css', '/admin/css/flags32.css', - //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', + 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', ]; public $js = [ '/js/script.js', @@ -31,9 +31,9 @@ class AppAsset extends AssetBundle '/admin/js/option.js', '/js/jmousewhell.js', '/js/autoresize.jquery.js', - '/js/forms.js', '/js/jquery.MultiFile.js', '/js/myGallery_min.js', + '/js/forms.js', 'js/fieldWidget.js' ]; public $depends = [ diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 48d61c9..04e139b 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -31,7 +31,6 @@ AppAsset::register($this); beginBody() ?> -
@@ -40,7 +39,7 @@ AppAsset::register($this);
Международная Федерация Проектантов
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index f837f9b..9d70273 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -429,7 +429,7 @@ ul.content-menu-first { width: 235px; float: left; position: relative; - z-index: 9999999; + z-index: 999; } ul.content-menu-first li { width: 100%; @@ -2391,7 +2391,7 @@ input[type=file]::-webkit-file-upload-button { } .galley-show-min-wrapper { - width: 840px; + width: 842px; margin: 0 auto; overflow: hidden; padding-top: 40px; @@ -2416,9 +2416,9 @@ input[type=file]::-webkit-file-upload-button { position: absolute; top: 0; left: 0; - width: 152px; - height: 108px; - border: 2px solid greenyellow; + width: 150px; + height: 106px; + border: 2px solid #fff; } .gallery-min-left, .gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right { width: 35px; @@ -6406,4 +6406,9 @@ input[disabled], select[disabled] { .admn-menu-err .help-block{ width: 245px; margin-left: -5px; +} +.kv-plugin-loading { + width: 24px; + height: 24px; + background: transparent url('/images/loading-plugin-new.gif') center left no-repeat; } \ No newline at end of file diff --git a/frontend/web/images/loading-plugin-new.gif b/frontend/web/images/loading-plugin-new.gif new file mode 100644 index 0000000..0292502 Binary files /dev/null and b/frontend/web/images/loading-plugin-new.gif differ diff --git a/frontend/web/js/forms.js b/frontend/web/js/forms.js index b54ef9d..f9a5a2a 100755 --- a/frontend/web/js/forms.js +++ b/frontend/web/js/forms.js @@ -1,65 +1,67 @@ $(document).ready(function(){ - if($('.blog-buttons-add-favorite, .performance-vacancy-add-favorite a, .get-list, .main-menu-icons-copy, .blog-buttons-offer, .get-project, .main-menu-icons-home').length>0) { - console.log('here'); - var overlayLength = $('#overlay').length; - $.post("site/forms-modal", function (data) { - if ( !overlayLength>0 ){ - $("body").append('
'); - } - $("body").append(data); - }).complete(function() { - $('.closed-form, #overlay').on('click', function(){ - $('#modal_form_favorite, #modal_form_offer, #modal_form_question') - .animate({opacity: 0, top: '30%'}, 200, - function(){ - $(this).css('display', 'none'); - $('#overlay').fadeOut(400); - } - ); - }); - }); - } - - addToFavorites(); - addToOffer(); - addCuestions(); - - 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 addCuestions() { - $('.header-contacts-menu li:last-child').click(function(e){ - 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); - }); - }) - } + 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'); + // $.post("site/forms-modal", function (data) { + // if ( !($('#overlay').length)>0 ){ + // $("body").append('
'); + // } + // $("body").append(data); + // }).complete(function() { + // $('.closed-form, #overlay').on('click', function(){ + // $('#modal_form_favorite, #modal_form_offer, #modal_form_question') + // .animate({opacity: 0, top: '30%'}, 200, + // function(){ + // $(this).css('display', 'none'); + // $('#overlay').fadeOut(400); + // } + // ); + // }); + // }); + //} + // + //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 diff --git a/frontend/web/js/myGallery_min.js b/frontend/web/js/myGallery_min.js index 55d3761..510d3ad 100755 --- a/frontend/web/js/myGallery_min.js +++ b/frontend/web/js/myGallery_min.js @@ -1 +1,5 @@ -$(document).ready(function(){function l(l){function i(){var l=$(".gallery-show-min img").length;$(".gallery-show-min").css({width:c*l-t})}function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[s]).fadeIn(100);var i=$(l[s]).find("img"),a=i.attr("data-link");i.attr("src",a)}$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty();var s=$(l).index();$(".gallery-show-min").css({marginLeft:0});for(var e=$(l).parent().find(".gallery-box-preview span"),r=$(l).parent().find(".gallery-box-big span"),g=0;g')}$(".gallery-show-min img:first-child").addClass("gallery-active-pic"),$(".gallery-show-min img:last-child").css({marginRight:0}),$(".gallery-show-min").append('
');for(var o=0;o')}var d=$(".gallery-show-big tr:first-child").find("img"),h=d.attr("data-link");d.attr("src",h);var p=m,f=$(window).height();$(".gallery-page");755>f&&($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:f/p+"px"}),$(".gallery-show-big img").css({height:f/p+"px"})),i();var v=$(".gallery-show-min img");$(v).removeClass("gallery-active-pic"),$(v[s]).addClass("gallery-active-pic"),$(".border-gallery").css({left:c*s}),a(),0==s?$(".gallery-big-left").css({display:"none"}):$(".gallery-big-left").css({display:"block"})}function i(){var l=$(".gallery-show-min img"),i=$(".gallery-show-min img").length;n>=i?$(".gallery-min-left, .gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"none"}):($(".gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"block"}),$(".gallery-min-left").css({display:"none"})),$(".gallery-show-min img").on("click",function(){function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var s=l,e=$(".gallery-show-min").offset().left;s=$(s[2]).offset().left-e,$(".gallery-show-min img").removeClass("gallery-active-pic"),$(this).addClass("gallery-active-pic");var r=$(".gallery-active-pic").offset().left-e,g=$(".gallery-active-pic").index(),t=i-(g+1);2>=g&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").css({display:"none"})),2==g&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list")),n-1>=g&&(a(),$(".border-gallery").css({left:r}),g>3&&$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o)),g>=n-1&&($(".gallery-min-left").css({display:"block"}),i==n&&g==n-1&&($(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==t&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().prev().addClass("act-list"),setTimeout(function(){$(".gallery-min-right").css({display:"none"})},o)),1==t&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-s-c)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().addClass("act-list")),2==t&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),t>2&&(console.log(">2"),a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o,function(){$(".gallery-min-right").css({display:"block"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),n>=i&&$(".gallery-min-left").css({display:"none"})),i>n&&t>2&&$(".gallery-min-right").css({display:"block"}),3==g&&($(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o),$(l[1]).click(function(){$(".gallery-show-min").stop().animate({marginLeft:0},o)}),n>=i?$(".gallery-show-min").stop().animate({marginLeft:0},o):$(".gallery-min-left").attr("style",'disply:"block"')),g>=1&&i-1>g&&$(".gallery-big-left, .gallery-big-right").css({display:"block"}),g==i-1&&$(".gallery-big-right").css({display:"none"}),0==g&&$(".gallery-big-left").css({display:"none"})})}function a(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-right").on("click",function(){var i=$(".act-list"),a=i.index()+1,s=$(".gallery-show-min img").length,e=s-a;if($(this).css("display","none"),e>=2*n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a+(n-1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a+(n-1))*c)},o,function(){$(".gallery-min-right").css("display","block"),2*n>e&&$(".gallery-min-right").css("display","none")})),2*n-1>e){var r=s-(a+4);r=a+r-1,$(".gallery-show-min img").removeClass("act-list"),$(l[r]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r*c)},o,function(){})}a>0&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o)})}function s(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").on("click",function(){var i=$(".act-list"),a=i.index()+1,s=a-1;s>0&&($(this).css("display","none"),n-1>=s&&($(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:0},o,function(){n+1>=a?$(".gallery-min-right").css({display:"block"}):$(".gallery-min-left").css("display","block")})),s>n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a-(n+1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a-(n+1))*c)},o,function(){n+1>=a||($(".gallery-min-right").css("display","block"),$(".gallery-min-left").css("display","block"))})))})}function e(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-right").on("click",function(){function s(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var e=$(".gallery-active-pic"),r=e.index()+1,g=r;2>=r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),s(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=n-2&&r>l&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o),r>=l-3&&$(".gallery-min-right").css({display:"none"}),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),r>=1&&($(".gallery-big-left").css({display:"block"}),l>n&&r>2&&$(".gallery-min-left").css({display:"block"})),r+1>=l&&$(".gallery-big-right").css({display:"none"})})}function r(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-left").on("click",function(){function s(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var e=$(".gallery-active-pic"),r=e.index()-1,g=r;2>=r&&(r>0&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[0]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s())),3>r&&setTimeout(function(){$(".gallery-min-left").css({display:"none"})},o),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),s(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),1>r&&$(".gallery-big-left").css({display:"none"}),l-2>=r&&$(".gallery-big-right").css({display:"block"})})}$("body").append('
');var g=152,t=20,n=5,o=500,c=g+t,y=$(".gallery-page"),m=1.68;$(".gallery-box-min").click(function(g){g.preventDefault();var t=$(this).parent().find(".gallery-box-hidden");if($(t).hasClass("gallery-box-hidden")){var n=m,o=$(window).height(),c=$(".gallery-page");if(755>o)$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)}),c.css({height:o/n+148+"px",marginTop:-((o/n+148)/2)+"px"});else{var y=$(".gallery-show-big-wrp").height()+$(".galley-show-min-wrapper").height();$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)})}l(this),i(),$(".gallery-min-right").unbind("click"),$(".gallery-min-left").unbind("click"),$(".gallery-min-right").bind("click",a()),$(".gallery-min-left").bind("click",s()),$(".gallery-big-right").unbind("click"),$(".gallery-big-left").unbind("click"),$(".gallery-big-right").bind("click",e()),$(".gallery-big-left").bind("click",r())}}),$(".closed-form, #overlay").click(function(){$(".gallery-page").animate({opacity:0,top:255},200,function(){$(this).css("display","none"),$("#overlay").fadeOut(400)}),$(".gallery-big-left, .gallery-big-right").attr("style",""),$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty()});var d=m;$(window).resize(function(){var l=$(window).height();755>l?($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:l/d+"px"}),$(".gallery-show-big img").css({height:l/d+"px"}),y.css({height:l/d+148+"px",marginTop:-((l/d+148)/2)+"px"})):($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td, .gallery-show-big img").css({height:560}),y.css({height:710,marginTop:"-355px"}))})}); \ No newline at end of file +$(document).ready(function(){ + if( $('.gallery-box').length ){ + function l(l){function i(){var l=$(".gallery-show-min img").length;$(".gallery-show-min").css({width:c*l-t})}function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[s]).fadeIn(100);var i=$(l[s]).find("img"),a=i.attr("data-link");i.attr("src",a)}$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty();var s=$(l).index();$(".gallery-show-min").css({marginLeft:0});for(var e=$(l).parent().find(".gallery-box-preview span"),r=$(l).parent().find(".gallery-box-big span"),g=0;g')}$(".gallery-show-min img:first-child").addClass("gallery-active-pic"),$(".gallery-show-min img:last-child").css({marginRight:0}),$(".gallery-show-min").append('
');for(var o=0;o')}var d=$(".gallery-show-big tr:first-child").find("img"),h=d.attr("data-link");d.attr("src",h);var p=m,f=$(window).height();$(".gallery-page");755>f&&($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:f/p+"px"}),$(".gallery-show-big img").css({height:f/p+"px"})),i();var v=$(".gallery-show-min img");$(v).removeClass("gallery-active-pic"),$(v[s]).addClass("gallery-active-pic"),$(".border-gallery").css({left:c*s}),a(),0==s?$(".gallery-big-left").css({display:"none"}):$(".gallery-big-left").css({display:"block"})}function i(){var l=$(".gallery-show-min img"),i=$(".gallery-show-min img").length;n>=i?$(".gallery-min-left, .gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"none"}):($(".gallery-min-right, .copy-gallery-min-left, .copy-gallery-min-right").css({display:"block"}),$(".gallery-min-left").css({display:"none"})),$(".gallery-show-min img").on("click",function(){function a(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var s=l,e=$(".gallery-show-min").offset().left;s=$(s[2]).offset().left-e,$(".gallery-show-min img").removeClass("gallery-active-pic"),$(this).addClass("gallery-active-pic");var r=$(".gallery-active-pic").offset().left-e,g=$(".gallery-active-pic").index(),t=i-(g+1);2>=g&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").css({display:"none"})),2==g&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o),$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list")),n-1>=g&&(a(),$(".border-gallery").css({left:r}),g>3&&$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o)),g>=n-1&&($(".gallery-min-left").css({display:"block"}),i==n&&g==n-1&&($(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==t&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().prev().addClass("act-list"),setTimeout(function(){$(".gallery-min-right").css({display:"none"})},o)),1==t&&(a(),$(".gallery-show-min").stop().animate({marginLeft:-(r-s-c)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".border-gallery").css({left:r}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().prev().addClass("act-list")),2==t&&(a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o,function(){$(".gallery-min-right").css({display:"none"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),t>2&&(console.log(">2"),a(),$(".border-gallery").css({left:r}),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o,function(){$(".gallery-min-right").css({display:"block"})}),$(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list")),n>=i&&$(".gallery-min-left").css({display:"none"})),i>n&&t>2&&$(".gallery-min-right").css({display:"block"}),3==g&&($(".gallery-show-min img").removeClass("act-list"),$(this).prev().prev().addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r-s)},o),$(l[1]).click(function(){$(".gallery-show-min").stop().animate({marginLeft:0},o)}),n>=i?$(".gallery-show-min").stop().animate({marginLeft:0},o):$(".gallery-min-left").attr("style",'disply:"block"')),g>=1&&i-1>g&&$(".gallery-big-left, .gallery-big-right").css({display:"block"}),g==i-1&&$(".gallery-big-right").css({display:"none"}),0==g&&$(".gallery-big-left").css({display:"none"})})}function a(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-right").on("click",function(){var i=$(".act-list"),a=i.index()+1,s=$(".gallery-show-min img").length,e=s-a;if($(this).css("display","none"),e>=2*n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a+(n-1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a+(n-1))*c)},o,function(){$(".gallery-min-right").css("display","block"),2*n>e&&$(".gallery-min-right").css("display","none")})),2*n-1>e){var r=s-(a+4);r=a+r-1,$(".gallery-show-min img").removeClass("act-list"),$(l[r]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-(r*c)},o,function(){})}a>0&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o)})}function s(){var l=$(".gallery-show-min img");$(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-min-left").on("click",function(){var i=$(".act-list"),a=i.index()+1,s=a-1;s>0&&($(this).css("display","none"),n-1>=s&&($(".gallery-show-min img").removeClass("act-list"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:0},o,function(){n+1>=a?$(".gallery-min-right").css({display:"block"}):$(".gallery-min-left").css("display","block")})),s>n-1&&($(".gallery-show-min img").removeClass("act-list"),$(l[a-(n+1)]).addClass("act-list"),$(".gallery-show-min").stop().animate({marginLeft:-((a-(n+1))*c)},o,function(){n+1>=a||($(".gallery-min-right").css("display","block"),$(".gallery-min-left").css("display","block"))})))})}function e(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-right").on("click",function(){function s(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var e=$(".gallery-active-pic"),r=e.index()+1,g=r;2>=r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),s(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=n-2&&r>l&&setTimeout(function(){$(".gallery-min-left").css({display:"block"})},o),r>=l-3&&$(".gallery-min-right").css({display:"none"}),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),r>=1&&($(".gallery-big-left").css({display:"block"}),l>n&&r>2&&$(".gallery-min-left").css({display:"block"})),r+1>=l&&$(".gallery-big-right").css({display:"none"})})}function r(){var l=$(".gallery-show-min img").length,i=$(".gallery-show-min img"),a=3*c;$(".gallery-big-left").on("click",function(){function s(){var l=$(".gallery-show-big tr");$(".gallery-show-big tr").css({display:"none"}),$(l[g]).fadeIn(100);var i=$(l[g]).find("img"),a=i.attr("data-link");i.attr("src",a)}var e=$(".gallery-active-pic"),r=e.index()-1,g=r;2>=r&&(r>0&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s(),$(".gallery-show-min").stop().animate({marginLeft:0},o)),0==r&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[0]).addClass("gallery-active-pic"),$(".gallery-show-min img:first-child").addClass("act-list"),$(".border-gallery").css({left:c*r}),s())),3>r&&setTimeout(function(){$(".gallery-min-left").css({display:"none"})},o),l-r>0&&r>2&&($(".gallery-show-min img").removeClass("gallery-active-pic act-list"),$(i[r]).addClass("gallery-active-pic"),$(i[r]).prev().prev().addClass("act-list"),s(),$(".border-gallery").css({left:c*r}),l-r>2&&$(".gallery-show-min").stop().animate({marginLeft:-(r*c-a+c)},o),r>=3&&l-4>=r&&$(".gallery-min-right").css({display:"block"})),1>r&&$(".gallery-big-left").css({display:"none"}),l-2>=r&&$(".gallery-big-right").css({display:"block"})})}$("body").append('
');var g=152,t=20,n=5,o=500,c=g+t,y=$(".gallery-page"),m=1.68;$(".gallery-box-min").click(function(g){g.preventDefault();var t=$(this).parent().find(".gallery-box-hidden");if($(t).hasClass("gallery-box-hidden")){var n=m,o=$(window).height(),c=$(".gallery-page");if(755>o)$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)}),c.css({height:o/n+148+"px",marginTop:-((o/n+148)/2)+"px"});else{var y=$(".gallery-show-big-wrp").height()+$(".galley-show-min-wrapper").height();$("#overlay").fadeIn(400,function(){$(".gallery-page").css({display:"block",marginTop:-(y/2)}).animate({opacity:1,top:"50%"},200)})}l(this),i(),$(".gallery-min-right").unbind("click"),$(".gallery-min-left").unbind("click"),$(".gallery-min-right").bind("click",a()),$(".gallery-min-left").bind("click",s()),$(".gallery-big-right").unbind("click"),$(".gallery-big-left").unbind("click"),$(".gallery-big-right").bind("click",e()),$(".gallery-big-left").bind("click",r())}}),$(".closed-form, #overlay").click(function(){$(".gallery-page").animate({opacity:0,top:255},200,function(){$(this).css("display","none"),$("#overlay").fadeOut(400)}),$(".gallery-big-left, .gallery-big-right").attr("style",""),$(".gallery-show-wr .gallery-show-min, .gallery-show-wr .gallery-show-big").empty()});var d=m;$(window).resize(function(){var l=$(window).height();755>l?($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td").css({height:l/d+"px"}),$(".gallery-show-big img").css({height:l/d+"px"}),y.css({height:l/d+148+"px",marginTop:-((l/d+148)/2)+"px"})):($(".gallery-show-big-wrp, .gallery-show-big, .gallery-show-big tr td, .gallery-show-big img").css({height:560}),y.css({height:710,marginTop:"-355px"}))}) + } +}); \ No newline at end of file diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index f8524c2..2ffb32b 100755 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -10,7 +10,7 @@ $(document).ready(function(){ projectAllMenu(); mapLoad(); federationHome(); - validationForms(); + //validationForms(); //menuContent(); jobClick(); box15Height(); @@ -59,7 +59,7 @@ $(document).ready(function(){ } if (tempScrollTop < currentScrollTop ){ if (currentScrollTop>=114) { - $('.menu-header-all').css({position:'fixed', zIndex:999}); + $('.menu-header-all').css({position:'fixed', zIndex:9990}); $('.section-box.content').css({marginTop:41}); } @@ -317,169 +317,169 @@ $(document).ready(function(){ },500); } - 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 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){ @@ -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