From 08e8a038f222c66ce6f55760a766e90b87b3c50b Mon Sep 17 00:00:00 2001 From: Laurence Maultsby Date: Mon, 8 May 2017 13:49:59 -0400 Subject: [PATCH] Row striping for platform roles, users, and projects Signed-off-by: Laurence Maultsby --- skyquake/framework/core/modules/api/userManagementAPI.js | 4 ++-- skyquake/framework/style/_colors.scss | 1 + .../project_management/src/dashboard/dashboard.jsx | 2 +- .../project_management/src/dashboard/projectMgmt.scss | 8 ++++++++ .../plugins/user_management/src/dashboard/userMgmt.scss | 3 +++ .../platformRoleManagement/platformRoleManagement.scss | 8 ++++++++ 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/skyquake/framework/core/modules/api/userManagementAPI.js b/skyquake/framework/core/modules/api/userManagementAPI.js index c05c2b343..1aee575d7 100644 --- a/skyquake/framework/core/modules/api/userManagementAPI.js +++ b/skyquake/framework/core/modules/api/userManagementAPI.js @@ -211,7 +211,7 @@ UserManagement.update = function(req) { var api_server = req.query['api_server']; var bodyData = req.body; data = { - "user":[bodyData] + "rw-user:user": bodyData } var updateTasks = []; if(bodyData.hasOwnProperty('old-password')) { @@ -237,7 +237,7 @@ UserManagement.update = function(req) { updateTasks.push(changePW); }; var updateUser = rp({ - uri: utils.confdPort(api_server) + '/api/config/user-config', + uri: utils.confdPort(api_server) + '/api/config/user-config/user/' + bodyData['user-name'] + ',' + bodyData['user-domain'], method: 'PUT', headers: _.extend({}, constants.HTTP_HEADERS.accept.data, { 'Authorization': req.session && req.session.authorization diff --git a/skyquake/framework/style/_colors.scss b/skyquake/framework/style/_colors.scss index 24a4475f6..a01c293f3 100644 --- a/skyquake/framework/style/_colors.scss +++ b/skyquake/framework/style/_colors.scss @@ -66,6 +66,7 @@ $neutral-light-3: hsl(360, 100%, 50%); $neutral-light-4: hsl(360, 100%, 50%); $neutral-light-5: hsl(360, 100%, 50%); +$neutral-dark-0: hsl(0, 0%, 80.7%); $neutral-dark-1: hsl(0, 0%, 63.7%); $neutral-dark-2: hsl(0, 0%, 56.7%); $neutral-dark-3: hsl(0, 0%, 49.7%); diff --git a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx index 66c3f4873..c0adc7a4a 100644 --- a/skyquake/plugins/project_management/src/dashboard/dashboard.jsx +++ b/skyquake/plugins/project_management/src/dashboard/dashboard.jsx @@ -311,7 +311,7 @@ class ProjectManagementDashboard extends React.Component { - +
{!state.isReadOnly ? : null} diff --git a/skyquake/plugins/project_management/src/dashboard/projectMgmt.scss b/skyquake/plugins/project_management/src/dashboard/projectMgmt.scss index eca6a5993..3b23963ab 100644 --- a/skyquake/plugins/project_management/src/dashboard/projectMgmt.scss +++ b/skyquake/plugins/project_management/src/dashboard/projectMgmt.scss @@ -151,6 +151,11 @@ justify-content:center; } } + tbody tr { + &:nth-child(even) { + background:$neutral-dark-0; + } + } } .userTable { .FormSection-body { @@ -239,6 +244,9 @@ font-weight:bold; } &--data { + &:nth-child(even) { + background:$neutral-dark-0; + } &:hover:not(&-active) { background:$neutral-dark-1; } diff --git a/skyquake/plugins/user_management/src/dashboard/userMgmt.scss b/skyquake/plugins/user_management/src/dashboard/userMgmt.scss index a265f0dbf..a332c556a 100644 --- a/skyquake/plugins/user_management/src/dashboard/userMgmt.scss +++ b/skyquake/plugins/user_management/src/dashboard/userMgmt.scss @@ -131,6 +131,9 @@ font-weight:bold; } &--data { + &:nth-child(even) { + background:$neutral-dark-0; + } &:hover:not(&-active) { background:$neutral-dark-1; } diff --git a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.scss b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.scss index dc8fcce60..ac81d90e2 100644 --- a/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.scss +++ b/skyquake/plugins/user_management/src/platformRoleManagement/platformRoleManagement.scss @@ -147,6 +147,11 @@ justify-content:center; } } + tbody tr { + &:nth-child(even) { + background:$neutral-dark-0; + } + } } } @@ -229,6 +234,9 @@ font-weight:bold; } &--data { + &:nth-child(even) { + background:$neutral-dark-0; + } &:hover:not(&-active) { background:$neutral-dark-1; } -- 2.25.1