adding collection features for users page

app/assets/javascripts/application/users.coffee

+$('a.showmore').on 'click', ->
+  $('span', this).toggle()
+  $('.user-biography').slideToggle()
+  return
\ No newline at end of file

app/assets/javascripts/edges.coffee

-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/registrations.coffee

-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/university.coffee

-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/javascripts/users.coffee

-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/application/learning_objects.scss

@@ -29,7 +29,7 @@
 
   .learning-object-thumbnail {
     max-width: 250px;
-    height: 150px;
+    height: 150px !important;
     position: relative;
   }
 

app/assets/stylesheets/application/users.scss

@@ -11,7 +11,8 @@ $background-grey: #e7e7e8;
 .user-header {
   background-color: $background-grey;
   width: 100%;
-  height: 145px;
+  min-height: 145px;
+  height: auto;
   margin-top: 30px;
   margin-bottom: 50px;
   padding: 15px;
@@ -25,6 +26,7 @@ $background-grey: #e7e7e8;
     font-style: italic;
   }
   .header-content {
+    margin-top: 20px;
   }
 
   .right-column {
@@ -42,3 +44,8 @@ $background-grey: #e7e7e8;
 .user-files {
 
 }
+
+.user-biography {
+  padding-left: 85px !important;
+  display: none;
+}
\ No newline at end of file

app/controllers/users_controller.rb

@@ -2,6 +2,7 @@ class UsersController < ApplicationController
 
   def show
     @objects = learning_object_repository.all
+    @new_collection = Collection.new
   end
 
 end

app/views/collections/_create.html.erb

-<a href="#" id="create_collection_popover">Criar coleção</a>
+<button id="create_collection_popover" type="button" class="btn btn-primary">Criar coleção</button>
 
 <div id="create_collection_popover_content" style="display: none">
-  <%= render 'collections/form' %>
+  <%= render 'collections/form', collection: collection %>
 </div>
 
 <div id="create_collection_popover_title" style="display: none">

app/views/collections/_form.html.erb

-<%= form_for @collection do |f| %>
+<%= form_for collection do |f| %>
 
-    <%= f.label :title %>
-    <%= f.text_field :title, required: true, style: 'width: 250px;' %>
+    <%= f.label :name %>
+    <%= f.text_field :name, required: true, style: 'width: 250px;' %>
 
     <%= f.label :privacy %>
     <select name="collection[privacy]">

app/views/learning_objects/_learning_object_vertical.erb

@@ -15,4 +15,4 @@
       <span>Por <a>Usuário&nbsp;</a></span>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file

app/views/users/show.html.erb

@@ -10,13 +10,31 @@
         <div class="media-body">
           <h2 class="media-heading">Usuário</h2>
           <h3 class="header-sub">nome da instituição</h3>
-          <h3 class="header-content">x items</h3>
+          <div class="header-content">
+            <a href="#" class="showmore">
+              <span>ver mais</span>
+              <span style="display: none;">fechar</span>
+            </a>
+          </div>
         </div>
       </div>
     </div>
     <div class="col-md-6 right-column">
-      <button type="button" class="btn btn-default">Seguir</button>
+      <button type="button" class="btn btn-default">Editar perfil</button>
+    </div>
+
+    <div class="col-md-12 user-biography">
+      <h3>Biografia</h3>
+
+      <p>asdasdsadasdas</p>
+
+      <a href="#" class="showmore">
+        <span style="display: none;">fechar</span>
+        <span>fechar</span>
+      </a>
     </div>
+
+    <div style="clear: both;"></div>
   </div>
 
   <div class="user-files">
@@ -24,12 +42,13 @@
       <div class="col-md-6">
         <div class="media">
           <div class="media-body">
-            <h2 class="media-heading">Arquivos do usuário</h2>
+            <h2 class="media-heading">Objetos do usuário</h2>
             <h4>x items</h4>
           </div>
         </div>
       </div>
-      <div class="col-md-6 right-column">
+      <div class="col-md-6 right-column align-right">
+        <button type="button" class="btn btn-primary">Adicionar novo objeto</button>
       </div>
     </div>
 
@@ -53,12 +72,12 @@
       <div class="col-md-6">
         <div class="media">
           <div class="media-body">
-            <h2 class="media-heading">Coleções</h2>
-            <h4>x items</h4>
+            <h2 class="media-heading">Minhas Coleções</h2>
           </div>
         </div>
       </div>
-      <div class="col-md-6 right-column">
+      <div class="col-md-6 right-column align-right">
+        <%= render 'collections/create', collection: @new_collection %>
       </div>
     </div>
 
@@ -71,9 +90,4 @@
       <%= render @objects[2], orientation: "vertical" %>
     </div>
   </div>
-</div>
-
-
-<div class="row">
-  <%#= render 'collections/create' %>
-</div>
+</div>
\ No newline at end of file