Rework the generation of descriptions in the notes RSS feed

[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 179e1b2f687b0d09a48d39ef33ae87d6c139de4c..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| %>
 
 <%= error_messages_for 'user' %>
 <%= form_for :user, :html => { :multipart => true } do |f| %>


@@ -86,7 +89,7 @@
     </td>
     <td class="accountImage">
       <%= user_image @user %>
     </td>
     <td class="accountImage">
       <%= user_image @user %>

-      <table>
+      <table class="accountImage-options">

         <% if @user.image.file? %>
         <tr>
           <td><%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %></td>
         <% if @user.image.file? %>
         <tr>
           <td><%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %></td>


@@ -130,7 +133,7 @@
       <% content_for :head do %>
         <%= javascript_include_tag "user" %>
       <% end %>
       <% 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>
 
     </td>
   </tr>
 


@@ -146,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 %>
 <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