Minor UI tweaks

pull/4/head
Mark McDowall 12 years ago
parent c935db93dd
commit a80c2fb1f3

@ -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();
},

@ -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 () {

@ -79,6 +79,7 @@
<div class="span12" id="notification-region" />
</div>
<div class="span12" id="main-region"></div>
<div id="modal-region"></div>
</div>
</div>
</div>

@ -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'));
}
});

@ -28,7 +28,7 @@
<label class="control-label" for="inputQualityProfile">Quality Profile</label>
<div class="controls">
<select class="x-quality-profile" name="qualityProfileId">
<select class="x-quality-profile" id="inputQualityProfile" name="qualityProfileId">
{{#each qualityProfiles.models}}
<option value="{{id}}">{{attributes.name}}</option>
{{/each}}

@ -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
});
},

@ -7,8 +7,6 @@ namespace NzbDrone.Core.Datastore
[DebuggerDisplay("{GetType()} ID = {Id}")]
public abstract class ModelBase
{
[PetaPoco.Ignore]
[JsonIgnore]
public int Id
{

Loading…
Cancel
Save