summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2026-07-09 04:53:56 +0200
committererdgeist <erdgeist@erdgeist.org>2026-07-09 04:53:56 +0200
commit3ae22916cd5fd0f63ffacc7a9e1aa97d311b83e6 (patch)
tree05fa25472040295c9a318e17a03d9496cf91d825 /app
parent332ffbeed90cf07342925b82ed3fda1762346be2 (diff)
Fix button height mismatch between bordered and pill button styles, extend table styling to assets/users/events
Fix button height mismatch, extend table styling to assets/users/events a.action_button (bordered) and the state_changing/destructive/computation pills (borderless) rendered at different heights, since each pill variant set its own padding at higher specificity than the shared rule meant to equalize them. Padding and border-radius now live only in one shared rule; also restores the #page_editor prefix on a.action_button, needed to outrank the #page_editor a wavy-underline rule. table.assets_table, table.user_table, and table.events_table now share table.node_table's border-collapse/header/hover treatment. tr min-height is dropped -- browsers don't honor height on <tr> -- in favor of cell padding, kept at zero for node_table (spacing already comes from its h4/p content) and set to 8px for the plain-text tables.
Diffstat (limited to 'app')
-rw-r--r--app/views/assets/index.html.erb9
-rw-r--r--app/views/events/index.html.erb12
-rw-r--r--app/views/events/show.html.erb85
-rw-r--r--app/views/users/index.html.erb14
4 files changed, 67 insertions, 53 deletions
diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index 31dae59..4301fee 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -2,11 +2,16 @@
2 <%= link_to 'New asset', new_asset_path %> 2 <%= link_to 'New asset', new_asset_path %>
3<% end %> 3<% end %>
4 4
5
6<%= will_paginate @assets %> 5<%= will_paginate @assets %>
7 6
8<table class="assets_table"> 7<table class="assets_table">
9 <tr> 8 <tr class="header">
9 <th>Preview</th>
10 <th>Name</th>
11 <th>Type</th>
12 <th></th>
13 <th></th>
14 <th></th>
10 </tr> 15 </tr>
11<% @assets.each do |asset| %> 16<% @assets.each do |asset| %>
12 <tr> 17 <tr>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 3143a7b..c3e0e5a 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -1,7 +1,7 @@
1<h1>Listing events</h1> 1<h1>Listing events</h1>
2 2
3<table class="events_table"> 3<table class="events_table">
4 <tr> 4 <tr class="header">
5 <th>Title</th> 5 <th>Title</th>
6 <th>Start time</th> 6 <th>Start time</th>
7 <th>End time</th> 7 <th>End time</th>
@@ -9,23 +9,21 @@
9 <th>Allday</th> 9 <th>Allday</th>
10 <th>Url</th> 10 <th>Url</th>
11 <th>Node</th> 11 <th>Node</th>
12 <th>Action</th> 12 <th></th>
13 </tr> 13 </tr>
14 14
15<% @events.each do |event| %> 15<% @events.each do |event| %>
16 <tr> 16 <tr>
17 <td><%=h event.display_title %></td> 17 <td><%= link_to event.display_title, event %></td>
18 <td><%=h event.start_time %></td> 18 <td><%=h event.start_time %></td>
19 <td><%=h event.end_time %></td> 19 <td><%=h event.end_time %></td>
20 <td><%=h event.rrule %></td> 20 <td><%=h event.rrule %></td>
21 <td><%=h event.allday %></td> 21 <td><%=h event.allday %></td>
22 <td><%=h event.url %></td> 22 <td><%=h event.url %></td>
23 <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td> 23 <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
24 <td><%= link_to 'show', event %> | <%= link_to 'edit', edit_event_path(event) %> | <%= button_to 'destroy', event, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } %></td> 24 <td><%= link_to 'edit', edit_event_path(event) %></td>
25 </tr> 25 </tr>
26<% end %> 26<% end %>
27</table> 27</table>
28 28
29<br /> 29<%= link_to 'New event', new_event_path, class: 'action_button' %>
30
31<%= link_to 'New event', new_event_path %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index e206bc4..5812228 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,52 +1,51 @@
1<% content_for :subnavigation do %> 1<div id="page_editor" class="show_node">
2 <% if @event.node %> 2 <h1><%= @event.node ? "Event for node #{@event.node.unique_name}" : "Event" %></h1>
3 <%= link_to 'node', node_path(@event.node) %>
4 <% end %>
5 <%= link_to 'edit', edit_event_path(@event, return_to: request.path) %>
6 <%= button_to 'destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
7<% end %>
8 3
9<h2>Event for node <%= @event.node.unique_name %></h2> 4 <div id="content">
5 <div class="node_description">Actions</div>
6 <div class="node_content node_info_group">
7 <div class="node_info_group_items">
8 <% if @event.node %>
9 <div class="node_info_item">
10 <%= link_to 'Node', node_path(@event.node) %>
11 </div>
12 <% end %>
13 <div class="node_info_item">
14 <%= link_to 'Edit', edit_event_path(@event, return_to: request.path), class: 'action_button' %>
15 </div>
16 <div class="node_info_item">
17 <%= button_to 'Destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
18 </div>
19 </div>
20 </div>
10 21
11<p> 22 <div class="node_description">Start time</div>
12 <b>Start time:</b> 23 <div class="node_content"><%=h @event.start_time %></div>
13 <%=h @event.start_time %>
14</p>
15 24
16<p> 25 <div class="node_description">End time</div>
17 <b>End time:</b> 26 <div class="node_content"><%=h @event.end_time %></div>
18 <%=h @event.end_time %>
19</p>
20 27
21<p> 28 <div class="node_description">Rrule</div>
22 <b>Rrule:</b> 29 <div class="node_content"><%=h @event.rrule %></div>
23 <%=h @event.rrule %>
24 <% if (human = @event.humanize_rrule(I18n.locale)) %>
25 <br/><small><em>( <%= human %></em> )</small>
26 <% end %>
27</p>
28 30
29<p> 31 <% if (human = @event.humanize_rrule(I18n.locale)) %>
30 <b>Tags:</b> 32 <div class="node_description">Recurrence</div>
31 <%=h @event.tag_list %> 33 <div class="node_content"><em><%= human %></em></div>
32</p> 34 <% end %>
33 35
34<p> 36 <div class="node_description">Tags</div>
35 <b>Allday:</b> 37 <div class="node_content"><%=h @event.tag_list %></div>
36 <%=h @event.allday %>
37</p>
38 38
39<p> 39 <div class="node_description">Allday</div>
40 <b>Url:</b> 40 <div class="node_content"><%=h @event.allday %></div>
41 <%=h @event.url %>
42</p>
43 41
44<p> 42 <div class="node_description">Url</div>
45 <b>Latitude:</b> 43 <div class="node_content"><%=h @event.url %></div>
46 <%=h @event.latitude %>
47</p>
48 44
49<p> 45 <div class="node_description">Latitude</div>
50 <b>Longitude:</b> 46 <div class="node_content"><%=h @event.latitude %></div>
51 <%=h @event.longitude %> 47
52</p> 48 <div class="node_description">Longitude</div>
49 <div class="node_content"><%=h @event.longitude %></div>
50 </div>
51</div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index cf00ef6..88868f5 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -2,13 +2,25 @@
2 <tr> 2 <tr>
3 <td><h1>Admins</h1></td> 3 <td><h1>Admins</h1></td>
4 </tr> 4 </tr>
5 <tr class="header">
6 <th>Login</th>
7 <th></th>
8 <th></th>
9 <th></th>
10 </tr>
5 <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %> 11 <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %>
6 <tr> 12 <tr>
7 <td><h1>Users</h1></td> 13 <td><h1>Users</h1></td>
8 </tr> 14 </tr>
15 <tr class="header">
16 <th>Login</th>
17 <th></th>
18 <th></th>
19 <th></th>
20 </tr>
9 <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %> 21 <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %>
10</table> 22</table>
11 23
12<% content_for :subnavigation do %> 24<% content_for :subnavigation do %>
13 <%= link_to "create", new_user_path %> 25 <%= link_to "create", new_user_path %>
14<% end %> \ No newline at end of file 26<% end %>
generated by cgit v1.3 (git 2.53.0) at 2026-07-14 15:00:25 +0000