open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git

Browse Source
pull/618/head
Jamie.Rees 8 years ago
parent 877e0fa8fb ee515dcd90
commit b0869303af
4 changed files with 118 additions and 28 deletions
Show Stats Download Patch File Download Diff File

21
PlexRequests.UI/Resources/UI.resx
Unescape View File

@ -446,4 +446,25 @@
<data name="Custom_Donation_Default" xml:space="preserve"> <data name="Custom_Donation_Default" xml:space="preserve">
<value>Donate to Library Maintainer</value> <value>Donate to Library Maintainer</value>
</data> </data>
<data name="Search_Available_on_plex" xml:space="preserve">
<value>Available on Plex</value>
</data>
<data name="Search_Movie_Status" xml:space="preserve">
<value>Movie status</value>
</data>
<data name="Search_Not_Requested_Yet" xml:space="preserve">
<value>Not Requested yet</value>
</data>
<data name="Search_Pending_approval" xml:space="preserve">
<value>Pending approval</value>
</data>
<data name="Search_Processing_Request" xml:space="preserve">
<value>Processing request</value>
</data>
<data name="Search_Request_denied" xml:space="preserve">
<value>Request denied</value>
</data>
<data name="Search_TV_Show_Status" xml:space="preserve">
<value>TV show status</value>
</data>
</root> </root>

63
PlexRequests.UI/Resources/UI1.Designer.cs generated
Unescape View File

