From f2805be6479376db6ee97a5c1244d2b3842d4eef Mon Sep 17 00:00:00 2001
From: Lorin Werthen <werthenlorin@gmail.com>
Date: Sun, 23 Apr 2017 15:27:43 +0200
Subject: [PATCH] scripts at end of body

---
 Gemfile             |  4 ++--
 Gemfile.lock        |  2 +-
 Rules               |  5 +++++
 content/index.erb   | 21 ++++-----------------
 layouts/default.erb | 11 ++++++-----
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index 82c4ae3..feb18d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-gem 'nanoc', '4.7.7'
+gem 'nanoc'
 
 # General filtering
 gem 'coffee-script'
@@ -22,8 +22,8 @@ gem 'words_counted'
 group :development do
   gem 'adsf'
   gem 'highline'
-  gem 'terminal-notifier-guard'
   gem 'terminal-notifier'
+  gem 'terminal-notifier-guard'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b96971..a603def 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,7 +111,7 @@ DEPENDENCIES
   html_press
   icalendar
   kramdown
-  nanoc (= 4.7.7)
+  nanoc
   sass
   terminal-notifier
   terminal-notifier-guard
diff --git a/Rules b/Rules
index 184c47f..ba81269 100644
--- a/Rules
+++ b/Rules
@@ -110,9 +110,14 @@ end
 #
 compile '/assets/scripts/**/*.coffee' do
   filter :coffeescript
+  filter :uglify_js
   write ext: 'js'
 end
 
+compile '/assets/scripts/**/*.js' do
+  filter :uglify_js
+end
+
 ignore '/assets/stylesheets/includes/**/*'
 
 compile '/assets/stylesheets/**/*.scss' do
diff --git a/content/index.erb b/content/index.erb
index a50da53..dd8a1c3 100644
--- a/content/index.erb
+++ b/content/index.erb
@@ -4,6 +4,10 @@
 <META NAME="Description" CONTENT="Studentenvereniging van de informatica aan de Universiteit Gent. Informatie over o.a. Linux (downloads en lessen), programmeren, en internetbeveiliging.">
 <% end %>
 
+<% content_for :scripts do %>
+<%= asset :js, :gamification %>
+<% end %>
+
 <div id="homepage">
   <div class="tile is-vertical is-ancestor">
     <%= if studytime? then render '/tiles/blokmap.*'end %>
@@ -57,20 +61,3 @@
       </div>
   </div>
 </div>
-<%= asset :js, :gamification %>
-<!--
-<%= asset :js, :quote %>
--->
-<!--
-
-        <div class="tile is-parent is-2">
-          <a class="tile box is-child imgcenter project-tile" href="/projects/#12urenloop">
-            <%= asset :img, '12urenloop.png' %>
-          </a>
-        </div>
-        <div class="tile is-parent is-2">
-          <a class="tile is-child imgcenter box hydra-tile" href="/projects/#hydra">
-            <%= asset :img, 'hydra-logo.svg' %>
-          </a>
-        </div>
--->
diff --git a/layouts/default.erb b/layouts/default.erb
index b351c5f..76e17b6 100644
--- a/layouts/default.erb
+++ b/layouts/default.erb
@@ -11,8 +11,6 @@
 
     <link rel="icon" href="/assets/images/favicon32.png" type="image/x-icon" />
 
-    <script src="https://code.jquery.com/jquery-3.0.0.min.js" charset="utf-8"></script>
-
     <meta name="generator" content="Nanoc <%= Nanoc::VERSION %>">
 
     <!-- Android theme color -->
@@ -21,9 +19,6 @@
     <meta property="fb:app_id" content="597670540410704">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/Tipue-Search/5.0.0/tipuesearch.css" rel="stylesheet">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Tipue-Search/5.0.0/tipuesearch_set.js"></script>
-    <%= asset :js, :tipuesearch %>
-    <%= asset :js, :search %>
 
     <!-- Google Analytics -->
     <script>
@@ -59,5 +54,11 @@
       <%= yield %>
       </div>
     <%= render '/partials/_footer.*' %>
+
+  <script src="https://code.jquery.com/jquery-3.0.0.min.js" charset="utf-8"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/Tipue-Search/5.0.0/tipuesearch_set.js"></script>
+  <%= asset :js, :tipuesearch %>
+  <%= asset :js, :search %>
+  <%= content_for(@item, :scripts) %>
   </body>
 </html>