diff --git a/app/helpers/collections_helper.rb b/app/helpers/collections_helper.rb index f3f39644e8e64ce0afca9a65073658d6384f541c..eae6e5db81db5ce0bb334f1dd20beb87feb4697a 100644 --- a/app/helpers/collections_helper.rb +++ b/app/helpers/collections_helper.rb @@ -16,4 +16,15 @@ module CollectionsHelper index % 3 == 0 end -end \ No newline at end of file + def render_collection(orientation, collection) + case (orientation) + when "vertical" + render "collections/collection_vertical", collection: collection + when "horizontal" + render "collections/collection_horizontal", collection: collection + else + render "collections/collection_horizontal", collection: collection + end + end + +end diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb index 4ea55b3bcfb0dbc374121af59c38fc1ce4549ab1..3c3e6af41edf8e2aa965810c98d45ab2b22fea21 100644 --- a/app/views/collections/_collection.html.erb +++ b/app/views/collections/_collection.html.erb @@ -1,12 +1 @@ -<%= link_to collection_path(id: collection.id) do %> - <div class="col-sm-4"> - <div> - <%= image_tag 'icons/collection', width: 210,height:140 %> - </div> - <div class="panel-body"> - <h4 class="media-heading"><%= collection.name unless collection.name == "Bookmarks" %><%= "Favoritos" if collection.name == "Bookmarks" %></h4> - <span><a><%= collection_length collection %></a></span><br /> - <span><a><%= 'Por '+ collection.owner.name unless collection.owner.name.blank? %></a></span> - </div> - </div> -<% end %> +<%= render_collection orientation, collection %> diff --git a/app/views/collections/_collection_horizontal.erb b/app/views/collections/_collection_horizontal.erb new file mode 100644 index 0000000000000000000000000000000000000000..322fd57efc03f4f53b7ed4ad83612f57e52fd154 --- /dev/null +++ b/app/views/collections/_collection_horizontal.erb @@ -0,0 +1,41 @@ + + <% link = collection_path(id: collection.id) %> + <div class="learning-object-horizontal row"> + <!-- <div class="col-md-5"> --> + <div class="learning-object-thumbnail"> + <%#= link_to link do + collection_thumbnail collection + end %> + <%= link_to link do + image_tag 'icons/collection', width: 210,height:140 + end %> + + <%# if user_signed_in? %> + <%#= render 'collections/actions_buttons', collection: collection %> + <%# end %> + </div> + <!-- </div> --> + <div class="learning-object-body"> + <%= link_to link do %> + <h4 class="learning-object-heading"><%= collection.name %></h4> + <% end %> + + <span class="author-label">Por <%= collection.owner.name %></span><br/> + <span><a><%= collection_length collection %></a></span> + + <% unless collection.description.nil? %> + <div class="learning-object-text"> + <%= + if collection.description.length > 150 + d = collection.description[0..150] + d = d[0...d.rindex(' ')] + d << "..." + else + collection.description + end + %> + </div> + <br/> + <% end %> + </div> + </div> diff --git a/app/views/collections/_collection_vertical.html.erb b/app/views/collections/_collection_vertical.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..4ea55b3bcfb0dbc374121af59c38fc1ce4549ab1 --- /dev/null +++ b/app/views/collections/_collection_vertical.html.erb @@ -0,0 +1,12 @@ +<%= link_to collection_path(id: collection.id) do %> + <div class="col-sm-4"> + <div> + <%= image_tag 'icons/collection', width: 210,height:140 %> + </div> + <div class="panel-body"> + <h4 class="media-heading"><%= collection.name unless collection.name == "Bookmarks" %><%= "Favoritos" if collection.name == "Bookmarks" %></h4> + <span><a><%= collection_length collection %></a></span><br /> + <span><a><%= 'Por '+ collection.owner.name unless collection.owner.name.blank? %></a></span> + </div> + </div> +<% end %> diff --git a/app/views/collections/_group.html.erb b/app/views/collections/_group.html.erb index e0557608063b405b943c2227f32fa34449b28d68..10d119fe8d4a36a74b66eb40d6d11c9eaca5948b 100644 --- a/app/views/collections/_group.html.erb +++ b/app/views/collections/_group.html.erb @@ -5,7 +5,7 @@ <div style="margin-top: 10px;"> <% collections.each do |collection| %> - <%= render collection %> + <%= render collection, orientation: 'vertical' %> <% end %> </div> </div> diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb index 240d0db24886ab53d73e9598b9c274b64392fa32..4c037f7db4836c8c7aaf3b12d4856cd64dd17155 100644 --- a/app/views/collections/index.html.erb +++ b/app/views/collections/index.html.erb @@ -8,7 +8,7 @@ <div style="margin-top: 30px;" class="row recommend-collections"> <% @collections.each do |collection| %> - <%= render collection %> + <%= render collection, orientation: 'vertical' %> <% end %> </div> <% end %>