Move Chosen images to the right directory and put back JS files in head

This commit is contained in:
Frederic Guillot 2016-05-15 13:00:53 -04:00
parent 70c1df14db
commit 108e867605
4 changed files with 6 additions and 5 deletions

View File

@ -18,6 +18,11 @@
<?= $this->asset->css('assets/css/print.min.css', true, 'print') ?> <?= $this->asset->css('assets/css/print.min.css', true, 'print') ?>
<?= $this->asset->customCss() ?> <?= $this->asset->customCss() ?>
<?php if (! isset($not_editable)): ?>
<?= $this->asset->js('assets/js/vendor.min.js') ?>
<?= $this->asset->js('assets/js/app.min.js') ?>
<?php endif ?>
<?= $this->hook->asset('css', 'template:layout:css') ?> <?= $this->hook->asset('css', 'template:layout:css') ?>
<?= $this->hook->asset('js', 'template:layout:js') ?> <?= $this->hook->asset('js', 'template:layout:js') ?>
@ -60,9 +65,5 @@
</section> </section>
<?= $this->hook->render('template:layout:bottom') ?> <?= $this->hook->render('template:layout:bottom') ?>
<?php endif ?> <?php endif ?>
<?php if (! isset($not_editable)): ?>
<?= $this->asset->js('assets/js/vendor.min.js') ?>
<?= $this->asset->js('assets/js/app.min.js') ?>
<?php endif ?>
</body> </body>
</html> </html>

View File

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 538 B

View File

Before

Width:  |  Height:  |  Size: 738 B

After

Width:  |  Height:  |  Size: 738 B

View File

@ -123,7 +123,7 @@ gulp.task('vendor', function() {
.pipe(gulp.dest(dist.css + 'images/')); .pipe(gulp.dest(dist.css + 'images/'));
gulp.src('bower_components/chosen/*.png') gulp.src('bower_components/chosen/*.png')
.pipe(gulp.dest(dist.img + '')); .pipe(gulp.dest(dist.css + ''));
}); });
gulp.task('js', function() { gulp.task('js', function() {