Merge branch 'master' into openID

[rails.git] / app / views / user / account.html.erb

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 85e9aebefb300142b3465176b81ee0f3b33c88ad..83065c6839d9e92a8297c913365cf32cf4b20cc5 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -26,6 +26,10 @@
     <td class="fieldName"><%= t 'user.new.confirm password' %></td>
     <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
   </tr>
+  <tr>
+    <td class="fieldName" ><%= t 'user.account.openid.openid' %></td>
+    <td><%= f.text_field :openid_url, {:class => "openid_url"} %> (<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>) </td>
+  </tr>
 
   <tr>
     <td class="fieldName" valign="top"><%= t 'user.account.public editing.heading' %></td>