Commit f55c3826

mo <mokha@cisco.com>
2017-09-02 04:05:13
update admin activities page.
1 parent d0758ec
Changed files (4)
app/views/admin/activities/_comment.html.erb
@@ -1,9 +1,11 @@
-<div>
-  <i class="fa fa-comment icon-large"></i>
-  <%= avatar_for(subject.user, size: 24) %> 
-  <%= link_to subject.user.name, profile_path(subject.user) %> commented on <%= link_to subject.creation.name, cake_path(subject.creation) %>
-  <small><%= time_ago_in_words(subject.created_at) %> ago.</small>
-  <blockquote>
-    <%= subject.text %>
-  </blockquote>
+<div class="card">
+  <%= avatar_for(subject.user, clazz: 'card-img-top') %>
+  <div class="card-body">
+    <h4 class="card-title"><%= link_to subject.user.name, profile_path(subject.user) %> commented on <%= link_to subject.creation.name, cake_path(subject.creation) %></h4>
+    <p class="card-text"><%= subject.text %></p>
+  </div>
+  <div class="card-footer">
+    <i class="fa fa-comment icon-large"></i>
+    <small class="text-muted"><%= time_ago_in_words(subject.created_at) %> ago.</small>
+  </div>
 </div>
app/views/admin/activities/_favorite.html.erb
@@ -1,9 +1,14 @@
-<div>
-  <p>
-  <i class="fa fa-heart icon-large"></i>
-  <%= avatar_for(subject.user, size: 24) %> 
-  <%= link_to subject.user.name, profile_path(subject.user) %> added 
-  <%= link_to subject.creation.name, cake_path(subject.creation) %> to their favorites
-  <small><%= time_ago_in_words(subject.created_at) %> ago.</small>
-  </p>
+<div class="card">
+  <%= avatar_for(subject.user, clazz: 'card-img-top') %>
+  <div class="card-body">
+    <h4 class="card-title">Favorite Added</h4>
+    <p class="card-text">
+      <%= link_to subject.user.name, profile_path(subject.user) %> added
+      <%= link_to subject.creation.name, cake_path(subject.creation) %> to their favorites
+    </p>
+  </div>
+  <div class="card-footer">
+    <i class="fa fa-heart icon-large"></i>
+    <small class="text-muted"><%= time_ago_in_words(subject.created_at) %> ago.</small>
+  </div>
 </div>
app/views/admin/activities/index.html.erb
@@ -1,12 +1,12 @@
-<div class="row-fluid">
-  <div class="span2">
+<div class="row">
+  <div class="col-3">
     <%= render partial: "my/shared/my_nav" %>
   </div>
-  <div class="span10">
-    <dl class="dl-horizontal">
-      <% @recent_activities.each do |activity| %>
-        <%= render activity.subject.class.to_s.downcase, subject: activity.subject %>
+  <div class="col-9">
+    <div class="card-columns">
+      <% @recent_activities.find_each do |activity| %>
+        <%= render(activity.subject.class.to_s.downcase, subject: activity.subject) if activity.subject %>
       <% end %>
-    </dl>
+    </div>
   </div>
 </div>
config/routes.rb
@@ -78,14 +78,13 @@ Cake::Application.routes.draw do
 
   namespace :admin do
     root to: "users#index"
-    resources :users, only: [:index, :show, :update]
-    resources :jobs, only: [:index, :show, :update, :destroy]
     resources :activities, only: [:index]
-    resources :subscriptions, only: [:index]
-    resources :photos, only: [:index, :show, :update]
     resources :errors, only: [:index, :create]
-    resources :sessions, only: [:index, :destroy]
+    resources :jobs, only: [:index, :show, :update, :destroy]
+    resources :photos, only: [:index, :show, :update]
     resources :products, only: [:index, :show, :create]
+    resources :sessions, only: [:index, :destroy]
+    resources :users, only: [:index, :show, :update]
   end
 
   namespace :my do