Merge remote-tracking branch 'upstream/pull/3046'

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

diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 4021e5c084114c180b3897b0608c12fe386b75be..394e81cd1774549e2fae79bc3935e83c4d49aae5 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -13,20 +13,20 @@
 <%= error_messages_for current_user %>
 <%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>
   <fieldset>
 <%= error_messages_for current_user %>
 <%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>
   <fieldset>

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t "users.new.display name" %></label>
       <%= f.text_field :display_name %>
     </div>
   </fieldset>
 
   <fieldset>
       <label class="standard-label"><%= t "users.new.display name" %></label>
       <%= f.text_field :display_name %>
     </div>
   </fieldset>
 
   <fieldset>

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t ".current email address" %></label>
       <input type="email" disabled value="<%= current_user.email %>" />
       <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
     </div>
 
       <label class="standard-label"><%= t ".current email address" %></label>
       <input type="email" disabled value="<%= current_user.email %>" />
       <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
     </div>
 

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t ".new email address" %></label>
       <%= f.email_field :new_email, :autocomplete => :off %>
       <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
       <label class="standard-label"><%= t ".new email address" %></label>
       <%= f.email_field :new_email, :autocomplete => :off %>
       <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>


@@ -34,28 +34,28 @@
   </fieldset>
 
   <fieldset>
   </fieldset>
 
   <fieldset>

-    <div class="form-row">
+    <div class="standard-form-row">

         <label class="standard-label"><%= t "users.new.password" %></label>
       <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
     </div>
 
         <label class="standard-label"><%= t "users.new.password" %></label>
       <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
     </div>
 

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t "users.new.confirm password" %></label>
       <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
     </div>
   </fieldset>
 
   <fieldset>
       <label class="standard-label"><%= t "users.new.confirm password" %></label>
       <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
     </div>
   </fieldset>
 
   <fieldset>

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t ".external auth" %></label>
       <label class="standard-label"><%= t ".external auth" %></label>

-      <%= f.select :auth_provider, Auth::PROVIDERS %>
+      <%= f.select :auth_provider, Auth.providers %>

       <%= f.text_field :auth_uid %>
       <span class="form-help deemphasize">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</span>
     </div>
   </fieldset>
 
   <fieldset class="form-divider">
       <%= f.text_field :auth_uid %>
       <span class="form-help deemphasize">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</span>
     </div>
   </fieldset>
 
   <fieldset class="form-divider">

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t ".public editing.heading" %></label>
       <span class="form-help deemphasize">
         <% if current_user.data_public? %>
       <label class="standard-label"><%= t ".public editing.heading" %></label>
       <span class="form-help deemphasize">
         <% if current_user.data_public? %>


@@ -68,7 +68,7 @@
       </span>
     </div>
 
       </span>
     </div>
 

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t ".contributor terms.heading" %></label>
       <span class="form-help deemphasize">
         <% if current_user.terms_agreed? %>
       <label class="standard-label"><%= t ".contributor terms.heading" %></label>
       <span class="form-help deemphasize">
         <% if current_user.terms_agreed? %>


@@ -83,24 +83,24 @@
         <% end %>
       </span>
     </div>
         <% end %>
       </span>
     </div>

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t ".preferred editor" %></label>
       <label class="standard-label"><%= t ".preferred editor" %></label>

-      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>

     </div>
   </fieldset>
 
   <fieldset class="form-divider">
     </div>
   </fieldset>
 
   <fieldset class="form-divider">

-    <div class='form-row'>
+    <div class='standard-form-row'>

       <label class="standard-label"><%= t ".profile description" %></label>
       <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
     </div>
 
       <label class="standard-label"><%= t ".profile description" %></label>
       <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
     </div>
 

-    <div class="form-row">
+    <div class="standard-form-row">

       <label class="standard-label"><%= t ".preferred languages" %></label>
       <%= f.text_field :languages %>
     </div>
 
       <label class="standard-label"><%= t ".preferred languages" %></label>
       <%= f.text_field :languages %>
     </div>
 

-    <div class='form-row accountImage'>
+    <div class='standard-form-row accountImage'>

       <label class="standard-label"><%= t ".image" %></label>
         <%= user_image current_user %>
         <ul class='form-list accountImage-options'>
       <label class="standard-label"><%= t ".image" %></label>
         <%= user_image current_user %>
         <ul class='form-list accountImage-options'>


@@ -147,7 +147,7 @@
   </fieldset>
 
   <fieldset class="form-divider">
   </fieldset>
 
   <fieldset class="form-divider">

-    <div class='form-row location clearfix'>
+    <div class='standard-form-row location clearfix'>

     <label class="standard-label"><%= t ".home location" %></label>
     <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
       <p class="message form-help deemphasize"><%= t ".no home location" %></p>
     <label class="standard-label"><%= t ".home location" %></label>
     <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
       <p class="message form-help deemphasize"><%= t ".no home location" %></p>


@@ -162,11 +162,11 @@
       </div>
     </div>
 
       </div>
     </div>
 

-    <div class="form-row">
+    <div class="standard-form-row">

       <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
       <label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
     </div>
       <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
       <label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
     </div>

-    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
+    <%= tag.div "", :id => "map", :class => "content_map set_location" %>

   </fieldset>
 
   <%= submit_tag t(".save changes button") %>
   </fieldset>
 
   <%= submit_tag t(".save changes button") %>