From d70fd8ab1a07d842603b820d8ce7d0e5be9f976d Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 21 Oct 2011 11:53:53 +0100
Subject: [PATCH] Use HTML5 email and url field types where appropriate

---
 app/assets/stylesheets/common.css.scss | 2 +-
 app/views/user/account.html.erb        | 4 ++--
 app/views/user/login.html.erb          | 2 +-
 app/views/user/new.html.erb            | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 1c8f72c24..d8992b637 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -979,7 +979,7 @@ p#contributorGuidance {
   font-size: 0.8em;
 }
 
-input[type="text"], input[type="password"], textarea {
+input[type="text"], input[type="email"], input[type="url"], input[type="password"], textarea {
   border: 1px solid black;
 }
 
diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 606e8c358..0da8b2530 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -14,7 +14,7 @@
 
   <tr>
     <td class="fieldName"><%= t 'user.account.new email address' %></td>
-    <td><%= f.text_field :new_email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>
+    <td><%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>
   </tr>
 
   <tr>
@@ -29,7 +29,7 @@
 
   <tr>
     <td class="fieldName" ><%= t 'user.account.openid.openid' %></td>
-    <td><%= f.text_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td>
+    <td><%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td>
   </tr>
 
   <tr>
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 66392095b..9a4f50abc 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -45,7 +45,7 @@
             <%= raw t 'user.login.openid', :logo => openid_logo %>
           </td>
           <td>
-            <%= text_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
+            <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>
             <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
           </td>
         </tr>
diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 97622ae13..104a88959 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -18,11 +18,11 @@
   <table id="signupForm">
     <tr>
       <td class="fieldName"><%= t 'user.new.email address' %></td>
-      <td><%= text_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1 }) %></td>
+      <td><%= email_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1 }) %></td>
     </tr>
     <tr>
       <td class="fieldName"><%= t 'user.new.confirm email address' %></td>
-      <td><%= text_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>
+      <td><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>
     </tr>
     <tr>
       <td></td>
@@ -43,7 +43,7 @@
 
     <tr id="openid_field">
       <td class="fieldName"><%= raw t 'user.new.openid', :logo => openid_logo %></td>
-      <td><%= text_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :class => "openid_url" }) %></td>
+      <td><%= url_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :class => "openid_url" }) %></td>
     </tr>
 
     <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
-- 
2.43.2