diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Repository/Episode.cs index be18a06d2..8def90bc1 100644 --- a/NzbDrone.Core/Repository/Episode.cs +++ b/NzbDrone.Core/Repository/Episode.cs @@ -37,15 +37,12 @@ namespace NzbDrone.Core.Repository { get { - if (EpisodeFileId != 0) return EpisodeStatusType.Ready; if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now) { return EpisodeStatusType.Downloading; } - - if (Ignored) return EpisodeStatusType.Ignored; if (AirDate != null && AirDate.Value.Date < DateTime.Now) { diff --git a/NzbDrone.Web/Content/Images/Downloading.png b/NzbDrone.Web/Content/Images/Downloading.png new file mode 100644 index 000000000..63cacfae8 Binary files /dev/null and b/NzbDrone.Web/Content/Images/Downloading.png differ diff --git a/NzbDrone.Web/Content/Images/Missing.png b/NzbDrone.Web/Content/Images/Missing.png new file mode 100644 index 000000000..727fe419e Binary files /dev/null and b/NzbDrone.Web/Content/Images/Missing.png differ diff --git a/NzbDrone.Web/Content/Images/NotAired.png b/NzbDrone.Web/Content/Images/NotAired.png new file mode 100644 index 000000000..525de18af Binary files /dev/null and b/NzbDrone.Web/Content/Images/NotAired.png differ diff --git a/NzbDrone.Web/Content/Images/Ready.png b/NzbDrone.Web/Content/Images/Ready.png new file mode 100644 index 000000000..48fad1551 Binary files /dev/null and b/NzbDrone.Web/Content/Images/Ready.png differ diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index aaec2aadf..afb598f82 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -47,31 +47,6 @@ namespace NzbDrone.Web.Controllers return View(); } - public ActionResult SeasonEditor(int seriesId) - { - var model = new List(); - - var seasons = _episodeProvider.GetSeasons(seriesId); - - foreach (var season in seasons) - { - var seasonEdit = new SeasonEditModel(); - seasonEdit.Monitored = !_episodeProvider.IsIgnored(seriesId, season); - seasonEdit.SeasonNumber = season; - seasonEdit.SeriesId = seriesId; - seasonEdit.SeasonString = GetSeasonString(season); - - model.Add(seasonEdit); - } - - return View(model); - } - - public ActionResult GetSingleSeasonView(SeasonEditModel model) - { - return PartialView("SingleSeason", model); - } - [GridAction] public ActionResult _AjaxSeriesGrid() { diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index ca5f77003..c281c7da7 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -136,8 +136,12 @@ + + + + diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml index 2368ed200..d221aec72 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -30,16 +30,7 @@ } .seasonToggleTop - { - @*float: left; - border-width: 1px; - border-style: solid; - border-color: grey; - margin: 5px; - padding: 3px; - padding-top: 0px; - padding-bottom: 0px;*@ - + { background-color: #F1EDED; background-position: 5px center; background-repeat: no-repeat; @@ -61,6 +52,12 @@ padding-right: 0px; margin-bottom: -4px; } + + .statusImage + { + width: 18px; + height: 18px; + } @section ActionMenu{ @@ -84,13 +81,15 @@ } - @foreach (var s in Model.Seasons.Where(s => s > 0).Reverse()) + @foreach (var s in Model.Seasons.Reverse()) { var seriesId = @Model.SeriesId; var season = s;

- Season @season

+ @(season == 0 ? "Specials" : "Season " + season) + +
@{ Html.Telerik().Grid().Name("seasons_" + season) @@ -98,9 +97,9 @@ .Columns(columns => { columns.Bound(o => o.Ignored) - .Title("") + .Title("") .ClientTemplate( - "") + "") .Width(20) .HtmlAttributes(new { style = "text-align:center" }); @@ -108,7 +107,10 @@ columns.Bound(c => c.Title).Title("Title"); columns.Bound(c => c.AirDate).Width(0); columns.Bound(c => c.Quality).Width(0); - columns.Bound(c => c.Status).Width(0); + columns.Bound(c => c.Status) + .ClientTemplate("<#= Status #>") + .Width(20) + .HtmlAttributes(new { style = "text-align:center" }); columns.Bound(o => o.EpisodeId).Title("") .ClientTemplate("\" onclick=\"searchForEpisode('<#= EpisodeId #>'); return false;\">Search" + " | " + @@ -136,44 +138,6 @@ .Render();}
} - @if (Model.Seasons.Any(s => s == 0)) - { -
-

- Specials

-
- @{Html.Telerik().Grid().Name("seasons_0") - .TableHtmlAttributes(new { @class = "Grid" }) - .Columns(columns => - { - columns.Bound(o => o.Ignored) - .Title("") - .ClientTemplate( - "") - .Width(20) - .HtmlAttributes(new { style = "text-align:center" }); - - columns.Bound(c => c.EpisodeNumber).Width(10).Title("Episode"); - columns.Bound(c => c.Title).Title("Title").Width(10000); - columns.Bound(c => c.AirDate).Width(10); - columns.Bound(c => c.Quality).Width(10); - columns.Bound(c => c.Status).Width(10); - }) - .DetailView(detailView => detailView.ClientTemplate("
<#= Overview #>
<#= Path #>
")) - .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(false)) - .Footer(true) - .DataBinding( - d => - d.Ajax().Select("_AjaxSeasonGrid", "Series", - new RouteValueDictionary { { "seriesId", Model.SeriesId }, { "seasonNumber", 0 } })) - .ClientEvents(clientEvents => - { - clientEvents.OnRowDataBound("grid_rowBound"); - clientEvents.OnDataBound("grid_dataBound"); - }) - .Render(); } -
- } } @section Scripts{