Minor UI tweaks
This commit is contained in:
parent
c935db93dd
commit
a80c2fb1f3
|
@ -10,7 +10,7 @@ define(['app', 'Calendar/CalendarItemView'], function (app) {
|
||||||
calendar: '#calendar'
|
calendar: '#calendar'
|
||||||
},
|
},
|
||||||
|
|
||||||
initialize: function (context, collection) {
|
initialize: function (context, action, query, collection) {
|
||||||
this.collection = collection;
|
this.collection = collection;
|
||||||
this.calendar = new NzbDrone.Calendar.CalendarCollection();
|
this.calendar = new NzbDrone.Calendar.CalendarCollection();
|
||||||
},
|
},
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
series: function (action, query) {
|
series: function (action, query) {
|
||||||
this.setTitle('NzbDrone');
|
this.setTitle('NzbDrone');
|
||||||
NzbDrone.mainRegion.show(new NzbDrone.Series.SeriesCollectionView(this, action, query));
|
NzbDrone.mainRegion.show(new NzbDrone.Series.SeriesCollectionView());
|
||||||
},
|
},
|
||||||
|
|
||||||
upcoming: function (action, query) {
|
upcoming: function (action, query) {
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
this.setTitle('Calendar');
|
this.setTitle('Calendar');
|
||||||
var calendarCollection = new NzbDrone.Calendar.CalendarCollection();
|
var calendarCollection = new NzbDrone.Calendar.CalendarCollection();
|
||||||
calendarCollection.fetch();
|
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 () {
|
notFound: function () {
|
||||||
|
|
|
@ -79,6 +79,7 @@
|
||||||
<div class="span12" id="notification-region" />
|
<div class="span12" id="notification-region" />
|
||||||
</div>
|
</div>
|
||||||
<div class="span12" id="main-region"></div>
|
<div class="span12" id="main-region"></div>
|
||||||
|
<div id="modal-region"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
'click a': 'onClick'
|
'click a': 'onClick'
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
onClick: function (event) {
|
onClick: function (event) {
|
||||||
|
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
@ -38,15 +37,13 @@
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
setActive: function (element) {
|
setActive: function (element) {
|
||||||
this.$('a').removeClass('active');
|
this.$('a').removeClass('active');
|
||||||
$(element).addClass('active');
|
$(element).addClass('active');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
initialize: function () {
|
initialize: function () {
|
||||||
console.log('menue');
|
console.log('menu');
|
||||||
this.setElement($('#main-menu-region'));
|
this.setElement($('#main-menu-region'));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<label class="control-label" for="inputQualityProfile">Quality Profile</label>
|
<label class="control-label" for="inputQualityProfile">Quality Profile</label>
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
|
|
||||||
<select class="x-quality-profile" name="qualityProfileId">
|
<select class="x-quality-profile" id="inputQualityProfile" name="qualityProfileId">
|
||||||
{{#each qualityProfiles.models}}
|
{{#each qualityProfiles.models}}
|
||||||
<option value="{{id}}">{{attributes.name}}</option>
|
<option value="{{id}}">{{attributes.name}}</option>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
|
|
|
@ -34,7 +34,7 @@ define([
|
||||||
editSeries: function () {
|
editSeries: function () {
|
||||||
var view = new NzbDrone.Series.EditSeriesView({ model: this.model});
|
var view = new NzbDrone.Series.EditSeriesView({ model: this.model});
|
||||||
|
|
||||||
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
|
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
|
||||||
view: view
|
view: view
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
@ -7,8 +7,6 @@ namespace NzbDrone.Core.Datastore
|
||||||
[DebuggerDisplay("{GetType()} ID = {Id}")]
|
[DebuggerDisplay("{GetType()} ID = {Id}")]
|
||||||
public abstract class ModelBase
|
public abstract class ModelBase
|
||||||
{
|
{
|
||||||
[PetaPoco.Ignore]
|
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public int Id
|
public int Id
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue