Remove unused small.scss symlinks

[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 2a195ca60d40d659569d84bbb73010de47addf5c..4dcc9ab0546188c5a3bbed7b0128dcca7d347bf1 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -28,7 +28,7 @@
               <%= link_to t(".my comments"), diary_comments_path(current_user) %>
             </li>
             <li>
               <%= link_to t(".my comments"), diary_comments_path(current_user) %>
             </li>
             <li>

-              <%= link_to t(".my settings"), user_account_path(current_user) %>
+              <%= link_to t(".my settings"), edit_account_path %>

             </li>
 
             <% if current_user.blocks.exists? %>
             </li>
 
             <% if current_user.blocks.exists? %>


@@ -78,7 +78,7 @@
               <%= link_to t(".comments"), diary_comments_path(@user) %>
             </li>
             <li>
               <%= link_to t(".comments"), diary_comments_path(@user) %>
             </li>
             <li>

-              <% if current_user and current_user.is_friends_with?(@user) %>
+              <% if current_user and current_user.friends_with?(@user) %>

                 <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
               <% elsif current_user %>
                 <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>
                 <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>
               <% elsif current_user %>
                 <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>


@@ -120,7 +120,7 @@
         <small>
           <dl class="dl-inline">
             <dt><%= t ".mapper since" %></dt>
         <small>
           <dl class="dl-inline">
             <dt><%= t ".mapper since" %></dt>

-            <dd><%= l @user.creation_time.to_date, :format => :long %></dd>
+            <dd><%= l @user.created_at.to_date, :format => :long %></dd>

             <% unless @user.terms_agreed %>
               <dt><%= t ".ct status" %></dt>
               <dd>
             <% unless @user.terms_agreed %>
               <dt><%= t ".ct status" %></dt>
               <dd>


@@ -139,30 +139,44 @@
         <nav class='secondary-actions'>
           <ul class='clearfix'>
             <% if can? :set_status, User %>
         <nav class='secondary-actions'>
           <ul class='clearfix'>
             <% if can? :set_status, User %>

-              <% if ["active", "confirmed"].include? @user.status %>
+              <% if @user.may_activate? %>

                 <li>
                 <li>

-                  <%= link_to t(".deactivate_user"), set_status_user_path(:status => "pending", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                  <%= link_to t(".activate_user"), set_status_user_path(:event => "activate", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>

                 </li>
                 </li>

-              <% elsif ["pending"].include? @user.status %>
+              <% end %>
+
+              <% if @user.may_unsuspend? %>

                 <li>
                 <li>

-                  <%= link_to t(".activate_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                  <%= link_to t(".unsuspend_user"), set_status_user_path(:event => "unsuspend", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>

                 </li>
               <% end %>
 
                 </li>
               <% end %>
 

-              <% if ["active", "suspended"].include? @user.status %>
+              <% if @user.may_confirm? %>

                 <li>
                 <li>

-                  <%= link_to t(".confirm_user"), set_status_user_path(:status => "confirmed", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                  <%= link_to t(".confirm_user"), set_status_user_path(:event => "confirm", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_unconfirm? %>
+                <li>
+                  <%= link_to t(".unconfirm_user"), set_status_user_path(:event => "unconfirm", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_hide? %>
+                <li>
+                  <%= link_to t(".hide_user"), set_status_user_path(:event => "hide", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
+                </li>
+              <% end %>
+
+              <% if @user.may_unhide? %>
+                <li>
+                  <%= link_to t(".unhide_user"), set_status_user_path(:event => "unhide", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>

                 </li>
               <% end %>
                 </li>
               <% end %>

-              <li>
-                <% if ["pending", "active", "confirmed", "suspended"].include? @user.status %>
-                  <%= link_to t(".hide_user"), set_status_user_path(:status => "deleted", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
-                <% else %>
-                  <%= link_to t(".unhide_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :method => :post, :data => { :confirm => t(".confirm") } %>
-                <% end %>
-              </li>

             <% end %>
             <% end %>

-            <% if can? :destroy, User %>
+
+            <% if can?(:destroy, User) && @user.may_soft_destroy? %>

               <li>
                 <%= link_to t(".delete_user"), user_path(:display_name => @user.display_name), :method => :delete, :data => { :confirm => t(".confirm") } %>
               </li>
               <li>
                 <%= link_to t(".delete_user"), user_path(:display_name => @user.display_name), :method => :delete, :data => { :confirm => t(".confirm") } %>
               </li>