From f8ae95d36f54f5815156c72c22d8e39e5b294554 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 10 Sep 2011 16:01:15 -0700 Subject: [PATCH] Banner is now shown on Details view. --- .gitignore | 3 ++- NzbDrone.Web/Controllers/SeriesController.cs | 1 + NzbDrone.Web/Models/SeriesModel.cs | 1 + NzbDrone.Web/Views/Series/Details.cshtml | 26 ++++++++++++++++++-- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9cec3fceb..05b52a64e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ _ReSharper*/ *.db *Web.Publish.xml NzbDrone.Web/NzbDrone.Web.Publish.xml -*.sdf \ No newline at end of file +*.sdf +[Bb]anners \ No newline at end of file diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 285e091a6..713e7ad1d 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -152,6 +152,7 @@ namespace NzbDrone.Web.Controllers model.Seasons = _episodeProvider.GetSeasons(seriesId); model.Title = series.Title; model.SeriesId = series.SeriesId; + model.HasBanner = !String.IsNullOrEmpty(series.BannerUrl); return View(model); } diff --git a/NzbDrone.Web/Models/SeriesModel.cs b/NzbDrone.Web/Models/SeriesModel.cs index 66d3d18d8..7df0d4c5a 100644 --- a/NzbDrone.Web/Models/SeriesModel.cs +++ b/NzbDrone.Web/Models/SeriesModel.cs @@ -20,6 +20,7 @@ namespace NzbDrone.Web.Models public string QualityProfileName { get; set; } public string Overview { get; set; } public int Episodes { get; set; } + public bool HasBanner { get; set; } public IList Seasons { get; set; } diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml index 257b16a7b..b3302bcf0 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -1,5 +1,4 @@ -@model NzbDrone.Web.Models.SeriesModel -@using NzbDrone.Core.Repository +@model SeriesModel @using NzbDrone.Web.Models @section TitleContent{ @Model.Title @@ -79,6 +78,18 @@ { line-height: 1.5em; } + + #banner-container + { + + width: 758px; + height: 140px; + padding: 0px; + margin-top: 10px; + margin-bottom: 15px; + margin-left: auto; + margin-right: auto; + } @section ActionMenu{ @@ -91,6 +102,17 @@ } @section MainContent{ +
@foreach (var season in Model.Seasons)