From 9c15463042be7f7583a9d60b55d8eec88792dcf5 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 9 Jul 2014 16:31:17 +0200 Subject: [PATCH] =?UTF-8?q?pb=20tableau=20r=C3=A9solu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/admin.coffee | 2 +- app/views/portlet/shared/edit.js.erb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin.coffee b/app/assets/javascripts/admin.coffee index b780b8c..09ffea9 100644 --- a/app/assets/javascripts/admin.coffee +++ b/app/assets/javascripts/admin.coffee @@ -290,7 +290,7 @@ jQuery -> }) -$(document).on "mouseover", ".portlet", -> +$(document).on "mouseover", ".portlet:not(.edit)", -> $(this).children(".btn-toolbar").show() diff --git a/app/views/portlet/shared/edit.js.erb b/app/views/portlet/shared/edit.js.erb index b42ce41..9301f9b 100644 --- a/app/views/portlet/shared/edit.js.erb +++ b/app/views/portlet/shared/edit.js.erb @@ -1,4 +1,5 @@ -//$("#portlet_<%= @portlet.id %>").html("
"); +$("#portlet_<%= @portlet.id %>").addClass("edit"); +$("#portlet_<%= @portlet.id %>").find(".btn-toolbar").hide() //$("#edit_portlet_content_form").html("<%= escape_javascript(render( :partial => "form")) %>"); @@ -15,5 +16,3 @@ $("#collapse3").collapse('show'); <%- cancel_button = escape_javascript(link_to("annuler", portlet_portlet_path(@portlet), :class => "button cancel", :remote => true)); %> $("#portlet_<%= @portlet.id %>").find('.buttons ol').prepend('<%= cancel_button %>'); - -