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 badcc1249c2ceb81610589b938ffd01ac719e61d..ba5b652ac92a5434afa9d57744b8b2e8c1380284 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -6,6 +6,7 @@
     <td class="fieldName"><%= t 'user.new.display name' %></td>
     <td><%= f.text_field :display_name %></td>
   </tr>
     <td class="fieldName"><%= t 'user.new.display name' %></td>
     <td><%= f.text_field :display_name %></td>
   </tr>

+

   <tr>
     <td class="fieldName" style="padding-bottom:0px;"><%= t 'user.account.current email address' %></td>
     <td style="padding-bottom:0px;"><%= @user.email %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>
   <tr>
     <td class="fieldName" style="padding-bottom:0px;"><%= t 'user.account.current email address' %></td>
     <td style="padding-bottom:0px;"><%= @user.email %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>


@@ -25,10 +26,11 @@
     <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>
     <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>
   <tr>
     <td class="fieldName" ><%= t 'user.account.openid.openid' %></td>

-    <td style="padding-bottom:0px;"><%= f.text_field :openid_url %> (<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>) </td>
-</tr>
+    <td><%= f.text_field :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>
     <td class="fieldName" valign="top"><%= t 'user.account.public editing.heading' %></td>
 
   <tr>
     <td class="fieldName" valign="top"><%= t 'user.account.public editing.heading' %></td>