From bb9e4c88ce2d2c6fe1d0074ca8f46f61c65abe72 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 28 Apr 2012 12:15:08 -0700 Subject: [PATCH] SearchHistory Successful columns now sort properly and use images.] New: Delete images in grids now use the same image as Delete Series. --- .../Views/SceneMapping/Pending.cshtml | 2 +- NzbDrone.Web/Content/Images/{X.png => False.png} | Bin NzbDrone.Web/Content/Images/True.png | Bin 0 -> 1794 bytes NzbDrone.Web/NzbDrone.Web.csproj | 4 +++- NzbDrone.Web/Views/History/Index.cshtml | 2 +- NzbDrone.Web/Views/SearchHistory/Details.cshtml | 2 +- NzbDrone.Web/Views/SearchHistory/Index.cshtml | 2 +- .../Views/Settings/NewznabProvider.cshtml | 2 +- .../Views/Settings/QualityProfileItem.cshtml | 2 +- 9 files changed, 9 insertions(+), 7 deletions(-) rename NzbDrone.Web/Content/Images/{X.png => False.png} (100%) create mode 100644 NzbDrone.Web/Content/Images/True.png diff --git a/NzbDrone.Services/NzbDrone.Services.Service/Views/SceneMapping/Pending.cshtml b/NzbDrone.Services/NzbDrone.Services.Service/Views/SceneMapping/Pending.cshtml index ea1672ea6..07ab00c43 100644 --- a/NzbDrone.Services/NzbDrone.Services.Service/Views/SceneMapping/Pending.cshtml +++ b/NzbDrone.Services/NzbDrone.Services.Service/Views/SceneMapping/Pending.cshtml @@ -74,7 +74,7 @@ { sWidth: 'auto', "mDataProp": "Title", "bSortable": false }, //Title { sWidth: '40px', "mDataProp": "Commands", "bSortable": false, "fnRender": function (row) { var promoteImage = "\"Promote\""; - var deleteImage = "\"Delete\""; + var deleteImage = "\"Delete\""; return promoteImage + deleteImage; } diff --git a/NzbDrone.Web/Content/Images/X.png b/NzbDrone.Web/Content/Images/False.png similarity index 100% rename from NzbDrone.Web/Content/Images/X.png rename to NzbDrone.Web/Content/Images/False.png diff --git a/NzbDrone.Web/Content/Images/True.png b/NzbDrone.Web/Content/Images/True.png new file mode 100644 index 0000000000000000000000000000000000000000..e71398fa7fa2ae38b9a62abbf0172335116af32d GIT binary patch literal 1794 zcmV+d2mSboP)0m=496Y;*tk*Ag=m6AY$A0+B3P;-axJAt7;bbJ><{*__KZr%|Jj zkrD9|-Pjc8M1=*z_z+5I-$(micg`!tf~B;4&V-wszW46C_rBln+;h%7_g3Tg`{7wG zT6o6G9Dz9klPoO#eA4*dtN}Rj)feHa7oiwYZb#~S{)qIyoPm87tL1)Ta?&lle?O`j z_#cJR3bWO+f7`q70Hf8y@z1{dV4&YAWBrE_eLzu^S(6dqE#?E8-+lwUB7ndvP>lCj zx1ZicB;dz^W=n$Lv!{M6HJXfv3yKQRGz{QD%`3|IVH|nDpp(o?3p%|Xyk2h#Ry$P! zGQFJv@E1;>BJkC(Zd?xxI;R`88V&eh5d{I7E?)wV$6bYw_d;es9^<0`b?4459CDnG z3X3+iPh`y_@U`d8lyXL{I+cj;LDh4V~)Vd2No%mit^p|+O5*Q{B;Mve2HK`|!HOQHzP zH=1x|ej0qpIv@{=AIUV-)oo=M=H#litH5eWfZj)gs>7|$e+3;#cNE|6q*XMu-)N!t z4Ry68dV{`(`q6^KyF~Dz<|FkB6#+Hh+;n|R@K2i%g1=Z_zfH?%Pp(+K0xT9Q4B~VP zyo3%XB6tpR*X3YL)*roC|4Rv($5>{A?{^XS+`QZ&hZSQo8y>;`@!L%h1fgo&WG)E) zN<#yIKaq{#<1J|}N9(X3TV0*RSRib?Zm>+p9=3ps97;D@6S z#rZ`x8)#%5@XqL>1dln2!N@??%EfT&=AFa8U%SpA_(Myx7o)?Y!wyI>MH{aq!GqR& zAW2fx;6n*~+SAjMr`H<-F*KSY2YiP}EX~e@doA}5EqXCSwRw*#M(}82Z4d4fiI~6- z6Ubb$|5xg)i*sX#WS4uCCIgdC5~sLPqf2 zU0ryUEAcxA={u7r5GI{okpA4B&W=aW+udE7kd!nfB)TL16nI_o?7tTpWu`9Y0A0&*9LH4ezuDla#CXM; zXf1R0IWa?Z*-i1Ls7Mfax67@9$Nmmw8us37@I%oQv(;SYa=K&$wbvMDj7WmU^te5= zI+tTVN3`FV7843Baq)5G?m@SV;3_zd3rj*xDKN9d1+g64JErs4h7F#L#!^uGmAsqB z^jE0RbNUe^=+sT*MHM`@bHqCKgb4U2Fuk17P$}@DED7R1I%pye1YQ!oDtLVF@GH}Q zU>1`Pj4pbEu8IIlqO^}?8TA~Kz+?Ti+5D9ML!;BPRk(Zm3pecQ;TJxCIg|hRXy*Q@ kpCd3wV2;47mj4780LTshe(1FJng9R*07*qoM6N<$f(iy}asU7T literal 0 HcmV?d00001 diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index eda9416e4..1ae1636fd 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -157,6 +157,7 @@ + @@ -166,6 +167,7 @@ + @@ -173,6 +175,7 @@ + @@ -286,7 +289,6 @@ - diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml index 4786297dc..d94553632 100644 --- a/NzbDrone.Web/Views/History/Index.cshtml +++ b/NzbDrone.Web/Views/History/Index.cshtml @@ -90,7 +90,7 @@ } }, //Date { sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "fnRender": function (row) { - var deleteImage = "\"Delete\""; + var deleteImage = "\"Delete\""; var redownloadImage = "\"Redownload\""; return deleteImage + redownloadImage; diff --git a/NzbDrone.Web/Views/SearchHistory/Details.cshtml b/NzbDrone.Web/Views/SearchHistory/Details.cshtml index 93ef288fd..3f72e1cec 100644 --- a/NzbDrone.Web/Views/SearchHistory/Details.cshtml +++ b/NzbDrone.Web/Views/SearchHistory/Details.cshtml @@ -17,7 +17,7 @@ .ChangePageLength(false) .AddColumn(new Column().Image("/Content/Images/Indexers/{Indexer}.png", new { alt = "{Indexer}", title = "{Indexer}" }, "{Indexer}").Sortable(false).Title("").Width("20px")) .AddColumn(new Column().DataProperty("ReportTitle").Title("Report Title")) - .AddColumn(new Column().DataProperty("Success").Title("Successful").Width("120px")) + .AddColumn(new Column().Image("/Content/Images/{Success}.png", new { alt = "{Success}", title = "{Success}", @class = "gridImage" }, "{Success}").Title("Successful").Width("100px")) .AddColumn(new Column().DisplayAndSort("Quality", "QualityInt").Title("Quality").Width("80px")) .AddColumn(new Column().DataProperty("SearchError").Title("Error")) .AddColumn(new Column().DataProperty("return actionColumn(source, type, val);", true).Sortable(false).Searchable(false)) diff --git a/NzbDrone.Web/Views/SearchHistory/Index.cshtml b/NzbDrone.Web/Views/SearchHistory/Index.cshtml index e5b8556e3..d48c51ec3 100644 --- a/NzbDrone.Web/Views/SearchHistory/Index.cshtml +++ b/NzbDrone.Web/Views/SearchHistory/Index.cshtml @@ -16,7 +16,7 @@ .AddColumn(new Column().DataProperty("DisplayName").Link("SearchHistory/Details?searchId={Id}", "{DisplayName}", null).Title("Name")) .AddColumn(new Column().DataProperty("SearchTime").Title("Time").Width("170px")) .AddColumn(new Column().DataProperty("ReportCount").Title("Reports Found").Width("140px")) - .AddColumn(new Column().DataProperty("Successful").Title("Successful").Width("110px")) + .AddColumn(new Column().Image("/Content/Images/{Successful}.png", new { alt = "{Successful}", title = "{Successful}", @class = "gridImage" }, "{Successful}").Title("Successful").Width("110px")) .AddSorting(1) ) } diff --git a/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml b/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml index b7534aa34..6d9ae677e 100644 --- a/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml +++ b/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml @@ -14,7 +14,7 @@ @Model.Name - Delete + Delete
@Html.Label("Enabled") diff --git a/NzbDrone.Web/Views/Settings/QualityProfileItem.cshtml b/NzbDrone.Web/Views/Settings/QualityProfileItem.cshtml index e8a168b9d..21b439a86 100644 --- a/NzbDrone.Web/Views/Settings/QualityProfileItem.cshtml +++ b/NzbDrone.Web/Views/Settings/QualityProfileItem.cshtml @@ -12,7 +12,7 @@ @Model.Name - Delete + Delete
@Html.LabelFor(x => x.Name)