From 11437a0c19b50190a7099f75304e8fdc8c64632f Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Thu, 8 Oct 2015 13:23:04 -0300
Subject: [PATCH] render learning objects in collection view

---
 app/controllers/users_controller.rb          |  1 -
 app/helpers/collections_helper.rb            | 18 +++++++++++
 app/views/collections/show.html.erb          |  4 +--
 app/views/collections/test.html.erb          | 32 ++++++++++++++++++++
 app/views/shared/application/_about.html.erb |  4 +--
 5 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 app/views/collections/test.html.erb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c6e45098..17b22df4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,4 @@
 class UsersController < ApplicationController
-
   before_action :authenticate_user!, only: :me
   before_action :check_current_user_page, only: :show
   before_action :set_user, only: :show
diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb
index 4dfbadf4..a8b313c9 100644
--- a/app/helpers/collections_helper.rb
+++ b/app/helpers/collections_helper.rb
@@ -6,4 +6,22 @@ module CollectionsHelper
     "#{collection.learning_objects.count} objetos educacionais nessa coleção"
   end
 
+  def end_of_column_collection(index)
+    index % 3 == 0
+  end
+
+  def render_collection_objects(learning_objects = [])
+    columns = 3
+    objects_per_column = (learning_objects.length / columns).ceil
+
+    for i in columns
+      content_tag :div, class: 'col-md-4' do
+        for j in objects_per_column
+          learning_object = learning_objects.pop
+          render learning_object, orientation: "horizontal" unless learning_object.nil?
+        end
+      end
+    end
+  end
+
 end
\ No newline at end of file
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 5048a443..ca223c13 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -19,9 +19,7 @@
     </div>
 
     <div class="row learning-object-columns">
-      <%= render @objects[0], orientation: "vertical" %>
-      <%= render @objects[1], orientation: "vertical" %>
-      <%= render @objects[2], orientation: "vertical" %>
+
       <%= render @objects[0], orientation: "vertical" %>
       <%= render @objects[1], orientation: "vertical" %>
       <%= render @objects[2], orientation: "vertical" %>
diff --git a/app/views/collections/test.html.erb b/app/views/collections/test.html.erb
new file mode 100644
index 00000000..3b55d1d1
--- /dev/null
+++ b/app/views/collections/test.html.erb
@@ -0,0 +1,32 @@
+<nav class="navigation navbar-default "><br/>
+
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <%= image_tag image_path("icons/collection.png"), class: "logo-image", size: "90x66" %>
+      <ul class="nav navbar-nav navbar-right"><h1>&nbsp;<b>Coleção 1</b></h1> <br/>
+        &nbsp;  <%= image_tag image_path("icons/square.png"), class: "logo-image", size: "20x20" %> 200 itens
+      </ul>
+    </div>
+  </div>
+  <br/></nav>
+<nav class="navigation navbar-inverse ">
+  <div class="container-fluid">
+    <a class="navbar-brand" href="#">x arquivo(s) selecionado(s)</a>
+    <ul class="nav navbar-nav navbar-right">
+      <li><a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image", size: "35x28" %> Salvar no
+        computador</a></li>
+      <li><a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image", size: "35x28" %> Copiar
+        para</a></li>
+      <li><a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image", size: "35x28" %> Mover
+        para</a></li>
+      <li>
+        <a href="#"><%= image_tag image_path("icons/collection1.png"), class: "logo-image", size: "35x28" %> Remover da
+          coleção</a></li>
+    </ul>
+  </div>
+</nav>
+
+<div class="row mainpage-subjects">
+  <br/>
+  <%= render_collection_objects @collection.learning_objects %>
+</div>
\ No newline at end of file
diff --git a/app/views/shared/application/_about.html.erb b/app/views/shared/application/_about.html.erb
index f62e7945..d02692f9 100644
--- a/app/views/shared/application/_about.html.erb
+++ b/app/views/shared/application/_about.html.erb
@@ -45,7 +45,7 @@
         </li>
       </ul>
     </div>
-    <div role="tabpanel" class="tab-pane" id="faq"><%= render 'welcome/faq' %></div>
-    <div role="tabpanel" class="tab-pane" id="contact"><%= render 'welcome/contact' %></div>
+    <div role="tabpanel" class="tab-pane" id="faq"><%= render 'shared/application/faq' %></div>
+    <div role="tabpanel" class="tab-pane" id="contact"><%= render 'shared/application/contact' %></div>
   </div>
 </div>
-- 
GitLab