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 %} - + - + - + + + + + +