scripts at end of body

This commit is contained in:
Lorin Werthen 2017-04-23 15:27:43 +02:00
parent 98dcc26a11
commit f2805be647
No known key found for this signature in database
GPG key ID: F11FFC921E0E08E0
5 changed files with 18 additions and 25 deletions

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'nanoc', '4.7.7' gem 'nanoc'
# General filtering # General filtering
gem 'coffee-script' gem 'coffee-script'
@ -22,8 +22,8 @@ gem 'words_counted'
group :development do group :development do
gem 'adsf' gem 'adsf'
gem 'highline' gem 'highline'
gem 'terminal-notifier-guard'
gem 'terminal-notifier' gem 'terminal-notifier'
gem 'terminal-notifier-guard'
end end
group :production do group :production do

View file

@ -111,7 +111,7 @@ DEPENDENCIES
html_press html_press
icalendar icalendar
kramdown kramdown
nanoc (= 4.7.7) nanoc
sass sass
terminal-notifier terminal-notifier
terminal-notifier-guard terminal-notifier-guard

5
Rules
View file

@ -110,9 +110,14 @@ end
# #
compile '/assets/scripts/**/*.coffee' do compile '/assets/scripts/**/*.coffee' do
filter :coffeescript filter :coffeescript
filter :uglify_js
write ext: 'js' write ext: 'js'
end end
compile '/assets/scripts/**/*.js' do
filter :uglify_js
end
ignore '/assets/stylesheets/includes/**/*' ignore '/assets/stylesheets/includes/**/*'
compile '/assets/stylesheets/**/*.scss' do compile '/assets/stylesheets/**/*.scss' do

View file

@ -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."> <META NAME="Description" CONTENT="Studentenvereniging van de informatica aan de Universiteit Gent. Informatie over o.a. Linux (downloads en lessen), programmeren, en internetbeveiliging.">
<% end %> <% end %>
<% content_for :scripts do %>
<%= asset :js, :gamification %>
<% end %>
<div id="homepage"> <div id="homepage">
<div class="tile is-vertical is-ancestor"> <div class="tile is-vertical is-ancestor">
<%= if studytime? then render '/tiles/blokmap.*'end %> <%= if studytime? then render '/tiles/blokmap.*'end %>
@ -57,20 +61,3 @@
</div> </div>
</div> </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>
-->

View file

@ -11,8 +11,6 @@
<link rel="icon" href="/assets/images/favicon32.png" type="image/x-icon" /> <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 %>"> <meta name="generator" content="Nanoc <%= Nanoc::VERSION %>">
<!-- Android theme color --> <!-- Android theme color -->
@ -21,9 +19,6 @@
<meta property="fb:app_id" content="597670540410704"> <meta property="fb:app_id" content="597670540410704">
<link href="https://cdnjs.cloudflare.com/ajax/libs/Tipue-Search/5.0.0/tipuesearch.css" rel="stylesheet"> <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 --> <!-- Google Analytics -->
<script> <script>
@ -59,5 +54,11 @@
<%= yield %> <%= yield %>
</div> </div>
<%= render '/partials/_footer.*' %> <%= 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> </body>
</html> </html>