Merge branch 'master' into convert_roundabout_exits

[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 a4dbf81a3ea301b75fddf1df27ebf9adb95631b1..16fbc46ca828bfc48ab6854beccaf30a9b2ee47d 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -1,153 +1,180 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t 'user.account.my settings' %></h2>
+  <h1><%= t '.my settings' %></h1>

   <ul class='secondary-actions clearfix'>
   <ul class='secondary-actions clearfix'>

-    <li><%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %></li>
+    <li><%= link_to t('.return to profile'), user_path(current_user) %></li>

     <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
   </ul>
 <% end %>
 
     <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
   </ul>
 <% end %>
 

-<%= error_messages_for 'user' %>
-<%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %>
-  <fieldset class="form-row">
-    <label><%= t 'user.new.display name' %></label>
-    <%= f.text_field :display_name %>
+<%= 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">
+      <label class="standard-label"><%= t 'user.new.display name' %></label>
+      <%= f.text_field :display_name %>
+    </div>

   </fieldset>
 
   </fieldset>
 

-  <fieldset class="form-row">
-    <label><%= t 'user.account.current email address' %></label>
-    <input type="email" size="30" disabled value="<%= @user.email %>" />
-    <p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
-  </fieldset>
+  <fieldset>
+    <div class="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>

 
 

-  <fieldset class="form-row">
-    <label><%= t 'user.account.new email address' %></label>
-    <%= f.email_field :new_email %>
-    <p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
+    <div class="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>
+    </div>

   </fieldset>
 
   </fieldset>
 

-  <fieldset class="form-row">
-      <label><%= t 'user.new.password' %></label>
-    <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
-  </fieldset>
+  <fieldset>
+    <div class="form-row">
+        <label class="standard-label"><%= t 'user.new.password' %></label>
+      <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
+    </div>

 
 

-  <fieldset class="form-row">
-    <label><%= t 'user.new.confirm password' %></label>
-    <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
+    <div class="form-row">
+      <label class="standard-label"><%= t 'user.new.confirm password' %></label>
+      <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
+    </div>

   </fieldset>
 
   </fieldset>
 

-  <fieldset class="form-row">
-    <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>
+    <div class="form-row">
+      <label class="standard-label"><%= t '.external auth' %></label>
+      <%= 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>
 

-  <div class="form-row">
-    <label><%= t 'user.account.public editing.heading' %></label>
-    <p class="form-help deemphasize">
-      <% if @user.data_public? %>
-        <%= t 'user.account.public editing.enabled' %>
-        (<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)
-      <% else %>
-        <%= t 'user.account.public editing.disabled' %>
-        (<a href="#public"><%= t 'user.account.public editing.disabled link text' %></a>)
-      <% end %>
-    </p>
-  </div>
-
-  <fieldset class="form-row">
-    <label><%= t 'user.account.contributor terms.heading' %></label>
-    <p class="form-help deemphasize">
-      <% if @user.terms_agreed? %>
-        <%= t 'user.account.contributor terms.agreed' %>
-        (<a href="<%= t 'user.account.contributor terms.link' %>" target="_new"><%= t 'user.account.contributor terms.link text' %></a>)
-        <% if @user.consider_pd? %>
-          <%= t 'user.account.contributor terms.agreed_with_pd' %>
+  <fieldset class="form-divider">
+    <div class="form-row">
+      <label class="standard-label"><%= t '.public editing.heading' %></label>
+      <span class="form-help deemphasize">
+        <% if current_user.data_public? %>
+          <%= t '.public editing.enabled' %>
+          (<a href="<%= t '.public editing.enabled link' %>" target="_new"><%= t '.public editing.enabled link text' %></a>)
+        <% else %>
+          <%= t '.public editing.disabled' %>
+          (<a href="#public"><%= t '.public editing.disabled link text' %></a>)

         <% end %>
         <% end %>

-      <% else %>
-        <%= t 'user.account.contributor terms.not yet agreed' %>
-        <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
-      <% end %>
-    </p>
-  </fieldset>
+      </span>
+    </div>

 
 

-  <fieldset class="form-row">
-    <label><%= t 'user.account.profile description' %></label>
-    <%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
+    <div class="form-row">
+      <label class="standard-label"><%= t '.contributor terms.heading' %></label>
+      <span class="form-help deemphasize">
+        <% if current_user.terms_agreed? %>
+          <%= t '.contributor terms.agreed' %>
+          (<a href="<%= t '.contributor terms.link' %>" target="_new"><%= t '.contributor terms.link text' %></a>)
+          <% if current_user.consider_pd? %>
+            <%= t '.contributor terms.agreed_with_pd' %>
+          <% end %>
+        <% else %>
+          <%= t '.contributor terms.not yet agreed' %>
+          <%= link_to t('.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
+        <% end %>
+      </span>
+    </div>
+    <div class="form-row">
+      <label class="standard-label"><%= t '.preferred editor' %></label>
+      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+    </div>

   </fieldset>
 
   </fieldset>
 

-  <fieldset class="form-row">
-    <label><%= t 'user.account.preferred languages' %></label>
-    <%= f.text_field :languages %>
-  </fieldset>
+  <fieldset class="form-divider">
+    <div class='form-row'>
+      <label class="standard-label"><%= t '.profile description' %></label>
+      <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
+    </div>

 
 

-  <fieldset class="form-row">
-    <label><%= t 'user.account.preferred editor' %></label>
-    <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
-  </fieldset>
+    <div class="form-row">
+      <label class="standard-label"><%= t '.preferred languages' %></label>
+      <%= f.text_field :languages %>
+    </div>

 
 

-  <fieldset class="form-row">
-    <label><%= t 'user.account.image' %></label>
-    <div class="accountImage">
-      <%= user_image @user %>
-      <table class="accountImage-options">
-        <% if @user.image.file? %>
-        <fieldset class="form-row">
-          <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %>
-          <%= t 'user.account.keep image' %>
-        </fieldset>
+    <div class='form-row accountImage'>
+      <label class="standard-label"><%= t '.image' %></label>
+        <%= user_image current_user %>
+        <ul class='form-list accountImage-options'>
+        <% if current_user.image.file? %>
+        <li>
+          <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %>
+          <label class='standard-label' for='image_action_keep'><%= t '.keep image' %></label>
+        </li>

         <% end %>
         <% end %>

-        <% if @user.image.file? || @user.image_use_gravatar? %>
-        <fieldset class="form-row">
+        <% if current_user.image.file? || current_user.image_use_gravatar? %>
+        <li>

           <%= radio_button_tag "image_action", "delete" %>
           <%= radio_button_tag "image_action", "delete" %>

-          <%= t 'user.account.delete image' %>
-        </fieldset>
+          <label class='standard-label' for='image_action_delete'><%= t '.delete image' %></label>
+        </li>

         <% end %>
         <% 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>
+        <% if current_user.image.file? %>
+          <li>
+            <%= radio_button_tag "image_action", "new" %>
+            <label class='standard-label' for='image_action_new'>
+                <%= t '.replace image' %>
+                <span class="form-help deemphasize"><%= t '.image size hint' %></span>
+            </label>
+            <%= f.file_field :image %>
+          </li>

         <% else %>
         <% else %>

-        <fieldset class="form-row">
+        <li>

           <%= radio_button_tag "image_action", "new" %>
           <%= 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>
+          <label class='standard-label' for='image_action_new'>
+            <%= t '.new image' %>
+            <span class="form-help deemphasize"><%= t '.image size hint' %></span>
+          </label>
+          <%= f.file_field :image %>
+        </li>

         <% end %>
         <% end %>

-        <fieldset 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>
+        <li>
+          <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
+          <label class='standard-label' for='image_action_gravatar'>
+            <%= t '.gravatar.gravatar' %>
+            <span class='form-help deemphasize'> (<a href="<%= t '.gravatar.link' %>" target="_new"><%= t '.gravatar.link text' %></a>)</span>
+          </label>
+        </li>
+      </ul>

     </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>
-    <p class="message form-help deemphasize"><%= t 'user.account.no home location' %></p>
-    <div class="location">
-      <label><%= t 'user.account.latitude' %></label>
-      <%= f.text_field :home_lat, :id => "home_lat" %>
-      <label><%= t 'user.account.longitude' %></label>
-      <%= f.text_field :home_lon, :id => "home_lon" %>
+  <fieldset class="form-divider">
+    <div class='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>
+        <div class='form-column'>
+          <label class="standard-label secondary"><%= t '.latitude' %></label>
+          <%= f.text_field :home_lat, :id => "home_lat" %>
+        </div>
+        <div class='form-column'>
+          <label class="standard-label secondary"><%= t '.longitude' %></label>
+          <%= f.text_field :home_lon, :id => "home_lon" %>
+        </div>
+      </div>

     </div>
     </div>

-  </fieldset>

 
 

-  <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" %>
+    <div class="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>
+    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>

   </fieldset>
 
   </fieldset>
 

-  <fieldset class="form-row">
-    <%= submit_tag t('user.account.save changes button') %>
-  </fieldset>
+  <%= submit_tag t('.save changes button') %>

 <% end %>
 
 <% end %>
 

-<% unless @user.data_public? %>
+<% unless current_user.data_public? %>

 <a name="public"></a>
 <a name="public"></a>

-<h2><%= t 'user.account.public editing note.heading' %></h2>
-<%= raw t 'user.account.public editing note.text' %>
-  <%= button_to t('user.account.make edits public button'), :action => :go_public %>
+<h2><%= t '.public editing note.heading' %></h2>
+<%= raw t '.public editing note.text' %>
+  <%= button_to t('.make edits public button'), :action => :go_public %>

 <% end %>
 <% end %>