Lots of small fixes and tweaks

2025-08-20 21:33:15 -07:00 · 2016-12-02 14:51:14 +00:00 · 2016-12-02 14:51:14 +00:00 · d8e7693d8d
commit d8e7693d8d
parent 0185e8238d
29 changed files with 185 additions and 67 deletions
--- a/PlexRequests.UI/Views/Admin/Authentication.cshtml
+++ b/PlexRequests.UI/Views/Admin/Authentication.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

@{
    var baseUrl = Html.GetBaseUrl();
@ -50,7 +50,7 @@


            <br />
-            <a href="~/usermanagement/" class="btn btn-info-outline">User Management</a>
+            <a href="/@Html.GetBaseUrl()/usermanagement/" class="btn btn-info-outline">User Management</a>
            <br />
            <br />
            
--- a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
+++ b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
@ -1,6 +1,6 @@
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.CouchPotatoSettings>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@{
    int port;
    if (Model.Port == 0)
--- a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
@ -2,7 +2,7 @@
@using PlexRequests.Core.Models
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.EmailNotificationSettings>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@{
    int port;
    if (Model.EmailPort == 0)
--- a/PlexRequests.UI/Views/Admin/Headphones.cshtml
+++ b/PlexRequests.UI/Views/Admin/Headphones.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@{
    int port;
    if (Model.Port == 0)
--- a/PlexRequests.UI/Views/Admin/LandingPage.cshtml
+++ b/PlexRequests.UI/Views/Admin/LandingPage.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.LandingPageSettings>
@Html.LoadDateTimePickerAsset()
 <div class="col-sm-8 col-sm-push-1">
--- a/PlexRequests.UI/Views/Admin/Logs.cshtml
+++ b/PlexRequests.UI/Views/Admin/Logs.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@Html.LoadTableAssets()

@{
--- a/PlexRequests.UI/Views/Admin/NewsletterSettings.cshtml
+++ b/PlexRequests.UI/Views/Admin/NewsletterSettings.cshtml
@ -2,7 +2,7 @@
@using PlexRequests.Core.Models
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.NewletterSettings>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

 <div class="col-sm-8 col-sm-push-1">
    <form class="form-horizontal" method="POST" id="mainForm">
--- a/PlexRequests.UI/Views/Admin/NotificationSettings.cshtml
+++ b/PlexRequests.UI/Views/Admin/NotificationSettings.cshtml
@ -2,7 +2,7 @@
@using PlexRequests.Core.Models
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.NotificationSettingsV2>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

 <div class="col-sm-8 col-sm-push-1">
    <form class="form-horizontal" method="POST" id="mainForm">
--- a/PlexRequests.UI/Views/Admin/Plex.cshtml
+++ b/PlexRequests.UI/Views/Admin/Plex.cshtml
@ -1,6 +1,6 @@
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.PlexSettings>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@{
    int port;
    if (Model.Port == 0)
--- a/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

 <div class="col-sm-8 col-sm-push-1">
    <form class="form-horizontal" method="POST" id="mainForm">
--- a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

 <div class="col-sm-8 col-sm-push-1">
    <form class="form-horizontal" method="POST" id="mainForm">
--- a/PlexRequests.UI/Views/Admin/SchedulerSettings.cshtml
+++ b/PlexRequests.UI/Views/Admin/SchedulerSettings.cshtml
@ -1,6 +1,6 @@
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.UI.Models.ScheduledJobsViewModel>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

 <div class="col-sm-8 col-sm-push-1">

--- a/PlexRequests.UI/Views/Admin/Settings.cshtml
+++ b/PlexRequests.UI/Views/Admin/Settings.cshtml
@ -1,6 +1,6 @@
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.PlexRequestSettings>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@{
    int port;
    if (Model.Port == 0)
--- a/PlexRequests.UI/Views/Admin/Sickrage.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sickrage.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@{
    int port;
    if (Model.Port == 0)
--- a/PlexRequests.UI/Views/Admin/SlackNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/SlackNotifications.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

 <div class="col-sm-8 col-sm-push-1">
    <form class="form-horizontal" method="POST" id="mainForm">
--- a/PlexRequests.UI/Views/Admin/Sonarr.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
@ -1,5 +1,5 @@
@using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
@{
    int port;
    if (Model.Port == 0)
--- a/PlexRequests.UI/Views/FaultQueue/RequestFaultQueue.cshtml
+++ b/PlexRequests.UI/Views/FaultQueue/RequestFaultQueue.cshtml
@ -1,6 +1,6 @@
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<IEnumerable<PlexRequests.UI.Models.FaultedRequestsViewModel>>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
 <div class="col-sm-8 col-sm-push-1">
    <fieldset>
        <legend>Release Fault Queue</legend>
--- a/PlexRequests.UI/Views/Shared/Partial/_Sidebar.cshtml
+++ b/PlexRequests.UI/Views/Shared/Partial/_Sidebar.cshtml
@ -5,6 +5,7 @@
        @Html.GetSidebarUrl(Context, "/admin", "Plex Request")
        @Html.GetSidebarUrl(Context, "/admin/landingpage", "Landing Page")
        @Html.GetSidebarUrl(Context, "/admin/authentication", "Authentication")
+        @Html.GetSidebarUrl(Context, "/admin/usermanagementsettings", "User Management Settings")
        @Html.GetSidebarUrl(Context, "/admin/plex", "Plex")
        @Html.GetSidebarUrl(Context, "/admin/couchpotato", "CouchPotato")
        @Html.GetSidebarUrl(Context, "/admin/sonarr", "Sonarr")
--- a/PlexRequests.UI/Views/SystemStatus/Status.cshtml
+++ b/PlexRequests.UI/Views/SystemStatus/Status.cshtml
@ -1,6 +1,6 @@
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.SystemSettings>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
 <div id="lightbox" style="display:none"></div>
 <div class="col-sm-8 col-sm-push-1">
    <fieldset>
--- a/PlexRequests.UI/Views/UserManagement/Index.cshtml
+++ b/PlexRequests.UI/Views/UserManagement/Index.cshtml
@ -16,9 +16,6 @@
                <br />
                <br />
                <div class="col-md-12">
-                    <br>
-                    <br>
-                    <div ng-show="error.error" ng-bind="error.errorMessage"></div>
                    <br />
                    <br />
                    <br />
--- a/PlexRequests.UI/Views/UserManagementSettings/UserManagementSettings.cshtml
+++ b/PlexRequests.UI/Views/UserManagementSettings/UserManagementSettings.cshtml
@ -1,6 +1,6 @@
@using PlexRequests.UI.Helpers
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<PlexRequests.Core.SettingModels.UserManagementSettings>
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")

 <div class="col-sm-8 col-sm-push-1">
    <form class="form-horizontal" method="POST" id="mainForm">