From 4d4a8198eb45abaade88cfcc0ce3bd85a8d98f0c Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Fri, 24 Sep 2010 00:14:42 -0700 Subject: [PATCH] fixed show grid, added details page --- .../Controllers/ISeriesController.cs | 1 + NzbDrone.Core/Controllers/SeriesController.cs | 17 ++- NzbDrone.Core/Repository/Series.cs | 6 +- NzbDrone.Web/Bin/NzbDrone.Core.dll | Bin 13312 -> 13312 bytes NzbDrone.Web/Bin/NzbDrone.Core.pdb | Bin 30208 -> 30208 bytes NzbDrone.Web/Bin/NzbDrone.Web.dll | Bin 21504 -> 21504 bytes NzbDrone.Web/Bin/NzbDrone.Web.pdb | Bin 38400 -> 38400 bytes NzbDrone.Web/Controllers/SeriesController.cs | 4 +- .../Controllers/SettingsController.cs | 5 +- NzbDrone.Web/NzbDrone.Web.csproj | 1 + NzbDrone.Web/Views/Series/Details.aspx | 45 ++++++ NzbDrone.Web/Views/Series/index.aspx | 54 ++----- NzbDrone.Web/Views/Settings/Index.aspx | 2 +- NzbDrone.Web/Views/Shared/Site.Master | 2 +- NzbDrone.Web/Web.config | 133 +++++++++--------- 15 files changed, 153 insertions(+), 117 deletions(-) create mode 100644 NzbDrone.Web/Views/Series/Details.aspx diff --git a/NzbDrone.Core/Controllers/ISeriesController.cs b/NzbDrone.Core/Controllers/ISeriesController.cs index 25c620d05..2e2d46fe7 100644 --- a/NzbDrone.Core/Controllers/ISeriesController.cs +++ b/NzbDrone.Core/Controllers/ISeriesController.cs @@ -6,6 +6,7 @@ namespace NzbDrone.Core.Controllers public interface ISeriesController { IQueryable GetSeries(); + Series GetSeries(int tvdbId); void SyncSeriesWithDisk(); } } \ No newline at end of file diff --git a/NzbDrone.Core/Controllers/SeriesController.cs b/NzbDrone.Core/Controllers/SeriesController.cs index bb19b1c76..cf210ad9d 100644 --- a/NzbDrone.Core/Controllers/SeriesController.cs +++ b/NzbDrone.Core/Controllers/SeriesController.cs @@ -32,16 +32,23 @@ namespace NzbDrone.Core.Controllers return _sonioRepo.All(); } + public Series GetSeries(int tvdbId) + { + return _sonioRepo.Single(s=> s.TvdbId == tvdbId); + } + + + public void SyncSeriesWithDisk() { foreach (string seriesFolder in _diskController.GetDirectories(_config.SeriesRoot)) { - var dirInfo = new DirectoryInfo(seriesFolder); - if (!_sonioRepo.Exists(s => s.Path == _diskController.CleanPath(dirInfo.FullName))) + var cleanPath =_diskController.CleanPath(new DirectoryInfo(seriesFolder).FullName); + if (!_sonioRepo.Exists(s => s.Path == cleanPath)) { - _logger.InfoFormat("Folder '{0} isn't mapped to a series in the database. Trying to map it.'", seriesFolder); - AddShow(seriesFolder); + _logger.InfoFormat("Folder '{0} isn't mapped to a series in the database. Trying to map it.'", cleanPath); + AddShow(cleanPath); } } @@ -60,7 +67,7 @@ namespace NzbDrone.Core.Controllers private void AddShow(string path, TvdbSeries series) { - _sonioRepo.Add(new Series { Id = series.Id, SeriesName = series.SeriesName, AirTimes = series.AirsTime, AirsDayOfWeek = series.AirsDayOfWeek, Overview = series.Overview, Status = series.Status, Language = series.Language.Name, Path = path }); + _sonioRepo.Add(new Series { TvdbId = series.Id, SeriesName = series.SeriesName, AirTimes = series.AirsTime, AirsDayOfWeek = series.AirsDayOfWeek, Overview = series.Overview, Status = series.Status, Language = series.Language.Abbriviation, Path = path }); } } } \ No newline at end of file diff --git a/NzbDrone.Core/Repository/Series.cs b/NzbDrone.Core/Repository/Series.cs index 689e11cb9..e39853b80 100644 --- a/NzbDrone.Core/Repository/Series.cs +++ b/NzbDrone.Core/Repository/Series.cs @@ -1,10 +1,12 @@ using System; +using SubSonic.SqlGeneration.Schema; namespace NzbDrone.Core.Repository { public class Series { - public int Id + [SubSonicPrimaryKey] + public int TvdbId { get; set; @@ -22,6 +24,7 @@ namespace NzbDrone.Core.Repository set; } + [SubSonicLongString] public string Overview { get; @@ -51,5 +54,6 @@ namespace NzbDrone.Core.Repository get; set; } + } } diff --git a/NzbDrone.Web/Bin/NzbDrone.Core.dll b/NzbDrone.Web/Bin/NzbDrone.Core.dll index 258c4cf37f969fab69dfb7fbc2485f8541c3fdb5..79d52d4caa83f642c3cd5cada1d3862a7d689fb5 100644 GIT binary patch delta 4546 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 diff --git a/NzbDrone.Web/Bin/NzbDrone.Core.pdb b/NzbDrone.Web/Bin/NzbDrone.Core.pdb index d5a2c29ead1dbab7334eb142dd02bc50b401ef87..7b86f2d5833e4c17f1f8db406e809fb84a02122c 100644 GIT binary patch delta 3009 zcmZuze^AuN72o~(y_3UJ?|?hRv{1q?IQNhtsr51Az4m`|t=|3{K5Y+ap$(@kDWz~4 z0F{F(K$W2Fpfc@2_IhqQWxyEilxEHOf}36{$Q}Omf$KbutiGSC3Fp>)OMBP1hnqHD zn|KGrCmTT(*h3sAX4%X%ll2x1@ow=9eM z=$VQvS}6DPLVDhtVcZ5usY*Zf=I~M)EA0T=U6ElZ2D^b8Flta4nCF_yj%p%iFV+cvbs&M=>{x zh$f^Z`dcWGs&-lV1P)u{796sJTy;GLWZ5`J-w$S3=cMXpnTP~>Cz!<(=vLiszMZz# zXBcoBjLp>W$;TuT&>a2U7VQIRoc;vv#H7u);l>drt}Hnbg@h zzQrRqQ^0ccwEs)Nj?hj-LGL$<4N!Muvhya=cmWzhI)SmssyKdutFf14Dr!nL`aOQX zKc8BfHq!M9lQCW22sKru)92-z>Ag(jiq|sfbrO3P?NJo;J_}x#i8rM=@4(|hXb9=@ zV_rq5aa7rqhTGn)_hWj0PVaHoGI4#GovpHZkem=Ke2MuZX(1YxuwdJp=DY!o{m}R` zG+Zz&b|f?e#!*XE3hwtessbyK$IdGxKfhM!#acEZU!o7HlAW)@q6Zp6x+JZ}&dWr+ zIgPG8WhP&9b<WJm9m?+gQvfa0_%ASJ7Xp>?H?b^nH*JH|jSp8m`ceXG~9}7*}lX zKYaN3(DBhd!$*4ui|AgtS0n&s$JX-KadCU2Y2+&jN5uNaC{}-Z?@?qe5Wz*(0W*Qm z0&yWC0A_-(wQQG;;v-%bq#rL|No68<3n0ZT!kNH(#0q`SWA@B|md5`=Dh$0pF7%1$23KWk2C+80t&aH&b z>~q`ta9~e?Ee~jQAobU$6SXUh2v340L9?LC zpud9_KuIcNKF|)3_&7#E!u~^a0=p&VLl;A;YP*vE71~Bq-u)3Ueue}fCSCW8)a{PV zC63XH`;%#4zia${)C#jn&40-G?bu4`eXB%UY%b+*ON*!Ex-oc%h>c0PQ_lY+@ru-& ziedsgBL%mmp*d>VpB%U?xle9-r*xkp&B#Mw&r5zI1=^}HRvC@$bQnY^aZ^DLWgj!s z2W@7m?btx~+q`tN-A0$&R~uEKpwRYqhaoyT)ZS$h*@6wGP6d+<`eZ7&o3c9wZ70F~ z9%vHuI%pR3EBa-J!juBn)yYwS zx(<}^BAQ0Ojph&J#o^C(6U($(5P+KU84RQztUTY@^);%zn3lRrc$f-8UVfAgg$gmA z4(0Ja`a`G${Sr8(l-pUz19YU*3pcNH=Fx-0YYaCLj6!dQ5;y82<}XHd_ZPr-I(%bi z?2bb7o$2GEOe-;Qi732Lu_%HH3x>n31H&&s-Oje?%c6W~4*!2KeNo%KPCv?*`uGp* z%dH(A8hvhfaIo*W6S+I+wVq(ovPcNp>+)hmzHD;SLeGf$#IX?|_?tGy*&A4Tnw&>E)Y7wi#o}~2+f$RI%7T1XS|0e3E*w!$|5$1X%d<0b zvUIdbJsq9c=}5Rno%x9_v1{*z*KvM=F7_oGM6Gro62D4~Lk@B(W*Qjs(PX^& zu@|d&4qG=NwlK(peIS)=H(7_uEglm%hyX7p_Cp|9l~lL*lfYjT!v$ivCHfy7>bI!f kqHeQoG%@sTD=M|9`r;ozFNOJJ9scNI(feGpj1(#V2Wvl5^#A|> delta 2781 zcmbVOeN3BG7k}>4_Mv5^wosn7gAPi;GFnz(Y?QA-VQg#>3NoO;K1#u@BvsMi>og*b zQR7E+wr5M!OrlYL<$zs%PW^bmv;QZaEk8{!e_1@<9 zoO{nb_ndR@IrrSAeqyPg*b4!ZlL=}IDIV!-mJxHy{n&;*hRX};-^=0 z&3S7eXax!Ynf5q`$-3rpy3hKqIVN^r1amW>1N49d)Bv?W9k3Cw0Ji~!fB`TAd4LVb z2kZbvoqaYxI#oab2m%G^@U={Cx3&4Hv*)YN1Re83;q;*|SH@0;kF#6xm1zD6#_VLU z514Lvt&Gdpm=cw-ME}t})|jy`d}x%9&~IvmN{RgpO>1V|1!Cpe$`@StH>Hq^ml*y=k2YvaP9# znd!c!IRlPG66n88J{vzV9*1>8DL)G#kH*`#vs!w<@0DH;<#%ME2bxJl)M_5;j-P)YMt(NV(Y zsjK6A1HvbrB~Pc%c2>3a_r`M7jaAWWon8sSl@@ihw@0RPoo2R3J35DLT-9IhcEiFv z4Q`E?vTB%+uR8t7mP&C^r~J5eGc$9K_GqU^-^B{3ZJUklq5f?OJ<{T&%YHqTZjTv| znbIsh5%#iKdMiAf=?<`Fs_yn08Zc2#gWW!{+(3_phFt&LVpcg5Zllxf1)0WTC~!Bv z&dQb3JNAjpt9b5cV1{yNIY_M6K{Gv*>%AE9Jv0ebYBZ1YJAu}vT{YgXfXvfmij=s| zfja{UKKnGlg?KPU&>ZTDl&~DSD^fx;y-qqBG19JHJDrM{In6^7sIob#ECOG#2|ZcR z*^04z8d^J`?paN1nU-BSv>GXKU4=vv5_y0U2Qx79N*z1ik9+zw9{=$kfg z-U3!YP_@YDbi_d`eP&vTSV->Q0_nSVdLv*aXTAwrb<8pf&W(fTyqx^(hJUyiVn#c0C68 zNw>>0m^~0C45+h$Uh8t1eo!4I7)D1=2$T^hey8?S2PE^XZN*SxmweXQZ@-qQFNH2xQwowUY3k{#2f zA(MDPM`eSHWQ`UxBUML>dC4{k)Eh0Lm%7aKKy)D8XC&j4nSLJ5N%sv>Xe8;1L5K(J zAn-VF9C#1-ggzK4a+ktv00;p*9r}RXKmwSdDz;7zkxzP1(I2wB_r3=-g0@>#wnkDHTidBS1H^Y)IG2&asPPz18A_u)AG zFYch1;~jQ2`d}Z`90RN z9N_1!M=tikTqXKT;8{TfIGo*}eC0*-Q9uR$_VCw60{)*rdNS5I0A3tX<>`Pke9QlR twzUwL1j-Q+R81jBw&`ZJL_PNu(ab#o<)~$n;cl}Ah24K$_qz3d@lTmRJF5Ty diff --git a/NzbDrone.Web/Bin/NzbDrone.Web.dll b/NzbDrone.Web/Bin/NzbDrone.Web.dll index 92e14040f51c4e0d2ecbb6ddbfe9bc6f9af4c8bd..90a8b99f1196da5626f0550c745babe1e43d2b0b 100644 GIT binary patch delta 5591 zcmb7I3vd?I6+ZXw?)~47O+o@mNdAxqoBSaJ0zyLq35G``ghxO?1i^%s0Q$op9@2n6 z42mMON*A0WK0pQ)g)ua=BZ7_&gzBOIfT_3+m+0 zQ2gbfLC0c%)1?5+JT$zIIg&q{sz67wfexHEa{yI|WB|C0%+_nX7weXVas<@^gprA| zCk&1PoRL_}p#(=2TBbjvm;sU3UfporNNa(9P86ri&L=z%4Wa|(JyeE_qgoe?5= zt*@w?u>*6I$Yh2&N2CtSM~~zmna9yB7#%JhS0XfFUiU9m;}+vHaU*Z`%MR2?*nCf< z{@nKTI{!aadAnj<@nXz9zLE}uajLuk7jDxw| zc>*msuEJX)EmBRI=$1BXD(Ix0D-lgL7qZEe-`YS6?fu?`c>6YFmB0Svvo8 z^=8*VD8Wi79R;~ZYRn0N+*q6XraGeWI!4HH)Wsv^pe-JS18$<5>yj=vu3PJA;|{^6 zE$7^<#~UB@GKj5@;bp!6pG_hfn(WRFwC_yDzNxb_?X5DyD$#D$n5W&E$~>za?X0)1 zsktbaHqd$oGLvYQNUK*^Y>Y

OxR2kvdf1YL6kkj4r5`$XN4eFt>kO82eF%^2d(d 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 diff --git a/NzbDrone.Web/Bin/NzbDrone.Web.pdb b/NzbDrone.Web/Bin/NzbDrone.Web.pdb index cf7f70e91dbebf22b2ecb8f46ae6b26dd9850f18..0b7384336bcfac1bd9ae195e07c636c4c892d85f 100644 GIT binary patch delta 1884 zcmZuyeN0nV6o2Qn#Xc+r2GYs{TMDIR2$lg0Dk2I33Rr3YDNOm0kNU+3h6&6M5EV+J zLk`JsnKGSZxG^?-b;b=gHT%%GF^$HIIf;L4F*7U*aYM~;JMRf5OZJ-kyXXAwx#!$_ z?zy*3{cKY|+Y!bA!!ViDx(1_efM@rz5RqV*$AT~W08r1)k?Yy9XS15u8IKIP&$kcC z3j5DZdYRvutZujIFJeJw7@6v^UL7ZV+G&9^stnerw%UF1-toVtF26C9TAgV%%vc2p z^=b!ndS>{Xedu52ar(RH?aj)=hK{)2!4-Y~%L@fB^#gRE!avqaL2HvylT-7+W1bou z>hu{*?SeA_$^cHUB$__G;Ja`NxSv&jzkaUhDyY#n+A3cf+^EKKeXiWO&#e`PqO*XD zpMT+#&&a^*zXtbintv09ET?3k#nP}vgh#?!&~5Zbvr&aN;~n^}Q45WD)~F+#h%Lrl zDN0OyRf~_p{m~JwLVuG3e+k#ZDf}~BM>uP<%cRA)1b^%^sW3O8M4A_rpoI~PPtXyP z-TQ7cP{ig)KfD~F3J##{L@-Pf$9OVcOcEpZlf)%btHz1NDYSy&NFH;RltVY^JYIX* zOc6!SKe8MyNnBT?8AgQRrBy6EMPrhVa8=S?2*GcXtlU$UVSs)nT#@gGmgQN*?_T}^ zM4&M_lF*ji3K7C+awb3v8dvJr7Qi)SuL$)k!vGHBv6M~Fhmg96FeY^`oX5db6X9rT z59`5V<0^yL9bff1G@w1rMA)3R9IKM4(_<_XuDQ8gosA z*}3=N4#wy0fGIqkXCl0wS4I5d{3_y4tSf>kVLIOgtXqc1Q&ys*Ko4W+EC?n1xL_~b z$0&Owq21mCf%wE8N*G-DBe?O8!YX!5CPu`XA~TsBU7rGh!kwaYmd%$-&Qx|K)@;9BE%ahuaVTL!v5U*6D<@`4Cv8Sw635leFcv9)H6>=~6^@p; z0Is01EEKK?tIOU3@W#PCSVk{`v1CI^mI+j;p(%KsItca#{E-uv(PFGang;Fit z!rhe`d|0X?X}V%BEAzlTl?JgpS(y(3_@uHG2C%ux#144ivx<$Vbm-wW5xkeugJHU< zy-lZe8*PprsKp7#BEpc(RkSSU<}X-pg_MwzEoR^a=N50E&__2|DcJ8@tzwiV+wOA% zNd8lg zH3W0^&m%>R-Yqs+)3YCD232^V#VXUYqH!=jYAKMt_m4PMC$rE4AacL%&yhcV?jQ(r z54KR zq>sGN$MFf-iU4^zbjY7PwbMa!EhHmMJHlA+jFpZxl zHd|yB9`umxkj5L(*U8f(6XoO;A(R;<#yB;>5hS@Nj`)cW`Rqpy7&kW4j4?b$Gwzd} z1y49Nia;u{L{Wl#oS^YK^lIl7y~Kv0Z@Wfug`_lWZr4zOmA3O#T)S!9P0kG>tGGo{ zlqAXML_d-w@ob-Sx5ZMCxY{}59z{QUaD|Jfd$+;GE2fBzz*3hVcDVdOFZ8;?Suo-E ghY~?8aEGU4U`FVClm7a`a93xX(63$yC%f2x0iAVOcmMzZ delta 1621 zcmZuxeN0nV6z_Sj5Bh4UmKs{uVJoz@j-lY{=nNtt0xG4g0c-)GARiTr);JdwouWc1 z)lGUxMmF(lnPamqfk!s8#cd=mW0`R-WM*Xk!Hmh0CB|S()cBE|_dv5hd@uKR&;9-G zJ?Gtf&v}RA%;7k5(#$h5nQRla&`9Pau!pl71PyZ!(8Q>f4)tjg=y~*lOB_uol`n7x zFAuwG%05leoa;WYimOAf@^u_k+wq1{#m%GnD*Rh{5p?|ppNy(XnODs>;VGqExTdy4 zzuOd3mM*CN`Fho@r{6SIg!BKJ-ZYUgQZNj!;stMV93Y6?!ncwVDHKahPAvh))m9;x zJOHC9iWFY2AdVirpn3Bl@CTz+ii)|L@}aP8-?1TFa)gr58`{+W9V z#|lEwiIzem(+Rk-ai!2vXa?xPp>^BfEJD!=!tA0$FoGjRR>G;GGt6_q{p-`j?)3U^ zVK@4Ut%P00Ti_R*D&E0&!ffn$*p;D0e~FF!MM_-cX{ux$`A98|ii^K2rNu(?h94N1 zMoXEInU;xPfE{JiFoW6YS`0c>WbJdJCPzBtSy(`qkbB}JW z`OZKxKK7*(rdIz3alBjI%G_kdU>K^g;oz3QXswxH%H@(Dl}~}8Iz7`a$K}4oI9#U^ z&1zo{=GNq%t=`b#A zX#5Z$5vR5p37<9BqqoTfTHM!UWV9USm4{H-yc``36S0;9%o7gZZ%Gro^DR}N#>XvT zxPV=)R^~ziK5wo=MZg4;L>Q732{PFrwU6i?Ceaf(18q1HSV6dCdn-kcZ2yi)PY``z+bNFkUz z?(kGS{E;23ZSWepj-}vo4rLD&KM?I|V;}@C=yN|k9$0>1~iVu!@*$GM8%XUb8 zD&9HfX7zJ=MRzT$n6qzm``LhGi!oGK+2dj_OKWuaeb0WZ2j`ZPW!eTH-kJ`3x(6iUV%(W0Dn_8PcdG*+RfSI3F}-5d*h~{!j|cju;k2DTerPvz>&rL>9*`ntc<8 zX!dQIorUKjIxd;=Cs(wf9A`*x$D}?3H$eEr~H1ruLZw`_kC+BG* z%UvfcQ?j0rby2d!OP%E=#q^N4Hu{UIM2kwPAZnlz+Zr`+_lRAF4N)zgj4lMd@L6;z hLkD{8L@saw|G`5Rj0mw#JR7qMH + diff --git a/NzbDrone.Web/Views/Series/Details.aspx b/NzbDrone.Web/Views/Series/Details.aspx new file mode 100644 index 000000000..944fbbd8c --- /dev/null +++ b/NzbDrone.Web/Views/Series/Details.aspx @@ -0,0 +1,45 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> + + + Details + + + + +

Details

+ +
+ Fields + +
Id
+
<%: Model.TvdbId %>
+ +
SeriesName
+
<%: Model.SeriesName %>
+ +
Status
+
<%: Model.Status %>
+ +
Overview
+
<%: Model.Overview %>
+ +
AirTimes
+
<%: Model.AirTimes %>
+ +
Language
+
<%: Model.Language %>
+ +
Path
+
<%: Model.Path %>
+ +
TvdbId
+
<%: Model.TvdbId %>
+ +
+

+ <%-- <%: Html.ActionLink("Edit", "Edit", new { /* id=Model.PrimaryKey */ }) %> |--%> + <%: Html.ActionLink("Back to List", "Index") %> +

+ + + diff --git a/NzbDrone.Web/Views/Series/index.aspx b/NzbDrone.Web/Views/Series/index.aspx index ae6fa948e..921507fad 100644 --- a/NzbDrone.Web/Views/Series/index.aspx +++ b/NzbDrone.Web/Views/Series/index.aspx @@ -1,16 +1,13 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage>" %> - SeriesView + SeriesView - - -

SeriesView

- +

+ SeriesView

- @@ -20,58 +17,35 @@ - - - - - <% foreach (var item in Model) { %> - + <% foreach (var item in Model) + { %> + <%-- --%> - - - - - - <% } %> - + <% } %>
Id Status - Overview - - AirTimes - - Language - Path
+ <%: Html.ActionLink("Details", "Details", new { item.TvdbId })%> + | + <%: Html.ActionLink("Delete", "Delete", new { item.TvdbId })%> + - <%: Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) %> | - <%: Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ })%> | - <%: Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ })%> - - <%: item.Id %> + <%: item.TvdbId.ToString()%> - <%: item.SeriesName %> + <%: Html.ActionLink(item.SeriesName, "Details", new { item.TvdbId })%> <%: item.Status %> - <%: item.Overview %> - - <%: item.AirTimes %> - - <%: item.Language %> - <%: item.Path %>
-

<%: Html.ActionLink("Create New", "Create") %> + <%: Html.ActionLink("Sync With Disk", "Sync") %>

-
- diff --git a/NzbDrone.Web/Views/Settings/Index.aspx b/NzbDrone.Web/Views/Settings/Index.aspx index dfa44b172..fe0d11d55 100644 --- a/NzbDrone.Web/Views/Settings/Index.aspx +++ b/NzbDrone.Web/Views/Settings/Index.aspx @@ -9,7 +9,7 @@ Settings <% using (Html.BeginForm()) { %> - <%: Html.ValidationSummary(true, "Unable to save you settings. Please correct the errors and try again.") %> + <%: Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.") %>
General diff --git a/NzbDrone.Web/Views/Shared/Site.Master b/NzbDrone.Web/Views/Shared/Site.Master index 80fce96c3..f7e8af792 100644 --- a/NzbDrone.Web/Views/Shared/Site.Master +++ b/NzbDrone.Web/Views/Shared/Site.Master @@ -12,7 +12,7 @@