cafe-grader-web Commit - r378:0a752bff0187

cafe-grader-web

Commit `r378:0a752bff0187` public

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

               <%= error_messages_for 'user' %>
               <!--[form:user]-->
               <p><label for="user_name">Login</label><br/>
               <%= text_field 'user', 'login'  %></p>
               <p><label for="user_name">Full name</label><br/>
               <%= text_field 'user', 'full_name'  %></p>
               <p><label for="password">Password</label><br/>
               <%= password_field 'user', 'password'  %></p>
               <p><label for="password_confirmation">Password (confirm)</label><br/>
               <%= 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>
               <!--[eoform:user]-->

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

               <h1>Listing users</h1>
               <div class="submitbox">
                 <b>Quick add</b>
                 <%= form_tag :action => 'create' do %>
                   <table border="0">
                     <tr>
               	<td><label for="user_login">Login</label></td>
               	<td><label for="user_full_name">Full name</label></td>
               	<td><label for="user_password">Password</label></td>
               	<td><label for="user_password_confirmation">Confirm</label></td>
               	<td><label for="user_email">Email</label></td>
                     </tr>
                     <tr>
               	<td><%= text_field 'user', 'login', :size => 10  %></td>
               	<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>
                 <% end %>
                 <br/>
                 <b>Import from site management</b>
                 <%= form_tag({:action => 'import'}, :multipart => true) do %>
                   File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
                 <% end %>
                 <br/>
                 <b>What else: </b>
                 <%= link_to '[New user]', :action => 'new' %>
                 <%= link_to '[New list of users]', :action => 'new_list' %>
                 <%= link_to '[View administrators]', :action => 'admin' %>
                 <%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
                 <%= link_to '[View active users]', :action => 'active' %>
                 <%= link_to '[Mass mailing]', :action => 'mass_mailing' %>
                 <% if GraderConfiguration.multicontests? %>
                   <br/><b>Multi-contest:</b>
                   <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
                   View users in:
                   <% @contests.each do |contest| %>
                     <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
                   <% end %>
                   <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
                 <% end %>
               </div>
               Total <%= @user_count %> users |
               <% if !@paginated %>
                 Display all users.
                 <%= link_to '[show in pages]', :action => 'list', :page => '1' %>
               <% else %>
                 Display in pages.
                 <%= link_to '[display all]', :action => 'list', :page => 'all' %> |
                 <%= will_paginate @users, :container => false %>
               <% end %>
               <table class="info">
                 <tr class="info-head">
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) %>
                       <th><%= column.human_name %></th>
                     <% end %>
                   <% end %>
                   <th></th>
                   <th></th>
                   <th></th>
                 </tr>
               <% for user in @users %>
                 <tr class="info-<%= cycle("odd","even") %>">
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) %>
                       <td><%=h user.send(column.name) %></td>
                     <% end %>
                   <% end %>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to '[New user]', :action => 'new' %>
               <%= link_to '[New list of users]', :action => 'new_list' %>

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

               .contest-title
                 %h1
                   = "#{GraderConfiguration['contest.name']}: #{t 'registration.password_retrieval.header'}"
               - if flash[:notice]
                 %hr/
                 %b= flash[:notice]
                 %hr/
               %br/
               = 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')
               = link_to "#{t 'go_back_to'}#{t 'home_page'}", :controller => 'main', :action => 'index'

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

               .contest-title
                 %h1
                   = "#{GraderConfiguration['contest.name']}: #{t 'registration.title'}"
               .registration-desc
                 =t 'registration.description'
               = error_messages_for :user, :header_message => (t 'registration.errors.header')
               %table
                 = form_for @user, :url => { :action => 'register' } do |f|
                   %tr
                     %td{:align => "right"}
                       = "#{t 'login_label'}:"
                     %td= f.text_field :login
                   %tr
                     %td
                     %td
                       %small
                         =t 'registration.login_guide'
                   %tr
                     %td{:align => "right"}
                       = "#{t 'full_name_label'}:"
                     %td= f.text_field :full_name
                   %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
                       = submit_tag((t 'registration.register'), :name => 'commit')
                       = submit_tag((t 'cancel'), :name => 'cancel')

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

               # Sample localization file for English. Add more files in this directory for other locales.
               # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
               en:
                 cancel: 'Cancel'
                 login_label: 'Login'
                 full_name_label: 'Full name'
                 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"
                 menu:
                   main: 'Main'
                   messages: 'Messages'
                   tasks: 'Tasks'
                   submissions: 'Submissions'
                   test: 'Test Interface'
                   help: 'Help'
                   settings: 'Settings'
                   log_out: 'Log out'
                 title_bar:
                   current_time: "Current time is"
                   remaining_time: "Time left: "
                   contest_not_started: "The contest has not started."
                 login:
                   message: 'Please login to see the problem list'
                   login_submit: 'Login'
                   participation: 'Want to participate?'
                   please: 'Please'
                   register: 'register'
                   forget_password: 'Forget password?'
                 main:
                   start_soon: "The contest at your site will start soon.  Please wait."
                   specified_in_header: "Specified in header"
                   problem_desc: "desc"
                   submitted_at: "Submitted at"
                   graded_at: "Graded at"
                   score: "score: "
                   cmp_msg: "compiler msg"
                   src_link: "src"
                   submissions_link: "submissions"
                   confirm_contest_start:
                     box_title: "Contest confirmation"
                     contest_list: "You will participate in contest:"
                     timer_starts_after_click: "The timer will start after you click the start button."
                     start_button: "Start!"
                     start_button_confirm: "Are you sure?"
                 test:
                   title: "Test Interface"
                   intro: "You can test your submission with your own test data on the grading environment using this test interface."
                   disabled_at_end_announcement: "<b>Note:</b> Test interface will be disabled in the last 30 minutes of the contest time on your site."
                 registration:
                   title: "New user registration"
                   description: "Please enter your information below.  Please make sure your e-mail is correct, because you will have to confirm the registration through an e-mail we send to that e-mail address."
                   successful_title: "Registration successful"
                   login_guide: "Only a-z, A-Z, 0-9 and _.  Can be at most 20 characters long"
                   email_guide: "Please make sure that your e-mail is correct.<br/>You'll need to verify your account by email."
                   register: "Register"
                   email_body: "Hello %{full_name},
               You have registered for %{contest_name}
               Your login is: %{login}
               Your password is: %{password}
               Please follow the link:
               %{activation_url}
               to activate your user account.
               If you did not register, please ignore this e-mail
               and report this event to %{admin_email}.
               Thanks!"
                   email_sent: "We have sent a confimation message to your e-mail.  (Please also check the Junk mail box."
                   email_verify_at: "Please check at %{email} and confirm."
                   activation_sucessful_title: "User activated"
                   account_activated: "Your account has been activated."
                   activation_failed_title: "Activation failed"
                   errors:
                     header: "Errors occured during registration"
                     email:
                       title: "Errors in sending registration confirmation"
                       expl: "<h2>Your user account has been created, but the system cannot send you the confirmation e-mail.</h2>
               Maybe there's a problem in the configuration.  Please report the admin at %{email}.<br/>Thank you!"
                     activation:
                       email_exists: "A user with this E-mail exists."
                       invalid: "Your activation code is invalid.  Please check again."
                   password_retrieval:
                     header: "Password retrieval"
                     instructions: "Please enter the e-mail address that you used to register."
                     button_label: "Request new password"
                     no_email: "No user with that e-mail address."
                     email_body: "Hello %{full_name},
               You have requested for new password for %{contest_name}.  We have generated it for you:
               user name: %{login}
               password: %{password}
               If you didn't ask for new password or you're not the person who registered,
               please ignore this e-mail and inform %{admin_email} of this mistake.
               Thanks!"
                 contest:
                   notification:
                     email_subject: "[%{contest_title_name}] You have been upgraded to %{contest_name}"
                     email_body: "Congratulations %{full_name},
               You have advanced to contest %{contest_name} in %{contest_title_name}.
               You can now log-in and start participating in that contest.
               Cheers!
               -%{contest_title_name} Admin"
                 help:
                   how_to_submit: "How to submit"
                   must_specify_language: "You <b>must</b> specify the language you are using in your program header.  You can optionally specify the task you are submitting to."
                   list_available_language: "The possible language options are <tt>C</tt>, <tt>C++</tt>, and <tt>Pascal</tt>. The follow are examples."
                   accept_only_language_specified: "The server <b>will not</b> accept your submission, if you do not specify the language."
                   specifying_task: "Optionally, you can also specify the task with <tt>TASK:</tt> <i>taskname</i>.  On the first page, the taskname for each task is shown in parentheses."
                   example_cpp: "For example, suppose you are using <tt>C++</tt> to write task <b>mobiles</b>, you put the following on top of your source code."
                   example_pas: "If you are using <tt>Pascal</tt> to write the same task, you'll use"
                   ask_questions_at_messages: "If you have any problems, you can ask at [<a href=\"%{url}\">%{message_link_name}</a>]."
                 activerecord:
                   attributes:
                     user:
                       login: "login"
                       full_name: "full name"
                       email: "e-mail"
                       province: "province"

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	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

Sign in to your account

Author

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

Sign in to your account

Commit r378:0a752bff0187 public

Author

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

Commit `r378:0a752bff0187` public