From e6cf28b2221a8efc8c947fb64ea762a2fdf54f94 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 19 Jul 2014 23:46:45 +0200 Subject: [PATCH] Added support of own icon's in taskbar. --- .../app/controllers/ticket_zoom.js.coffee | 13 +++++++------ .../javascripts/app/controllers/user_zoom.js.coffee | 4 +++- .../javascripts/app/views/task_widget_tasks.jst.eco | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 678557dc4..4852430a4 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -33,13 +33,14 @@ class App.TicketZoom extends App.Controller meta: => meta = - url: @url() - id: @ticket_id + url: @url() + id: @ticket_id + iconClass: "priority" if @ticket - @ticket = App.Ticket.retrieve( @ticket.id ) - meta.head = @ticket.title - meta.title = '#' + @ticket.number + ' - ' + @ticket.title - meta.class = "level-#{@ticket.priority_id}" + @ticket = App.Ticket.retrieve( @ticket.id ) + meta.head = @ticket.title + meta.title = '#' + @ticket.number + ' - ' + @ticket.title + meta.class = "level-#{@ticket.priority_id}" meta url: => diff --git a/app/assets/javascripts/app/controllers/user_zoom.js.coffee b/app/assets/javascripts/app/controllers/user_zoom.js.coffee index 8b13bdfaa..60132a904 100644 --- a/app/assets/javascripts/app/controllers/user_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/user_zoom.js.coffee @@ -15,7 +15,9 @@ class App.UserZoom extends App.Controller meta = url: @url() id: @user_id - class: "level-1" + class: "" + iconClass: "user" + if @user meta.head = @user.displayName() diff --git a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco index 84c5f2f31..bed3ad73b 100644 --- a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco +++ b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco @@ -1,7 +1,7 @@ <% for item in @item_list: %>
-
+
<%= item.data.head %>