summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2026-06-26 01:59:57 +0200
committererdgeist <erdgeist@erdgeist.org>2026-06-26 01:59:57 +0200
commitc06723ee715512c2033c7786c48f15674585b56b (patch)
tree46d074bde9a4fc61f0a76cbc601007ed4412ec61 /app/views
parent0818a3057b0a91e422158d828026c941b4e10622 (diff)
Stage 4: Rails 5.2 -> 6.1 on Ruby 2.7.2
- routing-filter 0.6.3 -> 0.7.0 (Rails 6.1 compatibility) - RSS named routes rss_xml/rss_rdf added - RouteWithParams workarounds: will_paginate_patch, content_path shim, safe_path helper - Paperclip removed, replaced with FileAttachment concern (preserves URL scheme) - Assets resource moved to /admin/assets (Sprockets middleware conflict) - ApplicationRecord base class added, all models migrated - Strong parameters added to Assets, Occurrences, Events, MenuItems controllers - update_attributes -> update throughout - render :nothing -> head :ok/:not_found throughout - language_selector rewritten (removes :overwrite_params) - Environment files updated for Rails 6.1 (eager_load, public_file_server, ActionMailer) - Arel::Visitors::DepthFirst and Integer/Float duration patches removed from test_helper - AssetsController tests added (10 tests covering upload, variants, destroy, auth) - ImageMagick geometry: 460x250! for headline crop (not # which is invalid in IM6) 129 runs, 311 assertions, 5 failures (all pre-existing), 0 errors
Diffstat (limited to 'app/views')
-rw-r--r--app/views/content/_search.html.erb2
-rw-r--r--app/views/content/_tags.html.erb2
-rw-r--r--app/views/layouts/application.html.erb9
-rw-r--r--app/views/layouts/application.html.erb.bak54
4 files changed, 6 insertions, 61 deletions
diff --git a/app/views/content/_search.html.erb b/app/views/content/_search.html.erb
index aa91424..f732fca 100644
--- a/app/views/content/_search.html.erb
+++ b/app/views/content/_search.html.erb
@@ -1,3 +1,3 @@
1<%= form_tag search_path, :method => 'get' do %> 1<%= form_tag safe_path(:search_path), :method => 'get' do %>
2 <div><%= text_field_tag :search_term, params[:search_term], :placeholder => 'suchen', :type => 'search' %></div> 2 <div><%= text_field_tag :search_term, params[:search_term], :placeholder => 'suchen', :type => 'search' %></div>
3<% end %> 3<% end %>
diff --git a/app/views/content/_tags.html.erb b/app/views/content/_tags.html.erb
index 169ae84..387f51c 100644
--- a/app/views/content/_tags.html.erb
+++ b/app/views/content/_tags.html.erb
@@ -3,7 +3,7 @@
3 <h2>Tags</h2> 3 <h2>Tags</h2>
4 <ul class="teasertext"> 4 <ul class="teasertext">
5 <% @page.tags.each do |tag| %> 5 <% @page.tags.each do |tag| %>
6 <li><%= link_to tag.name, tag_path(:id => tag.name) %></li> 6 <li><%= link_to tag.name, safe_path(:tag_path, tag.name) %></li>
7 <% end %> 7 <% end %>
8 </ul> 8 </ul>
9</div> 9</div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2a46f09..84dcdc6 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,8 +16,8 @@
16 <%= stylesheet_link_tag "shadowbox" %> 16 <%= stylesheet_link_tag "shadowbox" %>
17 <%= javascript_include_tag 'public' %> 17 <%= javascript_include_tag 'public' %>
18 18
19 <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %> 19 <%= auto_discovery_link_tag(:atom, '/rss/updates.xml', title: "ATOM") %>
20 <%= auto_discovery_link_tag(:rss, {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %> 20 <%= auto_discovery_link_tag(:rss, '/rss/updates.rdf', title: "RSS") %>
21 21
22 <script> 22 <script>
23 (function() { document.addEventListener("DOMContentLoaded", function() { 23 (function() { document.addEventListener("DOMContentLoaded", function() {
@@ -32,7 +32,6 @@
32 <div id="wrapper"> 32 <div id="wrapper">
33 <div id="header"> 33 <div id="header">
34 <%= image_tag("header.png") %> 34 <%= image_tag("header.png") %>
35 <!-- <%= link_to_path(image_tag("header.png"), "/home") %> -->
36 </div> 35 </div>
37 <div id="toolbox"> 36 <div id="toolbox">
38 <div id="search"> 37 <div id="search">
@@ -53,8 +52,8 @@
53 <div class="main_navigation"> 52 <div class="main_navigation">
54 <h2>Admin</h2> 53 <h2>Admin</h2>
55 <ul> 54 <ul>
56 <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'),:controller => :admin, :action => 'index' %></li> 55 <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'), safe_path(:admin_path) %></li>
57 <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), node_path(:id => @page.node) %></li> 56 <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), safe_path(:node_path, @page.node) %></li>
58 </ul> 57 </ul>
59 </div> 58 </div>
60 <% end %> 59 <% end %>
diff --git a/app/views/layouts/application.html.erb.bak b/app/views/layouts/application.html.erb.bak
deleted file mode 100644
index 3c95d75..0000000
--- a/app/views/layouts/application.html.erb.bak
+++ /dev/null
@@ -1,54 +0,0 @@
1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
4<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
5 <head>
6 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
7
8 <title><%= page_title %></title>
9 <%= stylesheet_link_tag "ccc" %>
10 <%= javascript_include_tag 'jquery-1.3.2.min' %>
11 <%= javascript_include_tag 'shadowbox/shadowbox' %>
12 <%= stylesheet_link_tag "shadowbox" %>
13 <%= javascript_include_tag 'public' %>
14
15 <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %>
16 <%= auto_discovery_link_tag(:rss, {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %>
17 </head>
18
19 <body>
20 <div id="wrapper">
21 <div id="header">
22 <%= link_to_path(image_tag("header.png"), "/home") %>
23 </div>
24 <div id="search">
25 <%= render :partial => "content/search" %>
26 </div>
27 <div id="left_column">
28 <%= main_menu %>
29
30 <%= language_selector %>
31 <% if current_user && @page.node %>
32 <%= link_to "Edit", node_path(:id => @page.node) %>
33 <% end %>
34
35 <%= calendar %>
36 </div>
37 <div id="center_column">
38 <%= yield :layout %>
39
40 <div id="footer">
41 <br />
42 <br />
43 <p style="text-align: center">
44 <%= link_to t(:sponsors), content_path("sponsors") %>
45 </p>
46 </div>
47 </div>
48 <div id="right_column">
49 <%= tags %>
50 <%= featured_articles %>
51 </div>
52 </div>
53 </body>
54</html> \ No newline at end of file
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 19:36:34 +0000