From cfa32cf75c0651b8dac12703d929b8ca4ebbdfa3 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 9 Sep 2016 11:10:01 +0530
Subject: [PATCH 1/6] Fixing icons background color issue

---
 .../devicemgt/app/units/cdmf.unit.ui.theme/theme.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.ui.theme/theme.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.hbs
index cc4c1e741d8..bd79e7563f6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.hbs
@@ -18,7 +18,7 @@
 {{#zone "topCss" override=false}}
     {{css "css/custom-theme.css"}}
     {{css "css/custom-common.css"}}
-    {{css "css/custom-desktop.css"}}
+    {{css "css/custom-desktop.css" combine=false}}
     {{css "css/docs.min.css"}}
     {{css "css/modal.css"}}
 {{/zone}}

From 432c46601b3d70194950ae03e295c2c858aedb89 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 9 Sep 2016 11:12:08 +0530
Subject: [PATCH 2/6] Fixing breadcrumb height issue

---
 .../app/units/uuf.unit.theme/public/css/theme-wso2.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/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css b/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
index 7d570d33e02..39d6f1b6caf 100644
--- a/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
+++ b/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
@@ -4431,7 +4431,7 @@ a.thumbnail.active {
 .thumbnail.icon {
   border: none;
   margin: 0;
-  background: #004675;
+  background: #11375b;
   color: #fff;
   text-align: center;
   overflow: hidden;

From 2cd5a0e65947e01ccb5fc4b0908f58f4f208afc0 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Fri, 9 Sep 2016 11:13:37 +0530
Subject: [PATCH 3/6] Enable permission check according to the new permissions

---
 .../app/pages/cdmf.page.policies/policies.js  |   2 +-
 .../cdmf.page.policy.priority/priority.hbs    |  11 +-
 .../cdmf.page.policy.priority/priority.js     |   3 +
 .../units/cdmf.unit.policy.create/create.hbs  | 115 +++---
 .../units/cdmf.unit.policy.create/create.js   |   2 +
 .../app/units/cdmf.unit.policy.edit/edit.hbs  | 377 ++++++++++--------
 .../app/units/cdmf.unit.policy.edit/edit.js   |   8 +-
 .../app/units/cdmf.unit.policy.view/view.hbs  | 138 ++++---
 .../app/units/cdmf.unit.policy.view/view.js   |   1 +
 9 files changed, 362 insertions(+), 295 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.js
index 884627e70e0..a41d4cc69a4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.js
@@ -56,7 +56,7 @@ function onRequest(context) {
         page["noPolicy"] = true;
     }
 
-    if (userModule.isAuthorized("/permission/admin/device-mgt/policies/delete")) {
+    if (userModule.isAuthorized("/permission/admin/device-mgt/policies/manage")) {
         page.managePermitted = true;
     }
     return page;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.hbs
index 7b1a0775fe6..e526b7eaf4a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.hbs
@@ -38,5 +38,14 @@
 {{/zone}}
 
 {{#zone "content"}}
-    {{unit "cdmf.unit.policy.priority"}}
+    {{#if isAuthorized}}
+        {{unit "cdmf.unit.policy.priority"}}
+    {{else}}
+        <h1 class="page-sub-title">
+            Permission Denied
+        </h1>
+        <br>
+        You not authorized to enter Policy Management Section.
+        <br>
+    {{/if}}
 {{/zone}}
\ 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.policy.priority/priority.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.js
index ccc71cc1504..76f53e8024e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.js
@@ -26,4 +26,7 @@ function onRequest(context){
             return options.fn(this);
         }
     });
+    var viewModel = {};
+    viewModel.isAuthorized = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
+    return viewModel;
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs
index adfadb50ab4..6ca4a632859 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs
@@ -16,70 +16,79 @@
   under the License.
 }}
 {{#zone "content"}}
-    <div class="row">
-        <div class="col-md-12">
-            <div class="container col-centered wr-content policy-platform">
-                <div class="wr-form">
-                    <h1 id="policy-platform-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
-                    <hr>
-                    <div id="policy-platform-wizard-steps" class="row wr-wizard">
-                        <div class="col-md-3 col-xs-3">
-                            <div class="itm-wiz itm-wiz-current" data-step="policy-platform">
-                                <div class="wiz-no">1</div>
-                                <div class="wiz-lbl hidden-xs"><span>Select a platform</span></div>
+    {{#if isAuthorized}}
+        <div class="row">
+            <div class="col-md-12">
+                <div class="container col-centered wr-content policy-platform">
+                    <div class="wr-form">
+                        <h1 id="policy-platform-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
+                        <hr>
+                        <div id="policy-platform-wizard-steps" class="row wr-wizard">
+                            <div class="col-md-3 col-xs-3">
+                                <div class="itm-wiz itm-wiz-current" data-step="policy-platform">
+                                    <div class="wiz-no">1</div>
+                                    <div class="wiz-lbl hidden-xs"><span>Select a platform</span></div>
+                                </div>
+                                <br class="c-both"/>
                             </div>
-                            <br class="c-both" />
-                        </div>
-                        <div class="col-md-3 col-xs-3">
-                            <div class="itm-wiz" data-step="policy-profile">
-                                <div class="wiz-no">2</div>
-                                <div class="wiz-lbl hidden-xs"><span>Configure profile</span></div>
+                            <div class="col-md-3 col-xs-3">
+                                <div class="itm-wiz" data-step="policy-profile">
+                                    <div class="wiz-no">2</div>
+                                    <div class="wiz-lbl hidden-xs"><span>Configure profile</span></div>
+                                </div>
+                                <br class="c-both"/>
                             </div>
-                            <br class="c-both" />
-                        </div>
-                        <div class="col-md-3 col-xs-3">
-                            <div class="itm-wiz" data-step="policy-criteria">
-                                <div class="wiz-no">3</div>
-                                <div class="wiz-lbl hidden-xs"><span>Assign</span></div>
+                            <div class="col-md-3 col-xs-3">
+                                <div class="itm-wiz" data-step="policy-criteria">
+                                    <div class="wiz-no">3</div>
+                                    <div class="wiz-lbl hidden-xs"><span>Assign</span></div>
+                                </div>
+                                <br class="c-both"/>
                             </div>
-                            <br class="c-both" />
-                        </div>
-                        <div class="col-md-3 col-xs-3">
-                            <div class="itm-wiz" data-step="policy-naming">
-                                <div class="wiz-no">4</div>
-                                <div class="wiz-lbl hidden-xs"><span>Publish to devices</span></div>
+                            <div class="col-md-3 col-xs-3">
+                                <div class="itm-wiz" data-step="policy-naming">
+                                    <div class="wiz-no">4</div>
+                                    <div class="wiz-lbl hidden-xs"><span>Publish to devices</span></div>
+                                </div>
+                                <br class="c-both"/>
                             </div>
-                            <br class="c-both" />
                         </div>
-                    </div>
-                    <hr>
-                    <div class="row">
-                        <div class="col-lg-12">
-                            <h4>Step 1: Select a platform</h4>
-                            <br>
+                        <hr>
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4>Step 1: Select a platform</h4>
+                                <br>
 
-                            <div class="row wr-tile-buttons-list">
-                                <div class="wr-input-control">
-                                    <ul class="tile-buttons row">
-                                        {{#each types}}
-                                            <li class="col-lg-4"
-                                                style="margin-top: 5px;margin-bottom: 5px;">
-                                                <a href="{{@app.context}}/policy/add/{{name}}"
-                                                   class="wizard-stepper">
-                                                    <img src="{{icon}}" width="50px"
-                                                         height="50px"><br><br>
-                                                    <b>{{label}}</b>
-                                                </a>
-                                            </li>
-                                        {{/each}}
-                                    </ul>
+                                <div class="row wr-tile-buttons-list">
+                                    <div class="wr-input-control">
+                                        <ul class="tile-buttons row">
+                                            {{#each types}}
+                                                <li class="col-lg-4"
+                                                    style="margin-top: 5px;margin-bottom: 5px;">
+                                                    <a href="{{@app.context}}/policy/add/{{name}}"
+                                                       class="wizard-stepper">
+                                                        <img src="{{icon}}" width="50px"
+                                                             height="50px"><br><br>
+                                                        <b>{{label}}</b>
+                                                    </a>
+                                                </li>
+                                            {{/each}}
+                                        </ul>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
+                <!-- content -->
             </div>
-            <!-- content -->
         </div>
-    </div>
+    {{else}}
+        <h1 class="page-sub-title">
+            Permission Denied
+        </h1>
+        <br>
+        You not authorized to enter Policy Management Section.
+        <br>
+    {{/if}}
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.js
index 79d41eab855..3f6da524773 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.js
@@ -24,6 +24,8 @@ function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
 
     var types = {};
+
+    types.isAuthorized = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
     types["types"] = [];
     var typesListResponse = deviceModule.getDeviceTypes();
     if (typesListResponse["status"] == "success") {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
index fbeb8f8eb30..f053c7beeae 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
@@ -1,222 +1,255 @@
 {{#zone "content"}}
-    <div class="row">
-        <div class="col-md-12">
+    {{#if isAuthorized }}
+        <div class="row">
+            <div class="col-md-12">
 
-            <div class="wr-steps hidden">
-                <div class="col-md-3 col-xs-3">
-                    <div class="itm-wiz itm-wiz-current" data-step="policy-profile"><div class="wiz-no">1</div><div class="wiz-lbl hidden-xs"><span>Edit current profile</span></div></div>
-                    <br class="c-both" />
-                </div>
-                <div class="col-md-3 col-xs-3">
-                    <div class="itm-wiz" data-step="policy-criteria"><div class="wiz-no">2</div><div class="wiz-lbl hidden-xs"><span>Edit assignment groups</span></div></div>
-                    <br class="c-both" />
-                </div>
-                <div class="col-md-3 col-xs-3">
-                    <div class="itm-wiz" data-step="policy-naming"><div class="wiz-no">3</div><div class="wiz-lbl hidden-xs"><span>Republish to devices</span></div></div>
-                    <br class="c-both" />
+                <div class="wr-steps hidden">
+                    <div class="col-md-3 col-xs-3">
+                        <div class="itm-wiz itm-wiz-current" data-step="policy-profile">
+                            <div class="wiz-no">1</div>
+                            <div class="wiz-lbl hidden-xs"><span>Edit current profile</span></div>
+                        </div>
+                        <br class="c-both"/>
+                    </div>
+                    <div class="col-md-3 col-xs-3">
+                        <div class="itm-wiz" data-step="policy-criteria">
+                            <div class="wiz-no">2</div>
+                            <div class="wiz-lbl hidden-xs"><span>Edit assignment groups</span></div>
+                        </div>
+                        <br class="c-both"/>
+                    </div>
+                    <div class="col-md-3 col-xs-3">
+                        <div class="itm-wiz" data-step="policy-naming">
+                            <div class="wiz-no">3</div>
+                            <div class="wiz-lbl hidden-xs"><span>Republish to devices</span></div>
+                        </div>
+                        <br class="c-both"/>
+                    </div>
                 </div>
-            </div>
 
-            <div class="container col-centered wr-content policy-message hidden">
-                <div class="wr-form">
-                    <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy is successfully re-configured.</h1>
-                    <br>Please click <b>"Add Another Policy"</b>, if you wish to add another policy or click
-                    <b>"View policy list"</b> to complete the process and go back to the policy list.
-                    <hr>
-                    <button class="wr-btn wizard-stepper" data-current="policy-message" data-direct="/emm/policies/">
-                        View policy list
-                    </button>
-                    <a href="/emm/policies/add-policy" class="cu-btn-inner">
+                <div class="container col-centered wr-content policy-message hidden">
+                    <div class="wr-form">
+                        <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy is successfully
+                            re-configured.</h1>
+                        <br>Please click <b>"Add Another Policy"</b>, if you wish to add another policy or click
+                        <b>"View policy list"</b> to complete the process and go back to the policy list.
+                        <hr>
+                        <button class="wr-btn wizard-stepper" data-current="policy-message"
+                                data-direct="/emm/policies/">
+                            View policy list
+                        </button>
+                        <a href="/emm/policies/add-policy" class="cu-btn-inner">
                         <span class="fw-stack">
                             <i class="fw fw-ring fw-stack-2x"></i>
                             <i class="fw fw-add fw-stack-1x"></i>
                         </span>
-                        Add another policy
-                    </a>
+                            Add another policy
+                        </a>
+                    </div>
                 </div>
-            </div>
 
-            <div class="container col-centered wr-content policy-naming hidden">
-                <div class="wr-form">
-                    <h1 id="policy-naming-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
-                    <hr>
-                    <div id="policy-naming-wizard-steps" class="row wr-wizard"></div>
-                    <hr>
-                    <div class="row">
-                        <div class="col-lg-12">
-                            <h4 class="visible-xs">Step 3: Republish to devices</h4>
-                            <br>
-                            <div id="policy-naming-main-error-msg" class="alert alert-danger hidden" role="alert">
-                                <i class="icon fw fw-error"></i><span></span>
-                            </div>
-                            <div>
-                                <label class="wr-input-label">
-                                    Set a name * to your policy<br>
-                                    ( should be 1-to-30 characters long )
-                                </label>
-                                <div id="policy-name-field" class="form-group wr-input-control">
-                                    <div class="cus-col-50">
-                                        <input id="policy-name-input" class="form-control" type="text" value="" placeholder="[ Required field ]"/>
-                                    </div>
-                                    <br class="c-both"/>
-                                    <span class=" nameError hidden glyphicon glyphicon-remove form-control-feedback"></span>
-                                    <label class="error nameEmpty hidden" for="summary">Policy name is required & Should be be 1-to-30 characters long.</label>
+                <div class="container col-centered wr-content policy-naming hidden">
+                    <div class="wr-form">
+                        <h1 id="policy-naming-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
+                        <hr>
+                        <div id="policy-naming-wizard-steps" class="row wr-wizard"></div>
+                        <hr>
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4 class="visible-xs">Step 3: Republish to devices</h4>
+                                <br>
+                                <div id="policy-naming-main-error-msg" class="alert alert-danger hidden" role="alert">
+                                    <i class="icon fw fw-error"></i><span></span>
                                 </div>
-                                <label class="wr-input-label">
-                                    Add a description
-                                </label>
-                                <div class="wr-input-control">
-                                    <div class="cus-col-50">
-                                        <textarea id="policy-description-input" class="form-control" rows="10" placeholder="[ Optional field ]"></textarea>
+                                <div>
+                                    <label class="wr-input-label">
+                                        Set a name * to your policy<br>
+                                        ( should be 1-to-30 characters long )
+                                    </label>
+                                    <div id="policy-name-field" class="form-group wr-input-control">
+                                        <div class="cus-col-50">
+                                            <input id="policy-name-input" class="form-control" type="text" value=""
+                                                   placeholder="[ Required field ]"/>
+                                        </div>
+                                        <br class="c-both"/>
+                                        <span class=" nameError hidden glyphicon glyphicon-remove form-control-feedback"></span>
+                                        <label class="error nameEmpty hidden" for="summary">Policy name is required &
+                                            Should be be 1-to-30 characters long.</label>
+                                    </div>
+                                    <label class="wr-input-label">
+                                        Add a description
+                                    </label>
+                                    <div class="wr-input-control">
+                                        <div class="cus-col-50">
+                                            <textarea id="policy-description-input" class="form-control" rows="10"
+                                                      placeholder="[ Optional field ]"></textarea>
+                                        </div>
+                                        <br class="c-both"/>
                                     </div>
-                                    <br class="c-both" />
                                 </div>
-                            </div>
-                            <div class="wr-input-control wr-btn-grp">
-                                <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true" data-current="policy-naming" data-next="policy-criteria">
-                                    Back
-                                </a>
-                                <a href="#" class="wr-btn wizard-stepper" data-current="policy-naming-publish" data-next="policy-message" data-validate="true">
-                                    Save & Publish
-                                </a>
-                                <a href="#" class="wr-btn wizard-stepper" data-current="policy-naming" data-next="policy-message" data-validate="true">
-                                    Save
-                                </a>
+                                <div class="wr-input-control wr-btn-grp">
+                                    <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
+                                       data-current="policy-naming" data-next="policy-criteria">
+                                        Back
+                                    </a>
+                                    <a href="#" class="wr-btn wizard-stepper" data-current="policy-naming-publish"
+                                       data-next="policy-message" data-validate="true">
+                                        Save & Publish
+                                    </a>
+                                    <a href="#" class="wr-btn wizard-stepper" data-current="policy-naming"
+                                       data-next="policy-message" data-validate="true">
+                                        Save
+                                    </a>
 
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="container col-centered wr-content policy-criteria hidden">
-                <div class="wr-form">
-                    <h1 id="policy-criteria-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
-                    <hr>
-                    <div id="policy-criteria-wizard-steps" class="row wr-wizard"></div>
-                    <hr>
-                    <div class="row">
-                        <div class="col-lg-12">
-                            <h4 class="visible-xs">Step 2: Edit assignment groups</h4>
-                            <br>
-                            <div id="policy-criteria-main-error-msg" class="alert alert-danger hidden" role="alert">
-                                <i class="icon fw fw-error"></i><span></span>
-                            </div>
-                            <div>
-                                <label class="wr-input-label">
-                                    Set device ownership type
-                                </label>
-                                <div class="wr-input-control">
-                                    <div class="cus-col-50">
-                                        <select id="ownership-input" class="form-control">
-                                            <option value="ANY" selected>ANY</option>
-                                            <option value="BYOD">BYOD (Bring Your Own Device) </option>
-                                            <option value="COPE">COPE (Corporate-Owned, Personally Enabled)</option>
-                                        </select>
-                                    </div>
-                                    <br class="c-both" />
+                <div class="container col-centered wr-content policy-criteria hidden">
+                    <div class="wr-form">
+                        <h1 id="policy-criteria-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
+                        <hr>
+                        <div id="policy-criteria-wizard-steps" class="row wr-wizard"></div>
+                        <hr>
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4 class="visible-xs">Step 2: Edit assignment groups</h4>
+                                <br>
+                                <div id="policy-criteria-main-error-msg" class="alert alert-danger hidden" role="alert">
+                                    <i class="icon fw fw-error"></i><span></span>
                                 </div>
-                                <div class="wr-input-control">
-                                    <label class="wr-input-control radio light">
-                                        <input id="user-roles-radio-btn" type="radio" name="select-users-radio-btn" class="select-users-radio" checked/>
-                                        <span class="helper">&nbsp;Set user role(s)</span>
+                                <div>
+                                    <label class="wr-input-label">
+                                        Set device ownership type
                                     </label>
-                                    <label class="wr-input-control radio light" rel="assetfilter">
-                                        <input id="users-radio-btn" type="radio" name="select-users-radio-btn" class="select-users-radio" />
-                                        <span class="helper">&nbsp;Set user(s)</span>
-                                    </label>
-                                </div>
-                                <div id="user-roles-select-field" class="select-users">
                                     <div class="wr-input-control">
                                         <div class="cus-col-50">
-                                            <select id="user-roles-input" class="form-control select2" multiple="multiple">
+                                            <select id="ownership-input" class="form-control">
                                                 <option value="ANY" selected>ANY</option>
-                                                {{#each roles}}
-                                                    <option>{{this}}</option>
-                                                {{/each}}
+                                                <option value="BYOD">BYOD (Bring Your Own Device)</option>
+                                                <option value="COPE">COPE (Corporate-Owned, Personally Enabled)</option>
                                             </select>
                                         </div>
-                                        <br class="c-both" />
+                                        <br class="c-both"/>
                                     </div>
-                                </div>
-                                <div id="users-select-field" class="select-users">
+                                    <div class="wr-input-control">
+                                        <label class="wr-input-control radio light">
+                                            <input id="user-roles-radio-btn" type="radio" name="select-users-radio-btn"
+                                                   class="select-users-radio" checked/>
+                                            <span class="helper">&nbsp;Set user role(s)</span>
+                                        </label>
+                                        <label class="wr-input-control radio light" rel="assetfilter">
+                                            <input id="users-radio-btn" type="radio" name="select-users-radio-btn"
+                                                   class="select-users-radio"/>
+                                            <span class="helper">&nbsp;Set user(s)</span>
+                                        </label>
+                                    </div>
+                                    <div id="user-roles-select-field" class="select-users">
+                                        <div class="wr-input-control">
+                                            <div class="cus-col-50">
+                                                <select id="user-roles-input" class="form-control select2"
+                                                        multiple="multiple">
+                                                    <option value="ANY" selected>ANY</option>
+                                                    {{#each roles}}
+                                                        <option>{{this}}</option>
+                                                    {{/each}}
+                                                </select>
+                                            </div>
+                                            <br class="c-both"/>
+                                        </div>
+                                    </div>
+                                    <div id="users-select-field" class="select-users">
+                                        <div class="wr-input-control">
+                                            <div class="cus-col-50">
+                                                <select id="users-input" class="form-control select2"
+                                                        multiple="multiple">
+                                                    <option value="ANY" selected>ANY</option>
+                                                    {{#each users}}
+                                                        <option>{{username}}</option>
+                                                    {{/each}}
+                                                </select>
+                                            </div>
+                                            <br class="c-both"/>
+                                        </div>
+                                    </div>
+                                    <br>
+                                    <label class="wr-input-label" title="">
+                                        Set an action upon non-compliance
+                                    </label>
                                     <div class="wr-input-control">
                                         <div class="cus-col-50">
-                                            <select id="users-input" class="form-control select2" multiple="multiple">
-                                                <option value="ANY" selected>ANY</option>
-                                                {{#each users}}
-                                                    <option>{{username}}</option>
-                                                {{/each}}
+                                            <select id="action-input" class="form-control">
+                                                <option value="enforce" data-action="enforce" selected>Enforce</option>
+                                                <option value="warn" data-action="warn">Warn</option>
+                                                <option value="monitor" data-action="monitor">Monitor</option>
                                             </select>
                                         </div>
-                                        <br class="c-both" />
+                                        <br class="c-both"/>
                                     </div>
                                 </div>
-                                <br>
-                                <label class="wr-input-label" title="">
-                                    Set an action upon non-compliance
-                                </label>
-                                <div class="wr-input-control">
-                                    <div class="cus-col-50">
-                                        <select id="action-input" class="form-control">
-                                            <option value="enforce" data-action="enforce" selected>Enforce</option>
-                                            <option value="warn" data-action="warn">Warn</option>
-                                            <option value="monitor" data-action="monitor">Monitor</option>
-                                        </select>
-                                    </div>
-                                    <br class="c-both" />
+                                <div class="wr-input-control wr-btn-grp">
+                                    <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true"
+                                       data-current="policy-criteria" data-next="policy-profile">
+                                        Back
+                                    </a>
+                                    <a href="#" class="wr-btn wizard-stepper" data-current="policy-criteria"
+                                       data-next="policy-naming" data-validate="true">
+                                        Continue
+                                    </a>
                                 </div>
                             </div>
-                            <div class="wr-input-control wr-btn-grp">
-                                <a href="#" class="wr-btn wizard-stepper" data-is-back-btn="true" data-current="policy-criteria" data-next="policy-profile">
-                                    Back
-                                </a>
-                                <a href="#" class="wr-btn wizard-stepper" data-current="policy-criteria" data-next="policy-naming" data-validate="true">
-                                    Continue
-                                </a>
-                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="container col-centered wr-content policy-profile">
-                <div class="wr-form">
-                    <h1 id="policy-profile-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
-                    <hr>
-                    <div id="policy-profile-wizard-steps" class="row wr-wizard"></div>
-                    <hr>
-                    <div class="row">
-                        <div class="col-lg-12">
-                            <h4 class="visible-xs">Step 1: Edit current profile</h4>
-                            <br>
-                            <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
-                                <i class="icon fw fw-error"></i><span></span>
-                            </div>
-                            <div class="wr-advance-operations">
-                                <div class="wr-advance-operations-init">
-                                    <br>
-                                    &nbsp;&nbsp;
-                                    <i class="fw fw-settings fw-spin fw-2x"></i>
-                                    &nbsp;Loading platform features . . .
-                                    <br>
-                                    <br>
+                <div class="container col-centered wr-content policy-profile">
+                    <div class="wr-form">
+                        <h1 id="policy-profile-page-wizard-title" class="page-sub-title">EDIT POLICY</h1>
+                        <hr>
+                        <div id="policy-profile-wizard-steps" class="row wr-wizard"></div>
+                        <hr>
+                        <div class="row">
+                            <div class="col-lg-12">
+                                <h4 class="visible-xs">Step 1: Edit current profile</h4>
+                                <br>
+                                <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
+                                    <i class="icon fw fw-error"></i><span></span>
+                                </div>
+                                <div class="wr-advance-operations">
+                                    <div class="wr-advance-operations-init">
+                                        <br>
+                                        &nbsp;&nbsp;
+                                        <i class="fw fw-settings fw-spin fw-2x"></i>
+                                        &nbsp;Loading platform features . . .
+                                        <br>
+                                        <br>
+                                    </div>
+                                </div>
+                                <div class="wr-input-control wr-btn-grp">
+                                    <a href="#" class="wr-btn wizard-stepper" data-current="policy-profile"
+                                       data-next="policy-criteria" data-validate="true">
+                                        Continue
+                                    </a>
                                 </div>
-                            </div>
-                            <div class="wr-input-control wr-btn-grp">
-                                <a href="#" class="wr-btn wizard-stepper" data-current="policy-profile" data-next="policy-criteria" data-validate="true">
-                                    Continue
-                                </a>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <!-- content -->
+                <!-- content -->
 
+            </div>
         </div>
-    </div>
+    {{else}}
+        <h1 class="page-sub-title">
+            Permission Denied
+        </h1>
+        <br>
+        You not authorized to enter Policy Management Section.
+        <br>
+    {{/if}}
 {{/zone}}
 {{#zone "bottomJs"}}
     <!--suppress HtmlUnknownTarget -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.js
index dfb1cbe953f..fef29ec4735 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.js
@@ -24,13 +24,13 @@ function onRequest(context) {
 
     var rolesResult = userModule.getRoles();
     if (rolesResult.status == "success") {
-        context.roles = rolesResult.content;
+        viewModel.roles = rolesResult.content;
     }
 
     var usersResult = userModule.getUsers();
     if (usersResult.status == "success") {
-        context.users = usersResult.content;
+        viewModel.users = usersResult.content;
     }
-
-    return context;
+    viewModel.isAuthorized = userModule.isAuthorized("/permission/admin/device-mgt/policies/manage");
+    return viewModel;
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
index b7f2adf56d4..ea2b91a78c2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
@@ -1,77 +1,87 @@
 {{#zone "content"}}
-    {{#defineZone "policy-profile-top"}}
-        <div class="row wr-device-board">
-            <div class="col-lg-12 wr-secondary-bar">
-                <label id="policy-heading" class="device-id device-select">
-                </label>
+    {{#if isAuthorized}}
+        {{#defineZone "policy-profile-top"}}
+            <div class="row wr-device-board">
+                <div class="col-lg-12 wr-secondary-bar">
+                    <label id="policy-heading" class="device-id device-select">
+                    </label>
+                </div>
             </div>
-        </div>
-    {{/defineZone}}
+        {{/defineZone}}
 
-    <!-- #page-content-wrapper -->
-    <div class="page-content-wrapper">
-        <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
-            <div class="media">
-                <div class="media-body asset-desc add-padding-left-5x">
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                        Policy Overview
-                    </div>
-                    {{#defineZone "policy-detail-properties"}}
-                        <table class="table table-responsive table-striped" id="members">
-                            <tbody>
-                            <tr role="row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td>
-                                <td id="policy-platform" style="padding:10px 15px;"></td>
-                            </tr>
-                            <tr role="row" class="odd">
-                                <td class="sorting_1" style="padding:10px 15px;">Ownership</td>
-                                <td id="policy-assignment" style="padding:10px 15px;"></td>
-                            </tr>
-                            <tr role="row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td>
-                                <td id="policy-action" style="padding:10px 15px;"></td>
-                            </tr>
-                            <tr role="row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px;">Status</td>
-                                <td id="policy-status" style="padding:10px 15px;"></td>
-                            </tr>
-                            <tr role="row" id="users-row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px;">Assigned Users</td>
-                                <td id="policy-users" style="padding:10px 15px;"></td>
-                            </tr>
-                            <tr role="row" id="roles-row" class="even">
-                                <td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td>
-                                <td id="policy-roles" style="padding:10px 15px;"></td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    {{/defineZone}}
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description</div>
-                    <div class="add-margin-top-4x">
-                        <div id="policy-description" class="panel-title-description"></div>
-                    </div>
-                    <br>
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                        Profile Information
-                    </div>
-                    <div class="add-margin-top-4x">
-                        <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
-                            <i class="icon fw fw-error"></i><span></span>
+        <!-- #page-content-wrapper -->
+        <div class="page-content-wrapper">
+            <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
+                <div class="media">
+                    <div class="media-body asset-desc add-padding-left-5x">
+                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                            Policy Overview
                         </div>
-                        <div class="wr-advance-operations">
-                            <div class="wr-advance-operations-init">
-                                <br>
-                                <i class="fw fw-settings fw-spin fw-2x"></i>
-                                Loading platform features . . .
-                                <br>
-                                <br>
+                        {{#defineZone "policy-detail-properties"}}
+                            <table class="table table-responsive table-striped" id="members">
+                                <tbody>
+                                <tr role="row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px; width: 14%;">Platform</td>
+                                    <td id="policy-platform" style="padding:10px 15px;"></td>
+                                </tr>
+                                <tr role="row" class="odd">
+                                    <td class="sorting_1" style="padding:10px 15px;">Ownership</td>
+                                    <td id="policy-assignment" style="padding:10px 15px;"></td>
+                                </tr>
+                                <tr role="row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px;">Action upon non-compliance</td>
+                                    <td id="policy-action" style="padding:10px 15px;"></td>
+                                </tr>
+                                <tr role="row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px;">Status</td>
+                                    <td id="policy-status" style="padding:10px 15px;"></td>
+                                </tr>
+                                <tr role="row" id="users-row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px;">Assigned Users</td>
+                                    <td id="policy-users" style="padding:10px 15px;"></td>
+                                </tr>
+                                <tr role="row" id="roles-row" class="even">
+                                    <td class="sorting_1" style="padding:10px 15px;">Assigned Roles</td>
+                                    <td id="policy-roles" style="padding:10px 15px;"></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        {{/defineZone}}
+                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description
+                        </div>
+                        <div class="add-margin-top-4x">
+                            <div id="policy-description" class="panel-title-description"></div>
+                        </div>
+                        <br>
+                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                            Profile Information
+                        </div>
+                        <div class="add-margin-top-4x">
+                            <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
+                                <i class="icon fw fw-error"></i><span></span>
+                            </div>
+                            <div class="wr-advance-operations">
+                                <div class="wr-advance-operations-init">
+                                    <br>
+                                    <i class="fw fw-settings fw-spin fw-2x"></i>
+                                    Loading platform features . . .
+                                    <br>
+                                    <br>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
+    {{else}}
+        <h1 class="page-sub-title">
+            Permission Denied
+        </h1>
+        <br>
+        You not authorized to enter Policy Management Section.
+        <br>
+    {{/if}}
 {{/zone}}
 {{#zone "bottomJs"}}
     <!--suppress HtmlUnknownTarget -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.js
index 2d2a438263e..e8247821b69 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.js
@@ -21,5 +21,6 @@ function onRequest(context) {
 
 //    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
 //    context.roles = userModule.getRoles();
+    context.isAuthorized = userModule.isAuthorized("/permission/admin/device-mgt/policies/view");
     return context;
 }
\ No newline at end of file

From f42215a926934fc937301cb2b6b99eb973d5f678 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <imeshc@wso2.com>
Date: Fri, 9 Sep 2016 11:37:41 +0530
Subject: [PATCH 4/6] Adding modal code changes

---
 .../public/js/certificate-listing.js                |  1 -
 .../pages/cdmf.page.devices/public/js/listing.js    |  1 -
 .../app/pages/cdmf.page.groups/public/js/listing.js |  1 -
 .../cdmf.page.policies/public/js/policy-list.js     |  1 -
 .../app/pages/cdmf.page.users/public/js/listing.js  |  5 +++--
 .../app/units/cdmf.unit.lib.qrcode/qrcode.hbs       |  1 -
 .../public/js/user-menu.js                          |  2 +-
 .../public/js/nav-menu.js                           | 13 +++++++------
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js
index a7241b92407..01acf088d11 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js
@@ -35,7 +35,6 @@ function setPopupMaxHeight() {
  */
 function showPopup() {
     $(modalPopup).modal('show');
-    //setPopupMaxHeight();
 }
 
 /*
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 ce8117634af..571d8085ad8 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
@@ -456,7 +456,6 @@ function setPopupMaxHeight() {
  */
 function showPopup() {
     $(modalPopup).modal('show');
-    //setPopupMaxHeight();
 }
 
 /*
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
index ba07b661a96..d3a5c5cc736 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
@@ -269,7 +269,6 @@ function setPopupMaxHeight() {
  */
 function showPopup() {
     $(modalPopup).modal('show');
-    //setPopupMaxHeight();
 }
 
 /*
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
index 891a4ae12d8..f9d8c14c2cf 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js
@@ -82,7 +82,6 @@ function setPopupMaxHeight() {
  */
 function showPopup() {
     $(modalPopup).modal('show');
-    //setPopupMaxHeight();
 }
 
 /*
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index 5aa17f26fe9..2b6e7170801 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -41,7 +41,7 @@ $(function () {
 var apiBasePath = "/api/device-mgt/v1.0";
 var modalPopup = ".modal";
 var modalPopupContainer = modalPopup + " .modal-content";
-var modalPopupContent = modalPopup + " .modal-body";
+var modalPopupContent = modalPopup + " .modal-content";
 var body = "body";
 $(".icon .text").res_text(0.2);
 
@@ -58,7 +58,6 @@ function setPopupMaxHeight() {
  */
 function showPopup() {
     $(modalPopup).modal('show');
-    setPopupMaxHeight();
 }
 
 /*
@@ -67,6 +66,8 @@ function showPopup() {
 function hidePopup() {
     $(modalPopupContent).html('');
     $(modalPopup).modal('hide');
+    $('body').removeClass('modal-open').css('padding-right','0px');
+    $('.modal-backdrop').remove();
 }
 
 /**
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
index 501248ece8f..d63ee909652 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs
@@ -45,7 +45,6 @@
          */
         function showQRCodePopup() {
             $(modalPopup).modal('show');
-            //setPopupMaxHeight();
         }
 
         /*
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
index ec0f34ffe70..34bb5c1ddd0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
@@ -13,7 +13,7 @@ function inputIsValid(regExp, inputString) {
 $(document).ready(function () {
     var modalPopup = ".modal";
     // var modalPopupContainer = modalPopup + " .modal-content";
-    var modalPopupContent = modalPopup + " .modal-body";
+    var modalPopupContent = modalPopup + " .modal-content";
 
     $("#change-password").click(function () {
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
index c15f80b2680..5f3605da38a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
@@ -16,9 +16,9 @@
  * under the License.
  */
 
-var modalPopup = ".wr-modalpopup",
-    modalPopupContainer = modalPopup + " .modalpopup-container",
-    modalPopupContent = modalPopup + " .modalpopup-content";
+var modalPopup = ".modal";
+var modalPopupContainer = modalPopup + " .modal-content";
+var modalPopupContent = modalPopup + " .modal-content";
 
 var emmAdminBasePath = "/api/device-mgt/v1.0";
 
@@ -37,8 +37,7 @@ function setPopupMaxHeight() {
  * show popup function.
  */
 function showPopup() {
-    $(modalPopup).show();
-    setPopupMaxHeight();
+    $(modalPopup).modal('show');
 }
 
 /*
@@ -47,7 +46,9 @@ function showPopup() {
 function hidePopup() {
     $(modalPopupContent).html("");
     $(modalPopupContent).removeClass("operation-data");
-    $(modalPopup).hide();
+    $(modalPopup).modal('hide');
+    $('body').removeClass('modal-open').css('padding-right','0px');
+    $('.modal-backdrop').remove();
 }
 
 var updateNotificationCount = function (data, textStatus, jqXHR) {

From d60daae97f25e3ca142e9730ac3c7677082a94f6 Mon Sep 17 00:00:00 2001
From: harshanl <harshan@wso2.com>
Date: Fri, 9 Sep 2016 12:15:51 +0530
Subject: [PATCH 5/6] MSSQL fixes to dbscrpits and DAO layer

---
 .../impl/device/SQLServerDeviceDAOImpl.java   | 18 ++--
 .../impl/SQLServerNotificationDAOImpl.java    |  4 +-
 .../resources/dbscripts/certMgt/mssql.sql     |  2 +-
 .../main/resources/dbscripts/cdm/mssql.sql    | 82 ++-----------------
 4 files changed, 22 insertions(+), 84 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java
index a8f6f5b345f..fe942787f89 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java
@@ -162,7 +162,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.DESCRIPTION, " +
                          "d.NAME, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, " +
                          "DM_DEVICE_TYPE t WHERE DEVICE_TYPE_ID = t.ID AND t.NAME = ? " +
-                         "AND d.TENANT_ID = ?) d1 WHERE d1.ID = e.DEVICE_ID AND TENANT_ID = ? OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                         "AND d.TENANT_ID = ?) d1 WHERE d1.ID = e.DEVICE_ID AND TENANT_ID = ? ORDER BY ENROLMENT_ID" +
+                         " OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, request.getDeviceType());
             stmt.setInt(2, tenantId);
@@ -196,7 +197,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "AS DEVICE_TYPE FROM DM_DEVICE d, (SELECT e.OWNER, e.OWNERSHIP, e.ID AS ENROLMENT_ID, " +
                          "e.DEVICE_ID, e.STATUS, e.DATE_OF_LAST_UPDATE, e.DATE_OF_ENROLMENT FROM DM_ENROLMENT e WHERE " +
                          "e.TENANT_ID = ? AND e.OWNER = ?) e1, DM_DEVICE_TYPE t WHERE d.ID = e1.DEVICE_ID " +
-                         "AND t.ID = d.DEVICE_TYPE_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                         "AND t.ID = d.DEVICE_TYPE_ID ORDER BY ENROLMENT_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setString(2, request.getOwner());
@@ -230,7 +231,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.NAME, " +
                          "d.DESCRIPTION, t.NAME AS DEVICE_TYPE, d.DEVICE_IDENTIFICATION FROM DM_DEVICE d, " +
                          "DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.NAME LIKE ? AND d.TENANT_ID = ?) d1 " +
-                         "WHERE DEVICE_ID = e.DEVICE_ID AND TENANT_ID = ? OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                         "WHERE DEVICE_ID = e.DEVICE_ID AND TENANT_ID = ? ORDER BY ENROLMENT_ID " +
+                         "OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, request.getDeviceName() + "%");
             stmt.setInt(2, tenantId);
@@ -265,8 +267,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM (SELECT e.ID, e.DEVICE_ID, e.OWNER, e.OWNERSHIP, e.STATUS, " +
                          "e.DATE_OF_ENROLMENT, e.DATE_OF_LAST_UPDATE, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e " +
                          "WHERE TENANT_ID = ? AND OWNERSHIP = ?) e, DM_DEVICE d, DM_DEVICE_TYPE t " +
-                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? OFFSET ? " +
-                         "ROWS FETCH NEXT ? ROWS ONLY";
+                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? ORDER BY ENROLMENT_ID " +
+                         "OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setString(2, request.getOwnership());
@@ -301,8 +303,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM (SELECT e.ID, e.DEVICE_ID, e.OWNER, e.OWNERSHIP, e.STATUS, " +
                          "e.DATE_OF_ENROLMENT, e.DATE_OF_LAST_UPDATE, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e " +
                          "WHERE TENANT_ID = ? AND STATUS = ?) e, DM_DEVICE d, DM_DEVICE_TYPE t " +
-                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? OFFSET ? ROWS" +
-                         " FETCH NEXT ? ROWS ONLY";
+                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? ORDER BY ENROLMENT_ID " +
+                         "OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setString(2, request.getStatus());
@@ -356,7 +358,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                     "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.NAME, " +
                         "d.DESCRIPTION, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, " +
                             "DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ?" + filteringString +
-                                ") d1 WHERE d1.ID = e.DEVICE_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                                ") d1 WHERE d1.ID = e.DEVICE_ID ORDER BY ENROLMENT_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
 
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/SQLServerNotificationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/SQLServerNotificationDAOImpl.java
index e03a220ed12..2d16f87587a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/SQLServerNotificationDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/impl/SQLServerNotificationDAOImpl.java
@@ -51,7 +51,7 @@ public class SQLServerNotificationDAOImpl extends AbstractNotificationDAOImpl {
                     "NOTIFICATION_ID, DEVICE_ID, OPERATION_ID, STATUS, DESCRIPTION FROM DM_NOTIFICATION WHERE " +
                     "TENANT_ID = ?) n1 WHERE n1.DEVICE_ID = d.ID AND d.DEVICE_TYPE_ID=t.ID AND TENANT_ID = ?";
 
-            sql = sql + " OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+            sql = sql + " ORDER BY n1.NOTIFICATION_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
 
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
@@ -92,7 +92,7 @@ public class SQLServerNotificationDAOImpl extends AbstractNotificationDAOImpl {
                          "TENANT_ID = ? AND STATUS = ?) n1 WHERE n1.DEVICE_ID = d.ID AND d.DEVICE_TYPE_ID=t.ID " +
                          "AND TENANT_ID = ?";
 
-            sql = sql + " OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+            sql = sql + " ORDER BY n1.NOTIFICATION_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
 
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql
index 0e7f76e5eb0..7abe97f1df1 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql
@@ -1,5 +1,5 @@
 CREATE TABLE DM_DEVICE_CERTIFICATE (
-  ID            INTEGER IDENTITY NOT NULL,
+  ID INTEGER IDENTITY(1,1) NOT NULL,
   SERIAL_NUMBER VARCHAR(500) DEFAULT NULL,
   CERTIFICATE   VARBINARY(max) DEFAULT NULL,
   TENANT_ID     INTEGER DEFAULT 0,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
index 45c25fc856f..a3f9976fefb 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -34,7 +34,7 @@ CREATE TABLE DM_OPERATION (
 
 CREATE TABLE DM_CONFIG_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
-    OPERATION_CONFIG VARBINARY(255) DEFAULT NULL,
+    OPERATION_CONFIG VARBINARY(MAX) DEFAULT NULL,
     PRIMARY KEY (OPERATION_ID),
     CONSTRAINT FK_DM_OPERATION_CONFIG FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -51,7 +51,7 @@ CREATE TABLE DM_COMMAND_OPERATION (
 CREATE TABLE DM_POLICY_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     ENABLED INTEGER NOT NULL DEFAULT 0,
-    OPERATION_DETAILS VARBINARY(255) DEFAULT NULL,
+    OPERATION_DETAILS VARBINARY(MAX) DEFAULT NULL,
     PRIMARY KEY (OPERATION_ID),
     CONSTRAINT FK_DM_OPERATION_POLICY FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -60,7 +60,7 @@ CREATE TABLE DM_POLICY_OPERATION (
 CREATE TABLE DM_PROFILE_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     ENABLED INTEGER NOT NULL DEFAULT 0,
-    OPERATION_DETAILS VARBINARY(255) DEFAULT NULL,
+    OPERATION_DETAILS VARBINARY(MAX) DEFAULT NULL,
     PRIMARY KEY (OPERATION_ID),
     CONSTRAINT FK_DM_OPERATION_PROFILE FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -105,7 +105,7 @@ CREATE TABLE DM_DEVICE_OPERATION_RESPONSE (
     ID INTEGER IDENTITY(1,1) NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,
-    OPERATION_RESPONSE VARBINARY(255) DEFAULT NULL,
+    OPERATION_RESPONSE VARBINARY(MAX) DEFAULT NULL,
     RECEIVED_TIMESTAMP DATETIME2 DEFAULT NULL
     PRIMARY KEY (ID),
     CONSTRAINT FK_DM_DEVICE_OPERATION_RESP_ENROLMENT FOREIGN KEY (ENROLMENT_ID) REFERENCES
@@ -150,7 +150,7 @@ CREATE TABLE DM_DEVICE_POLICY (
   ID INTEGER IDENTITY(1,1) NOT NULL,
   DEVICE_ID INTEGER NOT NULL ,
   ENROLMENT_ID INTEGER NOT NULL,
-  DEVICE VARBINARY(255) NOT NULL,
+  DEVICE VARBINARY(MAX) NOT NULL,
   POLICY_ID INTEGER NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_POLICY_DEVICE_POLICY FOREIGN KEY (POLICY_ID) REFERENCES DM_POLICY (ID)
@@ -176,7 +176,7 @@ CREATE TABLE DM_PROFILE_FEATURES (
   FEATURE_CODE VARCHAR(100) NOT NULL,
   DEVICE_TYPE VARCHAR(300) NOT NULL,
   TENANT_ID INTEGER NOT NULL ,
-  CONTENT VARBINARY(255) NULL DEFAULT NULL,
+  CONTENT VARBINARY(MAX) NULL DEFAULT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES FOREIGN KEY (PROFILE_ID) REFERENCES DM_PROFILE (ID)
   ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -205,7 +205,7 @@ CREATE TABLE DM_USER_POLICY (
   DEVICE_ID INTEGER NOT NULL ,
   ENROLMENT_ID INTEGER NOT NULL,
   POLICY_ID INTEGER NOT NULL ,
-  POLICY_CONTENT VARBINARY(255) NULL ,
+  POLICY_CONTENT VARBINARY(MAX) NULL ,
   TENANT_ID INTEGER NOT NULL,
   APPLIED BIT NULL ,
   CREATED_TIME DATETIME2 NULL ,
@@ -239,7 +239,7 @@ CREATE TABLE DM_POLICY_CRITERIA_PROPERTIES (
   POLICY_CRITERION_ID INTEGER NOT NULL,
   PROP_KEY VARCHAR(45) NULL,
   PROP_VALUE VARCHAR(100) NULL,
-  CONTENT VARBINARY(255) NULL,
+  CONTENT VARBINARY(MAX) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_POLICY_CRITERIA_PROPERTIES FOREIGN KEY (POLICY_CRITERION_ID) REFERENCES DM_POLICY_CRITERIA (ID)
   ON DELETE CASCADE ON UPDATE NO ACTION
@@ -288,7 +288,7 @@ CREATE TABLE DM_APPLICATION (
     TYPE VARCHAR(50) NULL,
     LOCATION_URL VARCHAR(100) DEFAULT NULL,
     IMAGE_URL VARCHAR(100) DEFAULT NULL,
-    APP_PROPERTIES VARBINARY(255) NULL,
+    APP_PROPERTIES VARBINARY(MAX) NULL,
     MEMORY_USAGE INTEGER NULL,
     IS_ACTIVE BIT NOT NULL DEFAULT 0,
     TENANT_ID INTEGER NOT NULL,
@@ -434,67 +434,3 @@ CREATE TABLE DM_DEVICE_DETAIL (
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
-
--- DASHBOARD RELATED VIEWS --
-
-CREATE VIEW DEVICE_INFO_VIEW AS
-SELECT
-DM_DEVICE.ID AS DEVICE_ID,
-DM_DEVICE.DEVICE_IDENTIFICATION,
-DM_DEVICE_TYPE.NAME AS PLATFORM,
-DM_ENROLMENT.OWNERSHIP,
-DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
-DM_DEVICE.TENANT_ID
-FROM DM_DEVICE, DM_DEVICE_TYPE, DM_ENROLMENT
-WHERE DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID AND DM_DEVICE.ID = DM_ENROLMENT.DEVICE_ID;
-
-CREATE VIEW DEVICE_WITH_POLICY_INFO_VIEW AS
-SELECT
-DEVICE_ID,
-POLICY_ID,
-STATUS AS IS_COMPLIANT
-FROM DM_POLICY_COMPLIANCE_STATUS;
-
-CREATE VIEW POLICY_COMPLIANCE_INFO AS
-SELECT
-DEVICE_INFO_VIEW.DEVICE_ID,
-DEVICE_INFO_VIEW.DEVICE_IDENTIFICATION,
-DEVICE_INFO_VIEW.PLATFORM,
-DEVICE_INFO_VIEW.OWNERSHIP,
-DEVICE_INFO_VIEW.CONNECTIVITY_STATUS,
-IFNULL(DEVICE_WITH_POLICY_INFO_VIEW.POLICY_ID, -1) AS POLICY_ID,
-IFNULL(DEVICE_WITH_POLICY_INFO_VIEW.IS_COMPLIANT, -1) AS IS_COMPLIANT,
-DEVICE_INFO_VIEW.TENANT_ID
-FROM
-DEVICE_INFO_VIEW
-LEFT JOIN
-DEVICE_WITH_POLICY_INFO_VIEW
-ON DEVICE_INFO_VIEW.DEVICE_ID = DEVICE_WITH_POLICY_INFO_VIEW.DEVICE_ID
-ORDER BY DEVICE_INFO_VIEW.DEVICE_ID;
-
-CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
-SELECT
-DM_DEVICE.ID AS DEVICE_ID,
-DM_DEVICE.DEVICE_IDENTIFICATION,
-DM_DEVICE_DETAIL.DEVICE_MODEL,
-DM_DEVICE_DETAIL.VENDOR,
-DM_DEVICE_DETAIL.OS_VERSION,
-DM_ENROLMENT.OWNERSHIP,
-DM_ENROLMENT.OWNER,
-DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
-DM_POLICY_COMPLIANCE_STATUS.POLICY_ID,
-DM_DEVICE_TYPE.NAME AS PLATFORM,
-DM_POLICY_COMPLIANCE_FEATURES.FEATURE_CODE,
-DM_POLICY_COMPLIANCE_FEATURES.STATUS AS IS_COMPLAINT,
-DM_DEVICE.TENANT_ID
-FROM
-DM_POLICY_COMPLIANCE_FEATURES, DM_POLICY_COMPLIANCE_STATUS, DM_ENROLMENT, DM_DEVICE, DM_DEVICE_TYPE, DM_DEVICE_DETAIL
-WHERE
-DM_POLICY_COMPLIANCE_FEATURES.COMPLIANCE_STATUS_ID = DM_POLICY_COMPLIANCE_STATUS.ID AND
-DM_POLICY_COMPLIANCE_STATUS.ENROLMENT_ID = DM_ENROLMENT.ID AND
-DM_POLICY_COMPLIANCE_STATUS.DEVICE_ID = DM_DEVICE.ID AND
-DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID AND
-DM_DEVICE.ID = DM_DEVICE_DETAIL.DEVICE_ID
-ORDER BY TENANT_ID, DEVICE_ID;
-
--- END OF DASHBOARD RELATED VIEWS --
\ No newline at end of file

From 690bd7de5ceddc62dcb5fa002a7f588880b48f63 Mon Sep 17 00:00:00 2001
From: Imesh Chandrasiri <imeshc@wso2.com>
Date: Fri, 9 Sep 2016 14:58:31 +0530
Subject: [PATCH 6/6] modal popup changes

---
 .../cdmf.page.certificates/certificates.hbs   | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
index 86f161ae359..6bb4257acc3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
@@ -121,48 +121,49 @@
     </div>
 
     <div id="remove-certificate-success-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Done. Certificate was successfully removed.</h3>
-                    <div class="buttons">
-                        <a href="#" id="remove-certificate-success-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">Done. Certificate was successfully removed.</h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
             </div>
         </div>
     </div>
 
     <div id="remove-certificate-error-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>An unexpected error occurred. Please try again later.</h3>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
 
-                    <div class="buttons">
-                        <a href="#" id="remove-certificate-error-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
             </div>
         </div>
     </div>
 
     <div id="errorCertificateView" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">
                 <span class="fw-stack">
                     <i class="fw fw-ring fw-stack-2x"></i>
                     <i class="fw fw-error fw-stack-1x"></i>
                 </span>
-                        Unauthorized action!
-                    </h3>
-                </div>
+                Unauthorized action!
+            </h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
             </div>
         </div>
     </div>