diff --git a/app/assets/images/icons/Curtir_02.png b/app/assets/images/icons/Curtir_02.png new file mode 100644 index 0000000000000000000000000000000000000000..7a094156ef0e1fcb8f4d66a50ffaa47fe2f598d1 Binary files /dev/null and b/app/assets/images/icons/Curtir_02.png differ diff --git a/app/assets/javascripts/application/learning_objects.coffee b/app/assets/javascripts/application/learning_objects.coffee.erb similarity index 81% rename from app/assets/javascripts/application/learning_objects.coffee rename to app/assets/javascripts/application/learning_objects.coffee.erb index 88903b52b03bd531978b5ec6244f164c4f0459f5..994fc38c0e720f378f018e2847e96b883c1f362f 100644 --- a/app/assets/javascripts/application/learning_objects.coffee +++ b/app/assets/javascripts/application/learning_objects.coffee.erb @@ -46,4 +46,11 @@ $ -> $ -> $(document).on 'ajax:success', 'a.vote', (status, data, xhr) -> $('.votes-count[data-id=\'' + data.id + '\']').text data.count + if $('.vote img').attr('alt') == 'Descurtir' + $('.vote img').attr('src',"<%= image_path('icons/Curtir_01.png') %>") + $('.vote img').attr('alt', 'Curtir') + else if $('.vote img').attr('alt') == 'Curtir' + $('.vote img').attr('src',"<%= image_path('icons/Curtir_02.png') %>") + $('.vote img').attr('alt', 'Descurtir') return + return diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb index f2288acb2cf378597270251ed189ffa6d6213261..5078a276a9dbe53d9e322b3c52a5216e489e5b7f 100644 --- a/app/controllers/learning_objects_controller.rb +++ b/app/controllers/learning_objects_controller.rb @@ -13,6 +13,7 @@ class LearningObjectsController < ApplicationController # GET /learning_objects/1 # GET /learning_objects/1.json def show + @liked = learning_object_repository.liked?(current_user, @learning_object) if user_signed_in? end # GET /learning_objects/new diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb index 946b2c1d23b0624ca71d9065b1d749875f9a27da..ebee326b83368323ce1395defbc42847c35383b1 100644 --- a/app/views/learning_objects/show.html.erb +++ b/app/views/learning_objects/show.html.erb @@ -22,7 +22,9 @@ like_learning_object_path(@learning_object.id_dspace), method: :post, remote: true %> <% end %> --> - +<% content_for(:body_attributes) do %> + data-no-turbolink="true" +<% end %> <div class="row learning-object"> <div class="col-md-7"> <div class="view"> @@ -36,7 +38,7 @@ </div> <div class="pull-right" style="padding-right:122px"> <span class="glyphicon glyphicon-eye-open"><%= @learning_object.views %> </span> - <span class="glyphicon glyphicon-star"><%= @learning_object.likes %> </span> + <span class="glyphicon glyphicon-star votes-count" data-id="<%= @learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"><%= @learning_object.likes %></span> </div> <br/><br/> <h2 class="title"><%= @learning_object.name %></h2> @@ -60,24 +62,37 @@ </div> <div class="rating-panel"> <% if user_signed_in? %> - <div class="actions"> - <div class="col-md-3 action"> - <%= image_tag "icons/Curtir_01.png", alt: "Curtir" %> - <h6>curtir objeto</h6> - </div> - <div class="col-md-3 action"> - <a href="<%= @learning_object.get_retrievelink %>"> - <%= image_tag "icons/download.png", alt: "Download do objeto" %> - <h6>salvar no computador</h6> - </a> - </div> - <div class="col-md-3 action"> - <%= image_tag "icons/collection-add.png", alt: "Adicionar à coleção" %> - <h6>adicionar à coleção</h6> - </div> - <div class="col-md-3 action"> - <%= render "complaints/complaints_button" %> - <h6>denunciar objeto</h6> + <div class="actions"> + <div class="col-md-3 action"> + <%= link_to like_learning_object_path(id: @learning_object.id), class: 'vote',method: :post, remote: true do %> + <% if @liked %> + <%= image_tag "icons/Curtir_02.png", alt: "Descurtir" %> + <% else %> + <%= image_tag "icons/Curtir_01.png", alt: "Curtir" %> + <% end %> + <h6>curtir objeto</h6> + <% end %> + </div> + <div class="col-md-3 action"> + <a href="<%= @learning_object.get_retrievelink %>"> + <%= image_tag "icons/download.png", alt: "Download do objeto" %> + <h6>salvar no computador</h6> + </a> + </div> + <div class="col-md-3 action"> + <a tabindex="0" class="add_to_collection" role="button" data-toggle="popover" data-placement="left" title="Adicionar as coleções" data-loid="<%= @learning_object.id %>" data-poload="/learning_objects/<%= ERB::Util.url_encode(@learning_object.id) %>/collections.json"> + <%= image_tag "icons/collection-add.png", alt: "Adicionar à coleção" %> + <h6>adicionar à coleção</h6> + </a> + </div> + <div class="col-md-3 action"> + <button type="button" class="btn btn-default btn-xs add_to_complaint " data-toggle="button" data-trigger="click" aria-pressed="false" autocomplete="off" title="Denunciar Objeto" border-style: "none" style='background-color: transparent !important; border: 0' > + <%= image_tag "icons/report-circle.png", alt: "Denunciar objeto" %> + <h6 style="color: #F05A28">denunciar objeto</h6> + </button> + + <div id="complaints_list_popover" class="popover"> + <%= render 'complaints/form' %> </div> </div> <% else %>