From c4296b59a7f9d667d295f9c37b71f7849b818fb3 Mon Sep 17 00:00:00 2001
From: Charlie Root <root@web.ccc.local>
Date: Tue, 28 Jan 2025 22:47:15 +0100
Subject: Big overhaul patch and style changes

---
 app/views/content/_featured_articles.html.erb      | 33 +++++++++++++++++++---
 app/views/content/_main_navigation.html.erb        |  8 +++++-
 .../public/no_date_and_author.html.erb             |  4 +--
 .../no_title_abstract_date_and_author.html.erb     |  4 +--
 .../public/standard_template.html.erb              |  4 +--
 .../page_templates/public/title_only.html.erb      |  4 +--
 .../custom/page_templates/public/update.html.erb   |  4 +--
 app/views/custom/partials/_article.html.erb        |  4 +--
 .../custom/partials/_no_date_and_author.html.erb   |  4 +--
 app/views/layouts/application.html.erb             | 17 ++++++-----
 app/views/layouts/pages.html.erb                   |  2 ++
 app/views/nodes/edit.html.erb                      |  2 +-
 app/views/rss/recent_changes.xml.builder           |  8 +++---
 app/views/rss/updates.rdf.builder                  | 18 ++++++------
 app/views/rss/updates.xml.builder                  |  7 +++--
 app/views/search/_search_result.html.erb           |  6 ++--
 16 files changed, 81 insertions(+), 48 deletions(-)

(limited to 'app/views')

diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
index 75e2e1d..0220abb 100644
--- a/app/views/content/_featured_articles.html.erb
+++ b/app/views/content/_featured_articles.html.erb
@@ -1,5 +1,14 @@
 <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/",
@@ -7,6 +16,13 @@
         :title => "Chaosradio"
   )%>
 
+  <%= link_to(
+        image_tag( 'media-ccc-de-banner.svg', :size => '155x45' ),
+        "https://media.ccc.de",
+        :id => "media_ccc_de_icon",
+        :title => "Media Dot CCC Dot de"
+  )%>
+
   <%= link_to(
         image_tag( 'ds.png' ),
         "http://ds.ccc.de/",
@@ -22,10 +38,19 @@
   )%>
 
   <%= link_to(
-        image_tag( 'twitter.png' ),
-        "https://twitter.com/chaosupdates",
-        :id => "twitter_icon",
-        :title => "Twitter"
+        image_tag( 'Fediverse.svg', :size => '64x64' ),
+        "https://social.bau-ha.us/@ccc",
+        :rel => 'me',
+        :id => "fediverse_icon",
+        :title => "Fediverse"
   )%>
