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 92c37056b848235859886518cbe24496b54bede5..badcc1249c2ceb81610589b938ffd01ac719e61d 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -6,7 +6,6 @@
     <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>


@@ -19,13 +18,17 @@
 
   <tr>
     <td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td>
 
   <tr>
     <td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td>

-    <td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %></td>
+    <td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>

   </tr>
 
   <tr>
     <td class="fieldName"><%= t 'user.new.confirm password' %></td>
   </tr>
 
   <tr>
     <td class="fieldName"><%= t 'user.new.confirm password' %></td>

-    <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %></td>
+    <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>

   </tr>
   </tr>

+  <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>

 
   <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>


@@ -55,9 +58,9 @@
     <td valign="top">
       <% if @user.image.nil? %>
         <%= hidden_field_tag "image_action", "new" %>
     <td valign="top">
       <% if @user.image.nil? %>
         <%= hidden_field_tag "image_action", "new" %>

-        <%= t 'user.account.new image' %><br /><%= file_column_field "user", "image" %>
+        <%= t 'user.account.new image' %><br /><%= file_column_field "user", "image" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span>

       <% else %>
       <% else %>

-        <table>
+        <table id="accountImage">

           <tr>
             <td rowspan="3" valign="top"><%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %></td>
             <td><%= radio_button_tag "image_action", "keep", true %></td>
           <tr>
             <td rowspan="3" valign="top"><%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %></td>
             <td><%= radio_button_tag "image_action", "keep", true %></td>


@@ -69,7 +72,7 @@
           </tr>
           <tr>
             <td><%= radio_button_tag "image_action", "new" %></td>
           </tr>
           <tr>
             <td><%= radio_button_tag "image_action", "new" %></td>

-            <td><%= t 'user.account.replace image' %><br /><%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %></td>
+            <td><%= t 'user.account.replace image' %><br /><%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>

           </tr>
         </table>
       <% end %>
           </tr>
         </table>
       <% end %>


@@ -85,7 +88,7 @@
     <td></td>
     <td>
       <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
     <td></td>
     <td>
       <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>

-      <div id="map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>
+      <div id="map" class="user_map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>

     </td>
   </tr>
   
     </td>
   </tr>