From 3335105d4194fe8bcc4d347cd35bf97eb8763e0f Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 26 Dec 2013 22:53:21 +0100
Subject: [PATCH] Improved url of ticket views.

---
 .../app/controllers/default_route.js.coffee      |  2 +-
 .../app/controllers/navigation.js.coffee         |  2 +-
 .../app/controllers/ticket_overview.js.coffee    | 16 ++++++----------
 .../javascripts/app/views/ticket_zoom.jst.eco    |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/default_route.js.coffee b/app/assets/javascripts/app/controllers/default_route.js.coffee
index 808a64c1a..9a38da8bc 100644
--- a/app/assets/javascripts/app/controllers/default_route.js.coffee
+++ b/app/assets/javascripts/app/controllers/default_route.js.coffee
@@ -9,7 +9,7 @@ class Index extends App.Controller
 
     # check role
     if @isRole('Customer')
-      @navigate '#ticket_view/my_tickets'
+      @navigate '#ticket/view/my_tickets'
       return
 
     if @Config.get('default_controller')
diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee
index f169532af..6b999fe77 100644
--- a/app/assets/javascripts/app/controllers/navigation.js.coffee
+++ b/app/assets/javascripts/app/controllers/navigation.js.coffee
@@ -276,7 +276,7 @@ class App.Navigation extends App.Controller
     # remove old views
     NavBar = @Config.get( 'NavBar' ) || {}
     for key of NavBar
-      if NavBar[key].parent is '#ticket_view'
+      if NavBar[key].parent is '#ticket/view'
         delete NavBar[key]
 
     # add new views
diff --git a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
index d2afe8e7b..26f9f36e1 100644
--- a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
@@ -41,7 +41,7 @@ class Table extends App.ControllerContent
 
     # set title
     @title ''
-    @navupdate '#ticket_view/' + @view
+    @navupdate '#ticket/view/' + @view
 
     @meta = {}
     @bulk = {}
@@ -542,7 +542,7 @@ class Navbar extends App.Controller
 
     # add new views
     for item in data
-      item.target = '#ticket_view/' + item.link
+      item.target = '#ticket/view/' + item.link
       if item.link is @view
         item.active = true
       else
@@ -605,12 +605,8 @@ class Router extends App.Controller
       else
         @navigate 'ticket/zoom/' + @ticket_ids[ @position - 1 ] + '/nav/true'
 
-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( '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( '', { prio: 1000, parent: '#ticket_view', name: 'My assigned Tickets (51)', target: '#ticket_view/my_assigned', role: ['Agent'] }
-#App.Config.set( '', { prio: 1000, parent: '#ticket_view', name: 'Unassigned Tickets (133)', target: '#ticket_view/all_unassigned', role: ['Agent'] }
-
-#App.Config.set( 'TicketOverview', { prio: 1700, parent: '', name: 'Overviews', target: '#ticket_view', role: ['Customer'] }, 'NavBar' )
+App.Config.set( 'TicketOverview', { prio: 1000, parent: '', name: 'Overviews', target: '#ticket/view', role: ['Agent', 'Customer'] }, 'NavBar' )
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
index cd39103f4..bd7bbf8ed 100644
--- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
@@ -13,7 +13,7 @@
         <% if @C( 'LastOverview' ) && @nav: %>
           <div class="pagination pagination-small pagination-right">
             <span class="count"><%= @C( 'LastOverviewPosition' ) %>/<%= @C( 'LastOverviewTotal' ) %></span>
-            <% base_url ="#ticket_view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %>
+            <% base_url ="#ticket/view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %>
             <ul>
               <li class="<% if @C('LastOverviewPosition') <= 1: %>disabled<% end %>"><a href="<%- base_url %>previous" title="<%- @Ti( 'previous Ticket in Overview' ) %>">«</a></li>
               <li class="<% if @C('LastOverviewPosition') is @C('LastOverviewTotal'): %>disabled<% end %>"><a href="<%- base_url %>next" title="<%- @Ti( 'next Ticket in Overview' ) %>">»</a></li>