+
+  <%= link_to(
+        image_tag( 'Bluesky_Logo.svg', :size => '64x64' ),
+        "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..a984512 100644
--- a/app/views/content/_main_navigation.html.erb
+++ b/app/views/content/_main_navigation.html.erb
@@ -3,5 +3,11 @@
     <% menu_items.each do |item| %>
     <li><%= link_to_path item.title, item.path %></li>
     <% end %>
+    <li>
+      <%= language_selector %>
+    </li>
+    <li id="light-mode-li">
+      <input id="light-mode" type="checkbox" /><label for="light-mode">lights on</label>
+    </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/custom/page_templates/public/no_date_and_author.html.erb b/app/views/custom/page_templates/public/no_date_and_author.html.erb
index b019805..fa39e54 100644
--- a/app/views/custom/page_templates/public/no_date_and_author.html.erb
+++ b/app/views/custom/page_templates/public/no_date_and_author.html.erb
@@ -1,8 +1,8 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <p><%= sanitize( @page.abstract ) %></p>
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
index 83cbff6..64e2a7c 100644
--- a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
+++ b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
@@ -1,6 +1,6 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/standard_template.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb
index 8000af5..bbc8cd0 100644
--- a/app/views/custom/page_templates/public/standard_template.html.erb
+++ b/app/views/custom/page_templates/public/standard_template.html.erb
@@ -1,8 +1,8 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <div class="abstract"><p><%= sanitize( @page.abstract )%></p></div>
   <div id="headline_image"><%= headline_image %></div>
   <div class="body"><%= aggregate?(@page.body) %></div>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/title_only.html.erb b/app/views/custom/page_templates/public/title_only.html.erb
index 09c7455..42fe9a6 100644
--- a/app/views/custom/page_templates/public/title_only.html.erb
+++ b/app/views/custom/page_templates/public/title_only.html.erb
@@ -1,7 +1,7 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <div id="headline_image"><%= headline_image %></div>
   <%= aggregate?(@page.body) %>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/page_templates/public/update.html.erb b/app/views/custom/page_templates/public/update.html.erb
index 5ea277a..d5995ac 100644
--- a/app/views/custom/page_templates/public/update.html.erb
+++ b/app/views/custom/page_templates/public/update.html.erb
@@ -1,4 +1,4 @@
-<div class="article">
+<div class="article" lang="<%= @page.effective_lang %>">
   <h2 class="headline"><%= @page.title %></h2>
   <div class="author_and_date"><%= date_for_page @page %>, <%= @page.user.try(:login) %></div>
   <div class="abstract"><p><%= sanitize( @page.abstract )%></p></div>
@@ -6,4 +6,4 @@
   <div class="body"><%= aggregate?(@page.body) %></div>
 </div>
 
-<%= will_paginate(@content_collection) if @content_collection %>
\ No newline at end of file
+<%= will_paginate(@content_collection) if @content_collection %>
diff --git a/app/views/custom/partials/_article.html.erb b/app/views/custom/partials/_article.html.erb
index 433c31c..b738ac7 100644
--- a/app/views/custom/partials/_article.html.erb
+++ b/app/views/custom/partials/_article.html.erb
@@ -1,7 +1,7 @@
-<div class="article_partial">
+<div class="article_partial" lang="<%= page.effective_lang %>">
   <h2 class="headline"><%= link_to_path page.title, page.node.unique_name %></h2>
   <div class="author_and_date">
     <%= date_for_page page %>, <%= author_for_page page %>
   </div>
   <p class="excerpt"><%= page.abstract %> <%= link_to_path t(:more), page.node.unique_name %></p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/custom/partials/_no_date_and_author.html.erb b/app/views/custom/partials/_no_date_and_author.html.erb
index 61d6aac..fed02ac 100644
--- a/app/views/custom/partials/_no_date_and_author.html.erb
+++ b/app/views/custom/partials/_no_date_and_author.html.erb
@@ -1,4 +1,4 @@
-<div class="article_partial">
+<div class="article_partial" lang="<%= page.effective_lang %>">
   <h2 class="headline"><%= link_to page.title, content_path(page.node.unique_path) %></h2>
   <p class="excerpt"><%= page.abstract %></p>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3c95d75..e6efccf 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,6 +4,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport" content="width=device-width,initial-scale=1"/>
+    <meta name="description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung.">
+
+    <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" />
+    <meta property="og:description" content="Der Chaos Computer Club ist eine galaktische Gemeinschaft von Lebewesen für Informationsfreiheit und Technikfolgenabschätzung." />
 
     <title><%= page_title %></title>
     <%= stylesheet_link_tag "ccc" %>
@@ -16,7 +21,7 @@
     <%= auto_discovery_link_tag(:rss,  {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %>
   </head>
 
-  <body>
+  <body lang="<%= @page.effective_lang %>">
     <div id="wrapper">
       <div id="header">
         <%= link_to_path(image_tag("header.png"), "/home") %>
@@ -27,22 +32,16 @@
       <div id="left_column">
         <%= main_menu %>
 
-        <%= language_selector %>
         <% if current_user && @page.node %>
           <%= link_to "Edit", node_path(:id => @page.node) %>
         <% end %>
 
-        <%= calendar %>
+  	<%= calendar %>
       </div>
       <div id="center_column">
         <%= yield :layout %>
 
         <div id="footer">
-          <br />
-          <br />
-          <p style="text-align: center">
-            <%= link_to t(:sponsors), content_path("sponsors") %>
-          </p>
         </div>
       </div>
       <div id="right_column">
@@ -51,4 +50,4 @@
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/layouts/pages.html.erb b/app/views/layouts/pages.html.erb
index 327e0eb..70ceece 100644
--- a/app/views/layouts/pages.html.erb
+++ b/app/views/layouts/pages.html.erb
@@ -4,6 +4,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <meta name="viewport" content="width=device-width,initial-scale=1" />
+  <meta property="og:image" content="https://www.ccc.de/images/chaosknoten.svg" />
   <title>Pages: <%= controller.action_name %></title>
   <%= stylesheet_link_tag 'scaffold' %>
 </head>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 8e27d0f..b9260d2 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -107,4 +107,4 @@
   </table>
   <% end %>
 <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/rss/recent_changes.xml.builder b/app/views/rss/recent_changes.xml.builder
index c3b3ec9..cce3b5d 100644
--- a/app/views/rss/recent_changes.xml.builder
+++ b/app/views/rss/recent_changes.xml.builder
@@ -2,19 +2,19 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("CCC.de Recent Change")
-  xml.link(:href => "http://www.ccc.de/")
+  xml.link(:href => "https://www.ccc.de/")
   xml.link(:rel => "self", :href => "/rss/updates.xml")
   xml.updated(@items.first.updated_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("http://www.ccc.de/")
+  xml.id("https://www.ccc.de/")
   
   @items.each do |item|
     xml.entry do
       xml.title(item.title)
       xml.link(
-        :href => "http://www.ccc.de/#{item.node.unique_path}",
+        :href => "https://www.ccc.de/#{item.node.unique_path}",
         :rel => "alternate"
       )
       xml.id(content_url_helper(item.node.unique_path))
@@ -26,4 +26,4 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
     
   end
   
-end
\ No newline at end of file
+end
diff --git a/app/views/rss/updates.rdf.builder b/app/views/rss/updates.rdf.builder
index 00b6242..cc63201 100644
--- a/app/views/rss/updates.rdf.builder
+++ b/app/views/rss/updates.rdf.builder
@@ -2,26 +2,26 @@ xml.instruct!
 xml.tag!("rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", "xmlns:dc"  => "http://purl.org/dc/elements/1.1/", "xmlns" => "http://purl.org/rss/1.0/") do
   xml.tag!( "rdf:Description",  "rdf:about" => "http://www.w3.org/TR/rdf-syntax-grammar", "dc:title"=>"RDF/XML Syntax Specification (Revised)")
 
-  xml.channel do
+  xml.channel( "rdf:about" => "https://www.ccc.de/de/rss/updates.xml" ) do
     xml.title("Chaos Computer Club: Updates")
-    xml.link("http://www.ccc.de")
+    xml.link("https://www.ccc.de")
     xml.description("Kabelsalat ist gesund.")
     xml.tag!("dc:date", @items.first.published_at.xmlschema)
   end
-  
-  xml.image( "rdf:about" => "http://www.ccc.de/images/chaosknoten.gif") do
+
+  xml.image( "rdf:about" => "https://www.ccc.de/images/chaosknoten.gif") do
     xml.title("Chaos Computer Club (Chaosknoten)")
-    xml.link("http://www.ccc.de")
-    xml.url("http://www.ccc.de/images/chaosknoten.gif")
+    xml.link("https://www.ccc.de")
+    xml.url("https://www.ccc.de/images/chaosknoten.gif")
   end
-  
+
   @items.each do |item|
     xml.item("rdf:about" => content_url(:page_path => item.node.unique_path)) do
       xml.title(item.title)
       xml.link(content_url(:page_path => item.node.unique_path))
       xml.description(item.abstract)
-      xml.tag!("dc:creator", item.user.login)
+      xml.tag!("dc:creator", (item.user ? item.user.login : "CCC"))
       xml.tag!("dc:date", item.published_at.xmlschema)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index c09c9c9..6afcd56 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -2,13 +2,13 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("Chaos Computer Club Updates")
-  xml.link(:href => "http://www.ccc.de/")
+  xml.link(:href => "https://www.ccc.de/")
   xml.link(:rel => "self", :href => "#{@host}/rss/updates")
   xml.updated(@items.first.published_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("#{@host}/rss/updates")
+  xml.id("https://www.ccc.de/rss/updates")
   
   @items.each do |item|
     xml.entry do
@@ -21,6 +21,7 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
       xml.id(content_url(:page_path => item.node.feed_id))
       xml.updated(item.updated_at.xmlschema)
       xml.published(item.published_at.xmlschema)
+      xml.summary(item.abstract)
       xml.content(:type => "xhtml") do
         xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")
       end
@@ -28,4 +29,4 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
     
   end
   
-end
\ No newline at end of file
+end
diff --git a/app/views/search/_search_result.html.erb b/app/views/search/_search_result.html.erb
index 14898a2..6cd01f8 100644
--- a/app/views/search/_search_result.html.erb
+++ b/app/views/search/_search_result.html.erb
@@ -1,6 +1,6 @@
-<% if node.head %>
-<div class="article_partial">
+<% if node and node.head %>
+<div class="article_partial" lang="<%= node.head.effective_lang %>">
     <h2 class="headline"><%= link_to node.head.title, content_path(node.unique_path) %></h2>
     <p class="excerpt"><%= node.head.abstract %></p>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
-- 
cgit v1.3