Skip to content
Snippets Groups Projects
Commit f0a6d2fd authored by Mauricio Giacomini Girardello's avatar Mauricio Giacomini Girardello
Browse files

improvement in learning object views code and displaying users collections

parent 450f1551
No related branches found
No related tags found
No related merge requests found
...@@ -24,3 +24,17 @@ ...@@ -24,3 +24,17 @@
} }
} }
} }
.learning-object-vertical {
.learning-object-thumbnail {
max-width: 250px;
height: 150px;
position: relative;
}
}
.glyphicon-eye-open:before, .glyphicon-star:before {
margin-right: 5px;
}
\ No newline at end of file
...@@ -4,6 +4,14 @@ module LearningObjectsHelper ...@@ -4,6 +4,14 @@ module LearningObjectsHelper
categories.to_s categories.to_s
end end
def learning_object_thumbnail(learning_object)
if learning_object.thumbnail == "thumbnai"
image_tag('learning-object-preview.png')
else
image_tag learning_object.thumbnail, alt: learning_object_title(learning_object)
end
end
def learning_object_title(learning_object) def learning_object_title(learning_object)
if learning_object.name.nil? if learning_object.name.nil?
return 'Sem Título' return 'Sem Título'
......
...@@ -3,13 +3,9 @@ ...@@ -3,13 +3,9 @@
<div class="media"> <div class="media">
<div class="media-left media-middle"> <div class="media-left media-middle">
<div class="learning-object-thumbnail"> <div class="learning-object-thumbnail">
<a href="<%= link %>"> <%= link_to link do
<% if learning_object.thumbnail == "thumbnai" %> learning_object_thumbnail learning_object
<%= image_tag('learning-object-preview.png') %> end %>
<% else %>
<img src="<%= learning_object.thumbnail %>" alt="<%= learning_object_title learning_object %>">
<% end %>
</a>
<% if user_signed_in? %> <% if user_signed_in? %>
<%= render 'learning_objects/actions_buttons' %> <%= render 'learning_objects/actions_buttons' %>
...@@ -18,13 +14,13 @@ ...@@ -18,13 +14,13 @@
</div> </div>
<div class="media-body"> <div class="media-body">
<a href="<%= learning_object_path(id: learning_object.id) %>"> <%= link_to link do %>
<h4><%= learning_object_title learning_object %></h4> <h4><%= learning_object_title learning_object %></h4>
</a> <% end %>
<span>Por <a>Usuário&nbsp;</a></span><br/> <span>Por <%= link_to 'João', '#' %></span><br/>
<span class="glyphicon glyphicon-eye-open"><%= learning_object.views %>&nbsp;</span> <span class="glyphicon glyphicon-eye-open"><%= learning_object.views %></span>
<span class="glyphicon glyphicon-star"><%= learning_object.likes %>&nbsp;</span><br> <span class="glyphicon glyphicon-star"><%= learning_object.likes %></span><br>
<% unless learning_object.description.nil? %> <% unless learning_object.description.nil? %>
<%= learning_object.description %> <%= learning_object.description %>
<br/> <br/>
......
<div class="learning-object-vertical"> <div class="learning-object-vertical">
<div class="panel"> <div class="panel">
<div class="learning-object-thumbnail"> <div class="learning-object-thumbnail">
<a href=""><img src="http://dummyimage.com/250x150/363336/fff" alt='dummy image' class="img-responsive"></a> <%= link_to learning_object_path(id: learning_object.id) do
learning_object_thumbnail learning_object
end %>
<% if user_signed_in? %> <% if user_signed_in? %>
<%= render 'learning_objects/actions_buttons' %> <%= render 'learning_objects/actions_buttons' %>
<% end %> <% end %>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<% if learning_object.name.nil? %> <h4 class="media-heading"><%= learning_object_title(learning_object) %></h4>
<h4 class="media-heading">Sem Título</h4>
<% else %>
<h4 class="media-heading"><%= learning_object.name %></h4>
<% end %>
<span class="glyphicon glyphicon-eye-open"><%= learning_object.views %>&nbsp;</span> <span class="glyphicon glyphicon-eye-open"><%= learning_object.views %>&nbsp;</span>
<span class="glyphicon glyphicon-star"><%= learning_object.likes %>&nbsp;</span> <span class="glyphicon glyphicon-star"><%= learning_object.likes %>&nbsp;</span>
<span>Por <a>Usuário&nbsp;</a></span> <span>Por <a>Usuário&nbsp;</a></span>
......
...@@ -41,17 +41,20 @@ ...@@ -41,17 +41,20 @@
<%= render @objects[1], orientation: "vertical" %> <%= render @objects[1], orientation: "vertical" %>
<%= render @objects[2], orientation: "vertical" %> <%= render @objects[2], orientation: "vertical" %>
</div> </div>
</div>
</div>
<div style="clear: both;"></div>
<div style="float: right;">
<a href="#">Ver todos</a>
</div>
</div>
<div class="row"> <div class="user-files">
<div class="user-collections">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Coleções</h4> <h2 class="media-heading">Coleções</h2>
<h4>x items</h4>
</div> </div>
</div> </div>
</div> </div>
...@@ -70,6 +73,7 @@ ...@@ -70,6 +73,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<%#= render 'collections/create' %> <%#= render 'collections/create' %>
</div> </div>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment