summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2026-06-26 13:40:55 +0200
committererdgeist <erdgeist@erdgeist.org>2026-06-26 13:40:55 +0200
commit811bb04649365b0faaa00b1e0810bb101a4d19b1 (patch)
tree581d52faa6e1bf21a1cdfd4da7127a0f95786bad /app/views
parenta1ddc25da0d2aa79a4d9216ef7792f26233bd38e (diff)
Stage 5 click-testing fixes
- Fix link_to :method → button_to for all PUT/DELETE actions - Add button_to CSS reset to admin.css for visual consistency - Fix admin layout: replace broken jquery/jquery_ujs pipeline refs with admin_bundle via sprockets; add sprockets-rails, jquery-ui-rails gems - Add app/assets/javascripts/admin_bundle.js pipeline manifest - Fix event_information helper: use safe_join to avoid double-escaping - Fix nodes_helper: to_s(:db) → to_fs(:db) for event times - Fix revisions view: eliminate nested forms; diff button uses vanilla JS to collect radio button values before POST - Fix config/environments/development.rb and test.rb: cache_classes → enable_reloading - Add routing_filter_rails71_patch.rb version guard - Move LockedByAnotherUser to own file for Zeitwerk autoloading - Fix Globalize fallbacks via config.i18n.fallbacks in application.rb
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/_drafts.html.erb2
-rw-r--r--app/views/admin/_menu.html.erb2
-rw-r--r--app/views/assets/index.html.erb2
-rw-r--r--app/views/events/index.html.erb2
-rw-r--r--app/views/layouts/admin.html.erb5
-rw-r--r--app/views/menu_items/index.html.erb9
-rw-r--r--app/views/nodes/edit.html.erb2
-rw-r--r--app/views/occurrences/index.html.erb2
-rw-r--r--app/views/pages/index.html.erb2
-rw-r--r--app/views/revisions/index.html.erb38
-rw-r--r--app/views/users/_user.html.erb9
11 files changed, 41 insertions, 34 deletions
diff --git a/app/views/admin/_drafts.html.erb b/app/views/admin/_drafts.html.erb
index 2036d12..a35b0ab 100644
--- a/app/views/admin/_drafts.html.erb
+++ b/app/views/admin/_drafts.html.erb
@@ -17,7 +17,7 @@
17 <td class="actions"> 17 <td class="actions">
18 <%= link_to 'Show', node_path(draft.node) %> 18 <%= link_to 'Show', node_path(draft.node) %>
19 <%= link_to "Revisions", revision_path(draft.node.id) %> 19 <%= link_to "Revisions", revision_path(draft.node.id) %>
20 <%= link_to "Publish", publish_node_path(draft.node), :method => :put, :data => { :confirm => "Do you really want to publish?" } %> 20 <%= button_to "Publish", publish_node_path(draft.node), method: :put, form: { data: { confirm: "Do you really want to publish?" } } %>
21 </td> 21 </td>
22 </tr> 22 </tr>
23 <% end %> 23 <% end %>
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 3188d94..6f217eb 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,5 +1,5 @@
1<%= language_selector %> 1<%= language_selector %>
2<%= link_to 'Logout', logout_path, :method => :delete %> 2<%= button_to 'Logout', logout_path, method: :delete %>
3<%= link_to 'Overview', admin_path %> 3<%= link_to 'Overview', admin_path %>
4<%= link_to 'Nodes', nodes_path, selected?('nodes') %> 4<%= link_to 'Nodes', nodes_path, selected?('nodes') %>
5<%= link_to 'Assets', assets_path, selected?('assets') %> 5<%= link_to 'Assets', assets_path, selected?('assets') %>
diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index e7ef313..83d55c2 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -15,7 +15,7 @@
15 <td><%= asset.upload.content_type %></td> 15 <td><%= asset.upload.content_type %></td>
16 <td><%= link_to 'Show', asset %></td> 16 <td><%= link_to 'Show', asset %></td>
17 <td><%= link_to 'Edit', edit_asset_path(asset) %></td> 17 <td><%= link_to 'Edit', edit_asset_path(asset) %></td>
18 <td><%= link_to 'Destroy', asset, :data => { :confirm => 'Are you sure?' }, :method => :delete %></td> 18 <td><%= button_to 'Destroy', asset, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
19 </tr> 19 </tr>
20<% end %> 20<% end %>
21</table> 21</table>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 93c95fa..19b21ce 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -26,7 +26,7 @@
26 <td><%=h event.node_id %></td> 26 <td><%=h event.node_id %></td>
27 <td><%= link_to 'Show', event %></td> 27 <td><%= link_to 'Show', event %></td>
28 <td><%= link_to 'Edit', edit_event_path(event) %></td> 28 <td><%= link_to 'Edit', edit_event_path(event) %></td>
29 <td><%= link_to 'Destroy', event, :data => { :confirm => 'Are you sure?' }, :method => :delete %></td> 29 <td><%= button_to 'Destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
30 </tr> 30 </tr>
31<% end %> 31<% end %>
32</table> 32</table>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index e64850b..2a90786 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -7,14 +7,13 @@
7 <%= csrf_meta_tags %> 7 <%= csrf_meta_tags %>
8 8
9 <title><%= "#{params[:controller]} | #{params[:action]}" %></title> 9 <title><%= "#{params[:controller]} | #{params[:action]}" %></title>
10 <%= javascript_include_tag 'jquery', 'jquery_ujs' %> 10 <%= javascript_include_tag 'admin_bundle' %>
11 <%= javascript_include_tag 'jquery-ui-1.7.2.custom.min' %>
12 <%= javascript_include_tag 'jquery.hotkeys' %>
13 <%= javascript_include_tag 'tiny_mce/jquery.tinymce.js' %> 11 <%= javascript_include_tag 'tiny_mce/jquery.tinymce.js' %>
14 <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> 12 <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
15 <%= stylesheet_link_tag 'admin' %> 13 <%= stylesheet_link_tag 'admin' %>
16 <%= javascript_include_tag 'admin_search.js' %> 14 <%= javascript_include_tag 'admin_search.js' %>
17 <%= javascript_include_tag 'admin_interface.js' %> 15 <%= javascript_include_tag 'admin_interface.js' %>
16 <%= stylesheet_link_tag 'admin' %>
18 </head> 17 </head>
19 18
20 <body> 19 <body>
diff --git a/app/views/menu_items/index.html.erb b/app/views/menu_items/index.html.erb
index 7d0ce62..c52c150 100644
--- a/app/views/menu_items/index.html.erb
+++ b/app/views/menu_items/index.html.erb
@@ -14,12 +14,9 @@
14 <td class="menu_item_title"><%= menu_item.title %></td> 14 <td class="menu_item_title"><%= menu_item.title %></td>
15 <td><%= link_to "Edit", edit_menu_item_path(menu_item) %></td> 15 <td><%= link_to "Edit", edit_menu_item_path(menu_item) %></td>
16 <td> 16 <td>
17 <%= link_to( 17 <%= button_to "Delete", menu_item_path(menu_item),
18 "Delete", 18 method: :delete,
19 menu_item_path(menu_item), 19 form: { data: { confirm: "Are you sure?" } } %>
20 :method => :delete,
21 :data => { :confirm => "Are you sure?" }
22 ) %>
23 </td> 20 </td>
24 </tr> 21 </tr>
25 <% end %> 22 <% end %>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 64884cf..596f992 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -2,7 +2,7 @@
2 <%= link_to 'metadata', '#', :id => 'button', :class => "unselected" %> 2 <%= link_to 'metadata', '#', :id => 'button', :class => "unselected" %>
3 <%= link_to 'Show', @node %> 3 <%= link_to 'Show', @node %>
4 <%= link_to 'Preview', preview_page_path(@draft) %> 4 <%= link_to 'Preview', preview_page_path(@draft) %>
5 <%= link_to 'Publish', publish_node_path, :method => :put, :data => { :confirm => "Publish this draft?" } %> 5 <%= button_to 'Publish', publish_node_path(@node), method: :put, form: { data: { confirm: "Publish this draft?" } } %>
6 <%= link_to 'Revisions', node_revisions_path(@node) %> 6 <%= link_to 'Revisions', node_revisions_path(@node) %>
7<% end %> 7<% end %>
8 8
diff --git a/app/views/occurrences/index.html.erb b/app/views/occurrences/index.html.erb
index 7b8ffb8..0e99857 100644
--- a/app/views/occurrences/index.html.erb
+++ b/app/views/occurrences/index.html.erb
@@ -18,7 +18,7 @@
18 <td><%=h occurrence.event_id %></td> 18 <td><%=h occurrence.event_id %></td>
19 <td><%= link_to 'Show', occurrence %></td> 19 <td><%= link_to 'Show', occurrence %></td>
20 <td><%= link_to 'Edit', edit_occurrence_path(occurrence) %></td> 20 <td><%= link_to 'Edit', edit_occurrence_path(occurrence) %></td>
21 <td><%= link_to 'Destroy', occurrence, :data => { :confirm => 'Are you sure?' }, :method => :delete %></td> 21 <td><%= button_to 'Destroy', occurrence, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
22 </tr> 22 </tr>
23<% end %> 23<% end %>
24</table> 24</table>
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index 4b28c9b..91e5359 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -12,7 +12,7 @@
12 <td><%=h page.title %></td> 12 <td><%=h page.title %></td>
13 <td><%= link_to 'Show', content_path(:page_path => page.node.unique_path) %></td> 13 <td><%= link_to 'Show', content_path(:page_path => page.node.unique_path) %></td>
14 <td><%= link_to 'Edit', edit_page_path(page) %></td> 14 <td><%= link_to 'Edit', edit_page_path(page) %></td>
15 <td><%= link_to 'Destroy', page, :data => { :confirm => 'Are you sure?' }, :method => :delete %></td> 15 <td><%= button_to 'Destroy', page, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
16 </tr> 16 </tr>
17<% end %> 17<% end %>
18</table> 18</table>
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
index e038ed2..b875a4f 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -4,7 +4,6 @@
4 4
5<h2>Revisions for Node: <%= @node.unique_name %></h2> 5<h2>Revisions for Node: <%= @node.unique_name %></h2>
6 6
7<%= form_tag diff_node_revisions_path(@node) do %>
8<table id="revisions"> 7<table id="revisions">
9 <tr class="header"> 8 <tr class="header">
10 <th>First</th> 9 <th>First</th>
@@ -14,6 +13,7 @@
14 <th>Editor</th> 13 <th>Editor</th>
15 <th>Date</th> 14 <th>Date</th>
16 <th></th> 15 <th></th>
16 <th></th>
17 </tr> 17 </tr>
18<% (@pages || @node.pages.all).reverse.each do |page| %> 18<% (@pages || @node.pages.all).reverse.each do |page| %>
19 <tr> 19 <tr>
@@ -23,22 +23,36 @@
23 <td class="title"><%= page.title %></td> 23 <td class="title"><%= page.title %></td>
24 <td class="user"><%= page.editor.try(:login) %></td> 24 <td class="user"><%= page.editor.try(:login) %></td>
25 <td class="date"><%= page.updated_at %></td> 25 <td class="date"><%= page.updated_at %></td>
26 <td><%= link_to 'show', node_revision_path(@node, page) %></td>
26 <td> 27 <td>
27 <%= link_to 'show', node_revision_path(@node, page) %> 28 <%= button_to 'restore', restore_node_revision_path(@node, page),
28 </td> 29 method: :put,
29 <td> 30 form: { data: { confirm: "Restore this revision?" } } %>
30 <%= link_to(
31 'restore',
32 restore_node_revision_path(@node, page),
33 :method => :put,
34 :data => { :confirm => "Restore this revision?" }
35 ) %>
36 </td> 31 </td>
37 </tr> 32 </tr>
38<% end %> 33<% end %>
39 <tr class="no_hover"> 34 <tr class="no_hover">
40 <td colspan="8" class="right"><%= submit_tag 'Diff revisions' %></td> 35 <td colspan="8" class="right">
36 <%= button_to 'Diff revisions', diff_node_revisions_path(@node),
37 method: :post,
38 form: { id: 'diff_form' } %>
39 </td>
41 </tr> 40 </tr>
42</table> 41</table>
43 42
44<% end %> 43<script>
44 document.getElementById('diff_form').addEventListener('submit', function(e) {
45 var start = document.querySelector('input[name="start_revision"]:checked');
46 var end = document.querySelector('input[name="end_revision"]:checked');
47 if (start) {
48 var s = document.createElement('input');
49 s.type = 'hidden'; s.name = 'start_revision'; s.value = start.value;
50 this.appendChild(s);
51 }
52 if (end) {
53 var en = document.createElement('input');
54 en.type = 'hidden'; en.name = 'end_revision'; en.value = end.value;
55 this.appendChild(en);
56 }
57 });
58</script>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 9987e31..ddb7afd 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -7,12 +7,9 @@
7 <%= link_to "edit", edit_user_path(user) %> 7 <%= link_to "edit", edit_user_path(user) %>
8 </td> 8 </td>
9 <td> 9 <td>
10 <%= link_to( 10 <%= button_to "destroy", user_path(user),
11 "destroy", 11 method: :delete,
12 user_path(user), 12 form: { data: { confirm: "Do you really want to delete user #{user.login}?" } } %>
13 :method => :delete,
14 :data => { :confirm => "Do you really want to delete user #{user.login}?" }
15 ) %>
16 </td> 13 </td>
17 <% end %> 14 <% end %>
18</tr> 15</tr>