diff --git a/NzbDrone.Web/Content/Images/Ready.png b/NzbDrone.Web/Content/Images/Ready.png index 48fad15518..8501a8b586 100644 Binary files a/NzbDrone.Web/Content/Images/Ready.png and b/NzbDrone.Web/Content/Images/Ready.png differ diff --git a/NzbDrone.Web/Content/Images/redownload.png b/NzbDrone.Web/Content/Images/redownload.png new file mode 100644 index 0000000000..77e12d1c6a Binary files /dev/null and b/NzbDrone.Web/Content/Images/redownload.png differ diff --git a/NzbDrone.Web/Content/Images/settings.png b/NzbDrone.Web/Content/Images/settings.png index 4dd1b83a6a..6587d5bc38 100644 Binary files a/NzbDrone.Web/Content/Images/settings.png and b/NzbDrone.Web/Content/Images/settings.png differ diff --git a/NzbDrone.Web/Controllers/CommandController.cs b/NzbDrone.Web/Controllers/CommandController.cs index 64a722ce74..147a896f1f 100644 --- a/NzbDrone.Web/Controllers/CommandController.cs +++ b/NzbDrone.Web/Controllers/CommandController.cs @@ -47,15 +47,11 @@ public JsonResult RecentBacklogSearch() return JsonNotificationResult.Info("Queued"); } - public JsonResult ScanDisk(int seriesId) - { - _jobProvider.QueueJob(typeof(DiskScanJob), seriesId); - return JsonNotificationResult.Info("Queued"); - } - - public JsonResult UpdateInfo(int seriesId) + public JsonResult ForceRefresh(int seriesId) { _jobProvider.QueueJob(typeof(UpdateInfoJob), seriesId); + _jobProvider.QueueJob(typeof(DiskScanJob), seriesId); + return JsonNotificationResult.Info("Queued"); } diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 36f2a14a38..7840b37d03 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -154,6 +154,8 @@ + + @@ -501,6 +503,7 @@ + diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml index c9c9cbee49..d72436a419 100644 --- a/NzbDrone.Web/Views/History/Index.cshtml +++ b/NzbDrone.Web/Views/History/Index.cshtml @@ -1,6 +1,4 @@ @model String -@using NzbDrone.Common -@using NzbDrone.Web.Models @using NzbDrone.Web.Helpers @{ViewBag.Title = "History";} @section ActionMenu{ @@ -65,7 +63,7 @@ "sPaginationType": "four_button", "aoColumns": [ { sWidth: '20px', "bSortable": false, "mDataProp": "Indexer", "fnRender": function (row) { - return "\"""; + return " + row.aData["; } }, //Image { sWidth: 'auto', "mDataProp": "SeriesTitle" }, //Series Title @@ -83,7 +81,7 @@ }, //Date { sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "fnRender": function (row) { var deleteImage = "\"Delete\""; - var redownloadImage = "\"Redownload\""; + var redownloadImage = "\"Redownload\""; return deleteImage + redownloadImage; } diff --git a/NzbDrone.Web/Views/Missing/Index.cshtml b/NzbDrone.Web/Views/Missing/Index.cshtml index 44d587b3f8..82335d3a30 100644 --- a/NzbDrone.Web/Views/Missing/Index.cshtml +++ b/NzbDrone.Web/Views/Missing/Index.cshtml @@ -31,9 +31,9 @@ AirDate @*Commands Column*@ - - Actions - + + + @*Details Column*@ Details diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml index 7bfa0c0d05..6a00c9371d 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -67,11 +67,10 @@ @section ActionMenu { } diff --git a/NzbDrone.Web/Views/Series/Episode.cshtml b/NzbDrone.Web/Views/Series/Episode.cshtml index 9cd2a71276..1916f8a93c 100644 --- a/NzbDrone.Web/Views/Series/Episode.cshtml +++ b/NzbDrone.Web/Views/Series/Episode.cshtml @@ -25,8 +25,8 @@ @*Commands Column*@ - @Model.Status @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridImage" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null) + @Model.Status diff --git a/NzbDrone.Web/Views/Series/Season.cshtml b/NzbDrone.Web/Views/Series/Season.cshtml index 1e7ff14449..fba2a95223 100644 --- a/NzbDrone.Web/Views/Series/Season.cshtml +++ b/NzbDrone.Web/Views/Series/Season.cshtml @@ -11,7 +11,7 @@ - + @@ -23,7 +23,6 @@ @*Commands Column*@ - Status @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for all episodes in this season", @class = "gridImage" }, "SearchSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null) @Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename all episodes in this season", @class = "gridImage" }, "RenameSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null) diff --git a/NzbDrone.Web/Views/Shared/NoSeriesBanner.cshtml b/NzbDrone.Web/Views/Shared/NoSeriesBanner.cshtml new file mode 100644 index 0000000000..9886aab576 --- /dev/null +++ b/NzbDrone.Web/Views/Shared/NoSeriesBanner.cshtml @@ -0,0 +1,2 @@ + +
It looks like you haven't added any series to NzbDrone. @Html.ActionLink("Click here to add one.", "Index", "AddSeries")
\ No newline at end of file