From 3af2223d46f6b95ae0e015d9ae4a73357485620e Mon Sep 17 00:00:00 2001 From: pavel Date: Thu, 29 Jan 2015 18:33:09 +0000 Subject: [PATCH 1/4] fancybox bug fixed --- templates/client/blank.html | 7 +- templates/client/gulpfile.js | 4 +- templates/client/popups/reg_send.html | 13 +- templates/client/static_client/css/main.css | 8 +- templates/client/static_client/css/vendor.css | 12 +- .../client/static_client/css_min/main.min.css | 2 +- .../static_client/css_min/vendor.min.css | 2 +- .../static_client/js/_modules/block.common.js | 23 + templates/client/static_client/js/vendor.js | 2066 ++++++++++++++++- .../js_min/_modules/block.common.min.js | 2 +- .../_modules/page.profile.calendar.min.js | 2 +- .../js_min/_modules/page.profile.min.js | 2 +- .../client/static_client/js_min/vendor.min.js | 6 +- .../{img => lib}/fancybox/blank.gif | Bin .../fancybox/fancybox_loading.gif | Bin .../fancybox/fancybox_loading@2x.gif | Bin .../fancybox/fancybox_overlay.png | Bin .../{img => lib}/fancybox/fancybox_sprite.png | Bin .../fancybox/fancybox_sprite@2x.png | Bin .../lib/fancybox/helpers/fancybox_buttons.png | Bin 0 -> 1080 bytes .../helpers/jquery.fancybox-buttons.css | 97 + .../helpers/jquery.fancybox-buttons.js | 122 + .../fancybox/helpers/jquery.fancybox-media.js | 199 ++ .../helpers/jquery.fancybox-thumbs.css | 55 + .../helpers/jquery.fancybox-thumbs.js | 162 ++ .../{css => lib/fancybox}/jquery.fancybox.css | 12 +- .../lib/fancybox/jquery.fancybox.js | 2020 ++++++++++++++++ .../fancybox}/jquery.fancybox.pack.js | 0 28 files changed, 4743 insertions(+), 73 deletions(-) rename templates/client/static_client/{img => lib}/fancybox/blank.gif (100%) rename templates/client/static_client/{img => lib}/fancybox/fancybox_loading.gif (100%) rename templates/client/static_client/{img => lib}/fancybox/fancybox_loading@2x.gif (100%) rename templates/client/static_client/{img => lib}/fancybox/fancybox_overlay.png (100%) rename templates/client/static_client/{img => lib}/fancybox/fancybox_sprite.png (100%) rename templates/client/static_client/{img => lib}/fancybox/fancybox_sprite@2x.png (100%) create mode 100644 templates/client/static_client/lib/fancybox/helpers/fancybox_buttons.png create mode 100644 templates/client/static_client/lib/fancybox/helpers/jquery.fancybox-buttons.css create mode 100644 templates/client/static_client/lib/fancybox/helpers/jquery.fancybox-buttons.js create mode 100644 templates/client/static_client/lib/fancybox/helpers/jquery.fancybox-media.js create mode 100644 templates/client/static_client/lib/fancybox/helpers/jquery.fancybox-thumbs.css create mode 100644 templates/client/static_client/lib/fancybox/helpers/jquery.fancybox-thumbs.js rename templates/client/static_client/{css => lib/fancybox}/jquery.fancybox.css (91%) create mode 100644 templates/client/static_client/lib/fancybox/jquery.fancybox.js rename templates/client/static_client/{js => lib/fancybox}/jquery.fancybox.pack.js (100%) diff --git a/templates/client/blank.html b/templates/client/blank.html index b6c87fa2..8951c52c 100644 --- a/templates/client/blank.html +++ b/templates/client/blank.html @@ -31,8 +31,8 @@ This template include basic anf main styles and js files, - - + + + diff --git a/templates/client/gulpfile.js b/templates/client/gulpfile.js index 955b73a7..e3b6b790 100644 --- a/templates/client/gulpfile.js +++ b/templates/client/gulpfile.js @@ -15,7 +15,7 @@ gulp.task('make-vendor-js', function () { 'static_client/js/jquery.mousewheel.min.js', 'static_client/js/idangerous.swiper-2.4.min.js', 'static_client/js/jquery.mCustomScrollbar.concat.min.js', - 'static_client/js/jquery.fancybox.pack.js', + 'static_client/lib/fancybox/jquery.fancybox.js', 'static_client/js/jquery.placeholder.js', 'static_client/js/jquery.phototag.js', 'static_client/js/dna.min.js', @@ -37,7 +37,7 @@ gulp.task('make-vendor-css', function () { 'static_client/css/jquery.mCustomScrollbar.min.css', 'static_client/css/jquery-ui-1.10.3.custom.css', 'static_client/css/jquery.mousewheel.min.js', - 'static_client/css/jquery.fancybox.css', + 'static_client/lib/fancybox/jquery.fancybox.css', 'static_client/css/phototag.css', 'static_client/css/regions.css', 'static_client/css/select2.css' diff --git a/templates/client/popups/reg_send.html b/templates/client/popups/reg_send.html index b89ac63d..f5968916 100644 --- a/templates/client/popups/reg_send.html +++ b/templates/client/popups/reg_send.html @@ -1,8 +1,17 @@ {% load static %} {% load i18n %} -