cafe-grader-web Commit - r378:0a752bff0187

cafe-grader-web

parent | child

Description:

Changed to HTML5 email field and fixed some text appearance

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r378:0a752bff0187 - Wed, 31 Dec 2014 16:06:09 - 5 files changed: 8 inserted, 7 deleted

app/views/user_admin/_form.html.erb ¶ +1 -1

               <%= password_field 'user', 'password_confirmation'  %></p>
               <p><label for="user_email">E-mail</label><br/>
-            - <%= text_field 'user', 'email'  %></p>
+            + <%= email_field 'user', 'email'  %></p>
               <p><label for="user_alias">Alias</label><br/>
               <%= text_field 'user', 'alias'  %></p>

app/views/user_admin/list.html.erb ¶ +1 -1

               	<td><%= text_field 'user', 'full_name', :size => 30  %></td>
               	<td><%= password_field 'user', 'password', :size => 10  %></td>
               	<td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
-            - 	<td><%= text_field 'user', 'email', :size => 15 %></td>
+            + 	<td><%= email_field 'user', 'email', :size => 15 %></td>
               	<td><%= submit_tag "Create" %></td>
                   </tr>
                   </table>

app/views/users/forget.html.haml ¶ +2 -1

               = form_tag :action => 'retrieve_password' do
                 =t 'registration.password_retrieval.instructions'
-            -   = text_field 'email', nil, :size => 20
+            +   %br/
+            +   = email_field 'email', nil, :size => 20
                 %br/
                 = submit_tag(t 'registration.password_retrieval.button_label')

app/views/users/new.html.haml ¶ +2 -2

                   %tr
                     %td{:align => "right"}
                       = "#{t 'email_label'}:"
-            -       %td= f.text_field :email
+            +       %td= f.email_field :email
                   %tr
                     %td
                     %td
                       %small
-            -           =t 'registration.email_guide'
+            +           =t('registration.email_guide').html_safe
                   %tr
                     %td/
                     %td

config/locales/en.yml ¶ +2 -2

                 email_label: 'E-mail'
                 password_label: 'Password'
-            -   go_ahead_to: "Go ahead to"
+            +   go_ahead_to: "Go ahead to "
-            -   go_back_to: "Go back to"
+            +   go_back_to: "Go back to "
                 login_page: "login page"
                 home_page: "home page"

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings