Commit 7427a94f

mo khan <mo@mokhan.ca>
2014-01-19 17:13:37
extract partials for the different types of items that users can contribute.
master
1 parent 4935b6a
Changed files (7)
app
controllers
dashboard_controller.rb
views
activities
_comment.html.erb
_favorite.html.erb
admin
activities
index.html.erb
dashboard
_creation.html.erb
_tutorial.html.erb
index.html.erb
app/controllers/dashboard_controller.rb
@@ -2,8 +2,7 @@ class DashboardController < ApplicationController
   before_filter :authenticate_user!
 
   def index
-    @creations = current_user.creations
-    @tutorials = current_user.tutorials
+    @items = (current_user.creations + current_user.tutorials).sort_by! { |x| x.created_at }.reverse
     @activities = current_user.recent_activities
   end
 end
app/views/dashboard/_comment.html.erb → app/views/activities/_comment.html.erb
File renamed without changes
app/views/dashboard/_favorite.html.erb → app/views/activities/_favorite.html.erb
File renamed without changes
app/views/admin/activities/index.html.erb
@@ -3,7 +3,7 @@
     <%= render :partial => 'admin/shared/admin_nav' %>
     <dl class="dl-horizontal">
       <% @recent_activities.each do |activity| %>
-        <%= render "dashboard/#{activity.subject.class.to_s.downcase}", subject: activity.subject %>
+        <%= render "activities/#{activity.subject.class.to_s.downcase}", subject: activity.subject %>
       <% end %>
     </dl>
   </div>
app/views/dashboard/_creation.html.erb
@@ -0,0 +1,23 @@
+<div class="media">
+  <%= link_to item, class: 'pull-left' do %>
+    <img class="media-object" data-src="<%= item.primary_image.thumb_url %>" alt="64x64" style="width: 64px; height: 64px;" src="<%= item.primary_image.thumb_url %>">
+  <% end %>
+  <div class="media-body">
+    <h4 class="media-heading"><%= item.name %></h4>
+    <%= item.story %>
+    <p>
+    <%= link_to edit_creation_path(item) do %>
+      <i class="icon-edit"> edit</i>
+    <% end %>
+    <%= link_to new_creation_photo_path(item) do %>
+      <i class="icon-plus"> images</i>
+    <% end %>
+    <%= link_to creation_favorites_path(:creation_id => item.id) do %>
+      <i class="icon-heart"> fanclub (<%=  pluralize(item.favorites.length, 'fan') %>)</i>
+    <% end %>
+    <%= link_to creation_path(item), confirm: "Are you sure you want to permanently remove this creation?", method: :delete  do %>
+      <i class="icon-white icon-remove"> remove</i>
+    <% end %>
+    </p>
+  </div>
+</div>
app/views/dashboard/_tutorial.html.erb
@@ -0,0 +1,17 @@
+<div class="media">
+  <%= link_to item, class: 'pull-left' do %>
+    <img class="media-object" data-src="<%= item.image_url %>" alt="64x64" style="width: 64px; height: 64px;" src="<%= item.image_url %>">
+  <% end %>
+  <div class="media-body">
+    <h4 class="media-heading"><%= item.heading %></h4>
+    <%= item.description %>
+    <p>
+    <%= link_to edit_tutorial_path(item) do %>
+      <i class="icon-edit"> edit</i>
+    <% end %>
+    <%= link_to tutorial_path(item), confirm: "Are you sure you want to permanently remove this tutorial?", method: :delete  do %>
+      <i class="icon-white icon-remove"> remove</i>
+    <% end %>
+    </p>
+  </div>
+</div>
app/views/dashboard/index.html.erb
@@ -14,54 +14,13 @@
 </div>
 <div class="row">
   <div class="span7">
-    <% @creations.each do |creation| %>
-      <div class="media">
-        <%= link_to creation, class: 'pull-left' do %>
-          <img class="media-object" data-src="<%= creation.primary_image.thumb_url %>" alt="64x64" style="width: 64px; height: 64px;" src="<%= creation.primary_image.thumb_url %>">
-        <% end %>
-        <div class="media-body">
-          <h4 class="media-heading"><%= creation.name %></h4>
-          <%= creation.story %>
-          <p>
-          <%= link_to edit_creation_path(creation) do %>
-            <i class="icon-edit"> edit</i>
-          <% end %>
-          <%= link_to new_creation_photo_path(creation) do %>
-            <i class="icon-plus"> images</i>
-          <% end %>
-          <%= link_to creation_favorites_path(:creation_id => creation.id) do %>
-            <i class="icon-heart"> fanclub (<%=  pluralize(creation.favorites.length, 'fan') %>)</i>
-          <% end %>
-          <%= link_to creation_path(creation), confirm: "Are you sure you want to permanently remove this creation?", method: :delete  do %>
-            <i class="icon-white icon-remove"> remove</i>
-          <% end %>
-          </p>
-        </div>
-      </div>
-    <% end %>
-    <% @tutorials.each do |tutorial| %>
-      <div class="media">
-        <%= link_to tutorial, class: 'pull-left' do %>
-          <img class="media-object" data-src="<%= tutorial.image_url %>" alt="64x64" style="width: 64px; height: 64px;" src="<%= tutorial.image_url %>">
-        <% end %>
-        <div class="media-body">
-          <h4 class="media-heading"><%= tutorial.heading %></h4>
-          <%= tutorial.description %>
-          <p>
-          <%= link_to edit_tutorial_path(tutorial) do %>
-            <i class="icon-edit"> edit</i>
-          <% end %>
-          <%= link_to tutorial_path(tutorial), confirm: "Are you sure you want to permanently remove this tutorial?", method: :delete  do %>
-            <i class="icon-white icon-remove"> remove</i>
-          <% end %>
-          </p>
-        </div>
-      </div>
+    <% @items.each do |item| %>
+      <%= render item.class.to_s.downcase, item: item %>
     <% end %>
   </div>
   <div class="span5">
     <% @activities.each do |activity| %>
-      <%= render activity.subject.class.to_s.downcase, subject: activity.subject %>
+      <%= render "activities/#{activity.subject.class.to_s.downcase}", subject: activity.subject %>
     <% end %>
   </div>
 </div>