deenath
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

Browse Source
revert-70aa11f8
kamidu 8 years ago
parent 70dd5ded77 3cbaecfbbf
commit d7c7315f16
7 changed files with 68 additions and 636 deletions
Show Stats Download Patch File Download Diff File

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
Unescape View File

@ -45,9 +45,9 @@ var invokers = function () {
* If the token pair is not set in the session, this will return null.
*/
privateMethods.getAccessToken = function () {
var tokenPair = parse(session.get(constants["TOKEN_PAIR"]));
var tokenPair = session.get(constants["TOKEN_PAIR"]);
if (tokenPair) {
return tokenPair["accessToken"];
return parse(tokenPair)["accessToken"];
} else {
return null;
}

12
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
Unescape View File

@ -15,6 +15,7 @@
specific language governing permissions and limitations
under the License.
}}
{{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}}
{{#zone "breadcrumbs"}}
@ -24,8 +25,9 @@
</a>
</li>
<li>
<!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/certificates">
Certificate
Certificates
</a>
</li>
{{/zone}}
@ -33,6 +35,7 @@
{{#zone "navbarActions"}}
{{#if removePermitted}}
<li>
<!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/certificates/add">
<span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i>
@ -97,10 +100,7 @@
</tr>
</thead>
<tbody id="ast-container">
<br class="c-both"/>
</tbody>
<tbody id="ast-container"></tbody>
</table>
</div>
<br class="c-both"/>
@ -180,9 +180,9 @@
{{/zone}}
{{#zone "bottomJs"}}
<!--suppress HtmlUnknownTarget -->
<script id="certificate-listing" data-current-user="{{@user.username}}"
src="{{@page.publicUri}}/templates/certificate-listing.hbs"
type="text/x-handlebars-template"></script>
{{js "/js/certificate-listing.js"}}
{{/zone}}

22
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
Unescape View File

@ -16,26 +16,16 @@
under the License.
}}
{{#zone "contentTitle"}}
<div class="row wr-device-board">
<div class="col-lg-12 wr-secondary-bar">
<label class="device-id device-select"
data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
data-appcontext="{{@app.context}}">
{{#zone "content"}}
<h1 class="page-sub-title device-id device-select" data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}">
Device {{device.name}}
{{#if device.viewModel.vendor}}
{{#if device.viewModel.model}}
<span class="lbl-device">
( {{device.viewModel.vendor}} {{device.viewModel.model}} )
</span>
{{/if}}
</label>
</div>
</div>
{{/zone}}
{{#zone "content"}}
<div class="row no-gutter add-padding-5x add-margin-top-5x"
style="border: 1px solid #e4e4e4;">
</h1>
<div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
<div class="media">
<div id="device_overview">
<div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2">
@ -194,7 +184,7 @@
</div>
</div>
{{/defineZone}}
</div>
</div>
{{/zone}}
{{#zone "bottomJs"}}
{{js "js/device-view.js"}}

561
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
Unescape View File

@ -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
* ======================================================================== */
@ -6355,139 +5927,6 @@ body.inverse .fade-edge:after {
}
}
/* ========================================================================
* data table styles
* ======================================================================== */
table.dataTable thead .sorting:after,
table.dataTable thead .sorting_asc:after,
table.dataTable thead .sorting_desc:after,
.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';
}
.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 {
margin-right: 10px;
font-size: 11px;
opacity: 1;
}
.dataTables_wrapper ul.sort-list li a:before {
opacity: 0.2;
}
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;
}
table.dataTable tr td.dataTables_empty {
overflow: visible;
cursor: default;
}
.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 0 10px;
}
.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: #fff;
cursor: pointer;
}
.dataTables_filter input {
padding: 0 15px 0 35px;
margin: 0 0 0 -14px !important;
background-color: #bbb;
color: #fff;
height: 40px;
min-width: 400px;
border: none;
}
.dataTables_filter input::-webkit-input-placeholder {
color: #dedede;
}
.dataTables_filter input:-moz-placeholder { /* Firefox 18- */
color: #dedede;
}
.dataTables_filter input::-moz-placeholder { /* Firefox 19+ */
color: #dedede;
}
.dataTables_filter input:-ms-input-placeholder {
color: #dedede;
}
.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.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

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-theme.css
Unescape View File

@ -488,6 +488,9 @@ form .form-group label{
display: inline-block;
}
.panel-default.active .visible-xs .panel-title a {
color:#fff;
}
.panel-body {
background: transparent;
padding: 0;

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/less/theme-variables.less
Unescape View File

@ -6,7 +6,7 @@
@base-dark-color: #11375B;
@base-light-color: #ffffff;
@base-success-color: #5cb85c;
@base-info-color: #009DA7;
@base-info-color: #526A84;
@base-warning-color: #f0ad4e;
@base-danger-color: #d9534f;

48
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
Unescape View File

@ -777,7 +777,7 @@ a.text-success:focus {
}
.text-info {
color: #009DA7;
color: #526A84;
}
a.text-info:hover,
@ -826,7 +826,7 @@ a.bg-success:focus {
}
.bg-info {
background-color: #009DA7;
background-color: #526A84;
}
a.bg-info:hover,
@ -2088,7 +2088,7 @@ table th[class*="col-"] {
.table > tfoot > tr > th.info,
.table > tfoot > tr.info > td,
.table > tfoot > tr.info > th {
background-color: #009DA7;
background-color: #526A84;
}
.table-hover > tbody > tr > td.info:hover,
@ -4283,7 +4283,7 @@ a.label:hover, a.label:focus {
}
.label-info {
background-color: #009DA7;
background-color: #526A84;
}
.label-info[href]:hover, .label-info[href]:focus {
background-color: #006d74;
@ -4519,8 +4519,8 @@ a.thumbnail.active {
}
.alert-info {
background-color: #009DA7;
border-color: #009DA7;
background-color: #526A84;
border-color: #526A84;
color: #fff;
}
.alert-info hr {
@ -4655,7 +4655,7 @@ a.thumbnail.active {
}
.progress-bar-info {
background-color: #009DA7;
background-color: #526A84;
}
.progress-striped .progress-bar-info {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@ -4843,13 +4843,13 @@ button.list-group-item-success.active:focus {
}
.list-group-item-info {
color: #009DA7;
background-color: #009DA7;
color: #526A84;
background-color: #526A84;
}
a.list-group-item-info,
button.list-group-item-info {
color: #009DA7;
color: #526A84;
}
a.list-group-item-info .list-group-item-heading,
button.list-group-item-info .list-group-item-heading {
@ -4858,7 +4858,7 @@ button.list-group-item-info .list-group-item-heading {
a.list-group-item-info:hover, a.list-group-item-info:focus,
button.list-group-item-info:hover,
button.list-group-item-info:focus {
color: #009DA7;
color: #526A84;
background-color: #00858e;
}
a.list-group-item-info.active, a.list-group-item-info.active:hover, a.list-group-item-info.active:focus,
@ -4866,8 +4866,8 @@ button.list-group-item-info.active,
button.list-group-item-info.active:hover,
button.list-group-item-info.active:focus {
color: #fff;
background-color: #009DA7;
border-color: #009DA7;
background-color: #526A84;
border-color: #526A84;
}
.list-group-item-warning {
@ -5246,22 +5246,22 @@ button.list-group-item-danger.active:focus {
}
.panel-info {
border-color: #009DA7;
border-color: #526A84;
}
.panel-info > .panel-heading {
color: #009DA7;
background-color: #009DA7;
border-color: #009DA7;
color: #526A84;
background-color: #526A84;
border-color: #526A84;
}
.panel-info > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #009DA7;
border-top-color: #526A84;
}
.panel-info > .panel-heading .badge {
color: #009DA7;
background-color: #009DA7;
color: #526A84;
background-color: #526A84;
}
.panel-info > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #009DA7;
border-bottom-color: #526A84;
}
.panel-warning {
@ -5416,10 +5416,10 @@ button.close {
color: #5cb85c;
}
.message-info {
border-left-color: #009DA7;
border-left-color: #526A84;
}
.message-info h4 {
color: #009DA7;
color: #526A84;
}
.message-warning {
border-left-color: #f0ad4e;
@ -6871,7 +6871,7 @@ button.close {
}
.icon-info {
color: #009DA7;
color: #526A84;
}
.icon-warning {

Write Preview
Loading…
Cancel
Save