Description:
Changed to HTML5 email field and fixed some text appearance
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Waitaya Krongapiradee
-
r378:0a752bff0187 - - 4 files changed: 6 inserted, 5 deleted
| @@ -1,22 +1,22 | |||
|
|
1 | 1 | <%= error_messages_for 'user' %> |
|
|
2 | 2 | |
|
|
3 | 3 | <!--[form:user]--> |
|
|
4 | 4 | <p><label for="user_name">Login</label><br/> |
|
|
5 | 5 | <%= text_field 'user', 'login' %></p> |
|
|
6 | 6 | |
|
|
7 | 7 | <p><label for="user_name">Full name</label><br/> |
|
|
8 | 8 | <%= text_field 'user', 'full_name' %></p> |
|
|
9 | 9 | |
|
|
10 | 10 | <p><label for="password">Password</label><br/> |
|
|
11 | 11 | <%= password_field 'user', 'password' %></p> |
|
|
12 | 12 | |
|
|
13 | 13 | <p><label for="password_confirmation">Password (confirm)</label><br/> |
|
|
14 | 14 | <%= password_field 'user', 'password_confirmation' %></p> |
|
|
15 | 15 | |
|
|
16 | 16 | <p><label for="user_email">E-mail</label><br/> |
|
|
17 |
- <%= |
|
|
|
17 | + <%= email_field 'user', 'email' %></p> | |
|
|
18 | 18 | |
|
|
19 | 19 | <p><label for="user_alias">Alias</label><br/> |
|
|
20 | 20 | <%= text_field 'user', 'alias' %></p> |
|
|
21 | 21 | <!--[eoform:user]--> |
|
|
22 | 22 | |
| @@ -1,86 +1,86 | |||
|
|
1 | 1 | <h1>Listing users</h1> |
|
|
2 | 2 | |
|
|
3 | 3 | <div class="submitbox"> |
|
|
4 | 4 | <b>Quick add</b> |
|
|
5 | 5 | <%= form_tag :action => 'create' do %> |
|
|
6 | 6 | <table border="0"> |
|
|
7 | 7 | <tr> |
|
|
8 | 8 | <td><label for="user_login">Login</label></td> |
|
|
9 | 9 | <td><label for="user_full_name">Full name</label></td> |
|
|
10 | 10 | <td><label for="user_password">Password</label></td> |
|
|
11 | 11 | <td><label for="user_password_confirmation">Confirm</label></td> |
|
|
12 | 12 | <td><label for="user_email">Email</label></td> |
|
|
13 | 13 | </tr> |
|
|
14 | 14 | <tr> |
|
|
15 | 15 | <td><%= text_field 'user', 'login', :size => 10 %></td> |
|
|
16 | 16 | <td><%= text_field 'user', 'full_name', :size => 30 %></td> |
|
|
17 | 17 | <td><%= password_field 'user', 'password', :size => 10 %></td> |
|
|
18 | 18 | <td><%= password_field 'user', 'password_confirmation', :size => 10 %></td> |
|
|
19 |
- <td><%= |
|
|
|
19 | + <td><%= email_field 'user', 'email', :size => 15 %></td> | |
|
|
20 | 20 | <td><%= submit_tag "Create" %></td> |
|
|
21 | 21 | </tr> |
|
|
22 | 22 | </table> |
|
|
23 | 23 | <% end %> |
|
|
24 | 24 | <br/> |
|
|
25 | 25 | <b>Import from site management</b> |
|
|
26 | 26 | <%= form_tag({:action => 'import'}, :multipart => true) do %> |
|
|
27 | 27 | File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %> |
|
|
28 | 28 | <% end %> |
|
|
29 | 29 | <br/> |
|
|
30 | 30 | <b>What else: </b> |
|
|
31 | 31 | <%= link_to '[New user]', :action => 'new' %> |
|
|
32 | 32 | <%= link_to '[New list of users]', :action => 'new_list' %> |
|
|
33 | 33 | <%= link_to '[View administrators]', :action => 'admin' %> |
|
|
34 | 34 | <%= link_to '[Random passwords]', :action => 'random_all_passwords' %> |
|
|
35 | 35 | <%= link_to '[View active users]', :action => 'active' %> |
|
|
36 | 36 | <%= link_to '[Mass mailing]', :action => 'mass_mailing' %> |
|
|
37 | 37 | <% if GraderConfiguration.multicontests? %> |
|
|
38 | 38 | <br/><b>Multi-contest:</b> |
|
|
39 | 39 | <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %> |
|
|
40 | 40 | View users in: |
|
|
41 | 41 | <% @contests.each do |contest| %> |
|
|
42 | 42 | <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %> |
|
|
43 | 43 | <% end %> |
|
|
44 | 44 | <%= link_to "[no contest]", :action => 'contests', :id => 'none' %> |
|
|
45 | 45 | <% end %> |
|
|
46 | 46 | </div> |
|
|
47 | 47 | |
|
|
48 | 48 | Total <%= @user_count %> users | |
|
|
49 | 49 | <% if !@paginated %> |
|
|
50 | 50 | Display all users. |
|
|
51 | 51 | <%= link_to '[show in pages]', :action => 'list', :page => '1' %> |
|
|
52 | 52 | <% else %> |
|
|
53 | 53 | Display in pages. |
|
|
54 | 54 | <%= link_to '[display all]', :action => 'list', :page => 'all' %> | |
|
|
55 | 55 | <%= will_paginate @users, :container => false %> |
|
|
56 | 56 | <% end %> |
|
|
57 | 57 | <table class="info"> |
|
|
58 | 58 | <tr class="info-head"> |
|
|
59 | 59 | <% for column in User.content_columns %> |
|
|
60 | 60 | <% if !@hidden_columns.index(column.name) %> |
|
|
61 | 61 | <th><%= column.human_name %></th> |
|
|
62 | 62 | <% end %> |
|
|
63 | 63 | <% end %> |
|
|
64 | 64 | <th></th> |
|
|
65 | 65 | <th></th> |
|
|
66 | 66 | <th></th> |
|
|
67 | 67 | </tr> |
|
|
68 | 68 | |
|
|
69 | 69 | <% for user in @users %> |
|
|
70 | 70 | <tr class="info-<%= cycle("odd","even") %>"> |
|
|
71 | 71 | <% for column in User.content_columns %> |
|
|
72 | 72 | <% if !@hidden_columns.index(column.name) %> |
|
|
73 | 73 | <td><%=h user.send(column.name) %></td> |
|
|
74 | 74 | <% end %> |
|
|
75 | 75 | <% end %> |
|
|
76 | 76 | <td><%= link_to 'Show', :action => 'show', :id => user %></td> |
|
|
77 | 77 | <td><%= link_to 'Edit', :action => 'edit', :id => user %></td> |
|
|
78 | 78 | <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td> |
|
|
79 | 79 | </tr> |
|
|
80 | 80 | <% end %> |
|
|
81 | 81 | </table> |
|
|
82 | 82 | |
|
|
83 | 83 | <br /> |
|
|
84 | 84 | |
|
|
85 | 85 | <%= link_to '[New user]', :action => 'new' %> |
|
|
86 | 86 | <%= link_to '[New list of users]', :action => 'new_list' %> |
| @@ -1,18 +1,19 | |||
|
|
1 | 1 | .contest-title |
|
|
2 | 2 | %h1 |
|
|
3 | 3 | = "#{GraderConfiguration['contest.name']}: #{t 'registration.password_retrieval.header'}" |
|
|
4 | 4 | |
|
|
5 | 5 | - if flash[:notice] |
|
|
6 | 6 | %hr/ |
|
|
7 | 7 | %b= flash[:notice] |
|
|
8 | 8 | %hr/ |
|
|
9 | 9 | |
|
|
10 | 10 | %br/ |
|
|
11 | 11 | |
|
|
12 | 12 | = form_tag :action => 'retrieve_password' do |
|
|
13 | 13 | =t 'registration.password_retrieval.instructions' |
|
|
14 | - = text_field 'email', nil, :size => 20 | |
|
|
14 | + %br/ | |
|
|
15 | + = email_field 'email', nil, :size => 20 | |
|
|
15 | 16 | %br/ |
|
|
16 | 17 | = submit_tag(t 'registration.password_retrieval.button_label') |
|
|
17 | 18 | |
|
|
18 | 19 | = link_to "#{t 'go_back_to'}#{t 'home_page'}", :controller => 'main', :action => 'index' |
| @@ -1,39 +1,39 | |||
|
|
1 | 1 | .contest-title |
|
|
2 | 2 | %h1 |
|
|
3 | 3 | = "#{GraderConfiguration['contest.name']}: #{t 'registration.title'}" |
|
|
4 | 4 | |
|
|
5 | 5 | .registration-desc |
|
|
6 | 6 | =t 'registration.description' |
|
|
7 | 7 | |
|
|
8 | 8 | = error_messages_for :user, :header_message => (t 'registration.errors.header') |
|
|
9 | 9 | |
|
|
10 | 10 | %table |
|
|
11 | 11 | = form_for @user, :url => { :action => 'register' } do |f| |
|
|
12 | 12 | %tr |
|
|
13 | 13 | %td{:align => "right"} |
|
|
14 | 14 | = "#{t 'login_label'}:" |
|
|
15 | 15 | %td= f.text_field :login |
|
|
16 | 16 | %tr |
|
|
17 | 17 | %td |
|
|
18 | 18 | %td |
|
|
19 | 19 | %small |
|
|
20 | 20 | =t 'registration.login_guide' |
|
|
21 | 21 | %tr |
|
|
22 | 22 | %td{:align => "right"} |
|
|
23 | 23 | = "#{t 'full_name_label'}:" |
|
|
24 | 24 | %td= f.text_field :full_name |
|
|
25 | 25 | %tr |
|
|
26 | 26 | %td{:align => "right"} |
|
|
27 | 27 | = "#{t 'email_label'}:" |
|
|
28 |
- %td= f. |
|
|
|
28 | + %td= f.email_field :email | |
|
|
29 | 29 | %tr |
|
|
30 | 30 | %td |
|
|
31 | 31 | %td |
|
|
32 | 32 | %small |
|
|
33 |
- =t |
|
|
|
33 | + =t('registration.email_guide').html_safe | |
|
|
34 | 34 | %tr |
|
|
35 | 35 | %td/ |
|
|
36 | 36 | %td |
|
|
37 | 37 | = submit_tag((t 'registration.register'), :name => 'commit') |
|
|
38 | 38 | = submit_tag((t 'cancel'), :name => 'cancel') |
|
|
39 | 39 | |
You need to be logged in to leave comments.
Login now