mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2024-12-25 17:17:02 +00:00
Code Issues Releases Wiki Activity

Merge from hell? Something from the past came back to haunt us

Browse source
This commit is contained in:
Mark McDowall 2013-05-03 00:20:52 -07:00
parent 7ab1084437
commit 17e99958e1
6 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/Content/settings.quality.less
View file

@ -1,3 +0,0 @@
.quality-size-item {
padding-left: 10px;
}

7
UI/Controller.js
View file

@ -1,6 +1,6 @@
"use strict"; "use strict";
define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout', define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
'Series/Index/SeriesIndexLayout', 'Upcoming/UpcomingCollectionView', 'Series/Index/SeriesIndexLayout',
'Calendar/CalendarCollectionView', 'Shared/NotificationView', 'Calendar/CalendarCollectionView', 'Shared/NotificationView',
'Shared/NotFoundView', 'MainMenuView', 'Shared/NotFoundView', 'MainMenuView',
'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection', 'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
@ -32,11 +32,6 @@ define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout({action: action})); NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout({action: action}));
}, },
upcoming: function () {
this._setTitle('Upcoming');
NzbDrone.mainRegion.show(new NzbDrone.Upcoming.UpcomingCollectionView());
},
calendar: function () { calendar: function () {
this._setTitle('Calendar'); this._setTitle('Calendar');
var calendarCollection = new NzbDrone.Calendar.CalendarCollection(); var calendarCollection = new NzbDrone.Calendar.CalendarCollection();

1
UI/History/HistoryLayout.js
View file

@ -3,7 +3,6 @@ define([
'app', 'app',
'History/Collection', 'History/Collection',
'Series/Index/Table/AirDateCell', 'Series/Index/Table/AirDateCell',
'Shared/Toolbar/ToolbarView',
'Shared/Toolbar/ToolbarLayout' 'Shared/Toolbar/ToolbarLayout'
], ],
function () { function () {

3
UI/Index.html
View file

@ -14,11 +14,10 @@
<link href="/content/backbone.backgrid.filter.css" rel='stylesheet' type='text/css'/> <link href="/content/backbone.backgrid.filter.css" rel='stylesheet' type='text/css'/>
<link href="/content/tablesorter.bootstrap.css" rel='stylesheet' type='text/css'/> <link href="/content/tablesorter.bootstrap.css" rel='stylesheet' type='text/css'/>
<link href="/content/tablesorter.pager.css" rel='stylesheet' type='text/css'/> <link href="/content/tablesorter.pager.css" rel='stylesheet' type='text/css'/>
<link href="/content/toggle-switch.css" rel='stylesheet' type='text/css'/> <link href="/content/bootstrap.toggle-switch.css" rel='stylesheet' type='text/css'/>
<link href="/AddSeries/addseries.css" rel='stylesheet' type='text/css'/> <link href="/AddSeries/addseries.css" rel='stylesheet' type='text/css'/>
<link href="/content/menu.css" rel='stylesheet' type='text/css'/> <link href="/content/menu.css" rel='stylesheet' type='text/css'/>
<link href="/content/form.css" rel='stylesheet' type='text/css'/> <link href="/content/form.css" rel='stylesheet' type='text/css'/>
<link href="/content/settings.quality.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="/content/base.css" rel='stylesheet' type='text/css'/> <link href="/content/base.css" rel='stylesheet' type='text/css'/>

2
UI/Routing.js
View file

@ -11,8 +11,6 @@ require(['app', 'Controller'], function (app, controller) {
'series/add' : 'addSeries', 'series/add' : 'addSeries',
'series/add/:action(/:query)': 'addSeries', 'series/add/:action(/:query)': 'addSeries',
'series/details/:query' : 'seriesDetails', 'series/details/:query' : 'seriesDetails',
'upcoming' : 'upcoming',
'upcoming/index' : 'upcoming',
'calendar' : 'calendar', 'calendar' : 'calendar',
'settings' : 'settings', 'settings' : 'settings',
'settings/:action(/:query)' : 'settings', 'settings/:action(/:query)' : 'settings',

1
UI/app.js
View file

@ -45,7 +45,6 @@ define('app', function () {
window.NzbDrone.Quality = {}; window.NzbDrone.Quality = {};
window.NzbDrone.Shared = {}; window.NzbDrone.Shared = {};
window.NzbDrone.Shared.Toolbar = {}; window.NzbDrone.Shared.Toolbar = {};
window.NzbDrone.Upcoming = {};
window.NzbDrone.Calendar = {}; window.NzbDrone.Calendar = {};
window.NzbDrone.Settings = {}; window.NzbDrone.Settings = {};
window.NzbDrone.Settings.Naming = {}; window.NzbDrone.Settings.Naming = {};