Fixed airdate parsing. Fixed minor UI issues

This commit is contained in:
Mark McDowall 2013-05-13 20:21:37 -07:00
commit e6183b1f83
11 changed files with 31 additions and 65 deletions

View file

@ -42,13 +42,7 @@ define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
settings: function (action) {
this._setTitle('Settings');
var settingsModel = new NzbDrone.Settings.SettingsModel();
settingsModel.fetch({
success: function (settings) {
NzbDrone.mainRegion.show(new NzbDrone.Settings.SettingsLayout({settings: settings, action: action}));
}
});
NzbDrone.mainRegion.show(new NzbDrone.Settings.SettingsLayout({action: action}));
},
missing: function () {

View file

@ -20,7 +20,7 @@
</div>
</div>
<div class="row">
<a href="/series/details/{{id}}" target="_blank">
<a href="/series/details/{{id}}">
<div class="span10">
{{overview}}
</div>
@ -33,11 +33,11 @@
{{#if bestDateString}}
<span class="label">{{bestDateString}}</span>
{{else}}
<span class="label label-inverse">{{status}}</span>
<span class="label label-inverse">Continuing</span>
{{/if}}
<span class="label label-info">Season {{seasonCount}}</span>
{{else}}
<span class="label label-important">{{status}}</span>
<span class="label label-important">Ended</span>
<span class="label label-info">{{seasonCount}} Seasons</span>
{{/if}}
</div>

View file

@ -4,15 +4,13 @@
<div class="center">
<div class="series-poster-container x-series-poster">
<div class="series-controls">
<!--<div class="pull-right">-->
<i class="icon-cog x-edit" title="Edit Series"></i>
<i class="icon-remove x-remove" title="Delete Series"></i>
<!--</div>-->
<i class="icon-cog x-edit" title="Edit Series"></i>
<i class="icon-remove x-remove" title="Delete Series"></i>
</div>
{{#unless isContinuing}}
<div class="ended-banner">Ended</div>
{{/unless}}
<a href="/series/details/{{titleSlug}}" target="_blank">
<a href="/series/details/{{titleSlug}}">
<img class="series-poster img-polaroid" src="{{poster}}">
</a>
</div>
@ -26,7 +24,7 @@
{{#if bestDateString}}
<span class="label label-inverse air-date" title="{{shortDate}}">{{bestDateString}}</span>
{{else}}
<span class="label label-inverse">{{status}}</span>
<span class="label label-inverse">Continuing</span>
{{/if}}
<span class="label label-info">Season {{seasonCount}}</span>
{{else}}

View file

@ -10,7 +10,7 @@ Backgrid.SeriesStatusCell = Backgrid.Cell.extend({
if (!monitored) {
this.$el.html('<i class="icon-pause grid-icon" title="Not Monitored"></i>');
}
else if (status === 0) {
else if (status === 'continuing') {
this.$el.html('<i class="icon-play grid-icon" title="Continuing"></i>');
}

View file

@ -75,8 +75,5 @@ define([
throw "unknown download client id" + clientId;
}
}
});
});

View file

@ -21,8 +21,6 @@
</div>
</div>
{{debug}}
{{#each fields}}
<div class="control-group">
<label class="control-label">{{label}}</label>

View file

@ -108,7 +108,9 @@ define([
},
initialize: function (options) {
this.settings = options.settings;
this.settings = new NzbDrone.Settings.SettingsModel();
this.settings.fetch();
this.namingSettings = new NzbDrone.Settings.Naming.NamingModel();
this.namingSettings.fetch();