summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authorerdgeist <erdgeist@erdgeist.org>2026-07-13 23:33:11 +0200
committererdgeist <erdgeist@erdgeist.org>2026-07-13 23:33:11 +0200
commit8eab68f2c5a3c126e2fec2ecdfa7ace87ce0937b (patch)
treef446ebc26a7707c7b64a937aa51a155df146c80a /app/views/users
parent42714c697273a7117c6b355fab26c8c35e336ad1 (diff)
parentcdf5d9941ca866d437612d2f863eac6eb0b3db12 (diff)
Merge branch 'erdgeist-revive-events'
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/_user.html.erb7
-rw-r--r--app/views/users/edit.html.erb54
-rw-r--r--app/views/users/index.html.erb31
-rw-r--r--app/views/users/new.html.erb52
-rw-r--r--app/views/users/show.html.erb41
5 files changed, 96 insertions, 89 deletions
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index ddb7afd..3a88f5e 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -7,9 +7,10 @@
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 <%= button_to "destroy", user_path(user), 10 <%= button_to user_path(user), method: :delete,
11 method: :delete, 11 form: { data: { confirm: "Do you really want to destroy user #{user.login}?" }, class: 'button_to destructive' } do %>
12 form: { data: { confirm: "Do you really want to delete user #{user.login}?" } } %> 12 <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
13 <% end %>
13 </td> 14 </td>
14 <% end %> 15 <% end %>
15</tr> 16</tr>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index df1005b..77b33c6 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -2,38 +2,32 @@
2 2
3<% if @user.errors.any? %> 3<% if @user.errors.any? %>
4 <div class="error_messages"> 4 <div class="error_messages">
5 <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg.gsub("Slug", "Title") %></li><% end %></ul> 5 <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>
6 </div> 6 </div>
7<% end %> 7<% end %>
8 8
9<div id="page_editor">
10 <%= form_for @user do |f| %>
11 <div id="content">
12 <div class="node_description">Login</div>
13 <div class="node_content"><%= f.text_field :login %></div>
9 14
10<%= form_for @user do |f| %> 15 <div class="node_description">E-Mail</div>
11<table id="new_node"> 16 <div class="node_content"><%= f.text_field :email %></div>
12 <tr> 17
13 <td class="description">Login</td> 18 <div class="node_description">Password</div>
14 <td><%= f.text_field :login %></td> 19 <div class="node_content"><%= f.password_field :password %></div>
15 </tr> 20
16 <tr> 21 <div class="node_description">Confirm</div>
17 <td class="description">E-Mail</td> 22 <div class="node_content"><%= f.password_field :password_confirmation %></div>
18 <td><%= f.text_field :email %></td> 23
19 </tr> 24 <% if current_user.admin? %>
20 <tr> 25 <div class="node_description">Admin?</div>
21 <td class="description">Password</td> 26 <div class="node_content"><%= f.check_box :admin %></div>
22 <td><%= f.password_field :password %></td> 27 <% end %>
23 </tr> 28
24 <tr> 29 <div class="node_description"></div>
25 <td class="description">Confirm</td> 30 <div class="node_content"><%= f.submit "Update" %></div>
26 <td><%= f.password_field :password_confirmation %></td>
27 </tr>
28 <% if current_user.admin? %>
29 <tr>
30 <td class="description">Admin?</td>
31 <td><%= f.check_box :admin %></td>
32 </tr>
33 <% end %> 31 <% end %>
34 <tr> 32 </div>
35 <td class="description"></td> 33</div>
36 <td class="right"><%= f.submit "Update" %></td>
37 </tr>
38</table>
39<% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 59806db..4f5266d 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,14 +1,27 @@
1<table class="user_list"> 1<h1>Admins</h1>
2 <tr> 2<%= link_to new_user_path(admin: true), class: 'action_button' do %>
3 <td><h1>Admins</h1></td> 3 <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create admin user
4<% end %>
5<table class="user_table">
6 <tr class="header">
7 <th>Login</th>
8 <th></th>
9 <th></th>
10 <th></th>
4 </tr> 11 </tr>
5 <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %> 12 <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %>
6 <tr> 13</table>
7 <td><h1>Users</h1></td> 14
15<h1>Users</h1>
16<%= link_to new_user_path, class: 'action_button' do %>
17 <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create user
18<% end %>
19<table class="user_table">
20 <tr class="header">
21 <th>Login</th>
22 <th></th>
23 <th></th>
24 <th></th>
8 </tr> 25 </tr>
9 <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %> 26 <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %>
10</table> 27</table>
11
12<% content_for :subnavigation do %>
13 <%= link_to "create", new_user_path %>
14<% end %> \ No newline at end of file
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 6beda4f..ce38fdf 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -2,36 +2,30 @@
2 2
3<% if @user.errors.any? %> 3<% if @user.errors.any? %>
4 <div class="error_messages"> 4 <div class="error_messages">
5 <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg.gsub("Slug", "Title") %></li><% end %></ul> 5 <ul><% @user.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>
6 </div> 6 </div>
7<% end %> 7<% end %>
8 8
9<div id="page_editor">
10 <%= form_for @user do |f| %>
11 <div id="content">
12 <div class="node_description">Login</div>
13 <div class="node_content"><%= f.text_field :login %></div>
9 14
10<%= form_for @user do |f| %> 15 <div class="node_description">E-Mail</div>
11<table id="new_node"> 16 <div class="node_content"><%= f.text_field :email %></div>
12 <tr> 17
13 <td class="description">Login</td> 18 <div class="node_description">Password</div>
14 <td><%= f.text_field :login %></td> 19 <div class="node_content"><%= f.password_field :password %></div>
15 </tr> 20
16 <tr> 21 <div class="node_description">Confirm</div>
17 <td class="description">E-Mail</td> 22 <div class="node_content"><%= f.password_field :password_confirmation %></div>
18 <td><%= f.text_field :email %></td> 23
19 </tr> 24 <div class="node_description">Admin?</div>
20 <tr> 25 <div class="node_content"><%= f.check_box :admin %></div>
21 <td class="description">Password</td> 26
22 <td><%= f.password_field :password %></td> 27 <div class="node_description"></div>
23 </tr> 28 <div class="node_content"><%= f.submit "Create" %></div>
24 <tr> 29 <% end %>
25 <td class="description">Confirm</td> 30 </div>
26 <td><%= f.password_field :password_confirmation %></td> 31</div>
27 </tr>
28 <tr>
29 <td class="description">Admin?</td>
30 <td><%= f.check_box :admin %></td>
31 </tr>
32 <tr>
33 <td class="description"></td>
34 <td class="right"><%= f.submit "Create" %></td>
35 </tr>
36</table>
37<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 80483d3..70881db 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,20 +1,25 @@
1<% content_for :subnavigation do %> 1<div id="page_editor">
2 <%= link_to 'Edit', edit_user_path(@user) %> 2 <h1><%= @user.login %></h1>
3<% end %>
4 3
5<h1>User: <%= @user.login %></h1> 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 <div class="node_info_item">
9 <%= link_to edit_user_path(@user), class: 'action_button' do %>
10 <%= icon("edit", library: "tabler", "aria-hidden": true) %> Edit
11 <% end %>
12 </div>
13 </div>
14 </div>
6 15
7<table id="new_node"> 16 <div class="node_description">Login</div>
8 <tr> 17 <div class="node_content"><%= @user.login %></div>
9 <td class="description">Login</td> 18
10 <td><%= @user.login %></td> 19 <div class="node_description">E-Mail</div>
11 </tr> 20 <div class="node_content"><%= @user.email %></div>
12 <tr> 21
13 <td class="description">E-Mail</td> 22 <div class="node_description">Admin?</div>
14 <td><%= @user.email %></td> 23 <div class="node_content"><%= @user.admin ? "yes" : "no" %></div>
15 </tr> 24 </div>
16 <tr> 25</div>
17 <td class="description">Admin?</td>
18 <td><%= @user.admin ? "yes" : "no" %></td>
19 </tr>
20</table> \ No newline at end of file
generated by cgit v1.3 (git 2.53.0) at 2026-07-14 22:36:36 +0000