Use bootstrap text-muted in place of custom deemphasze class

[rails.git] / app / views / users / show.html.erb

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3b330d2944bc87378d5eaac6fc45d64eb79a9df7..1bd5f8fa5ba531c50225568472ed27a901f80b2b 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -111,7 +111,7 @@
 
       <% end %>
 
-      <% if can?(:set_status, User) || can?(:delete, User) %>
+      <% if can?(:set_status, User) || can?(:destroy, User) %>
 
         <ul class='secondary-actions clearfix'>
           <% if can? :set_status, User %>
@@ -138,7 +138,7 @@
               </li>
             <% end %>
           <% end %>
-          <% if can? :delete, User %>
+          <% if can? :destroy, User %>
             <li>
               <%= link_to t(".delete_user"), user_path(:display_name => @user.display_name), :method => :delete, :data => { :confirm => t(".confirm") } %>
             </li>
@@ -147,7 +147,7 @@
 
         <% end %>
 
-      <p class='deemphasize'>
+      <p class='text-muted'>
         <small>
           <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>
           <% unless @user.terms_agreed %>
@@ -168,7 +168,7 @@
   </div>
 
   <% if current_user and current_user.administrator? -%>
-    <div class='admin-user-info deemphasize'>
+    <div class='admin-user-info text-muted'>
       <small><b><%= t ".email address" %></b> <%= @user.email %></small>
       <% unless @user.creation_ip.nil? -%>
         <small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>
@@ -195,7 +195,7 @@
            :icon => image_path("marker-red.png"),
            :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
          } %>
-      <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
+      <%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
     <% end %>
 
     <% friends = @user.friends %>