From d182c194ed6bc830be84370a53dc5c5fd5709f36 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Fri, 9 Sep 2016 15:47:55 +0530 Subject: [PATCH 1/3] removing data table css from custom.desktop.css --- .../public/css/custom-desktop.css | 428 ------------------ 1 file changed, 428 deletions(-) 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 49ada6fc1e..13351ce4d2 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 @@ -1973,434 +1973,6 @@ input[type=number].form-control { } } -/* ======================================================================== - * list table styles - * ======================================================================== */ -.table.list-table { - min-width: 100%; - display: block; -} - -.table.list-table thead, -.table.list-table tbody { - vertical-align: top; -} - -.table.list-table > tbody > tr > td, -.table.list-table > tbody > tr > th, -.table.list-table > tfoot > tr > td, -.table.list-table > tfoot > tr > th, -.table.list-table > thead > tr > td, -.table.list-table > thead > tr > th { - border: none; - padding: 8px; - vertical-align: middle; - overflow: hidden; - position: relative; -} - -.table.list-table .h1, .table.list-table .h2, .table.list-table .h3, .table.list-table .h4, .table.list-table .h5, .table.list-table .h6, .table.list-table h1, .table.list-table h2, .table.list-table h3, .table.list-table h4, .table.list-table h5, .table.list-table h6 { - margin: 0; -} - -.table.list-table tr { - border-bottom: 5px solid transparent; -} - -.table.list-table > thead > tr.sort-row { - display: none; -} - -.table.list-table > tbody > tr:nth-of-type(odd), -.table.list-table > tbody > tr:nth-of-type(even) { - background-color: transparent; -} - -.table.list-table > tbody > tr.child ul { - text-align: left; - display: block; -} - -.table.table-hover > tbody > tr:hover td:not(.dataTables_empty) { - background: #e4e4e4 !important; -} - -.table.table-hover > tbody > tr:hover td:not(.dataTables_empty).fade-edge:after { - content: ""; - background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, fade(#e4e4e4, 0%)), color-stop(100%, fade(#e4e4e4, 100%))); - background-image: -webkit-linear-gradient(left, fade(#e4e4e4, 0%), fade(#e4e4e4, 100%)); - background: linear-gradient(to right, fade(#e4e4e4, 0%), fade(#e4e4e4, 100%)); - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=1, StartColorStr='#00$color', EndColorStr='$color'); - bottom: 0; - max-height: 100%; - position: absolute; - right: 0; - height: 10000px; - width: 60px; -} - -.table.table-selectable > tbody > tr:hover { - cursor: pointer; -} - -.table.table-selectable > tbody > tr:hover td:not(.dataTables_empty):first-child:before, -.table.table-selectable > tbody > tr.DTTT_selected td:not(.dataTables_empty):first-child:before { - position: absolute; - display: block; - content: ""; - background-color: transparent; - border-left: 2px solid #fff; - border-bottom: 2px solid #fff; - height: .65rem; - width: 1.3rem; - z-index: 102; - -webkit-transform: rotate(-45deg); - transform: rotate(-45deg); - right: 0.3rem; - left: auto; - top: 0.3rem; -} - -.table.table-selectable.grid-view > tbody > tr.DTTT_selected td:not(.dataTables_empty):first-child { - border: 5px solid #007d85; -} - -.table.table-selectable:not(.grid-view) > tbody > tr.DTTT_selected td:not(.dataTables_empty) { - background: #2C313B !important; - color: #fff; -} - -.table.table-selectable > tbody > tr:hover td:not(.dataTables_empty):first-child:after, -.table.table-selectable > tbody > tr.DTTT_selected td:not(.dataTables_empty):first-child:after, -.table.table-selectable > tbody > tr[data-type=selectable] td:not(.dataTables_empty):first-child:after { - position: absolute; - display: block; - border-top: 32px solid #007d85; - border-left: 32px solid transparent; - right: 0; - content: ""; - top: 0; - z-index: 101; -} - -.table.table-selectable > tbody > tr[data-type=selectable]:not(:hover):not(.DTTT_selected) td:not(.dataTables_empty):first-child:after { - border-top-color: #e4e4e4; -} - -.table.list-table thead tr.bulk-action-row { - display: block; - margin: 0 15px; -} - -.table.list-table thead tr.bulk-action-row > th, .table.list-table thead tr.bulk-action-row > td { - display: block !important; -} - -.table.list-table thead tr.bulk-action-row > th > div, .table.list-table thead tr.bulk-action-row > td > div, -.table.list-table thead tr.bulk-action-row > th > span, .table.list-table thead tr.bulk-action-row > td > span, -.table.list-table thead tr.bulk-action-row > th > ul, .table.list-table thead tr.bulk-action-row > td > ul { - margin: 0 -10px; -} - -.table.list-table > thead.block > tr > td:not(:empty):before, -.table.list-table > thead.block > tr > th:not(:empty):before { - content: attr(data-for); -} - -.table.list-table:not(.grid-view) .content-fill { - width: 1%; -} - -.table.list-table:not(.grid-view) > tbody > tr > td, -.table.list-table:not(.grid-view) > tbody > tr > th { - background: #f5f5f5; -} - -.table.list-table:not(.grid-view) > tbody > tr > td.fade-edge:after, -.table.list-table:not(.grid-view) > tbody > tr > th.fade-edge:after { - display: none; -} - -.table.list-table:not(.grid-view) tbody { - margin: 0 15px; -} - -.table.list-table:not(.grid-view) .thumbnail { - max-width: 60px; - min-width: 60px; -} - -.table.list-table.grid-view > thead > tr { - width: auto; -} - -.table.list-table.grid-view > tbody > tr > td, -.table.list-table.grid-view > tbody > tr > th, -.table.list-table.grid-view > tfoot > tr > td, -.table.list-table.grid-view > tfoot > tr > th { - display: block; - white-space: nowrap; - padding: 10px 0; -} - -.table.list-table.grid-view > tbody > tr > td[data-grid-label]:before, -.table.list-table.grid-view > tbody > tr > th[data-grid-label]:before { - content: attr(data-grid-label):; - font-weight: 600; - margin-right: 8px; -} - -.table.list-table.grid-view > tbody > tr.header-row { - display: none; -} - -.table.list-table.grid-view > thead > tr > td, -.table.list-table.grid-view > thead > tr > th { - display: inline-block; -} - -.table.list-table.grid-view > thead > tr > td:not(:empty):before, -.table.list-table.grid-view > thead > tr > th:not(:empty):before { - content: attr(data-for); -} - -.table.list-table.grid-view .hidden-on-grid-view { - display: none; -} - -.table.list-table.grid-view .padding-reduce-on-grid-view { - padding: 1px; -} - -.table.list-table.grid-view .text-left-on-grid-view { - text-align: left; -} - -.table.list-table.grid-view .text-right-on-grid-view { - text-align: right; -} - -.table.list-table.grid-view .text-center-on-grid-view { - text-align: center; -} - -.table.list-table { - width: auto; - display: block; -/* - margin-right: -15px; - margin-left: -15px; -*/ -} - -.table.list-table > thead, -.table.list-table > tbody, -.table.list-table > tfoot { - display: block; -} - -.table.list-table.grid-view tr { - display: inline-block; -} - -.table.list-table.grid-view > tbody > tr { - padding: 15px 15px 0; -} - -.table.list-table.grid-view .filter-row, -.table.list-table thead.block .filter-row { - background: #e4e4e4; - margin: 0 15px; - padding: 15px; - display: block; -} - -.table.list-table.grid-view .filter-row th:empty, -.table.list-table thead.block .filter-row th:empty { - display: none; -} - -.table.list-table.grid-view tr td { - padding: 0; -} - -@media (max-width: 767px) { - .table.list-table > thead > tr.filter-row, - .table.list-table > thead > tr.filter-row > td, - .table.list-table > thead > tr.filter-row > th { - display: block; - } -} - -@media (min-width: 320px) and (max-width: 479px) { - .table.list-table.grid-view tr { - width: 100%; - } -} - -@media (min-width: 480px) and (max-width: 767px) { - .table.list-table.grid-view tr { - width: 50%; - } - .table.list-table:not(.grid-view) .content-fill { - width: auto; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .table.list-table.grid-view tr { - width: 33.3%; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .table.list-table.grid-view tr { - width: 20%; - } -} - -@media (min-width: 1200px) { - .table.list-table.grid-view tr { - width: 10%; - } -} - -/* ======================================================================== - * data table styles - * ======================================================================== */ -table.dataTable thead .sorting:after, -table.dataTable thead .sorting_asc:after, -table.dataTable thead .sorting_desc:after { - font-family: "font-wso2"; -} - -.dataTables_wrapper ul.sort-list li a:before, -.dataTables_wrapper ul.sort-list li a.sorting_asc:before, -.dataTables_wrapper ul.sort-list li a.sorting_desc:before { - font-family: "font-wso2"; - margin-right: 10px; - font-size: 11px; - opacity: 1; - filter: "alpha(opacity=100)"; -} - -.dataTables_wrapper ul.sort-list li a:before { - opacity: 0.2; - filter: "alpha(opacity=20)"; -} - -table.dataTable thead .sorting:after, -.dataTables_wrapper ul.sort-list li a:before { - content: "\e673"; -} - -table.dataTable thead .sorting_asc:after, -.dataTables_wrapper ul.sort-list li a.sorting_asc:before { - content: "\e64b"; -} - -table.dataTable thead .sorting_desc:after, -.dataTables_wrapper ul.sort-list li a.sorting_desc:before { - content: "\e663"; -} - -table.dataTable thead .sorting { - padding-right: 30px !important; -} - -table.dataTable thead .no-sort:after { - display: none !important; -} - -table.dataTable thead .no-sort { - pointer-events: none !important; - cursor: default !important; -} - -table.dataTable tr.filter-row td, -table.dataTable tr.filter-row th { - padding: 0 8px 10px; -} - -.dataTables_wrapper > div.row > div { - text-align: left; -} - -.dataTables_filter, -.dataTables_toolbar, -.dataTables_length, -.dataTables_info { - text-align: left; - float: left; -} - -.dataTables_toolbar, -.dataTables_paginate { - float: right; -} - -.dataTablesTop, -.dataTablesBottom { - margin: 0; -} - -.dataTablesTop:after, -.dataTablesBottom:after { - content: " "; - display: block; - font-size: 0; - height: 0; - clear: both; - visibility: hidden; -} - -.dataTablesBottom .dataTables_info { - padding: 4px 0 0 10px; - margin-left: 10px; - border-left: 1px solid #e4e4e4; -} - -.dataTables_filter .search-icon { - position: relative; - z-index: 1; - right: -10px; - top: 0; - color: #7B7B7B; - cursor: pointer; -} - -.dataTables_filter input { - padding: 0 15px 0 35px; - min-width: 300px; - margin: 0 0 0 -14px !important; -} - -.table.dataTable tbody tr.active td, -.table.dataTable tbody tr.active th, -.table.dataTable tbody tr.active:hover td, -.table.dataTable tbody tr.active:hover th { - background-color: #2c313b !important; -} - -.table.dataTable tbody tr td.dataTables_empty { - overflow: visible; - cursor: default; - background: none; - padding: 0; -} - -table.dataTable.dtr-inline.collapsed > tbody > tr > td:first-child:before, -table.dataTable.dtr-inline.collapsed > tbody > tr > th:first-child:before { - top: 50%; - left: 10px; - margin-top: -8px; -} - -table.dataTable.dtr-inline.collapsed > tbody > tr > td:first-child:first-child, -table.dataTable.dtr-inline.collapsed > tbody > tr > th:first-child:first-child { - padding-left: 40px !important; -} - /* ======================================================================== * thumbnail styles * ======================================================================== */ From f90873865986b1bf3b0da9420dde7bf4dfd7ef45 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Fri, 9 Sep 2016 18:23:44 +0530 Subject: [PATCH 2/3] Modal Changes --- .../app/pages/cdmf.page.devices/devices.hbs | 102 ++-- .../app/pages/cdmf.page.policies/policies.hbs | 527 +++++++++--------- .../app/pages/cdmf.page.users/users.hbs | 21 +- 3 files changed, 337 insertions(+), 313 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs index 421ab3b779..4b1975f9bf 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs @@ -229,61 +229,83 @@
-
-
-
-

Do you really want to remove this device from your Devices List?

+ + +
+
-
-
-
-

Device was successfully removed.

-
+ + +
-
-
-
-

Please enter new name for the device?

-
- -
- -
- -
+ + +
+
+ + +