4 files changed, 44 insertions, 22 deletions

diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
index 75e2e1d..6717c51 100644
--- a/app/views/content/_featured_articles.html.erb
+++ b/app/views/content/_featured_articles.html.erb
@@ -1,31 +1,56 @@
 <div id="featured_articles">
   <h2>Featured</h2>
+
+  <!-- %= link_to(
+        image_tag( '34c3-tuwat.1e4e25c.png' ),
+        "https://events.ccc.de/congress/2017/wiki/Main_Page",
+        :id => "34C3_icon",
+        :size => "155x90",
+        :title => "Chaos Communication Congress 2017"
+  )% -->
+
   <%= link_to(
-        image_tag( 'chaosradio.png' ),
-        "http://chaosradio.ccc.de/",
+        '<img src="/images/chaosradio.png" alt="Chaosradio">'.html_safe,
+        "https://chaosradio.ccc.de/",
         :id => "chaosradio_icon",
         :title => "Chaosradio"
   )%>
 
   <%= link_to(
-        image_tag( 'ds.png' ),
-        "http://ds.ccc.de/",
+        '<img src="/images/media-ccc-de-banner.svg" width="155" height="45" alt="Media Dot CCC Dot de">'.html_safe,
+        "https://media.ccc.de",
+        :id => "media_ccc_de_icon",
+        :title => "Media Dot CCC Dot de"
+  )%>
+
+  <%= link_to(
+        '<img src="/images/ds.png" alt="Datenschleuder">'.html_safe,
+        "https://ds.ccc.de/",
         :id => "ds_icon",
         :title => "Datenschleuder"
   )%>
 
   <%= link_to(
-        image_tag( 'events.png' ),
-        "http://events.ccc.de/",
+        '<img src="/images/events.png" alt="Events-Blog">'.html_safe,
+        "https://events.ccc.de/",
         :id => "events_icon",
-        :title => "Events Blog"
+        :title => "Events-Blog"
   )%>
 
   <%= link_to(
-        image_tag( 'twitter.png' ),
-        "https://twitter.com/chaosupdates",
-        :id => "twitter_icon",
-        :title => "Twitter"
+        '<img src="/images/Fediverse.svg" width="64" height="64" alt="Fediverse">'.html_safe,
+        "https://social.bau-ha.us/@ccc",
+        :rel => 'me',
+        :id => "fediverse_icon",
+        :title => "Fediverse"
   )%>
+
+  <%= link_to(
+        '<img src="/images/Bluesky_Logo.svg" width="64" height="64" alt="bsky">'.html_safe,
+        "https://bsky.app/profile/ccc.de",
+        :id => "bluesky_icon",
+        :title => "bsky"
+  )%>
+
 </div>
 
diff --git a/app/views/content/_main_navigation.html.erb b/app/views/content/_main_navigation.html.erb
index 67d4ecc..2fe8b77 100644
--- a/app/views/content/_main_navigation.html.erb
+++ b/app/views/content/_main_navigation.html.erb
@@ -4,4 +4,4 @@
     <li><%= link_to_path item.title, item.path %></li>
     <% end %>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/content/_search.html.erb b/app/views/content/_search.html.erb
index 9f61042..aa91424 100644
--- a/app/views/content/_search.html.erb
+++ b/app/views/content/_search.html.erb
@@ -1,8 +1,3 @@
-<% form_tag search_path, :method => 'get' do %>
-<table>
-  <tr>
-    <td><%= text_field_tag :search_term, params[:search_term] %></td>
-    <td style="padding-top: 2px"><%= image_submit_tag("search_button.png") %></td>
-  </tr>
-</table>
-<% end %>
\ No newline at end of file
+<%= form_tag search_path, :method => 'get' do %>
+  <div><%= text_field_tag :search_term, params[:search_term], :placeholder => 'suchen', :type => 'search' %></div>
+<% end %>
diff --git a/app/views/content/_tags.html.erb b/app/views/content/_tags.html.erb
index d33bc10..f0e7210 100644
--- a/app/views/content/_tags.html.erb
+++ b/app/views/content/_tags.html.erb
@@ -1,8 +1,10 @@
+<% unless @page.nil? || @page.tags.empty? %>
 <div id="tags">
   <h2>Tags</h2>
   <ul class="teasertext">
     <% @page.tags.each do |tag| %>
-      <li><%= link_to tag.name, tag_path(:id => tag.name) %></li>
+      <li><%= link_to tag.name, tag_path(tag.name) %></li>
     <% end %>
   </ul>
-</div>
\ No newline at end of file
+</div>
+<% end %>