From 4549a3408350c8fc94d78b50f26da6b7e9a1bee3 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Fri, 13 Jan 2017 17:50:18 +0530 Subject: [PATCH] changed [fw-ok] with [fw-success] --- .../public/templates/device-listing.hbs | 2 +- .../app/pages/cdmf.page.devices/public/js/listing.js | 2 +- .../devicemgt/app/pages/cdmf.page.policies/policies.hbs | 2 +- .../pages/cdmf.page.register/public/js/validate-register.js | 4 ++-- .../cdmf.unit.device.overview-section/overview-section.hbs | 2 +- .../units/cdmf.unit.device.view/public/js/device-view.js | 6 +++--- .../public/templates/policy-compliance.hbs | 4 ++-- .../cdmf.unit.device.view/public/templates/policy-list.hbs | 2 +- .../units/cdmf.unit.effective-policy.view/public/js/view.js | 2 +- .../app/units/cdmf.unit.policy.view/public/js/view.js | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs index 4fd4390096..c0fe171866 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs @@ -20,7 +20,7 @@ {{enrolmentInfo.owner}} - {{#equal enrolmentInfo.status "ACTIVE"}} Active{{/equal}} + {{#equal enrolmentInfo.status "ACTIVE"}} Active{{/equal}} {{#equal enrolmentInfo.status "INACTIVE"}} Inactive{{/equal}} {{#equal enrolmentInfo.status "BLOCKED"}} Blocked{{/equal}} {{#equal enrolmentInfo.status "REMOVED"}} Removed{{/equal}} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index b3c977f9d1..bae88512d5 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -277,7 +277,7 @@ function loadDevices(searchType, searchParam) { var html; switch (status) { case 'ACTIVE' : - html = ' Active'; + html = ' Active'; break; case 'INACTIVE' : html = ' Inactive'; 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 87c8b9ca7e..ad28493c61 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 @@ -196,7 +196,7 @@ Active/Updated {{/equal}} {{#equal status "Active"}} - Active + Active {{/equal}} {{#equal status "Inactive/Updated"}} Inactive/Updated diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js index ea67fcc832..82b0068f7c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js @@ -121,12 +121,12 @@ $(document).ready(function(){ $("#add-user-btn").prop('disabled', false); if (data == 200) { $('.wr-validation-summary strong').html( - " Successfully Submitted."); + " Successfully Submitted."); $('.wr-validation-summary').removeClass("alert-danger"); $('.wr-validation-summary').addClass("alert-success"); } else if (data == 201) { $('.wr-validation-summary strong').html( - " User created succssfully. You will be " + + " User created succssfully. You will be " + "redirected to login page."); $('.wr-validation-summary').removeClass("alert-danger"); $('.wr-validation-summary').addClass("alert-success"); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.overview-section/overview-section.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.overview-section/overview-section.hbs index 34d64824e9..8cf8c0cfd7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.overview-section/overview-section.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.overview-section/overview-section.hbs @@ -51,7 +51,7 @@ Status {{#equal device.status "ACTIVE"}} Active{{/equal}} + class="fw fw-success icon-success"> Active{{/equal}} {{#equal device.status "INACTIVE"}} Inactive{{/equal}} {{#equal device.status "BLOCKED"}} Blocked{{/equal}} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js index 3672656fd4..b0fb423aa2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js @@ -81,7 +81,7 @@ var html; switch (status) { case "COMPLETED" : - html = " Completed"; + html = " Completed"; break; case "PENDING" : html = " Pending"; @@ -90,10 +90,10 @@ html = " Error"; break; case "IN_PROGRESS" : - html = " In Progress"; + html = " In Progress"; break; case "REPEATED" : - html = " Repeated"; + html = " Repeated"; break; } return html; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs index 590662aa20..c4872949cd 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs @@ -26,7 +26,7 @@
Compliance : {{#equal compliance "COMPLIANT"}} - Compliant + Compliant {{/equal}} {{#equal compliance "NON-COMPLIANT"}} Not Compliant @@ -62,7 +62,7 @@ {{featureCode}} - {{#equal compliance true}} Compliant{{/equal}} + {{#equal compliance true}} Compliant{{/equal}} {{#equal compliance false}} Not Compliant{{/equal}} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs index 25a119461d..e90198678b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs @@ -15,7 +15,7 @@ Active/Updated {{/equal}} {{#equal status "Active"}} - Active + Active {{/equal}} {{#equal status "Inactive/Updated"}} Inactive/Updated diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js index a41d89fa1b..27a1960b8f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js @@ -30,7 +30,7 @@ var displayPolicy = function (policyPayloadObj) { if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == true) { policyStatus = ' Active/Updated'; } else if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == false) { - policyStatus = ' Active'; + policyStatus = ' Active'; } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == true) { policyStatus = ' Inactive/Updated'; } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == false) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js index c308acb65a..8ff991b1ef 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js @@ -32,7 +32,7 @@ var displayPolicy = function (policyPayloadObj) { if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == true) { policyStatus = ' Active/Updated'; } else if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == false) { - policyStatus = ' Active'; + policyStatus = ' Active'; } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == true) { policyStatus = ' Inactive/Updated'; } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == false) {