From e26d0a2bd9d1fe4401163553ac3343d65356ea0e Mon Sep 17 00:00:00 2001 From: pavel Date: Wed, 24 Dec 2014 15:40:46 +0000 Subject: [PATCH] minified files tested --- templates/client/accounts/feed.html | 2 +- templates/client/accounts/fill_company.html | 2 +- templates/client/accounts/new_profile.html | 2 +- templates/client/blank.html | 18 +- templates/client/gulpfile.js | 11 +- .../includes/accounts/calendar_table.html | 2 +- templates/client/includes/catalog_search.html | 2 +- .../client/includes/catalog_search_main.html | 2 +- .../includes/exposition/exposition_list.html | 2 +- .../exposition/exposition_object.html | 2 +- .../client/includes/place/place_object.html | 2 +- templates/client/index.html | 2 +- templates/client/place/place_photo.html | 2 +- templates/client/static_client/css/app.css | 642 +++++++++++++++++- templates/client/static_client/css/main.css | 5 +- .../{css/min => css_min}/app.min.css | 2 +- .../{css/min => css_min}/main.min.css | 2 +- .../min/_modules/page.profile.calendar.min.js | 1 - .../_modules/block.common.min.js | 0 .../_modules/block.exposition.list.min.js | 0 .../_modules/block.search.min.js | 0 .../_modules/page.company.min.js | 0 .../_modules/page.events.feed.min.js | 0 .../_modules/page.exposition.object.min.js | 0 .../min => js_min}/_modules/page.index.min.js | 0 .../_modules/page.place.object.min.js | 0 .../_modules/page.place.photo.min.js | 0 .../_modules/page.profile.calendar.min.js | 1 + .../_modules/page.profile.min.js | 0 .../{js/min => js_min}/app.min.js | 0 30 files changed, 669 insertions(+), 35 deletions(-) rename templates/client/static_client/{css/min => css_min}/app.min.css (84%) rename templates/client/static_client/{css/min => css_min}/main.min.css (95%) delete mode 100644 templates/client/static_client/js/min/_modules/page.profile.calendar.min.js rename templates/client/static_client/{js/min => js_min}/_modules/block.common.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/block.exposition.list.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/block.search.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/page.company.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/page.events.feed.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/page.exposition.object.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/page.index.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/page.place.object.min.js (100%) rename templates/client/static_client/{js/min => js_min}/_modules/page.place.photo.min.js (100%) create mode 100644 templates/client/static_client/js_min/_modules/page.profile.calendar.min.js rename templates/client/static_client/{js/min => js_min}/_modules/page.profile.min.js (100%) rename templates/client/static_client/{js/min => js_min}/app.min.js (100%) diff --git a/templates/client/accounts/feed.html b/templates/client/accounts/feed.html index 81b9ced2..65cd841f 100644 --- a/templates/client/accounts/feed.html +++ b/templates/client/accounts/feed.html @@ -79,7 +79,7 @@ {% include 'includes/catalog_paginator.html' with page_obj=page_obj %} {% endblock %} {% block scripts %} - + - + - + - - - + - {% if not request.user.is_anonymous %} - {% if not request.user.url %} - - {% endif %} - {% endif %} - - {% block style %} - {% endblock %} - + diff --git a/templates/client/gulpfile.js b/templates/client/gulpfile.js index 3cdb5b0f..03b2cea4 100644 --- a/templates/client/gulpfile.js +++ b/templates/client/gulpfile.js @@ -25,7 +25,7 @@ gulp.task('make-app-js', function () { .pipe(gulp.dest('static_client/js/')) .pipe(uglify()) .pipe(rename('app.min.js')) - .pipe(gulp.dest('static_client/js/min/')) + .pipe(gulp.dest('static_client/js_min/')) }); gulp.task('make-app-css', function () { @@ -37,13 +37,14 @@ gulp.task('make-app-css', function () { 'static_client/css/jquery.mousewheel.min.js', 'static_client/css/jquery.fancybox.css', 'static_client/css/phototag.css', - 'static_client/css/regions.css' + 'static_client/css/regions.css', + 'static_client/css/select2.css' ]) .pipe(concat('app.css')) .pipe(gulp.dest('static_client/css/')) .pipe(cssmin()) .pipe(rename('app.min.css')) - .pipe(gulp.dest('static_client/css/min/')) + .pipe(gulp.dest('static_client/css_min/')) }); gulp.task('main-css', function () { @@ -54,13 +55,13 @@ gulp.task('main-css', function () { .pipe(gulp.dest('static_client/css/')) .pipe(cssmin()) .pipe(rename('main.min.css')) - .pipe(gulp.dest('static_client/css/min/')) + .pipe(gulp.dest('static_client/css_min/')) }); gulp.task('minify-modules', function () { gulp.src('static_client/js/_modules/*.js') .pipe(uglify()) .pipe(rename({extname: ".min.js"})) - .pipe(gulp.dest('static_client/js/min/_modules')) + .pipe(gulp.dest('static_client/js_min/_modules')) }); \ No newline at end of file diff --git a/templates/client/includes/accounts/calendar_table.html b/templates/client/includes/accounts/calendar_table.html index c016a966..2ef1fb1f 100644 --- a/templates/client/includes/accounts/calendar_table.html +++ b/templates/client/includes/accounts/calendar_table.html @@ -143,7 +143,7 @@
 
{% block scripts %} - + - + - + + + + + +