Correctly report which OAuth signature algorithms are supported

[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 7adea7c2cec3884c19b6ab07b88735f4c10a6fc0..2782fc808f095c17a559e9e5c5b882344461beae 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -1,7 +1,10 @@
-<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' %>
+<% content_for :heading do %>
+  <h2><%= t 'user.account.my settings' %></h2>
+  <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('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+  </ul>
+<% end %>
 
 <%= error_messages_for 'user' %>
 <%= form_for :user, :html => { :multipart => true } do |f| %>
@@ -84,27 +87,30 @@
     <td class="fieldName">
       <%= t 'user.account.image' %>
     </td>
-    <td valign="top">
-      <table id="accountImage">
+    <td class="accountImage">
+      <%= user_image @user %>
+      <table class="accountImage-options">
         <% if @user.image.file? %>
         <tr>
-          <td rowspan="4" valign="top"><%= user_image @user %></td>
           <td><%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %></td>
           <td><%= t 'user.account.keep image' %></td>
         </tr>
+        <% end %>
+        <% if @user.image.file? || @user.image_use_gravatar? %>
         <tr>
           <td><%= radio_button_tag "image_action", "delete" %></td>
           <td><%= t 'user.account.delete image' %></td>
         </tr>
+        <% end %>
+        <% if @user.image.file? %>
         <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>
+          <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>
         <% else %>
         <tr>
-          <td rowspan="2" valign="top"><%= user_image @user %></td>
-          <td><%= radio_button_tag "image_action", "new", !@user.image_use_gravatar %></td>
-          <td><%= t 'user.account.new image' %> <%= f.file_field :image %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
+          <td><%= radio_button_tag "image_action", "new" %></td>
+          <td><%= t 'user.account.new 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>
         <% end %>
         <tr>
@@ -127,7 +133,7 @@
       <% content_for :head do %>
         <%= javascript_include_tag "user" %>
       <% end %>
-      <%= content_tag "div", "", :id => "map", :class => "user_map set_location" %>
+      <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
     </td>
   </tr>
 
@@ -143,4 +149,4 @@
 <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 %>
-<% end %>
+<% end %>
\ No newline at end of file