From a80c2fb1f3254d740b43de525065752bddeae6c0 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 27 Feb 2013 20:48:31 -0800 Subject: [PATCH] Minor UI tweaks --- NzbDrone.Backbone/Calendar/CalendarCollectionView.js | 2 +- NzbDrone.Backbone/Controller.js | 4 ++-- NzbDrone.Backbone/Index.html | 1 + NzbDrone.Backbone/MainMenuView.js | 5 +---- NzbDrone.Backbone/Series/Edit/EditSeriesTemplate.html | 2 +- NzbDrone.Backbone/Series/SeriesItemView.js | 2 +- NzbDrone.Core/Datastore/ModelBase.cs | 2 -- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/NzbDrone.Backbone/Calendar/CalendarCollectionView.js b/NzbDrone.Backbone/Calendar/CalendarCollectionView.js index bf1a26fed..76d29df1f 100644 --- a/NzbDrone.Backbone/Calendar/CalendarCollectionView.js +++ b/NzbDrone.Backbone/Calendar/CalendarCollectionView.js @@ -10,7 +10,7 @@ define(['app', 'Calendar/CalendarItemView'], function (app) { calendar: '#calendar' }, - initialize: function (context, collection) { + initialize: function (context, action, query, collection) { this.collection = collection; this.calendar = new NzbDrone.Calendar.CalendarCollection(); }, diff --git a/NzbDrone.Backbone/Controller.js b/NzbDrone.Backbone/Controller.js index d6fb0a0f8..814c25e6a 100644 --- a/NzbDrone.Backbone/Controller.js +++ b/NzbDrone.Backbone/Controller.js @@ -11,7 +11,7 @@ series: function (action, query) { this.setTitle('NzbDrone'); - NzbDrone.mainRegion.show(new NzbDrone.Series.SeriesCollectionView(this, action, query)); + NzbDrone.mainRegion.show(new NzbDrone.Series.SeriesCollectionView()); }, upcoming: function (action, query) { @@ -23,7 +23,7 @@ this.setTitle('Calendar'); var calendarCollection = new NzbDrone.Calendar.CalendarCollection(); calendarCollection.fetch(); - NzbDrone.mainRegion.show(new NzbDrone.Calendar.CalendarCollectionView(this, calendarCollection, action, query)); + NzbDrone.mainRegion.show(new NzbDrone.Calendar.CalendarCollectionView(this, action, query, calendarCollection)); }, notFound: function () { diff --git a/NzbDrone.Backbone/Index.html b/NzbDrone.Backbone/Index.html index abae6de5e..439262bc0 100644 --- a/NzbDrone.Backbone/Index.html +++ b/NzbDrone.Backbone/Index.html @@ -79,6 +79,7 @@
+ diff --git a/NzbDrone.Backbone/MainMenuView.js b/NzbDrone.Backbone/MainMenuView.js index deeeb784d..b11f87ecd 100644 --- a/NzbDrone.Backbone/MainMenuView.js +++ b/NzbDrone.Backbone/MainMenuView.js @@ -8,7 +8,6 @@ 'click a': 'onClick' }, - onClick: function (event) { event.preventDefault(); @@ -38,15 +37,13 @@ }, - setActive: function (element) { this.$('a').removeClass('active'); $(element).addClass('active'); }, - initialize: function () { - console.log('menue'); + console.log('menu'); this.setElement($('#main-menu-region')); } }); diff --git a/NzbDrone.Backbone/Series/Edit/EditSeriesTemplate.html b/NzbDrone.Backbone/Series/Edit/EditSeriesTemplate.html index 91aaf2ec6..18e912943 100644 --- a/NzbDrone.Backbone/Series/Edit/EditSeriesTemplate.html +++ b/NzbDrone.Backbone/Series/Edit/EditSeriesTemplate.html @@ -28,7 +28,7 @@
- {{#each qualityProfiles.models}} {{/each}} diff --git a/NzbDrone.Backbone/Series/SeriesItemView.js b/NzbDrone.Backbone/Series/SeriesItemView.js index 2a38d9470..981194e0a 100644 --- a/NzbDrone.Backbone/Series/SeriesItemView.js +++ b/NzbDrone.Backbone/Series/SeriesItemView.js @@ -34,7 +34,7 @@ define([ editSeries: function () { var view = new NzbDrone.Series.EditSeriesView({ model: this.model}); - NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, { + NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, { view: view }); }, diff --git a/NzbDrone.Core/Datastore/ModelBase.cs b/NzbDrone.Core/Datastore/ModelBase.cs index 807fa5b5d..1b6f3aced 100644 --- a/NzbDrone.Core/Datastore/ModelBase.cs +++ b/NzbDrone.Core/Datastore/ModelBase.cs @@ -7,8 +7,6 @@ namespace NzbDrone.Core.Datastore [DebuggerDisplay("{GetType()} ID = {Id}")] public abstract class ModelBase { - [PetaPoco.Ignore] - [JsonIgnore] public int Id {