From 56edd81f2d8a43ac4b3d0759153791f2ed18f49c Mon Sep 17 00:00:00 2001 From: Jim MacKenzie Date: Sat, 22 Oct 2016 21:19:49 -0500 Subject: [PATCH] s582: admin improvements part 2 Added new lables to requests, moved some strings into resx files --- PlexRequests.UI/Resources/UI.resx | 21 +++++++ PlexRequests.UI/Resources/UI1.Designer.cs | 63 +++++++++++++++++++++ PlexRequests.UI/Views/Requests/Index.cshtml | 54 ++++++++++-------- PlexRequests.UI/Views/Search/Index.cshtml | 8 +-- 4 files changed, 118 insertions(+), 28 deletions(-) diff --git a/PlexRequests.UI/Resources/UI.resx b/PlexRequests.UI/Resources/UI.resx index 883e20be1..ced499673 100644 --- a/PlexRequests.UI/Resources/UI.resx +++ b/PlexRequests.UI/Resources/UI.resx @@ -446,4 +446,25 @@ Donate to Library Maintainer + + Available on Plex + + + Movie status + + + Not Requested yet + + + Pending approval + + + Processing request + + + Request denied + + + TV show status + \ No newline at end of file diff --git a/PlexRequests.UI/Resources/UI1.Designer.cs b/PlexRequests.UI/Resources/UI1.Designer.cs index acb53c9bb..548dafff4 100644 --- a/PlexRequests.UI/Resources/UI1.Designer.cs +++ b/PlexRequests.UI/Resources/UI1.Designer.cs @@ -744,6 +744,15 @@ namespace PlexRequests.UI.Resources { } } + /// + /// Looks up a localized string similar to Available on Plex. + /// + public static string Search_Available_on_plex { + get { + return ResourceManager.GetString("Search_Available_on_plex", resourceCulture); + } + } + /// /// Looks up a localized string similar to Coming Soon. /// @@ -834,6 +843,15 @@ namespace PlexRequests.UI.Resources { } } + /// + /// Looks up a localized string similar to Movie status. + /// + public static string Search_Movie_Status { + get { + return ResourceManager.GetString("Search_Movie_Status", resourceCulture); + } + } + /// /// Looks up a localized string similar to Movies. /// @@ -852,6 +870,15 @@ namespace PlexRequests.UI.Resources { } } + /// + /// Looks up a localized string similar to Not Requested yet. + /// + public static string Search_Not_Requested_Yet { + get { + return ResourceManager.GetString("Search_Not_Requested_Yet", resourceCulture); + } + } + /// /// Looks up a localized string similar to We could not remove this notification because you never had it!. /// @@ -870,6 +897,24 @@ namespace PlexRequests.UI.Resources { } } + /// + /// Looks up a localized string similar to Pending approval. + /// + public static string Search_Pending_approval { + get { + return ResourceManager.GetString("Search_Pending_approval", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Processing request. + /// + public static string Search_Processing_Request { + get { + return ResourceManager.GetString("Search_Processing_Request", resourceCulture); + } + } + /// /// Looks up a localized string similar to Report Issue. /// @@ -888,6 +933,15 @@ namespace PlexRequests.UI.Resources { } } + /// + /// Looks up a localized string similar to Request denied. + /// + public static string Search_Request_denied { + get { + return ResourceManager.GetString("Search_Request_denied", resourceCulture); + } + } + /// /// Looks up a localized string similar to Requested. /// @@ -978,6 +1032,15 @@ namespace PlexRequests.UI.Resources { } } + /// + /// Looks up a localized string similar to TV show status. + /// + public static string Search_TV_Show_Status { + get { + return ResourceManager.GetString("Search_TV_Show_Status", resourceCulture); + } + } + /// /// Looks up a localized string similar to The request of TV Shows is not correctly set up. Please contact your admin.. /// diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml index 8865450d0..392d2f11f 100644 --- a/PlexRequests.UI/Views/Requests/Index.cshtml +++ b/PlexRequests.UI/Views/Requests/Index.cshtml @@ -168,15 +168,38 @@

{{title}} ({{year}})

 - {{status}} +
+ {{#if_eq type "tv"}} + @UI.Search_TV_Show_Status: + {{else}} + @UI.Search_Movie_Status: + {{/if_eq}} + {{status}} +
+ +
+ Request status: + {{#if available}} + @UI.Search_Available_on_plex + {{else}} + {{#if approved}} + @UI.Search_Processing_Request + {{else if denied}} + @UI.Search_Request_denied + {{#if deniedReason}} + + {{/if}} + {{else}} + @UI.Search_Pending_approval + {{/if}} + {{/if}} +

{{#if denied}}
Denied: - {{#if deniedReason}} - - {{/if}} +
{{/if}} @@ -185,31 +208,14 @@ {{else}}
@UI.Requests_ReleaseDate: {{releaseDate}}
{{/if_eq}} - {{#unless denied}} -
- @UI.Common_Approved: - {{#if_eq approved false}} - - {{/if_eq}} - {{#if_eq approved true}} - - {{/if_eq}} -
- {{/unless}} -
- @UI.Requests_Available - {{#if_eq available false}} - - {{/if_eq}} - {{#if_eq available true}} - - {{/if_eq}} -
+
+ {{#if_eq type "tv"}} {{#if episodes}} Episodes: {{else}}
@UI.Requests_SeasonsRequested: {{seriesRequested}}
+ {{/if}} {{/if_eq}} {{#if requestedUsers}} diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml index 477dd7057..19317a344 100644 --- a/PlexRequests.UI/Views/Search/Index.cshtml +++ b/PlexRequests.UI/Views/Search/Index.cshtml @@ -168,14 +168,14 @@ {{/if_eq}} {{#if_eq type "tv"}} {{#if available}} - Available on Plex + @UI.Search_Available_on_plex {{else}} {{#if approved}} - Processing request + @UI.Search_Processing_Request {{else if requested}} - Pending approval + @UI.Search_Pending_approval {{else}} - Not Requested yet + @UI.Search_Not_Requested_Yet {{/if}} {{/if}}