From 108e867605dbc7ece4cbcbecc89a674e9c154a9b Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 May 2016 13:00:53 -0400
Subject: Move Chosen images to the right directory and put back JS files in
 head

---
 app/Template/layout.php         |   9 +++++----
 assets/css/chosen-sprite.png    | Bin 0 -> 538 bytes
 assets/css/chosen-sprite@2x.png | Bin 0 -> 738 bytes
 assets/img/chosen-sprite.png    | Bin 538 -> 0 bytes
 assets/img/chosen-sprite@2x.png | Bin 738 -> 0 bytes
 gulpfile.js                     |   2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 assets/css/chosen-sprite.png
 create mode 100644 assets/css/chosen-sprite@2x.png
 delete mode 100644 assets/img/chosen-sprite.png
 delete mode 100644 assets/img/chosen-sprite@2x.png

diff --git a/app/Template/layout.php b/app/Template/layout.php
index 811da9db..a80fc288 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -18,6 +18,11 @@
         <?= $this->asset->css('assets/css/print.min.css', true, 'print') ?>
         <?= $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('js', 'template:layout:js') ?>
 
@@ -60,9 +65,5 @@
         </section>
         <?= $this->hook->render('template:layout:bottom') ?>
     <?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>
 </html>
diff --git a/assets/css/chosen-sprite.png b/assets/css/chosen-sprite.png
new file mode 100644
index 00000000..c57da70b
Binary files /dev/null and b/assets/css/chosen-sprite.png differ
diff --git a/assets/css/chosen-sprite@2x.png b/assets/css/chosen-sprite@2x.png
new file mode 100644
index 00000000..6b505452
Binary files /dev/null and b/assets/css/chosen-sprite@2x.png differ
diff --git a/assets/img/chosen-sprite.png b/assets/img/chosen-sprite.png
deleted file mode 100644
index c57da70b..00000000
Binary files a/assets/img/chosen-sprite.png and /dev/null differ
diff --git a/assets/img/chosen-sprite@2x.png b/assets/img/chosen-sprite@2x.png
deleted file mode 100644
index 6b505452..00000000
Binary files a/assets/img/chosen-sprite@2x.png and /dev/null differ
diff --git a/gulpfile.js b/gulpfile.js
index 2f96cb36..97c61fbe 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -123,7 +123,7 @@ gulp.task('vendor', function() {
         .pipe(gulp.dest(dist.css + 'images/'));
 
     gulp.src('bower_components/chosen/*.png')
-        .pipe(gulp.dest(dist.img + ''));
+        .pipe(gulp.dest(dist.css + ''));
 });
 
 gulp.task('js', function() {
-- 
cgit v1.2.3