Merge pull request #20 from ZeusWPI/fix-image-assets

Point to dsa association images
2020-08-28 19:37:23 +02:00 · 2020-08-28 19:37:23 +02:00 · 87ed5faad8
commit 87ed5faad8
parent 17e185610f 10ee26ea88
6 changed files with 12 additions and 9 deletions
--- a/content/verenigingen/massacantus.md
+++ b/content/verenigingen/massacantus.md
@ -1,5 +1,5 @@
 ---
 titel: Massacantus
 naam: Massacantus
-konvent: mcantus
+konvent: massacantus
 ---
--- 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
--- a/layouts/default.erb
+++ b/layouts/default.erb
@ -1,7 +1,7 @@
 <html>
    <head>
        <meta charset="UTF-8">
-        <title> Durf Doen! - <%= item[:titel] || item.identifier.without_ext.split('/').last %> </title>
+        <title> Durf Doen! - <%= item[:titel] || abbreviation(item) %> </title>

        <link rel="stylesheet" href="/stylesheets/main.css">
        <link rel="shortcut icon" href="/assets/favicon.png">
--- a/layouts/partials/detail.erb
+++ b/layouts/partials/detail.erb
@ -1,5 +1,5 @@
 <div class="details-container details-logo">
-    <img src="/assets/logos/<%= item[:logo] %>" alt="logo"> </img>
+    <img src="https://dsa.ugent.be/api/verenigingen/<%= abbreviation(item) %>/logo?size=huge" alt="<%= item[:naam] %>">
 </div>
 <div class="details-container details-contact">
    <% if item[:deelname_link] %>
--- a/layouts/verenigingen.erb
+++ b/layouts/verenigingen.erb
@ -1,15 +1,15 @@
 <h1> Themas </h1>
 <ul>
    <% for theme in themes %>
-        <%= "<img src=/assets/konventen/" ++ theme.tr(" ", "_") ++ ".png alt=" ++ theme %>
-        <li> <%= link_to(theme, "/thema/"++theme.tr(" ", "_")) %>  </li>
+    <%= "<img src=/assets/themas/" ++ theme.tr(" ", "_") ++ ".png alt=" ++ theme %>
+    <li> <%= link_to(theme, "/thema/"++theme.tr(" ", "_")) %>  </li>
    <% end %>
 </ul>

 <h1> Konventen en projecten </h1>
 <ul>
    <% for konvent in konvents %>
-        <%= "<img src=/assets/konventen/" ++ konvent.tr(" ", "_") ++ ".png alt=" ++ konvent %>
+        <img src="https://dsa.ugent.be/api/verenigingen/<%= konvent.tr(" ", "_") %>/logo?size=medium" alt="<%= konvent %>">
        <li> <%= link_to(konvent, "/konventen/"++konvent.tr(" ", "_")++".html") %>  </li>
    <% end %>
 </ul>
--- 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('/').last
+    end
  end