merge branch origin/master

app/assets/stylesheets/application/learning_objects.scss

@@ -13,8 +13,8 @@
   }
 
   .learning-object-thumbnail {
-    width: 250px;
-    height: 150px;
+    min-width: 250px;
+    height: 141px;
     position: relative;
 
     .learning-object-actions {
@@ -23,5 +23,4 @@
       right: 5px;
     }
   }
-
-}
+}
\ No newline at end of file

app/helpers/learning_objects_helper.rb

@@ -4,6 +4,14 @@ module LearningObjectsHelper
     categories.to_s
   end
 
+  def learning_object_title(learning_object)
+    if learning_object.name.nil?
+      return 'Sem Título'
+    end
+
+    learning_object.name
+  end
+
   def render_learning_object(orientation, learning_object)
     case (orientation)
       when "vertical"

app/views/learning_objects/_learning_object_horizontal.erb

+<% link = learning_object_path(id: learning_object.id) %>
 <div class="learning-object-horizontal">
   <div class="media">
     <div class="media-left media-middle">
       <div class="learning-object-thumbnail">
-        <a href="#">
-          <img src="http://dummyimage.com/250x150/363336/fff" alt='dummy image'>
+        <a href="<%= link %>">
+          <% if learning_object.thumbnail == "thumbnai" %>
+              <%= image_tag('learning-object-preview.png') %>
+          <% else %>
+              <img src="<%= learning_object.thumbnail %>" alt="<%= learning_object_title learning_object %>">
+          <% end %>
         </a>
 
         <% if user_signed_in? %>
@@ -11,13 +16,10 @@
         <% end %>
       </div>
     </div>
+
     <div class="media-body">
       <a href="<%= learning_object_path(id: learning_object.id) %>">
-        <% if learning_object.name.nil? %>
-            <h4 class="media-heading">Sem Título</h4>
-        <% else %>
-            <h4 class="media-heading"><%= learning_object.name %></h4>
-        <% end %>
+        <h4><%= learning_object_title learning_object %></h4>
       </a>
 
       <span>Por <a>Usuário&nbsp;</a></span><br/>

app/views/management/carousels/edit.html.erb

-<h1 class="ls-title-intro ls-ico-users">Carousels</h1>
+<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
 
 <ol class="ls-breadcrumb">
-  <li><%= link_to 'Carousels', management_carousels_path %></li>
+  <li><%= link_to 'Carrosséis', management_carousels_path %></li>
   <li>Administrar</li>
 </ol>
 

app/views/management/carousels/index.html.erb

-<h1 class="ls-title-intro ls-ico-users">Carousels</h1>
+<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
 
 <a href="<%= new_management_carousel_path %>" class="ls-btn-primary" aria-expanded="false" role="combobox">Cadastrar
   novo</a>

app/views/management/carousels/new.html.erb

-<h1 class="ls-title-intro ls-ico-users">Usuários</h1>
+<h1 class="ls-title-intro ls-ico-users">Carrossel</h1>
 
 <ol class="ls-breadcrumb">
-  <li><a href="#">Usuários</a></li>
-  <li>Novo usuário</li>
+  <li><%= link_to 'Carrosséis', management_carousels_path %></li>
+  <li>Novo Carrossel</li>
 </ol>
 
-<%= render 'form' %>
+<%= render 'form' %>
\ No newline at end of file