cafe-grader-web

Commit r673:99c14e332823 public

parent | child
Description:
user_admin
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r673:99c14e332823 - - 7 files changed: 46 inserted, 36 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,31
1 + = error_messages_for 'user'
2 + / [form:user]
3 + .form-group
4 + %label.col-md-2.control-label{for: :login} Login
5 + .col-md-4
6 + = text_field 'user', 'login', class: 'form-control'
7 + .form-group
8 + %label.col-md-2.control-label{for: :full_name} Login
9 + .col-md-4
10 + = text_field 'user', 'full_name', class: 'form-control'
11 + .form-group
12 + %label.col-md-2.control-label{for: :password} Password
13 + .col-md-4
14 + = password_field 'user', 'password', class: 'form-control'
15 + .form-group
16 + %label.col-md-2.control-label{for: :password_confirmation} Password (confirm)
17 + .col-md-4
18 + = password_field 'user', 'password_confirmation', class: 'form-control'
19 + .form-group
20 + %label.col-md-2.control-label{for: :email} E-mail
21 + .col-md-4
22 + = email_field 'user', 'email', class: 'form-control'
23 + .form-group
24 + %label.col-md-2.control-label{for: :alias} Alias
25 + .col-md-4
26 + = text_field 'user', 'alias', class: 'form-control'
27 + .form-group
28 + %label.col-md-2.control-label{for: :remark} Remark
29 + .col-md-4
30 + = text_field 'user', 'remark', class: 'form-control'
31 + / [eoform:user]
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -9,15 +9,13
9 %th Description
9 %th Description
10 %th
10 %th
11 %th
11 %th
12 - %th
13
12
14 %tbody
13 %tbody
15 - @groups.each do |group|
14 - @groups.each do |group|
16 %tr
15 %tr
17 %td= group.name
16 %td= group.name
18 %td= group.description
17 %td= group.description
19 - %td= link_to 'Show', group, class: 'btn btn-default'
18 + %td= link_to 'View', group, class: 'btn btn-default'
20 - %td= link_to 'Edit', edit_group_path(group), class: 'btn btn-default'
21 %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
19 %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
22
20
23 %br
21 %br
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,5 +1,3
1 - %p#notice= notice
2 -
3 %p
1 %p
4 %b Name:
2 %b Name:
5 = @group.name
3 = @group.name
@@ -13,9 +11,13
13 = link_to 'Back', groups_path
11 = link_to 'Back', groups_path
14
12
15 .row
13 .row
14 + %h1 Group details
15 + .row
16 .col-md-6
16 .col-md-6
17 - %h1 Users in this group
17 + .panel.panel-default
18 -
18 + .panel-heading
19 + .panel-title Users in this group
20 + .panel-body
19 =form_tag add_user_group_path(@group), class: 'form-inline' do
21 =form_tag add_user_group_path(@group), class: 'form-inline' do
20 .form-group
22 .form-group
21 =label_tag :user_id, "User"
23 =label_tag :user_id, "User"
@@ -39,7 +41,10
39 %td= user.remark
41 %td= user.remark
40 %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger'
42 %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger'
41 .col-md-6
43 .col-md-6
42 - %h1 Problems in this group
44 + .panel.panel-default
45 + .panel-heading
46 + .panel-title Problems
47 + .panel-body
43
48
44 =form_tag add_problem_group_path(@group), class: 'form-inline' do
49 =form_tag add_problem_group_path(@group), class: 'form-inline' do
45 .form-group
50 .form-group
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -47,6 +47,7
47 = add_menu( 'Announcements', 'announcements', 'index')
47 = add_menu( 'Announcements', 'announcements', 'index')
48 = add_menu( 'Problems', 'problems', 'index')
48 = add_menu( 'Problems', 'problems', 'index')
49 = add_menu( 'Users', 'user_admin', 'index')
49 = add_menu( 'Users', 'user_admin', 'index')
50 + = add_menu( 'User Groups', 'groups', 'index')
50 = add_menu( 'Graders', 'graders', 'list')
51 = add_menu( 'Graders', 'graders', 'list')
51 = add_menu( 'Message ', 'messages', 'console')
52 = add_menu( 'Message ', 'messages', 'console')
52 %li.divider{role: 'separator'}
53 %li.divider{role: 'separator'}
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,9 +1,9
1 %h1 Editing user
1 %h1 Editing user
2
2
3 - = form_tag :action => 'update', :id => @user do
3 + = form_tag( {:action => 'update', :id => @user}, {class: 'form-horizontal'}) do
4 = error_messages_for 'user'
4 = error_messages_for 'user'
5 = render partial: "form"
5 = render partial: "form"
6 - = submit_tag "Edit"
6 + = submit_tag "Edit", class: 'btn btn-primary'
7
7
8
8
9 = link_to 'Show', :action => 'show', :id => @user
9 = link_to 'Show', :action => 'show', :id => @user
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -7,4 +7,4
7 <% end %>
7 <% end %>
8
8
9 <%= link_to 'Edit', :action => 'edit', :id => @user %> |
9 <%= link_to 'Edit', :action => 'edit', :id => @user %> |
10 - <%= link_to 'Back', :action => 'list' %>
10 + <%= link_to 'Back', :action => 'index' %>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now