From e209e055d3df02dcb3eee1fbe5dfd6b33087a187 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 12 Jul 2014 15:20:26 +0200 Subject: [PATCH] Moved to new nav bar. --- .../javascripts/app/controllers/_dashboard/ticket.js.coffee | 1 - app/assets/javascripts/app/controllers/dashboard.js.coffee | 4 +++- .../javascripts/app/controllers/ticket_overview.js.coffee | 2 +- app/assets/javascripts/app/controllers/ticket_zoom.js.coffee | 3 +-- app/assets/javascripts/app/controllers/user_zoom.js.coffee | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee index 81d9580cb..cbd90d78b 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee @@ -6,7 +6,6 @@ class App.DashboardTicket extends App.Controller constructor: -> super @start_page = 1 - @navupdate '#' # set new key @key = 'ticket_overview_' + @view diff --git a/app/assets/javascripts/app/controllers/dashboard.js.coffee b/app/assets/javascripts/app/controllers/dashboard.js.coffee index 009b71b1b..0550d6ed4 100644 --- a/app/assets/javascripts/app/controllers/dashboard.js.coffee +++ b/app/assets/javascripts/app/controllers/dashboard.js.coffee @@ -2,7 +2,7 @@ class Index extends App.ControllerContent constructor: -> super - + # check authentication return if !@authenticate() @@ -88,3 +88,5 @@ class Index extends App.ControllerContent @el.find( '#sortable-sidebar' ).sortable( dndOptions ) App.Config.set( 'dashboard', Index, 'Routes' ) +App.Config.set( 'Dashboard', { prio: 100, parent: '', name: 'Dashboard', target: '#dashboard', role: ['Agent'], class: 'dashboard' }, 'NavBar' ) + diff --git a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee index a8e093367..d826b6c62 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee @@ -673,4 +673,4 @@ App.Config.set( 'ticket/view', Index, 'Routes' ) App.Config.set( 'ticket/view/:view', Index, 'Routes' ) #App.Config.set( 'ticket/view/:view/:position/:direction', Router, 'Routes' ) -App.Config.set( 'TicketOverview', { prio: 1000, parent: '', name: 'Overviews', target: '#ticket/view', role: ['Agent', 'Customer'] }, 'NavBar' ) +App.Config.set( 'TicketOverview', { prio: 1000, parent: '', name: 'Overviews', target: '#ticket/view', role: ['Agent', 'Customer'], class: 'overviews' }, 'NavBar' ) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index dd652b8e8..678557dc4 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -5,8 +5,6 @@ class App.TicketZoom extends App.Controller # check authentication return if !@authenticate() - @navupdate '#' - @edit_form = undefined @ticket_id = params.ticket_id @article_id = params.article_id @@ -41,6 +39,7 @@ class App.TicketZoom extends App.Controller @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 a23b33403..8b13bdfaa 100644 --- a/app/assets/javascripts/app/controllers/user_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/user_zoom.js.coffee @@ -5,8 +5,6 @@ class App.UserZoom extends App.Controller # check authentication return if !@authenticate() - @navupdate '#' - start = (user) => @user = user @render() @@ -17,6 +15,8 @@ class App.UserZoom extends App.Controller meta = url: @url() id: @user_id + class: "level-1" + if @user meta.head = @user.displayName() meta.title = @user.displayName()