@ -744,6 +744,15 @@ namespace PlexRequests.UI.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Available on Plex.
/// </summary>
public static string Search_Available_on_plex {
get {
return ResourceManager.GetString("Search_Available_on_plex", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Coming Soon. /// Looks up a localized string similar to Coming Soon.
/// </summary> /// </summary>
@ -834,6 +843,15 @@ namespace PlexRequests.UI.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Movie status.
/// </summary>
public static string Search_Movie_Status {
get {
return ResourceManager.GetString("Search_Movie_Status", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Movies. /// Looks up a localized string similar to Movies.
/// </summary> /// </summary>
@ -852,6 +870,15 @@ namespace PlexRequests.UI.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Not Requested yet.
/// </summary>
public static string Search_Not_Requested_Yet {
get {
return ResourceManager.GetString("Search_Not_Requested_Yet", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to We could not remove this notification because you never had it!. /// Looks up a localized string similar to We could not remove this notification because you never had it!.
/// </summary> /// </summary>
@ -870,6 +897,24 @@ namespace PlexRequests.UI.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Pending approval.
/// </summary>
public static string Search_Pending_approval {
get {
return ResourceManager.GetString("Search_Pending_approval", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Processing request.
/// </summary>
public static string Search_Processing_Request {
get {
return ResourceManager.GetString("Search_Processing_Request", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Report Issue. /// Looks up a localized string similar to Report Issue.
/// </summary> /// </summary>
@ -888,6 +933,15 @@ namespace PlexRequests.UI.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Request denied.
/// </summary>
public static string Search_Request_denied {
get {
return ResourceManager.GetString("Search_Request_denied", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Requested. /// Looks up a localized string similar to Requested.
/// </summary> /// </summary>
@ -978,6 +1032,15 @@ namespace PlexRequests.UI.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to TV show status.
/// </summary>
public static string Search_TV_Show_Status {
get {
return ResourceManager.GetString("Search_TV_Show_Status", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to The request of TV Shows is not correctly set up. Please contact your admin.. /// Looks up a localized string similar to The request of TV Shows is not correctly set up. Please contact your admin..
/// </summary> /// </summary>

54
PlexRequests.UI/Views/Requests/Index.cshtml
Unescape View File

@ -168,15 +168,38 @@
<a href="http://www.imdb.com/title/{{imdb}}/" target="_blank"> <a href="http://www.imdb.com/title/{{imdb}}/" target="_blank">
<h4 class="request-title">{{title}} ({{year}})</h4> <h4 class="request-title">{{title}} ({{year}})</h4>
</a> </a>
<span class="label label-success">{{status}}</span> <div>
{{#if_eq type "tv"}}
<span>@UI.Search_TV_Show_Status: </span>
{{else}}
<span>@UI.Search_Movie_Status: </span>
{{/if_eq}}
<span class="label label-success">{{status}}</span>
</div>
<div>
<span>Request status: </span>
{{#if available}}
<span class="label label-success">@UI.Search_Available_on_plex</span>
{{else}}
{{#if approved}}
<span class="label label-info">@UI.Search_Processing_Request</span>
{{else if denied}}
<span class="label label-danger">@UI.Search_Request_denied</span>
{{#if deniedReason}}
<span class="customTooltip" title="{{deniedReason}}"><i class="fa fa-info-circle"></i></span>
{{/if}}
{{else}}
<span class="label label-warning">@UI.Search_Pending_approval</span>
{{/if}}
{{/if}}
</div>
</div> </div>
<br /> <br />
{{#if denied}} {{#if denied}}
<div> <div>
Denied: <i style="color:red;" class="fa fa-check"></i> Denied: <i style="color:red;" class="fa fa-check"></i>
{{#if deniedReason}}
<span class="customTooltip" title="{{deniedReason}}"><i class="fa fa-info-circle"></i></span>
{{/if}}
</div> </div>
{{/if}} {{/if}}
@ -185,31 +208,14 @@
{{else}} {{else}}
<div>@UI.Requests_ReleaseDate: {{releaseDate}}</div> <div>@UI.Requests_ReleaseDate: {{releaseDate}}</div>
{{/if_eq}} {{/if_eq}}
{{#unless denied}} <br />
<div>
@UI.Common_Approved:
{{#if_eq approved false}}
<i id="{{requestId}}notapproved" class="fa fa-times"></i>
{{/if_eq}}
{{#if_eq approved true}}
<i class="fa fa-check"></i>
{{/if_eq}}
</div>
{{/unless}}
<div>
@UI.Requests_Available
{{#if_eq available false}}
<i id="availableIcon{{requestId}}" class="fa fa-times"></i>
{{/if_eq}}
{{#if_eq available true}}
<i id="availableIcon{{requestId}}" class="fa fa-check"></i>
{{/if_eq}}
</div>
{{#if_eq type "tv"}} {{#if_eq type "tv"}}
{{#if episodes}} {{#if episodes}}
Episodes: <span class="customTooltip" data-tooltip-content="#{{requestId}}toolTipContent"><i class="fa fa-info-circle"></i></span> Episodes: <span class="customTooltip" data-tooltip-content="#{{requestId}}toolTipContent"><i class="fa fa-info-circle"></i></span>
{{else}} {{else}}
<div>@UI.Requests_SeasonsRequested: {{seriesRequested}}</div> <div>@UI.Requests_SeasonsRequested: {{seriesRequested}}</div>
{{/if}} {{/if}}
{{/if_eq}} {{/if_eq}}
{{#if requestedUsers}} {{#if requestedUsers}}

8
PlexRequests.UI/Views/Search/Index.cshtml
Unescape View File

@ -168,14 +168,14 @@
{{/if_eq}} {{/if_eq}}
{{#if_eq type "tv"}} {{#if_eq type "tv"}}
{{#if available}} {{#if available}}
<span class="label label-success">Available on Plex</span> <span class="label label-success">@UI.Search_Available_on_plex</span>
{{else}} {{else}}
{{#if approved}} {{#if approved}}
<span class="label label-info">Processing request</span> <span class="label label-info">@UI.Search_Processing_Request</span>
{{else if requested}} {{else if requested}}
<span class="label label-warning">Pending approval</span> <span class="label label-warning">@UI.Search_Pending_approval</span>
{{else}} {{else}}
<span class="label label-danger">Not Requested yet</span> <span class="label label-danger">@UI.Search_Not_Requested_Yet</span>
{{/if}} {{/if}}
{{/if}} {{/if}}
<br /> <br />

Write Preview
Loading…
Cancel
Save