diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
index f166911c8..340cc38c8 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
@@ -145,11 +145,11 @@ class App.Controller extends Spine.Controller
all_attributes = [
{ name: 'number', link: true, title: 'title' },
{ name: 'title', link: true, title: 'title' },
- { name: 'customer', class: 'user-data', data: { id: true } },
+ { name: 'customer', class: 'user-popover', data: { id: true } },
{ name: 'ticket_state', translate: true, title: true },
{ name: 'ticket_priority', translate: true, title: true },
{ name: 'group', title: 'group' },
- { name: 'owner', class: 'user-data', data: { id: true } },
+ { name: 'owner', class: 'user-popover', data: { id: true } },
{ name: 'created_at', callback: @frontendTime },
{ name: 'last_contact', callback: @frontendTime },
{ name: 'last_contact_agent', callback: @frontendTime },
@@ -282,11 +282,11 @@ class App.Controller extends Spine.Controller
ticketPopups: (position = 'right') ->
# remove old popovers
- $('.popover-inner').parent().remove()
+ $('.popover').remove()
# show ticket popup
ui = @
- $('.ticket-data').popover(
+ @el.find('.ticket-popover').popover(
trigger: 'hover'
container: 'body'
html: true
@@ -309,10 +309,10 @@ class App.Controller extends Spine.Controller
userPopups: (position = 'right') ->
# remove old popovers
- $('.popover-inner').parent().remove()
+ $('.popover').remove()
# show user popup
- $('.user-data').popover(
+ @el.find('.user-popover').popover(
trigger: 'hover'
container: 'body'
html: true
@@ -355,10 +355,10 @@ class App.Controller extends Spine.Controller
organizationPopups: (position = 'right') ->
# remove old popovers
- $('.popover-inner').parent().remove()
+ $('.popover').remove()
# show organization popup
- $('.organization-data').popover(
+ @el.find('.organization-popover').popover(
trigger: 'hover'
container: 'body'
html: true
@@ -380,7 +380,7 @@ class App.Controller extends Spine.Controller
userTicketPopups: (data) ->
# remove old popovers
- $('.popover-inner').parent().remove()
+ $('.popover').remove()
# get data
tickets = {}
@@ -400,7 +400,7 @@ class App.Controller extends Spine.Controller
# show user popup
controller = @
- $(data.selector).popover(
+ @el.find(data.selector).popover(
trigger: 'hover'
container: 'body'
html: true
diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
index 278218aa0..3c1c9ff48 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
@@ -22,11 +22,11 @@ class App.ControllerTable extends App.Controller
overview_extended: [
{ name: 'number', link: true },
{ name: 'title', link: true },
- { name: 'customer', class: 'user-data', data: { id: true } },
+ { name: 'customer', class: 'user-popover', data: { id: true } },
{ name: 'ticket_state', translate: true },
{ name: 'ticket_priority', translate: true },
{ name: 'group' },
- { name: 'owner', class: 'user-data', data: { id: true } },
+ { name: 'owner', class: 'user-popover', data: { id: true } },
{ name: 'created_at', callback: @frontendTime },
{ name: 'last_contact', callback: @frontendTime },
{ name: 'last_contact_agent', callback: @frontendTime },
diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
index 8c5c4fee7..be19bd974 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
@@ -1,4 +1,4 @@
-class App.TicketMerge extends App.ControllerModal
+ class App.TicketMerge extends App.ControllerModal
constructor: ->
super
@fetch()
@@ -39,11 +39,11 @@ class App.TicketMerge extends App.ControllerModal
overview_extended: [
{ name: 'number', link: true },
{ name: 'title', link: true },
-# { name: 'customer', class: 'user-data', data: { id: true } },
+# { name: 'customer', class: 'user-popover', data: { id: true } },
{ name: 'ticket_state', translate: true },
# { name: 'ticket_priority', translate: true },
{ name: 'group' },
-# { name: 'owner', class: 'user-data', data: { id: true } },
+# { name: 'owner', class: 'user-popover', data: { id: true } },
{ name: 'created_at', callback: @humanTime },
# { name: 'last_contact', callback: @frontendTime },
# { name: 'last_contact_agent', callback: @frontendTime },
@@ -66,11 +66,11 @@ class App.TicketMerge extends App.ControllerModal
overview_extended: [
{ name: 'number', link: true },
{ name: 'title', link: true },
-# { name: 'customer', class: 'user-data', data: { id: true } },
+# { name: 'customer', class: 'user-popover', data: { id: true } },
{ name: 'ticket_state', translate: true },
# { name: 'ticket_priority', translate: true },
{ name: 'group' },
-# { name: 'owner', class: 'user-data', data: { id: true } },
+# { name: 'owner', class: 'user-popover', data: { id: true } },
{ name: 'created_at', callback: @humanTime },
# { name: 'last_contact', callback: @frontendTime },
# { name: 'last_contact_agent', callback: @frontendTime },
diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee
index eee67fc03..38f84c4e7 100644
--- a/app/assets/javascripts/app/controllers/navigation.js.coffee
+++ b/app/assets/javascripts/app/controllers/navigation.js.coffee
@@ -112,7 +112,7 @@ class App.Navigation extends App.Controller
data =
display: "##{ticket.number} - #{ticket.title} - #{ticket.humanTime}"
id: ticket.id
- class: "ticket-data"
+ class: "ticket-popover"
url: "#ticket/zoom/#{ticket.id}"
area.result.push data
else if area.name is 'User'
@@ -122,7 +122,7 @@ class App.Navigation extends App.Controller
data =
display: "#{user.displayName()}"
id: user.id
- class: "user-data"
+ class: "user-popover"
url: "#users/#{user.id}"
area.result.push data
else if area.name is 'Organization'
@@ -132,7 +132,7 @@ class App.Navigation extends App.Controller
data =
display: "#{organization.displayName()}"
id: organization.id
- class: "organization-data"
+ class: "organization-popover"
url: "#organizations/#{ticket.id}"
area.result.push data
diff --git a/app/assets/javascripts/app/views/agent_ticket_history.jst.eco b/app/assets/javascripts/app/views/agent_ticket_history.jst.eco
index 04c8dd2eb..e7348868d 100644
--- a/app/assets/javascripts/app/views/agent_ticket_history.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_history.jst.eco
@@ -21,7 +21,7 @@
<% open = true %>
<% last_user = object['created_by_id'] %>
<% lasttime = object['created_at'] %>
- <%= object.created_by.displayName() %> -
+ <%= object.created_by.displayName() %> -
?
<% end %>
diff --git a/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco
index f04cadffa..03449857e 100644
--- a/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco
@@ -11,7 +11,7 @@
-
+
|
diff --git a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
index 330279080..76597cf3b 100644
--- a/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
@@ -2,7 +2,7 @@
<%- @T( @head ) %>
<% for item in @items: %>
- - "<%= item.updated_by.displayName() %>"
+ - "<%= item.updated_by.displayName() %>"
- <%- @T( item.history_type ) %> <%= item.type %><% if item.title: %> (<%= item.title %>)<% end %>.
<% end %>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
index cead3c74b..f5a298c93 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
@@ -1,7 +1,7 @@
<% for article in @articles: %>
-
+
- <%- @T(article.article_type.name) %>
<% if article.article_type.name is 'email': %>- <%- @T( 'raw' ) %>
<% end %>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
index ed0711fd4..b66883d13 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
@@ -1,6 +1,6 @@
-
+
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css
index 0c07bb405..ea6b8831b 100644
--- a/app/assets/stylesheets/zzz.css
+++ b/app/assets/stylesheets/zzz.css
@@ -74,6 +74,9 @@ table th, table td {
border-bottom: 1px solid #eeeeee;
}
+.popover {
+ z-index: 1110;
+}
.hero-two {
width: 100%;
}
|