Merge pull request #1588 from Georeactor/master

[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 6745f1b34fe248c18afac2d8cca5dac7c0db36a7..752d1cd017740bc9f83bd9b9c01ce68fee263e62 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -1,137 +1,178 @@
-<h2><%= t 'user.account.my settings' %></h2>
-
-<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> |
-<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
-
-<%= error_messages_for 'user' %>
-<%= form_for :user, :html => { :multipart => true } do |f| %>
-<table id="accountForm">
-  <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>
-
-  <tr>
-    <td class="fieldName"><%= t 'user.account.new email address' %></td>
-    <td><%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>
-  </tr>
-
-  <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, :autocomplete => :off} %></td>
-  </tr>
-
-  <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>
-    <td><%= f.url_field :openid_url, {:id => "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"><%= t 'user.account.public editing.heading' %></td>
-    <td>
-      <% if @user.data_public? %>
-        <%= t 'user.account.public editing.enabled' %> <span class="minorNote">(<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)</span>
-      <% else %>
-        <%= t 'user.account.public editing.disabled' %> <span class="minorNote">(<a href="#public"><%= t 'user.account.public editing.disabled link text' %></a>)</span>
-      <% end %>
-    </td>
-  </tr>
-
-  <tr>
-    <td class="fieldName"><%= t 'user.account.contributor terms.heading' %></td>
-    <td>
-      <% if @user.terms_agreed? %>
-        <%= t 'user.account.contributor terms.agreed' %>
-        <span class="minorNote">(<a href="<%= t 'user.account.contributor terms.link' %>" target="_new"><%= t 'user.account.contributor terms.link text' %></a>)</span>
-        <br />
-        <% if @user.consider_pd? %>
-          <%= t 'user.account.contributor terms.agreed_with_pd' %>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for :heading do %>
+  <h1><%= t 'user.account.my settings' %></h1>
+  <ul class='secondary-actions clearfix'>
+    <li><%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => current_user.display_name %></li>
+    <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+  </ul>
+<% end %>
+
+<%= error_messages_for current_user %>
+<%= form_for current_user, :url => { :action => :account }, :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>
+    <div class="form-row">
+      <label class="standard-label"><%= t 'user.account.current email address' %></label>
+      <input type="email" disabled value="<%= current_user.email %>" />
+      <span class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></span>
+    </div>
+
+    <div class="form-row">
+      <label class="standard-label"><%= t 'user.account.new email address' %></label>
+      <%= f.email_field :new_email, :autocomplete => :off %>
+      <span class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></span>
+    </div>
+  </fieldset>
+
+  <fieldset>
+    <div class="form-row">
+        <label class="standard-label"><%= t 'user.new.password' %></label>
+      <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
+    </div>
+
+    <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>
+    <div class="form-row">
+      <label class="standard-label"><%= t 'user.account.external auth' %></label>
+      <%= f.select :auth_provider, Auth::PROVIDERS %>
+      <%= f.text_field :auth_uid %>
+      <span class="form-help deemphasize">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
+    </diV>
+  </fieldset>
+
+  <fieldset class="form-divider">
+    <div class="form-row">
+      <label class="standard-label"><%= t 'user.account.public editing.heading' %></label>
+      <span class="form-help deemphasize">
+        <% if current_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 %>
+      </span>
+    </div>
+
+    <div class="form-row">
+      <label class="standard-label"><%= t 'user.account.contributor terms.heading' %></label>
+      <span class="form-help deemphasize">
+        <% if current_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 current_user.consider_pd? %>
+            <%= t 'user.account.contributor terms.agreed_with_pd' %>
+          <% 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 %>
+      </span>
+    </div>
+    <div class="form-row">
+      <label class="standard-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] } %>
+    </div>
+  </fieldset>
+
+  <fieldset class="form-divider">
+    <div class='form-row'>
+      <label class="standard-label"><%= t 'user.account.profile description' %></label>
+      <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
+    </div>
+
+    <div class="form-row">
+      <label class="standard-label"><%= t 'user.account.preferred languages' %></label>
+      <%= f.text_field :languages %>
+    </div>
+
+    <div class='form-row accountImage'>
+      <label class="standard-label"><%= t 'user.account.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 'user.account.keep image' %></label>
+        </li>
+        <% end %>
+        <% if current_user.image.file? || current_user.image_use_gravatar? %>
+        <li>
+          <%= radio_button_tag "image_action", "delete" %>
+          <label class='standard-label' for='image_action_delete'><%= t 'user.account.delete image' %></label>
+        </li>
+        <% end %>
+        <% if current_user.image.file? %>
+          <li>
+            <%= radio_button_tag "image_action", "new" %>
+            <label class='standard-label' for='image_action_new'>
+                <%= t 'user.account.replace image' %>
+                <span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
+            </label>
+            <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
+          </li>
+        <% else %>
+        <li>
+          <%= radio_button_tag "image_action", "new" %>
+          <label class='standard-label' for='image_action_new'>
+            <%= t 'user.account.new image' %>
+            <span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
+          </label>
+          <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
+        </li>

         <% end %>
         <% end %>

-      <% else %>
-        <%= t 'user.account.contributor terms.not yet agreed' %> <br />
-
-        <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
-      <% end %>
-    </td>
-  </tr>
-
-  <tr>
-    <td class="fieldName"><%= t 'user.account.profile description' %></td>
-    <td><%= richtext_area :user, :description, :rows => '15', :cols => '80' %></td>
-  </tr>
-
-  <tr>
-    <td class="fieldName"><%= t 'user.account.preferred languages' %></td>
-    <td><%= f.text_field :languages %></td>
-  </tr>
-
-  <tr>
-    <td class="fieldName"><%= t 'user.account.preferred editor' %></td>
-    <td><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %></td>
-  </tr>
-
-  <tr>
-    <td class="fieldName">
-      <%= t 'user.account.image' %>
-    </td>
-    <td valign="top">
-      <% if @user.image.file? %>
-        <table id="accountImage">
-          <tr>
-            <td rowspan="3" valign="top"><%= user_image @user %></td>
-            <td><%= radio_button_tag "image_action", "keep", true %></td>
-            <td><%= t 'user.account.keep image' %></td>
-          </tr>
-          <tr>
-            <td><%= radio_button_tag "image_action", "delete" %></td>
-            <td><%= t 'user.account.delete image' %></td>
-          </tr>
-          <tr>
-            <td><%= radio_button_tag "image_action", "new" %></td>
-            <td><%= t 'user.account.replace image' %><br /><%= f.file_field :image, :onchange => "$('image_action_new').prop('checked', true)" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
-          </tr>
-        </table>
-      <% else %>
-        <%= hidden_field_tag "image_action", "new" %>
-        <%= t 'user.account.new image' %><br /><%= f.file_field :image %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span>
-      <% end %>
-    </td>
-  </tr>
-
-  <tr id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> >
-    <td class="fieldName"><%= t 'user.account.home location' %></td>
-    <td><em class="message"><%= t 'user.account.no home location' %></em><span class="location"><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> <%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %></span></td>
-  </tr>
-
-  <tr>
-    <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>
-      <% content_for :head do %>
-        <%= javascript_include_tag "user" %>
-      <% end %>
-      <%= content_tag "div", "", :id => "map", :class => "user_map set_location" %>
-    </td>
-  </tr>
-  
-  <tr>
-    <td></td>
-    <td class="submitButton"><%= submit_tag t('user.account.save changes button') %></td>
-  </tr>
-</table>
+        <li>
+          <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
+          <label class='standard-label' for='image_action_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>
+          </label>
+        </li>
+      </ul>
+    </div>
+  </fieldset>
+
+  <fieldset class="form-divider">
+    <div class='form-row location clearfix'>
+    <label class="standard-label"><%= t 'user.account.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 'user.account.no home location' %></p>
+        <div class='form-column'>
+          <label class="standard-label secondary"><%= t 'user.account.latitude' %></label>
+          <%= f.text_field :home_lat, :id => "home_lat" %>
+        </div>
+        <div class='form-column'>
+          <label class="standard-label secondary"><%= t 'user.account.longitude' %></label>
+          <%= f.text_field :home_lon, :id => "home_lon" %>
+        </div>
+      </div>
+    </div>
+
+    <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 'user.account.update home location on click' %></label>
+    </div>
+    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
+  </fieldset>
+
+  <%= submit_tag t('user.account.save changes button') %>

 <% end %>
 
 <% end %>
 

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

 <a name="public"></a>
 <h2><%= t 'user.account.public editing note.heading' %></h2>
 <%= raw t 'user.account.public editing note.text' %>
 <a name="public"></a>
 <h2><%= t 'user.account.public editing note.heading' %></h2>
 <%= raw t 'user.account.public editing note.text' %>