diff --git a/NzbDrone.Core/Model/IndexerType.cs b/NzbDrone.Core/Model/IndexerType.cs index 2d4d6dcd9f..27427810ca 100644 --- a/NzbDrone.Core/Model/IndexerType.cs +++ b/NzbDrone.Core/Model/IndexerType.cs @@ -7,7 +7,7 @@ namespace NzbDrone.Core.Model { public enum IndexerType { - Other = 0, + Unknown = 0, NzbsOrg = 1, NzbMatrix = 2, NzbsRus = 3, diff --git a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs index 9a88bbfc6c..2e65dd060f 100644 --- a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs +++ b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs @@ -251,7 +251,7 @@ protected virtual EpisodeParseResult CustomParser(SyndicationItem item, EpisodeP /// IndexerType Enum protected virtual IndexerType GetIndexerType() { - return IndexerType.Other; + return IndexerType.Unknown; } private bool InHistory(IList episodes, EpisodeParseResult parseResult, SyndicationItem feedItem) diff --git a/NzbDrone.Web/Content/Images/Newzbin.png b/NzbDrone.Web/Content/Images/Newzbin.png new file mode 100644 index 0000000000..66ebe4329e Binary files /dev/null and b/NzbDrone.Web/Content/Images/Newzbin.png differ diff --git a/NzbDrone.Web/Content/Images/NzbMatrix.png b/NzbDrone.Web/Content/Images/NzbMatrix.png new file mode 100644 index 0000000000..95c561e45d Binary files /dev/null and b/NzbDrone.Web/Content/Images/NzbMatrix.png differ diff --git a/NzbDrone.Web/Content/Images/NzbsOrg.png b/NzbDrone.Web/Content/Images/NzbsOrg.png new file mode 100644 index 0000000000..36e68a30f1 Binary files /dev/null and b/NzbDrone.Web/Content/Images/NzbsOrg.png differ diff --git a/NzbDrone.Web/Content/Images/NzbsRus.png b/NzbDrone.Web/Content/Images/NzbsRus.png new file mode 100644 index 0000000000..ed22b8ee48 Binary files /dev/null and b/NzbDrone.Web/Content/Images/NzbsRus.png differ diff --git a/NzbDrone.Web/Content/Images/Unknown.png b/NzbDrone.Web/Content/Images/Unknown.png new file mode 100644 index 0000000000..7ac1ae7b69 Binary files /dev/null and b/NzbDrone.Web/Content/Images/Unknown.png differ diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs index 7af54721ba..0148e3837e 100644 --- a/NzbDrone.Web/Controllers/HistoryController.cs +++ b/NzbDrone.Web/Controllers/HistoryController.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Web.Mvc; +using NzbDrone.Core.Model; using NzbDrone.Core.Providers; using NzbDrone.Web.Models; using Telerik.Web.Mvc; @@ -53,11 +54,10 @@ public ActionResult _AjaxBinding() NzbTitle = h.NzbTitle, Quality = h.Quality.ToString(), IsProper = h.IsProper, - Date = h.Date + Date = h.Date, + Indexer = h.Indexer.ToString() }); - history.ToList(); - return View(new GridModel(history)); } } diff --git a/NzbDrone.Web/Models/HistoryModel.cs b/NzbDrone.Web/Models/HistoryModel.cs index be5e6fd3fc..3a87cb8df6 100644 --- a/NzbDrone.Web/Models/HistoryModel.cs +++ b/NzbDrone.Web/Models/HistoryModel.cs @@ -1,4 +1,5 @@ using System; +using NzbDrone.Core.Model; namespace NzbDrone.Web.Models { @@ -14,5 +15,6 @@ public class HistoryModel public string Quality { get; set; } public DateTime Date { get; set; } public bool IsProper { get; set; } + public string Indexer { get; set; } } } \ No newline at end of file diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml index 7dd4958c4b..91a4a17b8d 100644 --- a/NzbDrone.Web/Views/History/Index.cshtml +++ b/NzbDrone.Web/Views/History/Index.cshtml @@ -15,11 +15,15 @@ History .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => { + columns.Bound(c => c.Indexer) + .ClientTemplate("
<#= Indexer #>
") + .Title("") + .Width(20); columns.Bound(c => c.SeriesTitle).Title("Series Name"); columns.Bound(c => c.SeasonNumber).Title("Season").Width(1); columns.Bound(c => c.EpisodeNumber).Title("Episode").Width(1); columns.Bound(c => c.EpisodeTitle).Title("Episode Title"); - columns.Bound(c => c.Quality).Title("Quality").Width(10); + columns.Bound(c => c.Quality).Title("Quality").Width(50); columns.Bound(c => c.Date).Title("Grabbed on"); }) .DetailView(detailView => detailView.ClientTemplate(