summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/edit.html.erb54
-rw-r--r--app/views/users/index.html.erb17
-rw-r--r--app/views/users/new.html.erb52
-rw-r--r--app/views/users/show.html.erb39
4 files changed, 75 insertions, 87 deletions
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 88868f5..46e958b 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,7 +1,6 @@
1<h1>Admins</h1>
2<%= link_to 'New admin user', new_user_path(admin: true), class: 'action_button' %>
1<table class="user_table"> 3<table class="user_table">
2 <tr>
3 <td><h1>Admins</h1></td>
4 </tr>
5 <tr class="header"> 4 <tr class="header">
6 <th>Login</th> 5 <th>Login</th>
7 <th></th> 6 <th></th>
@@ -9,9 +8,11 @@
9 <th></th> 8 <th></th>
10 </tr> 9 </tr>
11 <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %> 10 <%= render :partial => "user", :locals => {:users => @users[:admin] ||= []} %>
12 <tr> 11</table>
13 <td><h1>Users</h1></td> 12
14 </tr> 13<h1>Users</h1>
14<%= link_to 'New user', new_user_path, class: 'action_button' %>
15<table class="user_table">
15 <tr class="header"> 16 <tr class="header">
16 <th>Login</th> 17 <th>Login</th>
17 <th></th> 18 <th></th>
@@ -20,7 +21,3 @@
20 </tr> 21 </tr>
21 <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %> 22 <%= render :partial => "user", :locals => {:users => @users[:user] ||= []} %>
22</table> 23</table>
23
24<% content_for :subnavigation do %>
25 <%= link_to "create", new_user_path %>
26<% end %>
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..e744efe 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,20 +1,23 @@
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', edit_user_path(@user), class: 'action_button' %>
10 </div>
11 </div>
12 </div>
6 13
7<table id="new_node"> 14 <div class="node_description">Login</div>
8 <tr> 15 <div class="node_content"><%= @user.login %></div>
9 <td class="description">Login</td> 16
10 <td><%= @user.login %></td> 17 <div class="node_description">E-Mail</div>
11 </tr> 18 <div class="node_content"><%= @user.email %></div>
12 <tr> 19
13 <td class="description">E-Mail</td> 20 <div class="node_description">Admin?</div>
14 <td><%= @user.email %></td> 21 <div class="node_content"><%= @user.admin ? "yes" : "no" %></div>
15 </tr> 22 </div>
16 <tr> 23</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-15 06:02:08 +0000