Merge branch 'bugfix-collections' into 'master'

Fixing collection counter in show



See merge request !227

app/assets/javascripts/application/collections.coffee

@@ -172,6 +172,13 @@ $(document).on 'refresh_comments', (e) ->
 
   $.get url, (data) ->
     $parent.html('<br>' + data)
+    num = $('.learning-object-vertical').length
+    if num == 1
+      $('.object-number').html("1 objeto")
+    else if num > 1
+      $('.object-number').html( num + " objetos")
+    else
+      $('.object-number').html("coleção vazia")
     $(document).trigger 'create-learning-object-columns'
     $(document).trigger 'add_collection_selector'
 

app/views/bookmarks/show.html.erb

@@ -7,7 +7,7 @@
         <li><h2>Favoritos</h2></li>
         <li>
           <input type="checkbox" class="count-collections-objects" data-toggle="tooltip" data-placement="bottom" title="Selecionar todos">
-            <%= bookmark_length @user %>
+          <span class="object-number"><%= bookmark_length @user %></span>
         </li>
       </ul>
     </div>

app/views/collections/show.html.erb

@@ -29,8 +29,8 @@
         <li><h2><%= (@collection.class != Bookmark) ? @collection.name : "Favoritos" %></h2></li>
         <li>
           <input type="checkbox" class="count-collections-objects" data-toggle="tooltip" data-placement="bottom" title="Selecionar todos">
-          <%= collection_length @collection %>
-          </a>
+          <span class="object-number"><%= collection_length @collection %>
+          </span>
         </li>
       </ul>
     </div>