From 91c14382a41c3934568227f850629653bfaab147 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 28 May 2015 14:47:00 +0200 Subject: [PATCH] fix tools dropdown, add tools icon, fix overview icon, add tools icon author --- .../app/controllers/_default_navbar.js.coffee | 4 +- .../app/views/navigation/menu.jst.eco | 4 +- .../app/views/navigation/personal.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 48 +++++++++++++------ extras/icon_authors/index.php | 17 +++++-- extras/icon_authors/list.json | 2 +- extras/icon_authors/store.php | 9 ---- public/assets/images/icons.svg | 2 +- public/assets/images/icons/overviews.svg | 2 +- public/assets/images/icons/split.svg | 2 +- public/assets/images/icons/tools.svg | 2 +- 11 files changed, 57 insertions(+), 37 deletions(-) mode change 100644 => 100755 extras/icon_authors/list.json delete mode 100644 extras/icon_authors/store.php diff --git a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee index 9d6be0afe..0119ed675 100644 --- a/app/assets/javascripts/app/controllers/_default_navbar.js.coffee +++ b/app/assets/javascripts/app/controllers/_default_navbar.js.coffee @@ -16,5 +16,5 @@ App.Config.set( 'Admin', { prio: 9000, parent: '', name: 'Admin', translate: tru App.Config.set( 'New', { prio: 20000, parent: '', name: 'New', translate: true, target: '#new', class: 'add' }, 'NavBarRight' ) App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', translate: true, target: '#tools', child: true, class: 'tools' }, 'NavBar' ) -#App.Config.set( 'Misc1', { prio: 1600, parent: '#tools', name: 'Test 1', target: '#test1', role: [ 'Admin' ] }, 'NavBar' ) -#App.Config.set( 'Misc2', { prio: 1700, parent: '#tools', name: 'Test 2', target: '#test2', role: [ 'Admin' ] }, 'NavBar' ) +App.Config.set( 'Misc1', { prio: 1600, parent: '#tools', name: 'Test 1', target: '#test1', role: [ 'Admin' ] }, 'NavBar' ) +App.Config.set( 'Misc2', { prio: 1700, parent: '#tools', name: 'Test 2', target: '#test2', role: [ 'Admin' ] }, 'NavBar' ) diff --git a/app/assets/javascripts/app/views/navigation/menu.jst.eco b/app/assets/javascripts/app/views/navigation/menu.jst.eco index 2c0a9c5b8..9310fab08 100644 --- a/app/assets/javascripts/app/views/navigation/menu.jst.eco +++ b/app/assets/javascripts/app/views/navigation/menu.jst.eco @@ -6,9 +6,9 @@ <%- @T( item.name ) %> - + -