From 9a006fc702b0b61921629aef277b1fcc264b5b78 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 11 Oct 2012 00:46:38 -0700 Subject: [PATCH] Font-Awesomed System --- NzbDrone.Core/Providers/StatsProvider.cs | 4 ++-- NzbDrone.Web/Content/Grid.css | 4 ++++ NzbDrone.Web/Views/System/Jobs.cshtml | 3 +-- NzbDrone.Web/Views/System/Stats.cshtml | 2 -- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NzbDrone.Core/Providers/StatsProvider.cs b/NzbDrone.Core/Providers/StatsProvider.cs index 24d44fbb9..f5ecbed09 100644 --- a/NzbDrone.Core/Providers/StatsProvider.cs +++ b/NzbDrone.Core/Providers/StatsProvider.cs @@ -27,7 +27,7 @@ public virtual StatsModel GetStats() { var series = _database.Fetch(); var episodes = _database.Fetch(); - var history = _database.Fetch("WHERE Date <= @0", DateTime.Today.AddDays(-30)); + var history = _database.Fetch("WHERE Date >= @0", DateTime.Today.AddDays(-30)); var stats = new StatsModel(); stats.SeriesTotal = series.Count; @@ -37,7 +37,7 @@ public virtual StatsModel GetStats() stats.EpisodesOnDisk = episodes.Count(e => e.EpisodeFileId > 0); stats.EpisodesMissing = episodes.Count(e => e.Ignored == false && e.EpisodeFileId == 0); stats.DownloadedLastMonth = history.Count; - stats.DownloadLastWeek = history.Count(h => h.Date <= DateTime.Today.AddDays(7)); + stats.DownloadLastWeek = history.Count(h => h.Date >= DateTime.Today.AddDays(-7)); return stats; } diff --git a/NzbDrone.Web/Content/Grid.css b/NzbDrone.Web/Content/Grid.css index b2d30e44e..d464bea98 100644 --- a/NzbDrone.Web/Content/Grid.css +++ b/NzbDrone.Web/Content/Grid.css @@ -58,6 +58,10 @@ display: none; } +.dataTable tr { + line-height: 25px; +} + /* Colour alternating rows */ .seriesTable .alt-row { diff --git a/NzbDrone.Web/Views/System/Jobs.cshtml b/NzbDrone.Web/Views/System/Jobs.cshtml index e21a6d74e..80238acbb 100644 --- a/NzbDrone.Web/Views/System/Jobs.cshtml +++ b/NzbDrone.Web/Views/System/Jobs.cshtml @@ -2,7 +2,6 @@ @model string @{ViewBag.Title = "Jobs";} -
@@ -68,7 +67,7 @@ if (!row.aData["Enable"]) return ""; - var link = '@Ajax.ImageActionLink("../../Content/Images/Gear.png", new { title = "Run Job", alt = "Job", @class = "gridAction" }, "RunJob", "System", new { typeName = "REPLACE" }, null, null)'; + var link = '@Ajax.IconActionLink("icon-cog gridAction", "", "RunJob", "System", new { typeName = "REPLACE" }, null, new { title = "Run Job" })'; link = link.replace("REPLACE", row.aData["TypeName"]); return link; } diff --git a/NzbDrone.Web/Views/System/Stats.cshtml b/NzbDrone.Web/Views/System/Stats.cshtml index 4c59e82bc..72d6288e1 100644 --- a/NzbDrone.Web/Views/System/Stats.cshtml +++ b/NzbDrone.Web/Views/System/Stats.cshtml @@ -14,8 +14,6 @@ } -

Stats

- @Html.LabelFor(m => m.SeriesTotal): @Html.DisplayTextFor(m => m.SeriesTotal)