From 07b02d90e68b34f770db45289d8bbeea8cd58c6c Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Sun, 27 Mar 2016 18:46:35 -0500 Subject: [PATCH] move approve buttons to the tab content --- PlexRequests.UI/Content/requests.js | 6 ++-- PlexRequests.UI/Views/Requests/Index.cshtml | 36 ++++++++++++++------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js index 46154ac6e..f035b5e05 100644 --- a/PlexRequests.UI/Content/requests.js +++ b/PlexRequests.UI/Content/requests.js @@ -29,9 +29,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { var $ml = $('#movieList'); var $tvl = $('#tvList'); - - if (target === "#TvShowTab") { + $('.approve-category').hide(); + if (target === "#TvShowTab") { + $('#approveTVShows').show(); if ($ml.mixItUp('isLoaded')) { activeState = $ml.mixItUp('getState'); $ml.mixItUp('destroy'); @@ -40,6 +41,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { $tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit } if (target === "#MoviesTab") { + $('#approveMovies').show(); if ($tvl.mixItUp('isLoaded')) { activeState = $tvl.mixItUp('getState'); $tvl.mixItUp('destroy'); diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml index 67ed20378..fcc14d237 100644 --- a/PlexRequests.UI/Views/Requests/Index.cshtml +++ b/PlexRequests.UI/Views/Requests/Index.cshtml @@ -5,8 +5,7 @@ @if (Context.CurrentUser.IsAuthenticated()) { - - +

} @@ -22,10 +21,25 @@ } +
+
-
+
+ @if (Context.CurrentUser.IsAuthenticated()) + { + @if (Model.SearchForMovies) + { + + } + @if (Model.SearchForTvShows) + { + + } + } +
+ -