From 70138c3c6ee31ead1c6ce280026b031d24761956 Mon Sep 17 00:00:00 2001 From: lasantha Date: Fri, 30 Jun 2017 10:49:25 +0530 Subject: [PATCH 1/3] removing select bar in device types page --- .../devicemgt/app/pages/cdmf.page.devicetypes/devicetypes.hbs | 4 ++++ .../app/pages/cdmf.page.devicetypes/public/css/custom.css | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/css/custom.css diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/devicetypes.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/devicetypes.hbs index 21dd6abb7d..e59b248e4f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/devicetypes.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/devicetypes.hbs @@ -20,6 +20,10 @@ {{unit "cdmf.unit.data-tables-extended"}} {{unit "cdmf.unit.ui.modal"}} +{{#zone "topCss"}} + {{css "css/custom.css"}} +{{/zone}} + {{#zone "breadcrumbs"}}
  • diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/css/custom.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/css/custom.css new file mode 100644 index 0000000000..094068472f --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/css/custom.css @@ -0,0 +1,3 @@ +#devicetype-table .dataTablesTop{ + Display : none; +} \ No newline at end of file From d5fac0c569247395ec2f4a230f157a98509e3c45 Mon Sep 17 00:00:00 2001 From: lasantha Date: Fri, 30 Jun 2017 14:36:08 +0530 Subject: [PATCH 2/3] Removing device type clicking option --- .../cdmf.page.devicetypes/public/js/devicetype-listing.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js index 9cfe22481a..93651c98f1 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js @@ -125,7 +125,7 @@ function loadDeviceTypes() { //noinspection JSUnusedLocalSymbols var columns = [ { - class: "remove-padding icon-only content-fill", + class: "remove-padding content-fill", data: null, defaultContent: "
    " + "" + @@ -193,7 +193,8 @@ function loadDeviceTypes() { "searching": false }; var settings = { - "sorting": false + "sorting": false, + "select": false }; var deviceTypeApiUrl = '/api/device-mgt/v1.0/admin/device-types'; From 8f225bc6231ce52b8c97fcf45aad519e0a26ad10 Mon Sep 17 00:00:00 2001 From: lasantha Date: Fri, 30 Jun 2017 15:38:06 +0530 Subject: [PATCH 3/3] Fixing minor UI issues --- .../cdmf.page.devicetypes/public/js/devicetype-listing.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js index 93651c98f1..6dfe99b268 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetypes/public/js/devicetype-listing.js @@ -193,8 +193,7 @@ function loadDeviceTypes() { "searching": false }; var settings = { - "sorting": false, - "select": false + "sorting": false }; var deviceTypeApiUrl = '/api/device-mgt/v1.0/admin/device-types';