From 4ef26cc12a18f838f37b105d0170856aa876c4e3 Mon Sep 17 00:00:00 2001 From: Dileesha Rajapakse Date: Wed, 9 Aug 2017 11:07:07 +0530 Subject: [PATCH 1/3] Fixing product-iots#1281 Fixed https://github.com/wso2/product-iots/issues/1281 --- .../app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs index eb788c4a81..49f4e02bad 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs @@ -764,7 +764,7 @@ stationaryAlert.addClass("geo-alert"); var withinAlert = createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/within_alert.html', - 'Add Geofence Alert', 'glyphicon glyphicon-log-in', geoToolsMenu); + 'Add Geofence Enter Alert', 'glyphicon glyphicon-log-in', geoToolsMenu); withinAlert.addClass("geo-alert"); var exitAlert = createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/exit_alert.html', From d518ebd271d1f1682285963f72eed3d2e4688a93 Mon Sep 17 00:00:00 2001 From: Dileesha Rajapakse Date: Mon, 21 Aug 2017 13:54:58 +0530 Subject: [PATCH 2/3] Fixing product-iots#1314 Fixed https://github.com/wso2/product-iots/issues/1314 --- .../devicemgt/app/pages/cdmf.page.groups/css/groups.css | 3 +++ .../devicemgt/app/pages/cdmf.page.groups/groups.hbs | 4 ++++ 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.groups/css/groups.css diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/css/groups.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/css/groups.css new file mode 100644 index 0000000000..2b489b1944 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/css/groups.css @@ -0,0 +1,3 @@ +.dataTablesTop .dataTables_toolbar ul li:nth-child(1), .dataTables_toolbar ul li:nth-child(2){ + display: none; +} \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs index 645d05b0ed..fc8119f547 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs @@ -22,6 +22,10 @@ {{unit "cdmf.unit.data-tables-extended"}} {{unit "cdmf.unit.lib.ui-permissions-utility"}} +{{#zone "topCss"}} + {{css "css/groups.css"}} +{{/zone}} + {{#zone "breadcrumbs"}}
  • From c6d6d61df6a75d6ec16cd46823d971db6442a452 Mon Sep 17 00:00:00 2001 From: Dileesha Rajapakse Date: Mon, 21 Aug 2017 14:01:55 +0530 Subject: [PATCH 3/3] Fixed formatting issues --- .../devicemgt/app/pages/cdmf.page.groups/css/groups.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/css/groups.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/css/groups.css index 2b489b1944..07e0846abe 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/css/groups.css +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/css/groups.css @@ -1,3 +1,3 @@ -.dataTablesTop .dataTables_toolbar ul li:nth-child(1), .dataTables_toolbar ul li:nth-child(2){ +.dataTablesTop .dataTables_toolbar ul li:nth-child(1), .dataTables_toolbar ul li:nth-child(2){ display: none; } \ No newline at end of file