diff --git a/app/views/bookmarks/_bookmarks.html.erb b/app/views/bookmarks/_bookmarks.html.erb index dcb2ed5266f66a5866b48fb02ded19275244d0e8..07fbcb9b03081f222f2b5c85be3702789f52acbb 100644 --- a/app/views/bookmarks/_bookmarks.html.erb +++ b/app/views/bookmarks/_bookmarks.html.erb @@ -1,4 +1,2 @@ -<%#= link_to collection, do %> - <%= image_tag 'icons/collection', width: 24 %> - Favoritos -<%# end %> \ No newline at end of file +<% bookmarks.owner.name = "" %> +<%= render 'collections/collection', collection: bookmarks %> diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb index cc1381979ec8cdf8653d53c04b59011e2a4cefd0..f8cf27f6c0be94c837ad10b5ad86d433e836cb13 100644 --- a/app/views/collections/_collection.html.erb +++ b/app/views/collections/_collection.html.erb @@ -4,7 +4,7 @@ <%= image_tag 'icons/collection', width: 210,height:140 %> </div> <div class="panel-body"> - <h4 class="media-heading"><%= collection.name %></h4> + <h4 class="media-heading"><%= collection.name unless collection.name == "Bookmarks" %><%= "Favoritos" if collection.name == "Bookmarks" %></h4> <!-- <span class="glyphicon glyphicon-eye-open">200 </span> <span class="glyphicon glyphicon-star">4,5 </span> --> <span><a><%= 'Por '+ collection.owner.name unless collection.owner.name.blank? %></a></span> diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb index be1ab078eeaec5aad2af95506ad5edf62ce41d55..e7a016113f92f87205117225a8ad8558b93ce400 100644 --- a/app/views/collections/show.html.erb +++ b/app/views/collections/show.html.erb @@ -15,7 +15,7 @@ <div class="navbar-header"> <%= image_tag image_path("icons/collection.png"), class: "logo-image", size: "90x66" %> <ul class="nav navbar-nav navbar-right collection-header" style="margin-left: 30px;"> - <li><h2><%= @collection.name %></h2></li> + <li><h2><%= (@collection.class != Bookmarks) ? @collection.name : "Favoritos" %></h2></li> <li> <%= image_tag image_path("icons/square.png"), class: "logo-image", size: "20x20" %> <%= collection_length @collection %>