Lots of small fixes and tweaks

PlexRequests.UI/Content/app/userManagement/Directives/addUser.html

@@ -9,7 +9,10 @@
         <input id="email" type="email" placeholder="email address" ng-model="user.email" class="form-control form-control-custom" />
     </div>
     <div class="row">
-        <h3>Permissions: </h3>
+        <div>
+            <h3 class="col-md-5">Permissions: </h3>
+            <h3 class="col-md-5">Features: </h3>
+        </div>
         <div class="col-md-5">
             <div class="checkbox" ng-repeat="permission in permissions">
                 <input id="permission_{{$id}}" class="checkbox-custom" name="permission[]"
@@ -18,7 +21,6 @@
             </div>
         </div>
 
-        <h3>Features: </h3>
         <div class="col-md-5">
             <div class="checkbox" ng-repeat="f in features">
                 <input id="features_{{$id}}" class="checkbox-custom" name="f[]"

PlexRequests.UI/Content/app/userManagement/Directives/sidebar.html

@@ -18,22 +18,25 @@
         <br />
         <div ng-show="selectedUser">
             <!--Edit-->
-
+            <div class="row" style="margin-left: 0; margin-right: 0;">
+                <div class="col-md-6">
                     <strong>Modify Permissions:</strong>
                     <!--Load all permissions-->
 
-            <div class="checkbox" ng-repeat="p in selectedUser.permissions">
+                    <div class="checkbox small-checkbox" ng-repeat="p in selectedUser.permissions">
                         <input id="permissionsCheckbox_{{$id}}" class="checkbox-custom" name="permissions[]" ng-checked="p.selected" ng-model="p.selected" type="checkbox" value="{{p.value}}" />
-                <label for="permissionsCheckbox_{{$id}}">{{p.name}}</label>
+                        <label class="small-label" for="permissionsCheckbox_{{$id}}">{{p.name}}</label>
                     </div>
-
+                </div>
+                <div class="col-md-6">
                     <strong>Modify Features:</strong>
                     <!--Load all features-->
-            <div class="checkbox" ng-repeat="p in selectedUser.features">
+                    <div class="checkbox small-checkbox" ng-repeat="p in selectedUser.features">
                         <input id="featuresCheckbox_{{$id}}" class="checkbox-custom" name="features[]" ng-checked="p.selected" ng-model="p.selected" type="checkbox" value="{{p.value}}" />
-                <label for="featuresCheckbox_{{$id}}">{{p.name}}</label>
+                        <label class="small-label" for="featuresCheckbox_{{$id}}">{{p.name}}</label>
+                    </div>
+                </div>
             </div>
-
                 <strong>Email Address</strong>
                 <div class="form-group">
                     <input id="emailAddress" type="email" ng-model="selectedUser.emailAddress" ng-disabled="selectedUser.type === 0" class="form-control form-control-custom" />

PlexRequests.UI/Content/app/userManagement/userManagementController.js

@@ -21,12 +21,6 @@
 
         $scope.hideColumns = false;
 
-
-        $scope.error = {
-            error: false,
-            errorMessage: ""
-        };
-
         var ReadOnlyPermission = "Read Only User";
         var open = false;
 
