From 3ab6773c8c1257d7dce910f56debff02f37daf2c Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 26 Jul 2014 08:12:59 +0200 Subject: [PATCH] Added more icons. --- app/assets/images/sprite.svg | 23 +++++++++++++ .../app/controllers/_default_navbar.js.coffee | 2 +- .../javascripts/app/models/ticket.js.coffee | 4 +-- .../app/models/ticket_article.js.coffee | 4 +-- .../javascripts/app/views/navigation.jst.eco | 2 +- app/assets/stylesheets/zzz.css.erb | 33 +++++++++++++++++++ 6 files changed, 62 insertions(+), 6 deletions(-) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 28a854111..0ccfc23b1 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -169,6 +169,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee index 72391f094..75b64260e 100644 --- a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee +++ b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee @@ -14,4 +14,4 @@ App.Config.set( 'User', { App.Config.set( 'Admin', { prio: 9000, parent: '', name: 'Admin', target: '#manage', role: ['Admin'] }, 'NavBarRight' ) App.Config.set( 'New', { prio: 20000, parent: '', name: 'New', target: '#new', class: 'add' }, 'NavBarRight' ) -App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', target: '#tools', child: true }, 'NavBar' ) +App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', target: '#tools', child: true, class: 'tools' }, 'NavBar' ) diff --git a/app/assets/javascripts/app/models/ticket.js.coffee b/app/assets/javascripts/app/models/ticket.js.coffee index 8d18e8f37..800e1ae01 100644 --- a/app/assets/javascripts/app/models/ticket.js.coffee +++ b/app/assets/javascripts/app/models/ticket.js.coffee @@ -35,5 +35,5 @@ class App.Ticket extends App.Model iconActivity: (user) -> if @owner_id == user.id - return 'user' - 'group' \ No newline at end of file + return 'important' + '' \ No newline at end of file diff --git a/app/assets/javascripts/app/models/ticket_article.js.coffee b/app/assets/javascripts/app/models/ticket_article.js.coffee index c4dd6a50a..3ea788f7d 100644 --- a/app/assets/javascripts/app/models/ticket_article.js.coffee +++ b/app/assets/javascripts/app/models/ticket_article.js.coffee @@ -36,5 +36,5 @@ class App.TicketArticle extends App.Model iconActivity: (user) -> ticket = App.Ticket.find(@ticket_id) if ticket.owner_id == user.id - return 'user' - 'group' \ No newline at end of file + return 'important' + '' \ No newline at end of file diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index c54b4c7b0..9f2301af0 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -12,7 +12,7 @@