From a7074e2e4e7077017a9795b2c87b1514248f2551 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Wed, 3 Aug 2016 17:23:16 +0530
Subject: [PATCH 1/9] refactored general configuration

---
 .../DeviceTypeManagementService.java          |   4 +-
 .../DeviceTypeManagementServiceImpl.java      |   6 +-
 .../src/main/webapp/META-INF/permissions.xml  |   2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |   2 +-
 .../devicemgt/app/modules/constants.js        |   2 +-
 .../devicemgt/app/modules/device.js           |  42 ++++-
 .../jaggeryapps/devicemgt/app/modules/user.js |  43 ++---
 .../app/pages/cdmf.page.devices/devices.js    |  29 +--
 .../cdmf.unit.device.types.listing/listing.js |  72 ++++----
 .../configuration.hbs                         | 172 +++++++++---------
 .../configuration.js                          |  23 ++-
 .../public/js/platform-configuration.js       |  21 ++-
 .../units/cdmf.unit.policy.create/create.js   |   4 +-
 13 files changed, 234 insertions(+), 188 deletions(-)
 rename components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/{admin => }/DeviceTypeManagementService.java (97%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/{admin => }/DeviceTypeManagementServiceImpl.java (92%)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceTypeManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
similarity index 97%
rename from components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceTypeManagementService.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
index 4ce4ac2147a..41cbb1a9935 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceTypeManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.jaxrs.service.api.admin;
+package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
@@ -30,7 +30,7 @@ import javax.ws.rs.core.Response;
 
 @API(name = "Device Type Management", version = "1.0.0", context = "/admin/device-types", tags = {"devicemgt_admin"})
 
-@Path("/admin/device-types")
+@Path("/device-types")
 @Api(value = "Device Type Management", description = "This API corresponds to all tasks related to device " +
         "type management")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceTypeManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceTypeManagementServiceImpl.java
similarity index 92%
rename from components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceTypeManagementServiceImpl.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceTypeManagementServiceImpl.java
index fdda3bdd887..e38f02a0271 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceTypeManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceTypeManagementServiceImpl.java
@@ -16,14 +16,14 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.jaxrs.service.impl.admin;
+package org.wso2.carbon.device.mgt.jaxrs.service.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceTypeList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
-import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceTypeManagementService;
+import org.wso2.carbon.device.mgt.jaxrs.service.api.DeviceTypeManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 
 import javax.ws.rs.GET;
@@ -32,7 +32,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 import java.util.List;
 
-@Path("/admin/device-types")
+@Path("/device-types")
 public class DeviceTypeManagementServiceImpl implements DeviceTypeManagementService {
 
     private static Log log = LogFactory.getLog(DeviceTypeManagementServiceImpl.class);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
index 6439eab85ed..9e0684004de 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml
@@ -107,7 +107,7 @@
                         <Permission>
                             <name>View device types</name>
                             <path>/device-mgt/admin/devices/Admin-DeviceType-View</path>
-                            <url>/admin/device-types</url>
+                            <url>/device-types</url>
                             <method>GET</method>
                         </Permission>
                         <!-- End of Device related APIs -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 1b128fb4507..d225d369954 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -78,7 +78,7 @@
     <bean id="groupManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.admin.GroupManagementAdminServiceImpl"/>
     <bean id="userManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.admin.UserManagementAdminServiceImpl"/>
     <bean id="dashboardServiceBean" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.DashboardImpl"/>
-    <bean id="deviceTypeManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.admin.DeviceTypeManagementServiceImpl"/>
+    <bean id="deviceTypeManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.DeviceTypeManagementServiceImpl"/>
     <bean id="jsonProvider" class="org.wso2.carbon.device.mgt.jaxrs.common.GsonMessageBodyHandler"/>
     <!--<bean id="errorHandler" class="org.wso2.carbon.device.mgt.jaxrs.common.ErrorHandler"/>-->
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/constants.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/constants.js
index 890a7e500e9..3aa7af9975b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/constants.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/constants.js
@@ -18,7 +18,7 @@
 
 var WEB_APP_TITLE = "WSO2 CDM";
 var WEB_APP_CONTEXT = "/devicemgt";
-var ADMIN_SERVICE_CONTEXT = "/devicemgt_admin";
+var ADMIN_SERVICE_CONTEXT = "/api/device-mgt/v1.0";
 var USER_SESSION_KEY = "_UUF_USER";
 var UNSPECIFIED = "Unspecified";
 var httpURL = "httpURL";
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/device.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/device.js
index 464093343d5..8dfdd26f5e5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/device.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/device.js
@@ -38,6 +38,32 @@ deviceModule = function () {
 
     var deviceCloudService = devicemgtProps["httpsURL"] + "/common/device_manager";
 
+    /**
+     * Only GET method is implemented for now since there are no other type of methods used this method.
+     * @param url - URL to call the backend without the host
+     * @param method - HTTP Method (GET, POST)
+     * @returns An object with 'status': 'success'|'error', 'content': {}
+     */
+    privateMethods.callBackend = function (url, method) {
+        if (constants["HTTP_GET"] == method) {
+            return serviceInvokers.XMLHttp.get(url,
+                function (backendResponse) {
+                    var response = {};
+                    response.content = backendResponse.responseText;
+                    if (backendResponse.status == 200) {
+                        response.status = "success";
+                    } else if (backendResponse.status == 400 || backendResponse.status == 401 ||
+                        backendResponse.status == 404 || backendResponse.status == 500) {
+                        response.status = "error";
+                    }
+                    return response;
+                }
+            );
+        } else {
+            log.error("Runtime error : This method only support HTTP GET requests.");
+        }
+    };
+
     privateMethods.validateAndReturn = function (value) {
         return (value == undefined || value == null) ? constants.UNSPECIFIED : value;
     };
@@ -289,16 +315,12 @@ deviceModule = function () {
     };
 
     publicMethods.getDeviceTypes = function () {
-        var url = devicemgtProps["httpsURL"] + constants.ADMIN_SERVICE_CONTEXT + "/devices/types";
-        return serviceInvokers.XMLHttp.get(
-                url, function (responsePayload) {
-                    return responsePayload;
-                },
-                function (responsePayload) {
-                    log.error(responsePayload);
-                    return -1;
-                }
-        );
+        var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/device-types";
+        var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
+        if (response.status == "success") {
+            response.content = parse(response.content);
+        }
+        return response;
     };
 
     //Old methods
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/user.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/user.js
index b2c840aae84..e02e286d911 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/user.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/user.js
@@ -263,29 +263,30 @@ var userModule = function () {
 
     /**
      * Get Platforms.
+     * @deprecated moved this device module under getDeviceTypes.
      */
     //TODO Move this piece of logic out of user.js to somewhere else appropriate.
-    publicMethods.getPlatforms = function () {
-        var carbonUser = session.get(constants["USER_SESSION_KEY"]);
-        var utility = require("/app/modules/utility.js")["utility"];
-        if (!carbonUser) {
-            log.error("User object was not found in the session");
-            throw constants["ERRORS"]["USER_NOT_FOUND"];
-        }
-        try {
-            utility.startTenantFlow(carbonUser);
-            var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/admin/device-types";
-            var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
-            if (response.status == "success") {
-                response.content = parse(response.content);
-            }
-            return response;
-        } catch (e) {
-            throw e;
-        } finally {
-            utility.endTenantFlow();
-        }
-    };
+    //publicMethods.getPlatforms = function () {
+    //    var carbonUser = session.get(constants["USER_SESSION_KEY"]);
+    //    var utility = require("/app/modules/utility.js")["utility"];
+    //    if (!carbonUser) {
+    //        log.error("User object was not found in the session");
+    //        throw constants["ERRORS"]["USER_NOT_FOUND"];
+    //    }
+    //    try {
+    //        utility.startTenantFlow(carbonUser);
+    //        var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/device-types";
+    //        var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
+    //        if (response.status == "success") {
+    //            response.content = parse(response.content);
+    //        }
+    //        return response;
+    //    } catch (e) {
+    //        throw e;
+    //    } finally {
+    //        utility.endTenantFlow();
+    //    }
+    //};
 
     /**
      * Get role
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
index 085f1f5a694..a8277d494a4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
@@ -50,21 +50,24 @@ function onRequest(context) {
         if (deviceCount > 0) {
             page.deviceCount = deviceCount;
             var utility = require("/app/modules/utility.js").utility;
-            var data = deviceModule.getDeviceTypes();
+            var typesListResponse = deviceModule.getDeviceTypes();
             var deviceTypes = [];
-            if (data) {
-                for (var i = 0; i < data.length; i++) {
-                    var config = utility.getDeviceTypeConfig(data[i].name);
-                    if (!config){
-                        continue;
+            if (typesListResponse["status"] == "success") {
+                var data = typesListResponse["content"];
+                if (data) {
+                    for (var i = 0; i < data.length; i++) {
+                        var config = utility.getDeviceTypeConfig(data[i].name);
+                        if (!config) {
+                            continue;
+                        }
+                        var deviceType = config.deviceType;
+                        deviceTypes.push({
+                            "type": data[i].name,
+                            "category": deviceType.category,
+                            "label": deviceType.label,
+                            "thumb": utility.getDeviceThumb(data[i].name)
+                        });
                     }
-                    var deviceType = config.deviceType;
-                    deviceTypes.push({
-                        "type": data[i].name,
-                        "category": deviceType.category,
-                        "label": deviceType.label,
-                        "thumb": utility.getDeviceThumb(data[i].name)
-                    });
                 }
             }
             page.deviceTypes = stringify(deviceTypes);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js
index fecc5228077..eb4c87aeaf5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/listing.js
@@ -25,47 +25,49 @@ function onRequest(context) {
     var viewModel = {};
     var deviceModule = require("/app/modules/device.js").deviceModule;
     var utility = require("/app/modules/utility.js").utility;
-    var deviceTypes = deviceModule.getDeviceTypes();
+    var typesListResponse = deviceModule.getDeviceTypes();
+    if (typesListResponse["status"] == "success") {
+        var deviceTypes = typesListResponse["content"];
+        if (deviceTypes) {
+            var deviceTypesList = [], virtualDeviceTypesList = [];
+            for (var i = 0; i < deviceTypes.length; i++) {
 
-    if (deviceTypes) {
-        var deviceTypesList = [], virtualDeviceTypesList = [];
-        for (var i = 0; i < deviceTypes.length; i++) {
-
-            var deviceTypeLabel = deviceTypes[i].name;
-            var configs = utility.getDeviceTypeConfig(deviceTypeLabel);
-            var deviceCategory = "device";
-            if (configs) {
-                if (configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_CATEGORY]) {
-                    deviceCategory = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_CATEGORY];
+                var deviceTypeLabel = deviceTypes[i].name;
+                var configs = utility.getDeviceTypeConfig(deviceTypeLabel);
+                var deviceCategory = "device";
+                if (configs) {
+                    if (configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_CATEGORY]) {
+                        deviceCategory = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_CATEGORY];
+                    }
+                    if (configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY]) {
+                        deviceTypeLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY];
+                    }
                 }
-                if (configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY]) {
-                    deviceTypeLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_DEVICE_TYPE_LABEL_KEY];
+                if (deviceCategory == 'virtual') {
+                    virtualDeviceTypesList.push({
+                        "hasCustTemplate": false,
+                        "deviceTypeLabel": deviceTypeLabel,
+                        "deviceTypeName": deviceTypes[i].name,
+                        "deviceCategory": deviceCategory,
+                        "deviceTypeId": deviceTypes[i].id,
+                        "thumb": utility.getDeviceThumb(deviceTypes[i].name)
+                    });
+                } else {
+                    deviceTypesList.push({
+                        "hasCustTemplate": false,
+                        "deviceTypeLabel": deviceTypeLabel,
+                        "deviceTypeName": deviceTypes[i].name,
+                        "deviceCategory": deviceCategory,
+                        "deviceTypeId": deviceTypes[i].id,
+                        "thumb": utility.getDeviceThumb(deviceTypes[i].name)
+                    });
                 }
             }
-            if (deviceCategory == 'virtual') {
-                virtualDeviceTypesList.push({
-                    "hasCustTemplate": false,
-                    "deviceTypeLabel": deviceTypeLabel,
-                    "deviceTypeName": deviceTypes[i].name,
-                    "deviceCategory": deviceCategory,
-                                                "deviceTypeId": deviceTypes[i].id,
-                                                "thumb": utility.getDeviceThumb(deviceTypes[i].name)
-                });
-            } else {
-                deviceTypesList.push({
-                    "hasCustTemplate": false,
-                    "deviceTypeLabel": deviceTypeLabel,
-                    "deviceTypeName": deviceTypes[i].name,
-                    "deviceCategory": deviceCategory,
-                                         "deviceTypeId": deviceTypes[i].id,
-                                         "thumb": utility.getDeviceThumb(deviceTypes[i].name)
-                });
+            if (virtualDeviceTypesList.length > 0) {
+                viewModel.virtualDeviceTypesList = virtualDeviceTypesList;
             }
+            viewModel.deviceTypesList = stringify(deviceTypesList);
         }
-        if (virtualDeviceTypesList.length > 0) {
-            viewModel.virtualDeviceTypesList = virtualDeviceTypesList;
-        }
-        viewModel.deviceTypesList = stringify(deviceTypesList);
     } else {
         log.error("Unable to fetch device types data");
         throw new Error("Unable to fetch device types!");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
index abdf6fd5988..e4d27bc01df 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
@@ -15,107 +15,109 @@
   specific language governing permissions and limitations
   under the License.
 }}
-<div class="row">
-    <div class="col-md-12">
-        <!-- content -->
-        <div id="config-save-form" class="container col-centered wr-content">
-            <br>
+{{#zone "content"}}
+    <div class="row">
+        <div class="col-md-12">
+            <!-- content -->
+            <div id="config-save-form" class="container col-centered wr-content">
+                <br>
 
-            <h1 class="page-sub-title">
-                Platform Configurations
-            </h1>
-            <br>
-            General and Platform Specific Server Settings for the Tenant
-            <br>
-            <br>
+                <h1 class="page-sub-title">
+                    Platform Configurations
+                </h1>
+                <br>
+                General and Platform Specific Server Settings for the Tenant
+                <br>
+                <br>
 
-            <div class="wr-advance-operations">
-                <div class="row no-gutter">
-                    <div class="wr-hidden-operations-nav col-lg-4">
-                        <a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
-                                        <span class="wr-hidden-operations-icon fw-stack">
-                                            <i class="fw fw-settings fw-stack-2x"></i>
-                                        </span>
-                            General Configurations
-                        </a>
-                        {{#each deviceTypes}}
-                            <a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)">
-                                        <span class="wr-hidden-operations-icon fw-stack">
-                                            <i class="fw fw-settings fw-stack-2x"></i>
-                                        </span>
-                                {{label}} Configurations
+                <div class="wr-advance-operations">
+                    <div class="row no-gutter">
+                        <div class="wr-hidden-operations-nav col-lg-4">
+                            <a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
+                                            <span class="wr-hidden-operations-icon fw-stack">
+                                                <i class="fw fw-settings fw-stack-2x"></i>
+                                            </span>
+                                General Configurations
                             </a>
-                        {{/each}}
-                    </div>
+                            {{#each deviceTypes}}
+                                <a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)">
+                                            <span class="wr-hidden-operations-icon fw-stack">
+                                                <i class="fw fw-settings fw-stack-2x"></i>
+                                            </span>
+                                    {{label}} Configurations
+                                </a>
+                            {{/each}}
+                        </div>
 
-                    <div class="wr-hidden-operations-content col-lg-8">
-                        <!-- general -->
-                        <div class="wr-hidden-operation" data-operation="general" style="display: block">
-                            <div class="panel panel-default">
-                                <div id="general-config-heading" class="panel-heading" role="tab">
-                                    <h2 class="sub-title panel-title">
-                                        Policy Monitoring
-                                    </h2>
-                                </div>
-                                <div id="email-config-body" class="panel-collapse panel-body"
-                                     role="tabpanel">
-                                    <div id="email-config-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-label" for="email-config-host">
-                                            Monitoring Frequency
-                                                <span class="helper" title="SMTP Server Host">
-                                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                                                </span>
-                                            <br>
-                                            ( Should be in milliseconds )
-                                        </label>
-                                        <input id="monitoring-config-frequency" type="text"
-                                               class="form-control"
-                                               placeholder="[ Required Field ]">
+                        <div class="wr-hidden-operations-content col-lg-8">
+                            <!-- general -->
+                            <div class="wr-hidden-operation" data-operation="general" style="display: block">
+                                <div class="panel panel-default">
+                                    <div id="general-config-heading" class="panel-heading" role="tab">
+                                        <h2 class="sub-title panel-title">
+                                            Policy Monitoring
+                                        </h2>
                                     </div>
-                                    <div class="wr-input-control wr-btn-grp">
-                                        <button id="save-general-btn" class="wr-btn">
-                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                        </button>
+                                    <div id="email-config-body" class="panel-collapse panel-body"
+                                         role="tabpanel">
+                                        <div id="email-config-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-label" for="email-config-host">
+                                                Monitoring Frequency
+                                                    <span class="helper" title="SMTP Server Host">
+                                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                                    </span>
+                                                <br>
+                                                ( Should be in milliseconds )
+                                            </label>
+                                            <input id="monitoring-config-frequency" type="text"
+                                                   class="form-control"
+                                                   placeholder="[ Required Field ]">
+                                        </div>
+                                        <div class="wr-input-control wr-btn-grp">
+                                            <button id="save-general-btn" class="wr-btn">
+                                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                            </button>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <!-- general-->
-                        {{#each deviceTypes}}
-                            <div class="wr-hidden-operation" data-operation="{{name}}" style="display: none;">
-                                {{unit unitName}}
-                            </div>
-                        {{/each}}
+                            <!-- general-->
+                            {{#each deviceTypes}}
+                                <div class="wr-hidden-operation" data-operation="{{name}}" style="display: none;">
+                                    {{unit unitName}}
+                                </div>
+                            {{/each}}
 
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
 
-        <div id="record-created-msg" class="container col-centered wr-content hidden">
-            <div class="wr-form">
-                <p class="page-sub-title">Configuration was saved successfully.</p>
-                <br>
-                <br>Please click <b>"Go back to configurations"</b>, if you wish to save another
-                    configuration or click
-                <b>"Exit"</b> to complete the process and go back to the dashboard.
-                <hr/>
-                <button class="wr-btn"
-                        onclick="window.location.href='{{@app.context}}/platform-configuration'">Go
-                                                                                                 back
-                                                                                                 to
-                                                                                                 configurations
-                </button>
-                <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">&nbsp;&nbsp;&nbsp;&nbsp;Exit&nbsp;&nbsp;&nbsp;&nbsp;</button>
+            <div id="record-created-msg" class="container col-centered wr-content hidden">
+                <div class="wr-form">
+                    <p class="page-sub-title">Configuration was saved successfully.</p>
+                    <br>
+                    <br>Please click <b>"Go back to configurations"</b>, if you wish to save another
+                        configuration or click
+                    <b>"Exit"</b> to complete the process and go back to the dashboard.
+                    <hr/>
+                    <button class="wr-btn"
+                            onclick="window.location.href='{{@app.context}}/platform-configuration'">Go
+                                                                                                     back
+                                                                                                     to
+                                                                                                     configurations
+                    </button>
+                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">&nbsp;&nbsp;&nbsp;&nbsp;Exit&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                </div>
             </div>
+            <!-- /content -->
         </div>
-        <!-- /content -->
     </div>
-</div>
+{{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/platform-configuration.js"}}
 {{/zone}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
index 749ee92c154..87105e0686f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
@@ -20,15 +20,22 @@ function onRequest(context) {
     var utility = require("/app/modules/device.js").utility;
     var deviceModule = require("/app/modules/device.js").deviceModule;
     //get all device types
-    var data = deviceModule.getDeviceTypes();
     var deviceTypesArray = [];
-    if (data) {
-        for (var i = 0; i < data.length; i++) {
-            var deviceTypeName = data[i].name;
-            var configUnitName = utility.getTenantedDeviceUnitName(deviceTypeName, "platform.configuration");
-            if(configUnitName) {
-                var deviceTypeConfig = utility.getDeviceTypeConfig(deviceTypeName);
-                deviceTypesArray.push({name: deviceTypeName, label:deviceTypeConfig.deviceType.label, unitName : configUnitName});
+    var typesListResponse = deviceModule.getDeviceTypes();
+    if (typesListResponse["status"] == "success") {
+        var data = typesListResponse["content"].deviceTypes;
+        if (data) {
+            for (var i = 0; i < data.length; i++) {
+                var deviceTypeName = data[i];
+                var configUnitName = utility.getTenantedDeviceUnitName(deviceTypeName, "platform.configuration");
+                if (configUnitName) {
+                    var deviceTypeConfig = utility.getDeviceTypeConfig(deviceTypeName);
+                    deviceTypesArray.push({
+                        name: deviceTypeName,
+                        label: deviceTypeConfig.deviceType.label,
+                        unitName: configUnitName
+                    });
+                }
             }
         }
     }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js
index f2704873a4a..2f739d228a8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js
@@ -41,7 +41,7 @@ $(document).ready(function () {
     }
 
     invokerUtil.get(
-            "/devicemgt_admin/configuration",
+            "/api/device-mgt/v1.0/configuration",
             function (data) {
                 data = JSON.parse(data);
                 if (data && data.configuration) {
@@ -85,13 +85,13 @@ $(document).ready(function () {
             configList.push(monitorFrequency);
             addConfigFormData.configuration = configList;
 
-            var addConfigAPI = "/devicemgt_admin/configuration";
-            invokerUtil.post(
+            var addConfigAPI = "/api/device-mgt/v1.0/configuration";
+            invokerUtil.put(
                     addConfigAPI,
                     addConfigFormData,
-                    function (data) {
-                        data = JSON.parse(data);
-                        if (data.statusCode == responseCodes["SUCCESS"]) {
+                    function (data, textStatus, jqXHR) {
+                        data = jqXHR.status;
+                        if (data == 200) {
                             $("#config-save-form").addClass("hidden");
                             $("#record-created-msg").removeClass("hidden");
                         } else if (data == 500) {
@@ -118,3 +118,12 @@ $(document).ready(function () {
         }
     });
 });
+
+// Start of HTML embedded invoke methods
+var showAdvanceOperation = function (operation, button) {
+    $(button).addClass('selected');
+    $(button).siblings().removeClass('selected');
+    var hiddenOperation = ".wr-hidden-operations-content > div";
+    $(hiddenOperation + '[data-operation="' + operation + '"]').show();
+    $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide();
+};
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 3e09ae185dc..e5c8045b4d4 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
@@ -21,11 +21,11 @@ function onRequest(context) {
     var DTYPE_CONF_DEVICE_TYPE_LABEL_KEY = "label";
 
     var utility = require("/app/modules/utility.js").utility;
-    var userModule = require("/app/modules/user.js")["userModule"];
+    var deviceModule = require("/app/modules/device.js").deviceModule;
 
     var types = {};
     types["types"] = [];
-    var typesListResponse = userModule.getPlatforms();
+    var typesListResponse = deviceModule.getDeviceTypes();
     if (typesListResponse["status"] == "success") {
         for (var type in typesListResponse["content"]) {
             var deviceType = typesListResponse["content"][type]["name"];

From 6f5d6abea3cff13a8904b2f2670209aeadd90980 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 11 Aug 2016 23:41:52 +0530
Subject: [PATCH 2/9] updated device type label to defaul device type name

---
 .../units/cdmf.unit.platform.configuration/configuration.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
index 87105e0686f..bdf84142ac3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
@@ -30,9 +30,13 @@ function onRequest(context) {
                 var configUnitName = utility.getTenantedDeviceUnitName(deviceTypeName, "platform.configuration");
                 if (configUnitName) {
                     var deviceTypeConfig = utility.getDeviceTypeConfig(deviceTypeName);
+                    var deviceTypeLabel = deviceTypeName;
+                    if (deviceTypeConfig) {
+                        deviceTypeLabel = deviceTypeConfig.deviceType.label;
+                    }
                     deviceTypesArray.push({
                         name: deviceTypeName,
-                        label: deviceTypeConfig.deviceType.label,
+                        label: deviceTypeLabel,
                         unitName: configUnitName
                     });
                 }

From 217f5419913bc66dbc83d961e7e048c00a17c205 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Fri, 12 Aug 2016 12:27:14 +0530
Subject: [PATCH 3/9] added certificate units

---
 .../cdmf.page.certificate.create/create.hbs   | 101 ++++++++++
 .../cdmf.page.certificate.create/create.js    |  45 +++++
 .../cdmf.page.certificate.create/create.json  |   5 +
 .../public/js/certificate-create.js           | 129 +++++++++++++
 .../cdmf.page.certificates/certificates.hbs   | 177 ++++++++++++++++++
 .../cdmf.page.certificates/certificates.js    |  15 ++
 .../cdmf.page.certificates/certificates.json  |   5 +
 .../public/js/certificate-listing.js          | 171 +++++++++++++++++
 .../public/templates/certificate-listing.hbs  |  30 +++
 9 files changed, 678 insertions(+)
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.hbs
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.js
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.json
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/public/js/certificate-create.js
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.hbs
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.js
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.json
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/js/certificate-listing.js
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/templates/certificate-listing.hbs

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.hbs
new file mode 100644
index 00000000000..3093ca27a9d
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.hbs
@@ -0,0 +1,101 @@
+{{!
+  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+
+  WSO2 Inc. licenses this file to you under the Apache License,
+  Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+}}
+{{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}}
+
+{{#zone "breadcrumbs"}}
+    <li>
+        <a href="{{@app.context}}/">
+            <i class="icon fw fw-home"></i>
+        </a>
+    </li>
+    <li>
+        <a href="{{@app.context}}/certificates/add">
+            <span class="fw-stack">
+               <i class="fw fw-ring fw-stack-2x"></i>
+               <i class="fw fw-document fw-stack-1x"></i>
+            </span>
+            Add Certificate
+        </a>
+    </li>
+{{/zone}}
+
+{{#zone "content"}}
+    <!-- content/body -->
+    <div class="row">
+        <div class="col-md-12">
+            <!-- content -->
+            <div id="certificate-create-form" class="container col-centered wr-content">
+                <div class="wr-form">
+                    <p class="page-sub-title">Add Certificate</p>
+                    <p>Please note that * sign represents required fields of data.</p>
+                    <hr/>
+                    <div class="row">
+                        <div class="col-lg-8">
+                            <div id="certificate-create-error-msg" class="alert alert-danger hidden" role="alert">
+                                <i class="icon fw fw-error"></i><span></span>
+                            </div>
+
+                            <label class="wr-input-label ">
+                                Serial Number *
+                            </label>
+                            <br>
+                            <div id="serialNoInputField" class="form-group wr-input-control">
+                                <input type="text" id="serialNo" class="form-control"/>
+                            </div>
+                            <label class="wr-input-label">Certificate *</label>
+                            <div id="certificateField" class="form-group wr-input-control">
+                                <input type="file" id="certificate" class="form-control"/>
+                            </div>
+                        </div>
+                    </div>
+                    <br>
+                    <div class="row">
+                        <div class="col-lg-8">
+                            <button id="add-certificate-btn" class="wr-btn">Add Certificate</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="certificate-created-msg" class="container col-centered wr-content hidden">
+                <div class="wr-form">
+                    <p class="page-sub-title">Certificate was added successfully.</p>
+                    <br>
+                    <br>Please click <b>"Add Another Certificate"</b>, if you wish to add another certificate or
+                        click
+                    <b>"View Certificate List"</b> to complete the process and go back to the certificate list.
+                    <hr/>
+                    <button class="wr-btn" onclick="window.location.href='/emm/certificates'">View Certificate List
+                    </button>
+                    <a href="/emm/certificates/add-certificate" 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 Certificate
+                    </a>
+                </div>
+            </div>
+            <!-- /content -->
+        </div>
+    </div>
+    <!-- /content/body -->
+{{/zone}}
+
+{{#zone "bottomJs"}}
+    {{js "/js/certificate-create.js"}}
+{{/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.page.certificate.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.js
new file mode 100644
index 00000000000..4e7585163a2
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.js
@@ -0,0 +1,45 @@
+/*
+ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+
+ WSO2 Inc. licenses this file to you under the Apache License,
+ Version 2.0 (the "License"); you may not use this file except
+ in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+/**
+ * Returns the dynamic state to be populated by add-user page.
+ *
+ * @param context Object that gets updated with the dynamic state of this page to be presented
+ * @returns {*} A context object that returns the dynamic state of this page to be presented
+ */
+function onRequest(context) {
+    // var log = new Log("units/user-create/create.js");
+    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
+    var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
+
+    var response = userModule.getRolesByUserStore();
+    if (response["status"] == "success") {
+        context["roles"] = response["content"];
+    }
+
+    context["charLimit"] = mdmProps["usernameLength"];
+    context["usernameJSRegEx"] = mdmProps["userValidationConfig"]["usernameJSRegEx"];
+    context["usernameHelpText"] = mdmProps["userValidationConfig"]["usernameHelpMsg"];
+    context["usernameRegExViolationErrorMsg"] = mdmProps["userValidationConfig"]["usernameRegExViolationErrorMsg"];
+    context["firstnameJSRegEx"] = mdmProps["userValidationConfig"]["firstnameJSRegEx"];
+    context["firstnameRegExViolationErrorMsg"] = mdmProps["userValidationConfig"]["firstnameRegExViolationErrorMsg"];
+    context["lastnameJSRegEx"] = mdmProps["userValidationConfig"]["lastnameJSRegEx"];
+    context["lastnameRegExViolationErrorMsg"] = mdmProps["userValidationConfig"]["lastnameRegExViolationErrorMsg"];
+
+    return context;
+}
\ 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.page.certificate.create/create.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.json
new file mode 100644
index 00000000000..db293d5ab12
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.json
@@ -0,0 +1,5 @@
+{
+    "version": "1.0.0",
+    "uri": "/certificates/add",
+    "layout": "cdmf.layout.default"
+}
\ 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.page.certificate.create/public/js/certificate-create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/public/js/certificate-create.js
new file mode 100644
index 00000000000..6ff663ea0db
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/public/js/certificate-create.js
@@ -0,0 +1,129 @@
+/*
+ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+
+ WSO2 Inc. licenses this file to you under the Apache License,
+ Version 2.0 (the "License"); you may not use this file except
+ in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+var pemContent = "";
+var errorMsgWrapper = "#certificate-create-error-msg";
+var errorMsg = "#certificate-create-error-msg span";
+var validateInline = {};
+var clearInline = {};
+
+var base_api_url = "/api/device-mgt/v1.0";
+
+var enableInlineError = function (inputField, errorMsg, errorSign) {
+    var fieldIdentifier = "#" + inputField;
+    var errorMsgIdentifier = "#" + inputField + " ." + errorMsg;
+    var errorSignIdentifier = "#" + inputField + " ." + errorSign;
+
+    if (inputField) {
+        $(fieldIdentifier).addClass(" has-error has-feedback");
+    }
+
+    if (errorMsg) {
+        $(errorMsgIdentifier).removeClass(" hidden");
+    }
+
+    if (errorSign) {
+        $(errorSignIdentifier).removeClass(" hidden");
+    }
+};
+
+var disableInlineError = function (inputField, errorMsg, errorSign) {
+    var fieldIdentifier = "#" + inputField;
+    var errorMsgIdentifier = "#" + inputField + " ." + errorMsg;
+    var errorSignIdentifier = "#" + inputField + " ." + errorSign;
+
+    if (inputField) {
+        $(fieldIdentifier).removeClass(" has-error has-feedback");
+    }
+
+    if (errorMsg) {
+        $(errorMsgIdentifier).addClass(" hidden");
+    }
+
+    if (errorSign) {
+        $(errorSignIdentifier).addClass(" hidden");
+    }
+};
+
+function readSingleFile(evt) {
+    var f = evt.target.files[0];
+    if (f) {
+        var r = new FileReader();
+        r.onload = function (e) {
+            var contents = e.target.result;
+            if (f.type == "application/x-x509-ca-cert") {
+                pemContent = contents;
+                console.log(contents);
+                console.log(pemContent);
+                pemContent = pemContent.substring(28, pemContent.length - 27);
+                console.log(pemContent);
+                $(errorMsgWrapper).addClass("hidden");
+            } else {
+                $(errorMsg).text("Certificate must be a .pem file containing a valid certificate data.");
+                $(errorMsgWrapper).removeClass("hidden");
+            }
+        }
+        r.readAsText(f);
+    } else {
+        //inline error
+    }
+}
+
+$(document).ready(function () {
+    pemContent = "";
+    document.getElementById('certificate').addEventListener('change', readSingleFile, false);
+
+    /**
+     * Following click function would execute
+     * when a user clicks on "Add Certificate" button.
+     */
+    $("button#add-certificate-btn").click(function () {
+        var serialNoInput = $("input#serialNo");
+        var serialNo = serialNoInput.val();
+        if (!serialNo) {
+            $(errorMsg).text("Serial Number is a required field. It cannot be empty.");
+            $(errorMsgWrapper).removeClass("hidden");
+        } else if (!pemContent) {
+            $(errorMsg).text(" .pem file must contains certificate information.");
+            $(errorMsgWrapper).removeClass("hidden");
+        } else {
+            var addCertificateFormData = {};
+            addCertificateFormData.serial = serialNo;
+            addCertificateFormData.pem = pemContent;
+            var certificateList = [];
+            certificateList.push(addCertificateFormData);
+
+            var serviceUrl = base_api_url + "/admin/certificates";
+            invokerUtil.post(
+                serviceUrl,
+                certificateList,
+                function (data) {
+                    // Refreshing with success message
+                    $("#certificate-create-form").addClass("hidden");
+                    $("#certificate-created-msg").removeClass("hidden");
+                }, function (data) {
+                    if (data["status"] == 500) {
+                        $(errorMsg).text("An unexpected error occurred at backend server. Please try again later.");
+                    } else {
+                        $(errorMsg).text(data);
+                    }
+                    $(errorMsgWrapper).removeClass("hidden");
+                }
+            );
+        }
+    });
+});
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.hbs
new file mode 100644
index 00000000000..b20da073afa
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.hbs
@@ -0,0 +1,177 @@
+{{!
+  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+
+  WSO2 Inc. licenses this file to you under the Apache License,
+  Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+}}
+{{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}}
+
+{{#zone "breadcrumbs"}}
+    <li>
+        <a href="{{@app.context}}/">
+            <i class="icon fw fw-home"></i>
+        </a>
+    </li>
+    <li>
+        <a href="{{@app.context}}/certificates/add">
+            <span class="fw-stack">
+               <i class="fw fw-ring fw-stack-2x"></i>
+               <i class="fw fw-document fw-stack-1x"></i>
+            </span>
+            Add Certificate
+        </a>
+    </li>
+{{/zone}}
+
+{{#zone "content"}}
+    {{unit "cdmf.unit.data-tables-extended"}}
+
+    <!-- content -->
+    <div id="loading-content" class="col-centered">
+        {{#if removePermitted}}
+            <input type="hidden" id="can-remove" value="true"/>
+        {{/if}}
+        {{#if viewPermitted}}
+            <input type="hidden" id="can-view" value="true"/>
+        {{/if}}
+        <i class="fw fw-settings fw-spin fw-2x"></i>
+        Loading Certificates . . .
+        <br>
+    </div>
+
+    <div id="certificate-listing-status" class="raw hidden">
+        <ul style="list-style-type: none;">
+            <li class="message message-info" >
+                <h4>
+                    <i class="icon fw fw-info"></i>
+                    <a id="certificate-listing-status-msg"></a>
+                </h4>
+            </li>
+        </ul>
+    </div>
+
+    <div id="certificate-table" data-user={{adminUser}}>
+        <table class="table table-striped table-hover list-table display responsive nowrap data-table grid-view"
+               id="certificate-grid">
+            <thead>
+            <tr class="sort-row">
+                <th class="no-sort"></th>
+                <th>By Serial Number</th>
+                <th class="no-sort"></th>
+                <th class="no-sort"></th>
+            </tr>
+            <tr class="filter-row filter-box">
+                <th colspan="3">
+                    <label class="wr-input-label" for="search-by-certificate">
+                        By Serial Number
+                    </label>
+                    <input id="search-by-certificate" type="text" class="form-control"
+                           placeholder="Search By Serial Number">
+                </th>
+                <th style="vertical-align:bottom;">
+                    <button id="search-btn" class="wr-btn">
+                        Search
+                    </button>
+                </th>
+            </tr>
+
+            </thead>
+            <tbody id="ast-container">
+
+            <br class="c-both"/>
+            </tbody>
+        </table>
+    </div>
+    <br class="c-both"/>
+    <div id="content-filter-types" style="display: none">
+        <div class="sort-title">Sort By</div>
+        <div class="sort-options">
+            <a href="#">By Serial Number</a>
+        </div>
+    </div>
+
+    <div id="remove-certificate-modal-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Do you really want to remove this certificate ?</h3>
+
+                    <div class="buttons">
+                        <a href="#" id="remove-certificate-yes-link" class="btn-operations">
+                            Remove
+                        </a>
+                        <a href="#" id="remove-certificate-cancel-link" class="btn-operations">
+                            Cancel
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </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>
+        </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="buttons">
+                        <a href="#" id="remove-certificate-error-link" class="btn-operations">
+                            Ok
+                        </a>
+                    </div>
+                </div>
+            </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>
+                <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>
+            </div>
+        </div>
+    </div>
+{{/zone}}
+
+{{#zone "bottomJs"}}
+    <script id="certificate-listing" data-current-user="{{@user.username}}"
+            src="{{@unit.publicUri}}/templates/certificate-listing.hbs"
+            type="text/x-handlebars-template"></script>
+
+    {{js "/js/certificate-listing.js"}}
+{{/zone}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.js
new file mode 100644
index 00000000000..8aeb02353e3
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.js
@@ -0,0 +1,15 @@
+function onRequest(context) {
+    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
+    var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
+
+    context["permissions"] = userModule.getUIPermissions();
+
+    if (userModule.isAuthorized("/permission/admin/device-mgt/emm-admin/certificate/Get")) {
+        context["removePermitted"] = true;
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/emm-admin/certificate/Get")) {
+        context["viewPermitted"] = true;
+    }
+    context["adminUser"] = mdmProps.adminUser;
+    return context;
+}
\ 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.page.certificates/certificates.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.json
new file mode 100644
index 00000000000..39fb7ff01b7
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.json
@@ -0,0 +1,5 @@
+{
+    "version": "1.0.0",
+    "uri": "/certificates",
+    "layout": "cdmf.layout.default"
+}
\ 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.page.certificates/public/js/certificate-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/js/certificate-listing.js
new file mode 100644
index 00000000000..d911d7fb451
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/js/certificate-listing.js
@@ -0,0 +1,171 @@
+/*
+ * Sorting function of certificates
+ * listed on Certificate Management page in WSO2 MDM Console.
+ */
+$(function () {
+    var sortableElem = '.wr-sortable';
+    $(sortableElem).sortable({
+        beforeStop: function () {
+            var sortedIDs = $(this).sortable('toArray');
+        }
+    });
+    $(sortableElem).disableSelection();
+});
+
+var modalPopup = ".wr-modalpopup";
+var modalPopupContainer = modalPopup + " .modalpopup-container";
+var modalPopupContent = modalPopup + " .modalpopup-content";
+var body = "body";
+var isInit = true;
+
+var base_api_url = "/api/certificate-mgt/v1.0";
+
+$(".icon .text").res_text(0.2);
+
+/*
+ * set popup maximum height function.
+ */
+function setPopupMaxHeight() {
+    $(modalPopupContent).css('max-height', ($(body).height() - ($(body).height() / 100 * 30)));
+    $(modalPopupContainer).css('margin-top', (-($(modalPopupContainer).height() / 2)));
+}
+
+/*
+ * show popup function.
+ */
+function showPopup() {
+    $(modalPopup).show();
+    setPopupMaxHeight();
+}
+
+/*
+ * hide popup function.
+ */
+function hidePopup() {
+    $(modalPopupContent).html('');
+    $(modalPopup).hide();
+}
+
+/**
+ * Following click function would execute
+ * when a user clicks on "Remove" link
+ * on Certificate Listing page in WSO2 MDM Console.
+ */
+function removeCertificate(serialNumber) {
+    var serviceUrl = base_api_url + "/admin/certificates/" + serialNumber;
+    $(modalPopupContent).html($('#remove-certificate-modal-content').html());
+    showPopup();
+
+    $("a#remove-certificate-yes-link").click(function () {
+        invokerUtil.delete(
+            serviceUrl,
+            function () {
+                $("#" + serialNumber).remove();
+                var newCertificateListCount = $(".user-list > span").length;
+                $("#certificate-listing-status-msg").text("Total number of Certificates found : " + newCertificateListCount);
+                $(modalPopupContent).html($('#remove-certificate-success-content').html());
+                $("a#remove-certificate-success-link").click(function () {
+                    hidePopup();
+                });
+            },
+            function () {
+                $(modalPopupContent).html($('#remove-certificate-error-content').html());
+                $("a#remove-certificate-error-link").click(function () {
+                    hidePopup();
+                });
+            }
+        );
+    });
+
+    $("a#remove-certificate-cancel-link").click(function () {
+        hidePopup();
+    });
+}
+
+/**
+ * Following on click function would execute
+ * when a user type on the search field on certificate Listing page in
+ * WSO2 MDM Console then click on the search button.
+ */
+$("#search-btn").click(function () {
+    var searchQuery = $("#search-by-certificate").val();
+    $("#ast-container").empty();
+    loadCertificates(searchQuery);
+});
+
+/**
+ * Following function would execute
+ * when a user clicks on the list item
+ * initial mode and with out select mode.
+ */
+function InitiateViewOption() {
+    if ($("#can-view").val()) {
+        $(location).attr('href', $(this).data("url"));
+    } else {
+        $(modalPopupContent).html($('#errorCertificateView').html());
+        showPopup();
+    }
+}
+
+function loadCertificates(searchParam) {
+    $("#loading-content").show();
+    var certificateListing = $("#certificate-listing");
+    var certificateListingSrc = certificateListing.attr("src");
+    $.template("certificate-listing", certificateListingSrc, function (template) {
+        var serviceURL = base_api_url + "/admin/certificates";
+
+        if (searchParam != null && searchParam != undefined && searchParam.trim() != '') {
+            serviceURL = base_api_url + "/admin/certificates?" + searchParam;
+        }
+
+        var successCallback = function (data, textStatus, jqXHR) {
+            if (jqXHR.status == 200 && data) {
+                data = JSON.parse(data);
+
+                var viewModel = {};
+                viewModel.certificates = data.certificates;
+
+                for (var i = 0; i < viewModel.certificates.length; i++) {
+                    viewModel.certificates[i].removePermitted = true;
+                    viewModel.certificates[i].viewPermitted = true;
+                }
+
+                if (viewModel.certificates.length > 0) {
+                    $('#ast-container').removeClass('hidden');
+                    $('#certificate-listing-status-msg').text("");
+                    var content = template(viewModel);
+                    $("#ast-container").html(content);
+                } else {
+                    $('#ast-container').addClass('hidden');
+                    $('#certificate-listing-status-msg').text('No certificate is available to be displayed.');
+                    $('#certificate-listing-status').removeClass('hidden');
+                }
+
+                $("#loading-content").hide();
+
+                if (isInit) {
+                    $('#certificate-grid').datatables_extended();
+                    isInit = false;
+                }
+
+                $(".icon .text").res_text(0.2);
+            }
+        };
+        invokerUtil.get(serviceURL,
+            successCallback,
+            function (message) {
+                $('#ast-container').addClass('hidden');
+                $('#certificate-listing-status-msg').
+                    text('Invalid search query. Try again with a valid search query');
+            }
+        );
+    });
+}
+
+$(document).ready(function () {
+    loadCertificates();
+
+    $(".viewEnabledIcon").click(function () {
+        InitiateViewOption();
+    });
+});
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/templates/certificate-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/templates/certificate-listing.hbs
new file mode 100644
index 00000000000..c492e4f8002
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/templates/certificate-listing.hbs
@@ -0,0 +1,30 @@
+{{#each certificates}}
+
+    <tr data-type="selectable" id="{{serialNumber}}" data-username="{{serialNumber}}">
+        <td class="remove-padding icon-only content-fill viewEnabledIcon" data-username="{{serialNumber}}">
+            <div class="thumbnail icon">
+                <i class="square-element text fw fw-document"></i>
+            </div>
+        </td>
+        <td class="fade-edge remove-padding-top" data-search="{{serialNumber}}" data-display="{{serialNumber}}"><i
+                class="fw-mobile"></i> {{serialNumber}}</td>
+        <td class="fade-edge remove-padding-top" data-search="{{subject}}" data-display="{{subject}}"><i
+                class="fw-policy"></i> {{subject}}</td>
+        <td class="text-right content-fill text-left-on-grid-view no-wrap">
+            {{#unequal adminUser serialNumber }}
+            {{#if removePermitted}}
+                <a href="#" data-username="{{serialNumber}}" data-userid="{{userid}}"
+                   data-click-event="remove-form" onclick="javascript:removeCertificate('{{serialNumber}}')"
+                   class="btn padding-reduce-on-grid-view remove-user-link">
+                    <span class="fw-stack">
+                        <i class="fw fw-ring fw-stack-2x"></i>
+                        <i class="fw fw-delete fw-stack-1x"></i>
+                    </span>
+                    <span class="hidden-xs hidden-on-grid-view">Remove</span>
+                </a>
+            {{/if}}
+            {{/unequal}}
+        </td>
+    </tr>
+
+{{/each}}
\ No newline at end of file

From 3219ac21018d3178140a15ebcf0f0304a5dfbb87 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Fri, 12 Aug 2016 14:04:16 +0530
Subject: [PATCH 4/9] Fixing the notification listing ui

---
 .../listing.hbs                               | 53 ++++++++++---------
 .../cdmf.unit.notification.listing/listing.js | 11 ++--
 .../public/js/notification-listing.js         |  4 +-
 .../public/templates/notification-listing.hbs |  8 +--
 4 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs
index 073d9cb3b28..694154c3838 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs
@@ -15,47 +15,48 @@
   specific language governing permissions and limitations
   under the License.
 }}
-<span id="permission" data-permission="{{permissions}}"></span>
-<div class="row">
-    <div class="col-md-12">
-        <!-- content -->
-        <div id="config-save-form" class="container col-centered wr-content">
-            <br>
-            Device Notifications
-            <br>
-            <br>
-            <div class="wr-advance-operations">
-                <div class="row no-gutter">
-                    <div class="wr-hidden-operations-nav col-lg-4">
-                        <a id="unReadNotifications" href="javascript:void(0)"
-                           onclick="showAdvanceOperation('unread', this)" class="selected">
+{{#zone "content"}}
+    <span id="permission" data-permission="{{permissions}}"></span>
+    <div class="row">
+        <div class="col-md-12">
+            <!-- content -->
+            <div id="config-save-form" class="container col-centered wr-content">
+                <br>
+                Device Notifications
+                <br>
+                <br>
+                <div class="wr-advance-operations">
+                    <div class="row no-gutter">
+                        <div class="wr-hidden-operations-nav col-lg-4">
+                            <a id="unReadNotifications" href="javascript:void(0)" onclick="showAdvanceOperation('unread', this)" class="selected">
                                 <span class="wr-hidden-operations-icon fw-stack">
                                     <i class="fw fw-mail fw-stack-2x"></i>
                                 </span>
-                            Unread
-                        </a>
-                        <a id="allNotifications" href="javascript:void(0)" onclick="showAdvanceOperation('all', this)">
+                                Unread
+                            </a>
+                            <a id="allNotifications" href="javascript:void(0)" onclick="showAdvanceOperation('all', this)">
                                 <span class="wr-hidden-operations-icon fw-stack">
                                     <i class="fw fw-forum fw-stack-2x"></i>
                                 </span>
-                            All Notifications
-                        </a>
-                    </div>
+                                All Notifications
+                            </a>
+                        </div>
 
-                    <div class="wr-hidden-operations-content col-lg-8" id="ast-container">
-                        <div class="panel-body">
-                            No unread messages
+                        <div class="wr-hidden-operations-content col-lg-8" id="ast-container">
+                            <div class="panel-body">
+                                No unread messages
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
+            <!-- /content -->
         </div>
-        <!-- /content -->
     </div>
-</div>
+{{/zone}}
 {{#zone "bottomJs"}}
     <script id="notification-listing" data-current-user="{{currentUser.username}}"
-            data-image-resource="{{self.publicURL}}/images/" src="{{self.publicURL}}/templates/notification-listing.hbs"
+            data-image-resource="{{@unit.publicUri}}/images/" src="{{@unit.publicUri}}/templates/notification-listing.hbs"
             type="text/x-handlebars-template"></script>
     {{js "js/notification-listing.js"}}
 {{/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.notification.listing/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.js
index 0086ba8e3e6..3512296bdac 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.js
@@ -16,15 +16,16 @@
  * under the License.
  */
 
-function onRequest(context){
+function onRequest(context) {
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var constants = require("/app/modules/constants.js");
+    var viewModel = {};
     var permissions = [];
-    if(userModule.isAuthorized("/permission/admin/device-mgt/emm-admin/notifications/list")){
+    if (userModule.isAuthorized("/permission/admin/device-mgt/emm-admin/notifications/list")) {
         permissions.push("LIST_NOTIFICATIONS");
     }
     var currentUser = session.get(constants.USER_SESSION_KEY);
-    context.permissions = stringify(permissions);
-    context.currentUser = currentUser;
-    return context;
+    viewModel.permissions = stringify(permissions);
+    viewModel.currentUser = currentUser;
+    return viewModel;
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
index 52fd96af333..f7f7db822f3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
@@ -91,8 +91,8 @@ function loadNotifications(){
         var successCallback = function (data) {
             var viewModel = {};
             data = JSON.parse(data);
-            viewModel.notifications = data;
-            if(data.length > 0){
+            viewModel.notifications = data.notifications;
+            if(data.count > 0){
                 var content = template(viewModel);
                 $("#ast-container").html(content);
                 $('#unread-notifications').datatables_extended();
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
index d59fc831db2..418bef892bb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/templates/notification-listing.hbs
@@ -16,10 +16,10 @@
                 <tbody>
                 {{#each notifications}}
                     {{#equal "NEW" status }}
-                        <tr data-type="selectable" data-id="{{notificationId}}">
+                        <tr data-type="selectable" data-id="{{id}}">
                             <td data-display="{{description}}" data-grid-label="Description">{{description}}</td>
                             <td style="text-align: center;">
-                                <a href="#" data-id="{{notificationId}}" data-url="device/{{deviceIdentifier.type}}/{{deviceIdentifier.id}}" class="new-notification" data-click-event="remove-form">
+                                <a href="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}" data-id="{{id}}" data-url="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}" class="new-notification" data-click-event="remove-form">
                                      <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-view fw-stack-1x"></i>
@@ -54,10 +54,10 @@
                 </thead>
                 <tbody>
                 {{#each notifications}}
-                    <tr data-type="selectable" data-id="{{notificationId}}">
+                    <tr data-type="selectable" data-id="{{id}}">
                         <td  data-display="{{description}}" data-grid-label="Description">{{description}}</td>
                         <td style="text-align: center;">
-                            <a href="device/{{deviceIdentifier.type}}/{{deviceIdentifier.id}}" data-click-event="remove-form">
+                            <a href="device?type={{deviceIdentifier.type}}&id={{deviceIdentifier.id}}" data-click-event="remove-form">
                                  <span class="fw-stack">
                                     <i class="fw fw-ring fw-stack-2x"></i>
                                     <i class="fw fw-view fw-stack-1x"></i>

From 0be419d6cc39ff592ae1d633242d36102b1e68e3 Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Fri, 12 Aug 2016 17:41:27 +0530
Subject: [PATCH 5/9] Fix ui issues in device view section

---
 .../devicemgt/app/pages/cdmf.page.device.view/view.hbs        | 2 +-
 .../devicemgt/app/units/cdmf.unit.device.view/view.hbs        | 4 +++-
 .../src/main/resources/jaggeryapps/devicemgt/jaggery.conf     | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
index 2b6be8fd6d2..1a583604098 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.view/view.hbs
@@ -19,7 +19,6 @@
 {{unit "cdmf.unit.lib.service-invoker-utility"}}
 {{unit "cdmf.unit.lib.handlebars"}}
 
-{{unit deviceViewUnitName}}
 
 {{#zone "breadcrumbs"}}
     <li>
@@ -40,6 +39,7 @@
 {{/zone}}
 
 {{#zone "content"}}
+    {{unit deviceViewUnitName}}
     {{unit "cdmf.unit.lib.data-table"}}
     {{unit "cdmf.unit.device.operation-mod"}}
     {{unit "cdmf.unit.device.view"}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
index 3663b0c6e91..83b6f723338 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
@@ -15,6 +15,7 @@
   specific language governing permissions and limitations
   under the License.
 }}
+
 {{#zone "contentTitle"}}
     <div class="row wr-device-board">
         <div class="col-lg-12 wr-secondary-bar">
@@ -32,6 +33,7 @@
     </div>
 {{/zone}}
 
+{{#zone "content"}}
 <div class="row no-gutter add-padding-5x add-margin-top-5x"
      style="border: 1px solid #e4e4e4;">
     <div class="media">
@@ -193,7 +195,7 @@
         </div>
     {{/defineZone}}
 </div>
-
+{{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/device-view.js"}}
     <script id="policy-view" src="{{@unit.publicUri}}/templates/policy-compliance.hbs"
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
index 83971215679..dec7a25f8cc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
@@ -50,6 +50,10 @@
     {
       "url": "/api/data-tables/invoker",
       "path": "/api/data-tables-invoker-api.jag"
+    },
+    {
+      "url": "/api/operation/*",
+      "path": "/api/operation-api.jag"
     }
   ]
 }
\ No newline at end of file

From e07991174d37d71112740bf4a908248e6a6c4439 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Fri, 12 Aug 2016 17:57:28 +0530
Subject: [PATCH 6/9] Adding user password change UI

---
 .../public/js/user-menu.js                    | 82 +++++++++++++++++++
 .../user-menu.hbs                             | 66 ++++++++++++++-
 .../user-menu.js                              |  4 +
 3 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 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
 create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.js

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
new file mode 100644
index 00000000000..fe168cc0e04
--- /dev/null
+++ 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
@@ -0,0 +1,82 @@
+/**
+ * Checks if provided input is valid against RegEx input.
+ *
+ * @param regExp Regular expression
+ * @param inputString Input string to check
+ * @returns {boolean} Returns true if input matches RegEx
+ */
+function inputIsValid(regExp, inputString) {
+    return regExp.test(inputString);
+}
+
+$(document).ready(function () {
+    var modalPopup = ".wr-modalpopup";
+    // var modalPopupContainer = modalPopup + " .modalpopup-container";
+    var modalPopupContent = modalPopup + " .modalpopup-content";
+
+    $("#change-password").click(function () {
+
+        $(modalPopupContent).html($('#change-password-window').html());
+        showPopup();
+
+        $("a#change-password-yes-link").click(function () {
+            var oldPassword = $("#old-password").val();
+            var newPassword = $("#new-password").val();
+            var confirmedPassword = $("#confirmed-password").val();
+            var user = $("#user").val();
+
+            var errorMsgWrapper = "#notification-error-msg";
+            var errorMsg = "#notification-error-msg span";
+            if (!oldPassword) {
+                $(errorMsg).text("Old password is a required field. It cannot be empty.");
+                $(errorMsgWrapper).removeClass("hidden");
+            } else if (!newPassword) {
+                $(errorMsg).text("New password is a required field. It cannot be empty.");
+                $(errorMsgWrapper).removeClass("hidden");
+            } else if (!confirmedPassword) {
+                $(errorMsg).text("Retyping the new password is required.");
+                $(errorMsgWrapper).removeClass("hidden");
+            } else if (confirmedPassword != newPassword) {
+                $(errorMsg).text("New password doesn't match the confirmation.");
+                $(errorMsgWrapper).removeClass("hidden");
+            } else if (!inputIsValid(/^[\S]{5,30}$/, confirmedPassword)) {
+                $(errorMsg).text("Password should be minimum 5 characters long, should not include any whitespaces.");
+                $(errorMsgWrapper).removeClass("hidden");
+            } else {
+                var changePasswordFormData = {};
+                //changePasswordFormData.username = user;
+                changePasswordFormData.newPassword = unescape((confirmedPassword));
+                changePasswordFormData.oldPassword = unescape((oldPassword));
+
+
+                var changePasswordAPI = "/api/device-mgt/v1.0/users" + user + "/credentials";
+
+                invokerUtil.put(
+                    changePasswordAPI,
+                    changePasswordFormData,
+                    function (data, textStatus, jqXHR) {
+                        if (jqXHR.status == 200 && data) {
+                            $(modalPopupContent).html($('#change-password-success-content').html());
+                            $("#change-password-success-link").click(function () {
+                                hidePopup();
+                            });
+                        }
+                    }, function (jqXHR) {
+                        if (jqXHR.status == 400) {
+                            $(errorMsg).text("Old password does not match with the provided value.");
+                            $(errorMsgWrapper).removeClass("hidden");
+                        } else {
+                            $(errorMsg).text("An unexpected error occurred. Please try again later.");
+                            $(errorMsgWrapper).removeClass("hidden");
+                        }
+                    }
+                );
+            }
+
+        });
+
+        $("a#change-password-cancel-link").click(function () {
+            hidePopup();
+        });
+    });
+});
\ 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.ui.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
index 5fc7ac3bca8..21b7c28f3ea 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
@@ -17,6 +17,70 @@
 }}
 {{#zone "userMenu-items"}}
     <li>
-        <a href="{{@app.context}}/logout">Logout</a>
+        <a href="javascript:void(0)" id="change-password">Change password</a>
     </li>
+    <li>
+        <a href="{{@app.context}}/logout">Sign out</a>
+    </li>
+
+    <div id="change-password-window" class="hide">
+        <input type="hidden" id="user" value="{{username}}">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h4>
+                        <span class="fw-stack">
+                            <i class="fw fw-ring fw-stack-2x"></i>
+                            <i class="fw fw-key fw-stack-1x"></i>
+                        </span>
+                        Change Password
+                        <br><br>
+                    </h4>
+                    <div id="notification-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <h3>
+                        Enter old password *
+                        <br><br>
+                        <div>
+                            <input type="password" class="form-control modal-input operationDataKeys" id="old-password" data-key="message"/>
+                        </div>
+                        <br>
+                        Enter new password *
+                        <br><br>
+                        <div>
+                            <input type="password" class="form-control modal-input operationDataKeys" id="new-password" data-key="message"/>
+                        </div>
+                        <br>
+                        Retype new password *
+                        <br><br>
+                        <div>
+                            <input type="password" class="form-control modal-input operationDataKeys" id="confirmed-password" data-key="message"/>
+                        </div>
+                        <br>
+                    </h3>
+                    <div class="buttons">
+                        <a href="#" id="change-password-yes-link" class="btn-operations">Update</a>
+                        <a href="#" id="change-password-cancel-link" class="btn-operations">Cancel</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div id="change-password-success-content" class="hide">
+        <div class="content">
+            <div class="row">
+                <div class="col-lg-5 col-md-6 col-centered">
+                    <h3>Password change is successful.</h3>
+                    <div class="buttons">
+                        <a href="#" id="change-password-success-link" class="btn-operations">Ok</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{{/zone}}
+{{#zone "bottomJs"}}
+    <script src="{{@unit.publicUri}}/js/user-menu.js"></script>
 {{/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.ui.header.user-menu/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/user-menu.js
new file mode 100644
index 00000000000..e0ebe26b0a4
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.js
@@ -0,0 +1,4 @@
+function onRequest() {
+    var constants = require("/app/modules/constants.js");
+    return session.get(constants["USER_SESSION_KEY"]);
+}

From fcff1f085422ae6761d7d74c799500d6c1fd6102 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Fri, 12 Aug 2016 20:00:46 +0530
Subject: [PATCH 7/9] Fixing user menu reg exp issue

---
 .../units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js   | 1 +
 1 file changed, 1 insertion(+)

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 fe168cc0e04..9547a1e50d9 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
@@ -6,6 +6,7 @@
  * @returns {boolean} Returns true if input matches RegEx
  */
 function inputIsValid(regExp, inputString) {
+    regExp = new RegExp(regExp);
     return regExp.test(inputString);
 }
 

From c04edef1518bf11ab21f864e36f525c9f5edee38 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Sat, 13 Aug 2016 10:38:09 +0530
Subject: [PATCH 8/9] Added Certificate Configuration

---
 .../{units => pages}/cdmf.page.certificate.create/create.hbs    | 2 +-
 .../app/{units => pages}/cdmf.page.certificate.create/create.js | 0
 .../{units => pages}/cdmf.page.certificate.create/create.json   | 0
 .../public/js/certificate-create.js                             | 2 +-
 .../{units => pages}/cdmf.page.certificates/certificates.hbs    | 2 +-
 .../app/{units => pages}/cdmf.page.certificates/certificates.js | 0
 .../{units => pages}/cdmf.page.certificates/certificates.json   | 0
 .../cdmf.page.certificates/public/js/certificate-listing.js     | 0
 .../public/templates/certificate-listing.hbs                    | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificate.create/create.hbs (97%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificate.create/create.js (100%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificate.create/create.json (100%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificate.create/public/js/certificate-create.js (98%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificates/certificates.hbs (98%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificates/certificates.js (100%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificates/certificates.json (100%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificates/public/js/certificate-listing.js (100%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/{units => pages}/cdmf.page.certificates/public/templates/certificate-listing.hbs (100%)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs
similarity index 97%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.hbs
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs
index 3093ca27a9d..b2411eac336 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.hbs
@@ -81,7 +81,7 @@
                     <hr/>
                     <button class="wr-btn" onclick="window.location.href='/emm/certificates'">View Certificate List
                     </button>
-                    <a href="/emm/certificates/add-certificate" class="cu-btn-inner">
+                    <a href="/emm/certificates/add" 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>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.js
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.js
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.js
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.json
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/create.json
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.json
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/public/js/certificate-create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/public/js/certificate-create.js
similarity index 98%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/public/js/certificate-create.js
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/public/js/certificate-create.js
index 6ff663ea0db..4ccd72a11fd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificate.create/public/js/certificate-create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/public/js/certificate-create.js
@@ -21,7 +21,7 @@ var errorMsg = "#certificate-create-error-msg span";
 var validateInline = {};
 var clearInline = {};
 
-var base_api_url = "/api/device-mgt/v1.0";
+var base_api_url = "/api/certificate-mgt/v1.0";
 
 var enableInlineError = function (inputField, errorMsg, errorSign) {
     var fieldIdentifier = "#" + inputField;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/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
similarity index 98%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.hbs
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
index b20da073afa..86f161ae359 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/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
@@ -170,7 +170,7 @@
 
 {{#zone "bottomJs"}}
     <script id="certificate-listing" data-current-user="{{@user.username}}"
-            src="{{@unit.publicUri}}/templates/certificate-listing.hbs"
+            src="{{@page.publicUri}}/templates/certificate-listing.hbs"
             type="text/x-handlebars-template"></script>
 
     {{js "/js/certificate-listing.js"}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.js
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.js
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.js
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.json
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/certificates.json
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.json
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/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
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/js/certificate-listing.js
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/templates/certificate-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/templates/certificate-listing.hbs
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.page.certificates/public/templates/certificate-listing.hbs
rename to components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/templates/certificate-listing.hbs

From e45ba68a902af164886ba9a90e6fea7d81860ff0 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Sat, 13 Aug 2016 10:54:32 +0530
Subject: [PATCH 9/9] changing the context of device-types api

---
 .../devicemgt/app/modules/business-controllers/user.js          | 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/modules/business-controllers/user.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
index 23f850f2ce2..05906058918 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
@@ -280,7 +280,7 @@ var userModule = function () {
         }
         try {
             utility.startTenantFlow(carbonUser);
-            var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/admin/device-types";
+            var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/device-types";
             var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
             if (response.status == "success") {
                 response.content = parse(response.content);