@@ -64,24 +58,18 @@
         // Create a user, do some validation too    
         $scope.addUser = function () {
             if (!$scope.user.username || !$scope.user.password) {
-                $scope.error.error = true;
+                generateNotify("Please provide a username and password", 'warning');
-                $scope.error.errorMessage = "Please provide a correct username and password";
-                generateNotify($scope.error.errorMessage, 'warning');
                 return;
             }
             if ($scope.selectedPermissions.length === 0) {
-                $scope.error.error = true;
+                generateNotify("Please select a permission", 'warning');
-                $scope.error.errorMessage = "Please select a permission";
-                generateNotify($scope.error.errorMessage, 'warning');
                 return;
             }
 
             var hasReadOnly = $scope.selectedPermissions.indexOf(ReadOnlyPermission) !== -1;
             if (hasReadOnly) {
                 if ($scope.selectedPermissions.length > 1) {
-                    $scope.error.error = true;
+                    generateNotify("Cannot have the " + ReadOnlyPermission + " permission with other permissions.", 'danger');
-                    $scope.error.errorMessage = "Cannot have the " + ReadOnlyPermission + " permission with other permissions.";
-                    generateNotify($scope.error.errorMessage, 'danger');
                     return;
                 }
             }
@@ -89,8 +77,7 @@
             userManagementService.addUser($scope.user, $scope.selectedPermissions, $scope.selectedFeatures)
                 .then(function (data) {
                     if (data.message) {
-                        $scope.error.error = true;
+                        generateNotify(data.message, 'warning');
-                        $scope.error.errorMessage = data.message;
                     } else {
                         $scope.users.push(data.data); // Push the new user into the array to update the DOM
                         $scope.user = {};

PlexRequests.UI/Content/app/userManagement/userManagementService.js

@@ -16,6 +16,13 @@
                 return null;
             }
 
+            if (!isArray(permissions)) {
+                permissions = [];
+            }
+            if (!isArray(features)) {
+                features = [];
+            }
+
             var url = createBaseUrl(getBaseUrl(), '/usermanagement/createuser');
 
             return $http({
@@ -38,6 +45,14 @@
 
         var updateUser = function (id, permissions, features, alias, email) {
 
+            if (!isArray(permissions)) {
+                permissions = [];
+            }
+            if (!isArray(features)) {
+                features = [];
+            }
+
+
             var url = createBaseUrl(getBaseUrl(), '/usermanagement/updateUser');
             return $http({
                 url: url,
@@ -69,6 +84,10 @@
         return $('#baseUrl').text();
     }
 
+    function isArray(obj) {
+        return !!obj && Array === obj.constructor;
+    }
+
     angular.module('PlexRequests').factory('userManagementService', ["$http", userManagementService]);
 
 }());

PlexRequests.UI/Content/base.css

@@ -56,6 +56,17 @@ label {
   margin-bottom: 0.5rem !important;
   font-size: 16px !important; }
 
+.small-label {
+  display: inline-block !important;
+  margin-bottom: 0.5rem !important;
+  font-size: 11px !important; }
+
+.small-checkbox {
+  min-height: 0 !important; }
+
+.round-checkbox {
+  border-radius: 8px; }
+
 .nav-tabs > li {
   font-size: 13px;
   line-height: 21px; }
@@ -294,6 +305,45 @@ label {
   text-align: center;
   line-height: 13px; }
 
+.small-checkbox label {
+  display: inline-block;
+  cursor: pointer;
+  position: relative;
+  padding-left: 25px;
+  margin-right: 15px;
+  font-size: 13px;
+  margin-bottom: 10px; }
+
+.small-checkbox label:before {
+  content: "";
+  display: inline-block;
+  width: 18px;
+  height: 18px;
+  margin-right: 10px;
+  position: absolute;
+  left: 0;
+  bottom: 1px;
+  border: 2px solid #eee;
+  border-radius: 8px;
+  min-height: 0px !important; }
+
+.small-checkbox input[type=checkbox] {
+  display: none; }
+
+.small-checkbox input[type=checkbox]:checked + label:before {
+  content: "\2713";
+  font-size: 13px;
+  color: #fafafa;
+  text-align: center;
+  line-height: 13px; }
+
+.small-checkbox label {
+  min-height: 0 !important;
+  padding-left: 20px;
+  margin-bottom: 0;
+  font-weight: normal;
+  cursor: pointer; }
+
 .input-group-sm {
   padding-top: 2px;
   padding-bottom: 2px; }

PlexRequests.UI/Content/base.scss

@@ -86,6 +86,21 @@ label {
     margin-bottom: .5rem $i;
     font-size: 16px $i;
 }
+.small-label {
+    display: inline-block $i;
+    margin-bottom: .5rem $i;
+    font-size: 11px $i;
+}
+
+.small-checkbox{
+    min-height:0 $i;
+
+}
+
+
+.round-checkbox {
+    border-radius:8px;
+}
 
 .nav-tabs > li {
     font-size: 13px;
@@ -369,6 +384,50 @@ $border-radius: 10px;
     line-height: 13px;
 }
 
+.small-checkbox label {
+    display: inline-block;
+    cursor: pointer;
+    position: relative;
+    padding-left: 25px;
+    margin-right: 15px;
+    font-size: 13px;
+    margin-bottom: 10px;
+}
+
+.small-checkbox label:before {
+    content: "";
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    margin-right: 10px;
+    position: absolute;
+    left: 0;
+    bottom: 1px;
+    border: 2px solid #eee;
+    border-radius: 8px;
+    min-height:0px $i;
+}
+
+.small-checkbox input[type=checkbox] {
+    display: none;
+}
+
+.small-checkbox input[type=checkbox]:checked + label:before {
+    content: "\2713";
+    font-size: 13px;
+    color: #fafafa;
+    text-align: center;
+    line-height: 13px;
+}
+
+.small-checkbox label {
+  min-height: 0 $i;
+  padding-left: 20px;
+  margin-bottom: 0;
+  font-weight: normal;
+  cursor: pointer;
+}
+
 .input-group-sm {
     padding-top: 2px;
     padding-bottom: 2px;

PlexRequests.UI/PlexRequests.UI.csproj

@@ -685,7 +685,7 @@
     <Content Include="Views\Admin\EmailNotifications.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Views\Admin\Status.cshtml">
+    <Content Include="Views\SystemStatus\Status.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Views\Admin\PushbulletNotifications.cshtml">
@@ -706,7 +706,7 @@
     <Content Include="Views\Admin\Headphones.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Views\Admin\_Sidebar.cshtml">
+    <Content Include="Views\Shared\Partial\_Sidebar.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Views\Admin\SlackNotifications.cshtml">
@@ -751,10 +751,10 @@
     <None Include="Views\Admin\NewsletterSettings.cshtml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="Views\Admin\RequestFaultQueue.cshtml">
+    <Content Include="Views\FaultQueue\RequestFaultQueue.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Views\Admin\UserManagementSettings.cshtml">
+    <Content Include="Views\UserManagementSettings\UserManagementSettings.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="Web.Debug.config">

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 />
             

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)

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)

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)

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">

PlexRequests.UI/Views/Admin/Logs.cshtml

@@ -1,5 +1,5 @@
 @using PlexRequests.UI.Helpers
-@Html.Partial("_Sidebar")
+@Html.Partial("Shared/Partial/_Sidebar")
 @Html.LoadTableAssets()
 
 @{

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">

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">

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)

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">

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">

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">
 

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)

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)

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">

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)

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>

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")

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>

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 />

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">