nicer routes

This commit is contained in:
Keivan Beigi 2013-06-25 18:00:56 -07:00
parent 1ce785f417
commit ab28b50c7e
4 changed files with 20 additions and 22 deletions

View File

@ -4,15 +4,15 @@
<title>NzbDrone</title> <title>NzbDrone</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<link href="/Content/Bootstrap.css" rel='stylesheet' type='text/css'/> <link href="/Content/Bootstrap.css" rel='stylesheet' type='text/css'/>
<link href="/Content/bootstrap.toggle-switch.css" rel='stylesheet' type='text/css'/>
<link href="/Content/Messenger/messenger.css" rel='stylesheet' type='text/css'/> <link href="/Content/Messenger/messenger.css" rel='stylesheet' type='text/css'/>
<link href="/Content/Messenger/messenger.future.css" rel='stylesheet' type='text/css'/> <link href="/Content/Messenger/messenger.future.css" rel='stylesheet' type='text/css'/>
<link href="/Cells/Cells.css" rel='stylesheet' type='text/css'>
<link href="/Content/fullcalendar.css" rel='stylesheet' type='text/css'> <link href="/Content/fullcalendar.css" rel='stylesheet' type='text/css'>
<link href="/Content/base.css" rel='stylesheet' type='text/css'/> <link href="/Content/base.css" rel='stylesheet' type='text/css'/>
<link href="/Content/bootstrap.toggle-switch.css" rel='stylesheet' type='text/css'/> <link href="/Cells/Cells.css" rel='stylesheet' type='text/css'>
<link href="/AddSeries/Addseries.css" rel='stylesheet' type='text/css'/>
<link href="/Series/Series.css" rel='stylesheet' type='text/css'/> <link href="/Series/Series.css" rel='stylesheet' type='text/css'/>
<link href="/settings/settings.css" rel='stylesheet' type='text/css'/> <link href="/Settings/settings.css" rel='stylesheet' type='text/css'/>
<link href="/AddSeries/Addseries.css" rel='stylesheet' type='text/css'/>
<link href="/Calendar/calendar.css" rel='stylesheet' type='text/css'/> <link href="/Calendar/calendar.css" rel='stylesheet' type='text/css'/>
</head> </head>
<body> <body>

View File

@ -1,4 +1,4 @@
'use strict'; 'use strict';
require( require(
[ [
'app', 'app',
@ -11,20 +11,19 @@ require(
controller: new Controller(), controller: new Controller(),
appRoutes : { appRoutes : {
'' : 'series', '' : 'series',
'series' : 'series', 'series' : 'series',
'series/index' : 'series', 'addseries' : 'addSeries',
'series/add' : 'addSeries', 'addseries/:action(/:query)': 'addSeries',
'series/add/:action(/:query)': 'addSeries', 'series/:query' : 'seriesDetails',
'series/details/:query' : 'seriesDetails', 'calendar' : 'calendar',
'calendar' : 'calendar', 'settings' : 'settings',
'settings' : 'settings', 'settings/:action(/:query)' : 'settings',
'settings/:action(/:query)' : 'settings', 'missing' : 'missing',
'missing' : 'missing', 'history' : 'history',
'history' : 'history', 'logs' : 'logs',
'logs' : 'logs', 'rss' : 'rss',
'rss' : 'rss', ':whatever' : 'notFound'
':whatever' : 'notFound'
} }
}); });
@ -36,7 +35,6 @@ require(
RouterBinder.bind(App.Router); RouterBinder.bind(App.Router);
}); });
return App.Router; return App.Router;
}); });

View File

@ -80,7 +80,7 @@ define(
{ {
title: 'Add Series', title: 'Add Series',
icon : 'icon-plus', icon : 'icon-plus',
route: 'series/add' route: 'addseries'
}, },
{ {
title : 'RSS Sync', title : 'RSS Sync',

View File

@ -53,7 +53,7 @@ define(
return this.get('status') === 'continuing'; return this.get('status') === 'continuing';
}, },
route : function () { route : function () {
return '/series/details/' + this.get('titleSlug'); return '/series/' + this.get('titleSlug');
//return '/series/details/' + this.get('id'); //return '/series/details/' + this.get('id');
}, },