User management stuff

Ombi-app · Aug 18, 2016 · ef58563 · ef58563
1 parent 20b2f06
commit ef58563
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/PlexRequests.UI/Content/app/userManagement/userManagementController.js b/PlexRequests.UI/Content/app/userManagement/userManagementController.js
@@ -16,7 +16,8 @@
             errorMessage: ""
         };
 
-        $scope.selectUser = function(id) {
+        $scope.selectUser = function (id) {
+            $scope.selectedUser = {};
             $scope.selectedUser = $scope.users.find(x => x.id === id);
         }
 

diff --git a/PlexRequests.UI/Content/base.css b/PlexRequests.UI/Content/base.css
@@ -341,3 +341,14 @@ label {
   -webkit-box-shadow: 3px 3px 5px 6px #191919;
   box-shadow: 3px 3px 5px 6px #191919; }
 
+.img-circle {
+  border-radius: 50%; }
+
+.user-management-menu {
+  border-style: ridge;
+  height: 100%;
+  left: 60%;
+  position: absolute;
+  width: 40%;
+  top: 7%; }
+
diff --git a/PlexRequests.UI/Content/base.min.css b/PlexRequests.UI/Content/base.min.css
diff --git a/PlexRequests.UI/Content/base.scss b/PlexRequests.UI/Content/base.scss
@@ -430,3 +430,15 @@ $border-radius: 10px;
     -webkit-box-shadow: 3px 3px 5px 6px #191919;
     box-shadow: 3px 3px 5px 6px #191919;
 }
+.img-circle {
+    border-radius: 50%;
+}
+
+.user-management-menu {
+    border-style: ridge;
+    height: 100%;
+    left: 60%;
+    position: absolute;
+    width: 40%;
+    top: 7%;
+}
diff --git a/PlexRequests.UI/Views/Shared/_AngularLayout.cshtml b/PlexRequests.UI/Views/Shared/_AngularLayout.cshtml
@@ -3,7 +3,7 @@
 <html ng-app="PlexRequests">
 @Html.Partial("Shared/Partial/_Head")
 
-<body>
+<body>@Html.LoadAngularAssets()
 
     @Html.Partial("Shared/Partial/_Navbar")
 

diff --git a/PlexRequests.UI/Views/UserManagement/Index.cshtml b/PlexRequests.UI/Views/UserManagement/Index.cshtml
@@ -1,6 +1,6 @@
 @using PlexRequests.UI.Helpers
 @inherits PlexRequests.UI.Helpers.AngularViewBase
-@Html.LoadAngularAssets()
+
 <script src="~/Content/app/userManagement/userManagementController.js"></script>
 <script src="~/Content/app/userManagement/userManagementService.js"></script>
 <div ng-controller="userManagementController" ng-init="getUsers()">
@@ -81,10 +81,10 @@
         </table>
     </div>
 
-    <div class="col-md-5 col-md-push-1" ng-show="selectedUser.username">
+    <div class="col-md-5 col-md-push-1 user-management-menu" ng-show="selectedUser.username">
         <br />
         <br />
-        <img ng-src="{{selectedUser.plexInfo.thumb}}" />
+        <img ng-show="selectedUser.plexInfo.thumb" class="col-md-pull-1 img-circle" style="position: absolute" ng-src="{{selectedUser.plexInfo.thumb}}" />
         <div hidden="hidden" ng-bind="selectedUser.id"></div>
         <div>
             <strong>Username: </strong><span ng-bind="selectedUser.username"></span>