X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f6c7ed601159aca360da09948f1544172ddf1a41..19b4c1422594ab721e641fe89119758c834e549b:/app/views/user/account.html.erb

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 371524f96..f7408dfe5 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -26,17 +26,17 @@
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.new.password' %>
+      <label><%= t 'user.new.password' %></label>
     <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.new.confirm password' %>
+    <label><%= t 'user.new.confirm password' %></label>
     <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label ><%= t 'user.account.openid.openid' %>
+    <label><%= t 'user.account.openid.openid' %></label>
       <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %>
       <p class="form-help deemphasize">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</p>
   </fieldset>
@@ -89,40 +89,52 @@
     <label><%= t 'user.account.image' %></label>
     <div class="accountImage">
       <%= user_image @user %>
-      <table class="accountImage-options">
+      <fieldset class="accountImage-options">
         <% if @user.image.file? %>
-        <fieldset class="form-row">
+        <div class="form-row">
           <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %>
           <%= t 'user.account.keep image' %>
-        </fieldset>
+        </div>
         <% end %>
         <% if @user.image.file? || @user.image_use_gravatar? %>
-        <fieldset class="form-row">
+        <div class="form-row">
           <%= radio_button_tag "image_action", "delete" %>
           <%= t 'user.account.delete image' %>
-        </fieldset>
+        </div>
         <% end %>
         <% if @user.image.file? %>
-        <fieldset class="form-row">
-          <%= radio_button_tag "image_action", "new" %>
-          <%= t 'user.account.replace image' %><br /><%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %><br /><span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
-        </fieldset>
+        <div>
+          <div class="form-row">
+            <%= radio_button_tag "image_action", "new" %>
+            <%= t 'user.account.replace image' %>
+          </div>
+          <div class="form-row">
+            <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
+            <p class="form-help deemphasize"><%= t 'user.account.image size hint' %></p>
+          </div>
+        </div>
         <% else %>
-        <fieldset class="form-row">
+        <div class="form-row">
           <%= radio_button_tag "image_action", "new" %>
-          <%= t 'user.account.new image' %><br /><%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %><br /><span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
-        </fieldset>
+          <%= t 'user.account.new image' %>
+        </div>
+        <div class="form-row">
+          <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
+          <p class="form-help deemphasize"><%= t 'user.account.image size hint' %></p>
+        </div>
         <% end %>
-        <fieldset class="form-row">
+        <div class="form-row">
           <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %>
-          <%= t 'user.account.gravatar.gravatar' %> <span class="form-help deemphasize">(<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</span>
-        </fieldset>
-      </table>
+          <%= t 'user.account.gravatar.gravatar' %>
+          <p class="form-help deemphasize">(<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</p>
+        </div>
+      </fieldset>
     </div>
   </fieldset>
 
-  <fieldset id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> >
-    <p class="form-help"><%= t 'user.account.home location' %></p>
+<fieldset>
+  <p class="form-help"><%= t 'user.account.home location' %></p>
+  <div id="homerow" <% unless @user.home_lat and @user.home_lon %>class="nohome"<%end%> >
     <p class="message form-help deemphasize"><%= t 'user.account.no home location' %></p>
     <div class="location">
       <label><%= t 'user.account.latitude' %></label>
@@ -130,22 +142,18 @@
       <label><%= t 'user.account.longitude' %></label>
       <%= f.text_field :home_lon, :id => "home_lon" %>
     </div>
-  </fieldset>
+  </div>
 
-  <fieldset class="form-row">
-    
-    
-      <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>
-      <% content_for :head do %>
-        <%= javascript_include_tag "user" %>
-      <% end %>
-      <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
-    
-  </fieldset>
+  <div class="form-row">
+    <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>
+    <% content_for :head do %>
+      <%= javascript_include_tag "user" %>
+    <% end %>
+    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
+  </div>
+</fieldset>
 
-  <fieldset class="form-row">
-    <%= submit_tag t('user.account.save changes button') %>
-  </fieldset>
+  <%= submit_tag t('user.account.save changes button') %>
 <% end %>
 
 <% unless @user.data_public? %>