diff --git a/UI/Index.html b/UI/Index.html index b246221d9..e3cb2a431 100644 --- a/UI/Index.html +++ b/UI/Index.html @@ -4,15 +4,15 @@ NzbDrone + - - - + - + + diff --git a/UI/Router.js b/UI/Router.js index ac4b01d21..8ca2af07a 100644 --- a/UI/Router.js +++ b/UI/Router.js @@ -1,4 +1,4 @@ -'use strict'; +'use strict'; require( [ 'app', @@ -11,20 +11,19 @@ require( controller: new Controller(), appRoutes : { - '' : 'series', - 'series' : 'series', - 'series/index' : 'series', - 'series/add' : 'addSeries', - 'series/add/:action(/:query)': 'addSeries', - 'series/details/:query' : 'seriesDetails', - 'calendar' : 'calendar', - 'settings' : 'settings', - 'settings/:action(/:query)' : 'settings', - 'missing' : 'missing', - 'history' : 'history', - 'logs' : 'logs', - 'rss' : 'rss', - ':whatever' : 'notFound' + '' : 'series', + 'series' : 'series', + 'addseries' : 'addSeries', + 'addseries/:action(/:query)': 'addSeries', + 'series/:query' : 'seriesDetails', + 'calendar' : 'calendar', + 'settings' : 'settings', + 'settings/:action(/:query)' : 'settings', + 'missing' : 'missing', + 'history' : 'history', + 'logs' : 'logs', + 'rss' : 'rss', + ':whatever' : 'notFound' } }); @@ -36,7 +35,6 @@ require( RouterBinder.bind(App.Router); }); - return App.Router; }); diff --git a/UI/Series/Index/SeriesIndexLayout.js b/UI/Series/Index/SeriesIndexLayout.js index 9ea6dc157..1cdeaccfe 100644 --- a/UI/Series/Index/SeriesIndexLayout.js +++ b/UI/Series/Index/SeriesIndexLayout.js @@ -80,7 +80,7 @@ define( { title: 'Add Series', icon : 'icon-plus', - route: 'series/add' + route: 'addseries' }, { title : 'RSS Sync', diff --git a/UI/Series/SeriesModel.js b/UI/Series/SeriesModel.js index 223b00ac4..dcd9c97a3 100644 --- a/UI/Series/SeriesModel.js +++ b/UI/Series/SeriesModel.js @@ -53,7 +53,7 @@ define( return this.get('status') === 'continuing'; }, route : function () { - return '/series/details/' + this.get('titleSlug'); + return '/series/' + this.get('titleSlug'); //return '/series/details/' + this.get('id'); },