From 62d92ef630437caea1103f461a3b49d01a2a6d7e Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 14 Nov 2014 16:44:59 +0100 Subject: [PATCH] ticketZoom attributeBar animation --- .../_application_controller_generic.js.coffee | 2 ++ .../app/views/agent_ticket_view/bulk.jst.eco | 2 +- .../javascripts/app/views/ticket_zoom.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 23 ++++++++++++++----- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee index 2595dd695..2245d5604 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee @@ -511,10 +511,12 @@ class App.Sidebar extends App.Controller toggleSidebar: -> @el.parent().find('.tabsSidebar-sidebarSpacer').toggleClass('is-closed') @el.parent().find('.tabsSidebar').toggleClass('is-closed') + @el.parent().next('.attributeBar').toggleClass('is-closed') showSidebar: -> @el.parent().find('.tabsSidebar-sidebarSpacer').removeClass('is-closed') @el.parent().find('.tabsSidebar').removeClass('is-closed') + @el.parent().next('.attributeBar').addClass('is-closed') toggleTab: (e) -> diff --git a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco index 144040faa..e82c990a1 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco @@ -1,6 +1,6 @@
-
+
<%- @T('Confirm') %>
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index 9450c636f..58e9caaa1 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -53,7 +53,7 @@
- +