From d120a61ccbe0b62b59858e4e81e58a31767dda01 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 21 Aug 2011 23:25:32 -0700 Subject: [PATCH] Series/Details specials grid will be generated like all others. Added images for Episode Status, Ignored status removed Updated SceneNameMappings.csv --- NzbDrone.Core/Repository/Episode.cs | 3 - NzbDrone.Web/Content/Images/Downloading.png | Bin 0 -> 3077 bytes NzbDrone.Web/Content/Images/Missing.png | Bin 0 -> 771 bytes NzbDrone.Web/Content/Images/NotAired.png | Bin 0 -> 1541 bytes NzbDrone.Web/Content/Images/Ready.png | Bin 0 -> 1587 bytes NzbDrone.Web/Controllers/SeriesController.cs | 25 ------- NzbDrone.Web/NzbDrone.Web.csproj | 4 ++ NzbDrone.Web/Views/Series/Details.cshtml | 70 +++++-------------- SceneMappings.csv | 6 +- 9 files changed, 26 insertions(+), 82 deletions(-) create mode 100644 NzbDrone.Web/Content/Images/Downloading.png create mode 100644 NzbDrone.Web/Content/Images/Missing.png create mode 100644 NzbDrone.Web/Content/Images/NotAired.png create mode 100644 NzbDrone.Web/Content/Images/Ready.png 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 0000000000000000000000000000000000000000..63cacfae83f9d8db80ebf2228db57af1ad1f15fd GIT binary patch literal 3077 zcmV+g4EpnlP)KY%5K74EfxC!vrBS@Gxz-OdH(NQF*7m|Kwbj(=5v>V z!E#UV`b@Y#j`gtjdf3bk8tem#+}%(*`&Yju)u}!aUNG^Ex?)B%N!oKm{93!GOdYX1uv=ee{*V z{@{&@t)HA2xm5X+&+LvxFflWpdJ4Dq`1!C@*wXXz`RX5e)2Biw{ZSw|2@p}l0rtxQ z0HpKl4b-5KD2>F=7ee<}zwz+Se=J>~@ySo(Ap-zFMC1?u?b5#jU%&*(b(L)17hUC- zLqsr|hK`!$y8Qdszp(4~nwRAOJn^l!{s8#K+KjgA^29g3c>g~^2EgzC%Y~i5IiS3@ z!N`gi>pBn*g=)ILTTc@}oDeuDgpRH0qU9s=$(Iz04j#}xnkDh0tV@8pJ}vp~}VG8b4X>T~N@X#v8W>k>Pf1=7k^T6`P8L{K%nx2E|o4T2&m zYipWj3RNQ?R&zPR3`4T-&Pm6zfQaC-RyS~xDy2q}&3fhtSYGNb1HmjihXQGU44e=K z4kutHcry|Yepw7@M>>)PoCr?R61T4q(pv}-fkxt~HaxXPvLx51o!$x;(8bswKokhQ zg@FD-NFfSPHL9^^z7|u96|XB}$ZDkR7$5>7jzZuV=#3cORN@nRwovX3IsNu6-nu!% z#9W<9BOz#s1Fm%z4KT%F6a%5u6Ed`}hkZLYaAem;W@`yQ{OP+~9Gzieu13{s+B39? zLEBltA&3~g#el7YeLVTtVM3RZ8i(#1;`BS?oIG`v@!2Y7q~;7QE|BVP2u2|kdW#X8 z%e_4IYs2i@If!!(=Nw0NZQ^hK^9&312DK!~GDdp{v}FO3`KA~Y1L5QMZzc*P;&z-%( zXAcdpm=zJ&y`@a47!U-KQR5j`Btju{9QoBDHkNx=C~uidJ@e{iMknT2s5OWakJk7W)6me2IDIaOh1p-!#C%0ru3V7a7|?=dr`vbDbFU%QF{$1)Idajvxz%x6AtjGoPAespqy z*=mDYqw~tc9b$xX3rN}B)Dl#cM-C0QfUw*hn##X=neV+h!sz7u9aSFg6dxdI$5vC% zq$=i>7tUNk1dbhC2|_Mv#xp;9hnLP>XKZSLnfW^P#Aozadj-#XNyiwWbh$f!yG&Ao z6QPkL%v5TKGydo76)-q?l%`;o6(@1;^GbCco%+RqQ*pY4! zA#mw(cj$y52%78vlC{c7;+dMS@q_atgn{s>{lhqM0L0$&{OQZQa&eT|g*x6Vp%Yvo z0CL(q4X%kAUP+6f4gk@9FMtq+E-Pdr`g;l#qM%8NV0rq3o+v~x&R?5ga<0nWdpF|M z_{sGN#wO!BQ_r5AWj3j~t>W3R@Ik?ATUvfh+IXS`6jK()!@@ zpZFNxeBmt5y>gLy!_$a;TUOAP1vqi^M2@XPB_2O|phfw-6$Z(d{jx#I;>*m->VW0n zivUPd!Ja7O@uLTL?d?&f<|OGZO<9)BaUDfyVy1;u$rPgRZ zfBACzFCwe10}MzEs*MI0M#dSNm}T40`u8!#Mdg-Of6E)A#h>Lp?=?0t%Y~6~s*MJT zdA#{myFgHW;L~4ianhgnSoTui)pw`Zy?rACr5+ZSMwUS!D~XWX1-ti}dBeDJbBcd> z`hU4}V}j}VDvdZfSeH$yjPO8$MpX{3vORXtwK(RYI>>@cUr60z1x&ixdnV!<#ed3 zuaj;c`LOL8c@cPB%#6X`dh$cLX=?J@U%TGiHaGB@KU=wN&H%{^o}8Jvo1Hx`!7?_+ zmh8%Cl_#d3`@810Id|g33E8x1lRWyhXTN2}?=C8=pdPZt&O1WNby6~d#>62KWZ(IT zy!zxno__LkUmPDFx8ui;o18p(a@+j;e18;0JTj=}!;FCRPb>Q8S>t-mxjJ8)%ucKzs7wLCFb zEqOJ!wu-*LIOlXzxo2+sVBhS0n+K*pvTgm$o-O5>AaGt)iy{(>NaUQ0R5koRrSQ#I TXfGu700000NkvXXu0mjfNZsRu literal 0 HcmV?d00001 diff --git a/NzbDrone.Web/Content/Images/Missing.png b/NzbDrone.Web/Content/Images/Missing.png new file mode 100644 index 0000000000000000000000000000000000000000..727fe419e7b4811a3facbd604ae9fce38f28077f GIT binary patch literal 771 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oArNM~bhqvgP>?0v z(btiIVPjv-@4(4GzCyA`kS_y6l_~>6Lo)-z&;LOBB?Ch#(6mgUYnZYWK)%Q-1%wYzmjtT4{jTPbo|Jfgv2As}(SRru3y|0mh(d7j5=Y2}>F}TQvLBOHKra?E#^DE0)8Ga_P&K+H5 zNw$u`$D0`(7z95Z2wtK3q@w9rA3I|MgVHhy)#Jh?g*F@vECL(9GHA|QF#EA1&|r_1 zCptd1NZQJR%sA2_lBM17gLBKJL#^{2w9VOM=2>(e{eGTtc{^*s@`H#E_kjj3^D&VlgW&+cZ>n}vQt}pnuu-Qf79?Oya z3rbAP&VrnDJfNy6+aie3&Q1d8_R9)>_ouP^NC5i3`6hF5!wu$BY!|yXXfkmqOmlq0 zXsK||&qL6Gf%ln&0v7|zg$dt*VZocmFA&NPK> zvASZn3FwZE4>C{Pli>2?00z(k+qnz5_5nR~g86sb2KF*$5X;ozPacPr+>>WgzyPge wFwtAdek8l$$5DZTAKWXV9rO0F2_!J2PHimP`p3Eom|z(^UHx3vIVCg!03GNGasU7T literal 0 HcmV?d00001 diff --git a/NzbDrone.Web/Content/Images/NotAired.png b/NzbDrone.Web/Content/Images/NotAired.png new file mode 100644 index 0000000000000000000000000000000000000000..525de18af121e8c07d394412a5a9e890c64f272d GIT binary patch literal 1541 zcmWkuX;c$e6n>LQNC*%jVM)R^>>#p4BLoDUuxQv!2&h0o1J(uHP(VPyP5@a7#;}Np z1(OKY4GU^pwORs3Fi0zkRTQZRX$6i8RMSGW+Tq82_uTKi^PPL|_q|ssTD!)C%BBJU zOdyWpY#m-Bn+4(+ z01mhSfRz9+{~6Cy0Oa6o(-Hsz8v(G|Q@iQ*Y5+(D5n=rJyr*ferl-@G2x6kClk(^l zx$xdV`g6D6=om<2p?&rs&BFb;Ma4_F6OQJmCnmDxO@^BO(Ug>bGFe1A8eO8E^_7(M z3QHd3N?T%kwlGn!=r7EX{+2NQ8NETv2=KBoC47(vs73ye_#a9>0l_Hwl9k*8EJeB= zkXqC)=ROPuVYK9$;e=p_j+O>tcI}J5JWwp3*d?9wxP)*`pM}R&y)eXpqfT0spb_Ya zT3LDVaS^+|lC{^xZ2^ap!>v18kjJye#9GEcmN9_B?!ZE2gM7j;()KG$4^0Y|9Z0fp#vJVIsX#4?H;h zixY1{Z0~_KzHGh0c(AB5cu-|Q!g)NFb2ywuCYmU1X3!Z8v}IuJ_N~o^?M82uZAHca zUyeZe1EJz1>gkm{XK2~yR50#L>$|l$-29zh*g~8L-MCRg?y9eW+TIR%nY_JUtI{R@C<xWEOR#?;(tD5(TnP zTmw+)UD$ku-K2UH4XP7a+fP@19iE>*EQVIDWa1JybqGJ&pWq#mbs4ocGUZQwrg*y4 zl-1d}R~?o+plZ9ML>0h*YTYq0J+iAj$5bl&WLmXIQF62<&C#Tsm4yw%{Ra1|Iy?vz zBq?W_A5%;_L+(+;z%FOjJW#y07R}mH-$%RAmg%s(6%JK^P~pnKbnXdDpOl;?J`3ud z$WuWmxW6x6ML6qWOw|_*wph6PWUKtEv?SbxbEGrOj@0qpRb!bjg5X`+F7NmazwTm6eiW7QD(~H!6iR+c^ z;SkHXf>=F3L8rXt?;&~L7DdDwRywhpbhe=_08kKDs*ULm zSM1+T@4=;ZT$@WxRHcxM&axk?tVI#rGn6}veMql_A?mVNA8 z1U~p!#PIMDGKdtU zT1??SB@h=-hgs%;|7$PbDA51?>XaE2J literal 0 HcmV?d00001 diff --git a/NzbDrone.Web/Content/Images/Ready.png b/NzbDrone.Web/Content/Images/Ready.png new file mode 100644 index 0000000000000000000000000000000000000000..48fad15518a73767b5d9d74ca2da12a004fce4b3 GIT binary patch literal 1587 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq zxP?HN@zUM8KR`i=64!{5;QX|b^2DN42FH~Aq*MjB%%art{G#k)|IPA#Kyw5^Y9f4n ztdjF{^%6l!^eS=-7;Nk-3KEmEQ%e+*Qqwc@Y?Txg6qFP)Q*4#OO??e~3!GCkGCit_ zQiH4fLXxYplPyz}?CrR0Dy)E-b5lza6)JLb@`|l0Y?Z)fS^?Q0VSOb9u#%E&TP28l zB76fBob!uP6-@LDb(0N@O%zPb^o-1nEX~by6oL~=6uc7i6pYLjj0_Bbgprl8IS>II z0|rWVTtM2UC?(A*$i)q6Cy-~Wlu=SrV5P5LUS6(OZmgGIl&)`RX=$l%V5DzkqzhD` zTU?n}l31aeSF8*%1ZIv)YH@N=WKgSL&Iux9Pjcq_WQ4}F;Md(j;Ni0dV zGcqtV&^0vFHM9sZGPE)VB8w;_{SZZH+I{m=GSezCv>RC&SX!AFK(!+&f@-(X2L%LD zz<@&?(7LIIYN3=gk@(xM!2w4@~Kr{<*QrskCt1H;S^HOx|ytwq$-TLNG z#b(27epUF1s`!CYmOl*Phm3M9T~@r5FkSXMn{x^CRsT}k%cp;F_m>keI){K59@*R7cO|BJWQwl3P2%e!S) zp`E=`F9%~)3bzg8^Ito*mVWuF%J;g#BvDpk)&{(); - - 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{