From d38714b7e646f9977f00c792b558129a1aec0563 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Wed, 5 Jul 2017 12:08:45 +0530 Subject: [PATCH 1/2] fixes wso2/product-iots#1113 --- .../operation-bar.hbs | 2 +- .../operation-bar.hbs | 2 +- .../public/css/custom-desktop.css | 25 +++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs index 0dd0c6a174..b389f8bb57 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs @@ -36,7 +36,7 @@ } {{#each control_operations}} - + {{name}} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs index 343098c3d7..bb0a8f9e3a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.operation-bar/operation-bar.hbs @@ -35,7 +35,7 @@ } {{#each control_operations}} - + {{#if iconFont}} {{else}} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css index d4d33dad3d..1598fa8578 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css @@ -2844,6 +2844,31 @@ a.ast-type-item:hover { } /* operations panel/board */ +.operation-tile{ + width: 88px; + height: 100px; + background-color: #ebebeb; + float: left; + margin: 0px 10px 10px 0px; + cursor: pointer; + position: relative; +} + +.operation-tile i{ + padding: 15px 0px 0px 0px; + display: block; + min-height: 65px; + margin: -5px !important; + font-size: 36px !important; +} + +.operation-tile span{ + height: 35px; + line-height: 15px; + vertical-align: middle; + display: table-cell !important; + width: inherit; +} .wr-operations-board { background: #fafafa; margin-bottom: 10px; From e1857099a7e2fa8d42d49a04b995661de4bfa015 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Thu, 6 Jul 2017 14:17:16 +0530 Subject: [PATCH 2/2] Fixes wso2/product-iots#1083 --- .../devicemgt/app/pages/cdmf.page.policies/policies.hbs | 2 +- .../units/cdmf.unit.policy.create/public/js/policy-create.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs index 1819831912..fcce815fc0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs @@ -209,7 +209,7 @@ data-search="{{platform}}" data-display="{{platform}}"> - diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js index 303f338140..789f0114bd 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js @@ -66,7 +66,7 @@ var disableInlineError = function (inputField, errorMsg, errorSign) { */ function loadGroups(callback) { invokerUtil.get( - "/api/device-mgt/v1.0/groups", + "/api/device-mgt/v1.0/admin/groups", function (data) { data = JSON.parse(data); callback(data.deviceGroups);