From 0bb36eb20c8a609f4a9ec67ec2e3634438ea5049 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sat, 25 Feb 2012 08:35:27 -0800 Subject: [PATCH] Some new icons/ Submenu tweaks. --- NzbDrone.Web/Content/Images/Ready.png | Bin 1587 -> 534 bytes NzbDrone.Web/Content/Images/redownload.png | Bin 0 -> 800 bytes NzbDrone.Web/Content/Images/settings.png | Bin 982 -> 819 bytes NzbDrone.Web/Controllers/CommandController.cs | 8 ++------ NzbDrone.Web/NzbDrone.Web.csproj | 3 +++ NzbDrone.Web/Views/History/Index.cshtml | 6 ++---- NzbDrone.Web/Views/Missing/Index.cshtml | 6 +++--- NzbDrone.Web/Views/Series/Details.cshtml | 7 +++---- NzbDrone.Web/Views/Series/Episode.cshtml | 2 +- NzbDrone.Web/Views/Series/Season.cshtml | 3 +-- .../Views/Shared/NoSeriesBanner.cshtml | 2 ++ 11 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 NzbDrone.Web/Content/Images/redownload.png create mode 100644 NzbDrone.Web/Views/Shared/NoSeriesBanner.cshtml diff --git a/NzbDrone.Web/Content/Images/Ready.png b/NzbDrone.Web/Content/Images/Ready.png index 48fad15518a73767b5d9d74ca2da12a004fce4b3..8501a8b58649150bf75ce22871727e5111027c85 100644 GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7m&H)T;i5Q?0wbq~1C!8%1{M`4GmJ^7 zti46;ui^pqozGQF4R$74)!sH>23mmt^<`Gq<{rOL`Y$T~_^yu@yBODeEm@P@zf}6b z^IsO%n%yt+Caf+0-CV|yz4w;<7UqcctiPKJ7_#TS;lIWBW`6HC_J<7Dsy;?#uy1(J z-@yhX-q~KtWBC2=!L`M2**09;{MXUCVXJ+`ml?Ym-~48t-}{h3Mw|Pgf}`2$4`Mpdp2%nIJR*UL){JeA2~eiAQ_-qi!iYR64u-aK(z)S z?b~Ovfao9m$4`a-Ivmfio`LZO3)g}41q?DQoCg9oFdQ@RU`UqHY53SIz}Pdtg)`xg zMhL^>^oKtgVt6{)9%MzBFidw|%(z2Nj_<$>GpUBhw=)=yZF$JB=lNnriOX)x1vS#V zKna-!!(0=F~6@vd$@?2>^$4&Mp7| 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)&{;XHLv^X{MWe`Tlinj{a@#N-#PzxnA+M}IA}100Yb>4X_(gy!}zoRE}P9-Gcn=d zkLP%hWjQ4)@@JM~+i8G(XAfenZNtG5HYNzd8%dOYyWMWnOnF3+72tRd!jUi}2NK|K@I&8)OF&qx6p4}p zNk|SR-ebsy13*!0YHDW7YT0sZYHEb3naQ_!H+||v`?BIuOy6N2+`4@WqS457TO^h) zm&>rVwN(K?sZ?EUrDdq93cY>3t8LL(cd1me(hdXzFq59yt*$=OA8Cm$X{rYHyV)7A z#X?cQ`YiyT&v&O(EP<};pb-roKY8>C?|NIBLs@#ZUja+Twe?j%i2xe~G);pCbMras zNLeT#2A>Qz9?$BUE+N?{W;%*H`IOjtzBJ zbcqY1Brc%;m;*rB&UK$%qceTbLcVYjRapQA4pnLuP|^uxzK1(Rn)UJR(iAxgof;y1uelRaG_g>g8*| zAi&Pe?eA0t^n1W zX4Kl&3PZywBhVa}N1wF+SVMXH*LDTK>)l&an7)3`#Be)-7DtoN3TR7cbNHakwn95Q eJ67C30R{j{$`Q#a2a=)y0000e*)D> zL_t(|+H6x@NEA^NJ~OlHjJvbByJoDqmgYmcX0E>#gljzoJtRmb_D~X)P@42uNCXuY zN=Xn@wEd9clZHjxOa6dZ=!X5NPwpC9qL#Z>y6pdS&aGWaym02uz2EuH{mwb}a^HN5 zuy&LeR~Xev>Lq~}AR3E8I22AFf1eneU+cF~p9ZSQkmI;>ilVes?5rr9b=c)dlXq9DofaiHbEEe0l@@r*4k|ZEQ68Qc88pJyh z->SrvgXnKVMIRFZGR>KnP^KYCOoB)xvc>E5Hb|lb7z}uhhlPcOV;BI`e`+;^f+2%$ zgRTu}2Z+nl=fNZUO4jBqP^nZ*HW|lrEC9{4CN+fPVPJoF-yctbGn>sOYq52kwZ!^# zcyL&cGC^<9!^u-8Am5S?(^J!M_s%_7_ARr3He2P-Pm`0?&N1h-$K#pja&mGMQ4&Fu ztN|%mVo@)&p8t-8JdVF3e`tF~M@H?}+ODS(76=5WCJ+n+!R2ysyhf`5tyT+yN?<31 zLLo4jOhoQS^U^Hq@Y{l-+|VZ-rW@xtLFG7UUw6IR_(QdFv7T^uMqjrIwD-v7)?{={Pn=qm3j-`$1L>skA_ zKkbV~qf9cbDeriSbTcF2NcS7(>mziP**)mE(XLBLNnu1RAk@{@C32;?_HZrRC!G8` zZnoH*AK%u$2r|Ze=7xxU|;^74vN%`II-dxCdL;*m|+`HsYP+pSX$ZJ!c$7w55O6>1gXd=idSh Y0MAH4d%fu{vj6}907*qoM6N<$f=|GMRsaA1 delta 959 zcmV;w13>(<2G$2LiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=1ZP1_ zK>z@+$TtOw>5(BPe*D7W@e(;2@pUeM?q?8svwYJ2I3F1XV3nF#Q}vt>I4vX z193ADmq4Y~0dWgZ&p%}K00Bf&2qY#ZRst<}2gI*|_#%*xp&w|$Q=nYx9|(8`#3Dd^ z2Z#fK_&2(Ge}DkO8v?Phu|hy98i-deUcC4f&;SD@X)PdT2deo2QVPU3foe`dLm>%B z@qhvhh-HA-5s2M@@>kI900P8#ZkCOG>%|2q2t^5NOaIpd&(o_!l%Af$%3F zo(9BCKzs&C9E6twaT=+)3LtJtD>d00D&I03{_QQy_H;i`t%h_wJRVsZ|0}cd@9Q3RIgzi~|4y z2qO&u9mIu0?F%ewUxFx*N6@4=iH!n)0Aj*Ykvsw7zd+1@hP~wFE z0fe(006GF>`BWgz#3Bu{gcVKf4yeQfTKt5RTmTS2II|(pVWmKv334D3{tcyB(fA;& z0>s;8Wo1dKUjPCKp9B7&Sw0_#H=>C}0`X5I{@?#3Hn9K#2%l^Fp%?__0dWc_-Jz-3 ze+F%Gf$D*4Kc7pWy7 zKmZYJkiaa5M$24ist1*VC!aoj`U9%w4Y@5SfB<3~=&l(+01bG@1R#J0+yMXqG~f;Z h2%rIX06>5N0EesTgirUhb^rhX07*qo1w^hwV1g(pcHIB~ diff --git a/NzbDrone.Web/Controllers/CommandController.cs b/NzbDrone.Web/Controllers/CommandController.cs index 64a722ce7..147a896f1 100644 --- a/NzbDrone.Web/Controllers/CommandController.cs +++ b/NzbDrone.Web/Controllers/CommandController.cs @@ -47,15 +47,11 @@ namespace NzbDrone.Web.Controllers return JsonNotificationResult.Info("Queued"); } - public JsonResult ScanDisk(int seriesId) + public JsonResult ForceRefresh(int seriesId) { + _jobProvider.QueueJob(typeof(UpdateInfoJob), seriesId); _jobProvider.QueueJob(typeof(DiskScanJob), seriesId); - return JsonNotificationResult.Info("Queued"); - } - public JsonResult UpdateInfo(int seriesId) - { - _jobProvider.QueueJob(typeof(UpdateInfoJob), seriesId); return JsonNotificationResult.Info("Queued"); } diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 36f2a14a3..7840b37d0 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 c9c9cbee4..d72436a41 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 44d587b3f..82335d3a3 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 7bfa0c0d0..6a00c9371 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -67,11 +67,10 @@ @section ActionMenu {
    -
  • @Ajax.ActionLink("Scan Disk", "ScanDisk", "Command", new { seriesId = Model.SeriesId }, null)
    • -
  • @Ajax.ActionLink("Update Info", "UpdateInfo", "Command", new { seriesId = Model.SeriesId }, null)
    • -
  • @Ajax.ActionLink("Search for missing episodes", "BacklogSeries", "Episode", new { seriesId = Model.SeriesId }, null)
    • -
  • @Ajax.ActionLink("Rename Episodes", "RenameEpisodes", "Episode", new { seriesId = Model.SeriesId }, null)
  • Edit
    • +
  • @Ajax.ActionLink("Force Refresh", "ForceRefresh", "Command", new { seriesId = Model.SeriesId }, null)
    • +
  • @Ajax.ActionLink("Search for missing episodes", "BacklogSeries", "Episode", new { seriesId = Model.SeriesId }, null)
    • +
  • @Ajax.ActionLink("Rename Episode Files", "RenameEpisodes", "Episode", new { seriesId = Model.SeriesId }, null)
} diff --git a/NzbDrone.Web/Views/Series/Episode.cshtml b/NzbDrone.Web/Views/Series/Episode.cshtml index 9cd2a7127..1916f8a93 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 1e7ff1444..fba2a9522 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 000000000..9886aab57 --- /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