From 799f21f9c80887bc318391e2380a3b51b8991395 Mon Sep 17 00:00:00 2001 From: mcbloch Date: Sun, 23 Aug 2020 00:06:03 +0200 Subject: [PATCH 1/4] Point to dsa association images --- content/verenigingen/{mcantus.md => massacantus.md} | 4 ++-- content/verenigingen/temp.md | 2 +- layouts/partials/detail.erb | 4 ++-- layouts/verenigingen.erb | 2 +- lib/helpers/verenigingen.rb | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) rename content/verenigingen/{mcantus.md => massacantus.md} (62%) diff --git a/content/verenigingen/mcantus.md b/content/verenigingen/massacantus.md similarity index 62% rename from content/verenigingen/mcantus.md rename to content/verenigingen/massacantus.md index 35d49c8..3cc0f58 100644 --- a/content/verenigingen/mcantus.md +++ b/content/verenigingen/massacantus.md @@ -1,5 +1,5 @@ --- titel: Massacantus naam: Massacantus -konvent: mcantus ---- \ No newline at end of file +konvent: massacantus +--- diff --git a/content/verenigingen/temp.md b/content/verenigingen/temp.md index 7079b82..041fbe0 100644 --- a/content/verenigingen/temp.md +++ b/content/verenigingen/temp.md @@ -2,7 +2,7 @@ titel: Temp naam: Temp tags: tem,p -konvent: tk +konvent: TempConvent bestuur: - functie: Voorzitter naam: /tmp diff --git a/layouts/partials/detail.erb b/layouts/partials/detail.erb index 73e5ef8..f4b1d27 100644 --- a/layouts/partials/detail.erb +++ b/layouts/partials/detail.erb @@ -1,5 +1,5 @@
<% if item[:deelname_link] %> @@ -51,4 +51,4 @@
<% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/layouts/verenigingen.erb b/layouts/verenigingen.erb index 7b08cab..36fe47b 100644 --- a/layouts/verenigingen.erb +++ b/layouts/verenigingen.erb @@ -9,7 +9,7 @@

Konventen en projecten

diff --git a/lib/helpers/verenigingen.rb b/lib/helpers/verenigingen.rb index 7ee4de9..4618663 100644 --- a/lib/helpers/verenigingen.rb +++ b/lib/helpers/verenigingen.rb @@ -19,4 +19,7 @@ module VerenigingenHelper "themas" => x[:themas] }}.to_a end + def abbreviation(item) + item.identifier.without_ext.split('/')[2] + end end From a0f6d06546bd4a69e75d4f928a96dcb3b9105b0a Mon Sep 17 00:00:00 2001 From: mcbloch Date: Sun, 23 Aug 2020 00:09:11 +0200 Subject: [PATCH 2/4] Better abbreviation function, also add dsa images for themes --- layouts/default.erb | 2 +- layouts/verenigingen.erb | 4 ++-- lib/helpers/verenigingen.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layouts/default.erb b/layouts/default.erb index 540e5d3..ec771c6 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -1,7 +1,7 @@ - Durf Doen! - <%= item[:titel] || item.identifier.without_ext.split('/').last %> + Durf Doen! - <%= item[:titel] || abbreviation(item) %> diff --git a/layouts/verenigingen.erb b/layouts/verenigingen.erb index 36fe47b..6300dda 100644 --- a/layouts/verenigingen.erb +++ b/layouts/verenigingen.erb @@ -1,8 +1,8 @@

Themas

diff --git a/lib/helpers/verenigingen.rb b/lib/helpers/verenigingen.rb index 4618663..b7ce7d1 100644 --- a/lib/helpers/verenigingen.rb +++ b/lib/helpers/verenigingen.rb @@ -20,6 +20,6 @@ module VerenigingenHelper }}.to_a end def abbreviation(item) - item.identifier.without_ext.split('/')[2] + item.identifier.without_ext.split('/').last end end From 24af65f2998d2444992ec8940be4c609543ffb1e Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Sun, 23 Aug 2020 01:36:09 +0200 Subject: [PATCH 3/4] Move to new URLs --- layouts/partials/detail.erb | 2 +- layouts/verenigingen.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/partials/detail.erb b/layouts/partials/detail.erb index f4b1d27..f25b41e 100644 --- a/layouts/partials/detail.erb +++ b/layouts/partials/detail.erb @@ -1,5 +1,5 @@
<% if item[:deelname_link] %> diff --git a/layouts/verenigingen.erb b/layouts/verenigingen.erb index 6300dda..ee6b9a0 100644 --- a/layouts/verenigingen.erb +++ b/layouts/verenigingen.erb @@ -1,7 +1,7 @@

Themas

    <% for theme in themes %> - /logo?size=medium" alt="<%= theme %>"> + /logo?size=medium" alt="<%= theme %>">
  • <%= link_to(theme, "/thema/"++theme.tr(" ", "_")) %>
    • <% end %>
@@ -9,7 +9,7 @@

Konventen en projecten

    <% for konvent in konvents %> - /logo?size=medium" alt="<%= konvent %>"> + /logo?size=medium" alt="<%= konvent %>">
  • <%= link_to(konvent, "/konventen/"++konvent.tr(" ", "_")++".html") %>
    • <% end %>
From 10ee26ea8822fe51bcedf83449b6b54b82d9ce7a Mon Sep 17 00:00:00 2001 From: mcbloch Date: Fri, 28 Aug 2020 19:36:54 +0200 Subject: [PATCH 4/4] Thema's hebben niet echt een dsa logo. --- layouts/verenigingen.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/verenigingen.erb b/layouts/verenigingen.erb index ee6b9a0..4cbdcf5 100644 --- a/layouts/verenigingen.erb +++ b/layouts/verenigingen.erb @@ -1,7 +1,7 @@

Themas

    <% for theme in themes %> - /logo?size=medium" alt="<%= theme %>"> + <%= " ++ theme %> <li> <%= link_to(theme, <% end %>