From 3e4f3932cd6a312e8f1a57079b1b0b42bd6eaf84 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sun, 31 Jul 2016 17:38:04 +0200 Subject: [PATCH 1/3] gotta keep shit up to date --- content/about.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/about.erb b/content/about.erb index 7ad92d4..0ad06c4 100644 --- a/content/about.erb +++ b/content/about.erb @@ -15,26 +15,26 @@

Het bestuur

- Het bestuur zorgt ervoor dat alle wieltjes blijven draaien en organiseert regelmatig activiteiten voor de leden. Het bestuur voor het academiejaar 2015-2016 van Zeus WPI is. + Het bestuur zorgt ervoor dat alle wieltjes blijven draaien en organiseert regelmatig activiteiten voor de leden. Het bestuur voor het academiejaar 2016-2017 van Zeus WPI is. @@ -60,7 +60,7 @@ bezoek ons IRC-kanaal. (server: wina.ugent.be, kanaal: #zeus)
  • - bel naar 09 264 4751 (intern: 4751) + bel naar 09 264 4751 (intern: 4751)
  • stort op BE32 9799 9370 6502 (BIC: ARSP BE 22) From 84181be5e86b34b632bc7f2a1a3cb59e837190a2 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sun, 31 Jul 2016 19:28:23 +0200 Subject: [PATCH 2/3] navigation --- .gitignore | 2 +- Checks | 2 +- Gemfile.lock | 4 ++-- Rules | 2 +- content/about.erb | 4 ++++ content/archives.erb | 4 ++++ content/cammie.erb | 4 ++++ content/projects.erb | 4 ++++ content/search.erb | 4 ++++ layouts/partials/_navbar.erb | 20 +++++--------------- lib/helpers/nav.rb | 10 ++++++++++ lib/helpers_.rb | 1 + 12 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 lib/helpers/nav.rb diff --git a/.gitignore b/.gitignore index 3a11a65..82e6258 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ output/ tmp/ # Crash Log -crash.log +crash.log* .idea/ diff --git a/Checks b/Checks index 08a7f08..c0a6213 100644 --- a/Checks +++ b/Checks @@ -4,6 +4,6 @@ deploy_check :elinks # The w3c validators go offline often, not great for our build CI # deploy_check :html -deploy_check :ilinks +#deploy_check :ilinks deploy_check :mixed_content deploy_check :stale diff --git a/Gemfile.lock b/Gemfile.lock index e780af9..ece43fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM hamster (3.0.0) concurrent-ruby (~> 1.0) icalendar (2.4.0) - json (2.0.1) + json (2.0.2) kramdown (1.11.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -50,7 +50,7 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) - notiffany (0.1.0) + notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) pkg-config (1.1.7) diff --git a/Rules b/Rules index 111b328..57e2ea8 100644 --- a/Rules +++ b/Rules @@ -161,7 +161,7 @@ route '/posts/**/*', rep: :ical do end route '/**/*.{erb,html,md}' do - "#{item.identifier.without_ext}/index.html" + "#{item.identifier.without_ext}.html" end # diff --git a/content/about.erb b/content/about.erb index 0ad06c4..c526ec6 100644 --- a/content/about.erb +++ b/content/about.erb @@ -1,3 +1,7 @@ +--- +navigable: true +title: About +---

    Over Zeus WPI

    diff --git a/content/archives.erb b/content/archives.erb index 2872249..b099a30 100644 --- a/content/archives.erb +++ b/content/archives.erb @@ -1,3 +1,7 @@ +--- +navigable: true +title: Archieven +---
      <% academic_years_items.each do |year, item| %>
    • diff --git a/content/cammie.erb b/content/cammie.erb index 2a297a3..aa7b719 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -1,3 +1,7 @@ +--- +navigable: true +title: Cammie +---
      diff --git a/content/search.erb b/content/search.erb index 4bc0e7d..499adea 100644 --- a/content/search.erb +++ b/content/search.erb @@ -1,3 +1,7 @@ +--- +navigable: true +title: Search +---
      diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb index d856c7c..cc69bd0 100644 --- a/layouts/partials/_navbar.erb +++ b/layouts/partials/_navbar.erb @@ -4,21 +4,11 @@ - - About - - - Archief - - - Projecten - - - Cammie - - - Zoeken - + <% nav_items do |item, active| %> + + <%= item[:title] %> + + <% end %>
      diff --git a/lib/helpers/nav.rb b/lib/helpers/nav.rb new file mode 100644 index 0000000..ec6a8fb --- /dev/null +++ b/lib/helpers/nav.rb @@ -0,0 +1,10 @@ +module NavigationHelper + def nav_items + navigables = items.select { |i| i[:navigable] } + + navigables.each do |item| + is_active = @item_rep && @item_rep.path == item.path + yield item, is_active + end + end +end diff --git a/lib/helpers_.rb b/lib/helpers_.rb index 86f3a76..686ba03 100644 --- a/lib/helpers_.rb +++ b/lib/helpers_.rb @@ -6,3 +6,4 @@ include Nanoc::Helpers::Text include ArchiveHelper include IcalHelper +include NavigationHelper From d0efbe5cd5b3f967a71120ebbe47c99dd90d5756 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sun, 31 Jul 2016 19:29:16 +0200 Subject: [PATCH 3/3] check ilinks as well --- Checks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Checks b/Checks index c0a6213..08a7f08 100644 --- a/Checks +++ b/Checks @@ -4,6 +4,6 @@ deploy_check :elinks # The w3c validators go offline often, not great for our build CI # deploy_check :html -#deploy_check :ilinks +deploy_check :ilinks deploy_check :mixed_content deploy_check :stale