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

[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 bb30581f93d83516ea319448ee960420ca93a0eb..dc31de97aea3d6671b55219c8ed8ab96225b54b1 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -6,7 +6,9 @@
   <h1><%= t ".my settings" %></h1>
   <ul class='secondary-actions clearfix'>
     <li><%= link_to t(".return to profile"), user_path(current_user) %></li>
-    <li><%= link_to t("users.show.oauth settings"), :controller => "oauth_clients", :action => "index" %></li>
+    <li><%= link_to t(".oauth1 settings"), oauth_clients_path %></li>
+    <li><%= link_to t(".oauth2 applications"), oauth_applications_path %></li>
+    <li><%= link_to t(".oauth2 authorizations"), oauth_authorized_applications_path %></li>
   </ul>
 <% end %>
 
@@ -94,7 +96,7 @@
   <fieldset>
     <legend><%= t ".home location" -%></legend>
     <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>
+      <p class="message text-muted"><%= t ".no home location" %></p>
       <div class="form-row">
         <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
         <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>