changes to swagger SecurityDefinitionConfigurator and annotations

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java

@@ -34,8 +34,8 @@ import javax.ws.rs.core.Response;
 @API(name = "Configuration Management", version = "1.0.0", context = "/api/device-mgt/v1.0/configuration", tags = {"devicemgt_admin"})
 
 @Path("/configuration")
-@Api(value = "Configuration Management", description = "General Tenant Configuration management capabilities are exposed " +
+@Api(value = "Configuration Management", description = "The general platform configuration management capabilities are exposed " +
-        "through this API")
+        "through this API.")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public interface ConfigurationManagementService {
@@ -44,14 +44,16 @@ public interface ConfigurationManagementService {
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
-            value = "Get the general platform configurations.",
+            value = "Getting General Platform Configurations",
-            notes = "Get the general platform level configuration details.",
+            notes = "WSO2 EMM monitors policies to verify that the devices comply with the policies enforced on them. " +
+                    "General platform configurations include the settings on how often the the device need to be monitored. " +
+                    "Using this REST API you can get the general platform level configurations.",
             tags = "Configuration Management")
     @ApiResponses(
             value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Successfully fetched general platform configuration.",
+                    message = "OK. \n Successfully fetched the general platform configurations.",
                     response = PlatformConfiguration.class,
                     responseContainer = "List",
                     responseHeaders = {
@@ -70,22 +72,23 @@ public interface ConfigurationManagementService {
             ),
             @ApiResponse(
                     code = 304,
-                    message = "Not Modified. \n Empty body because the client has already the latest version of " +
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
-                            "the requested resource."),
             @ApiResponse(
                     code = 406,
-                    message = "Not Acceptable.\n The requested media type is not supported"),
+                    message = "Not Acceptable.\n The requested media type is not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n Server error occurred while fetching the general " +
-                            "platform configuration.",
+                            "platform configurations.",
                     response = ErrorResponse.class)
     })
     @Permission(name = "View Configurations", permission = "/device-mgt/platform-configurations/view")
     Response getConfiguration(
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z." +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since")
                     String ifModifiedSince);
@@ -95,14 +98,16 @@ public interface ConfigurationManagementService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Update General Platform Configurations.",
+            value = "Updating General Platform Configurations",
-            notes = "This resource is used to update the general platform configuration.",
+            notes = "WSO2 EMM monitors policies to verify that the devices comply with the policies enforced on them." +
+                    "General platform configurations include the settings on how often the the device need to be monitored." +
+                    "Using this REST API you can update the general platform level configurations.",
             tags = "Configuration Management")
     @ApiResponses(
             value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n General platform configuration has been updated successfully",
+                    message = "OK. \n Successfully updated the general platform configurations.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Type",
@@ -120,18 +125,18 @@ public interface ConfigurationManagementService {
                     message = "Bad Request. \n Invalid request or validation error."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while modifying general platform configuration.",
+                            "Server error occurred while modifying the general platform configurations.",
                     response = ErrorResponse.class)
     })
     @Permission(name = "Manage configurations", permission = "/device-mgt/platform-configurations/manage")
     Response updateConfiguration(
             @ApiParam(
                     name = "configuration",
-                    value = "The required properties to be updated in the platform configuration.",
+                    value = "The properties required to update the platform configurations.",
                     required = true)
                     PlatformConfiguration configuration);
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java

@@ -44,15 +44,15 @@ public interface RoleManagementService {
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
-            value = "Get the list of roles.",
+            value = "Getting the List of Roles",
-            notes = "If you wish to get the details of all the roles in EMM, you can do so using this REST API. All " +
+            notes = "WSO2 EMM supports role-based access control (RBAC) and role management. Using this API you can the list of roles that are in WSO2 EMM.\n" +
-                    "internal roles, roles created for Service-providers and application related roles are omitted.",
+                    "Note: Internal roles, roles created for service-providers, and application related roles will not be given in the output.",
             tags = "Role Management")
     @ApiResponses(
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Successfully fetched the requested list of roles.",
+                            message = "OK. \n Successfully fetched the list of roles in WSO2 EMM.",
                             response = RoleList.class,
                             responseHeaders = {
                                     @ResponseHeader(
@@ -69,41 +69,45 @@ public interface RoleManagementService {
                             }),
                     @ApiResponse(
                             code = 304,
-                            message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                            message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
                     @ApiResponse(
                             code = 406,
                             message = "Not Acceptable.\n The requested media type is not supported"),
                     @ApiResponse(
                             code = 500,
-                            message = "Internal Server Error. \n Server error occurred while fetching requested list of roles.",
+                            message = "Internal Server Error. \n Server error occurred while fetching list of roles.",
                             response = ErrorResponse.class)
             })
     @Permission(name = "View Roles", permission = "/device-mgt/roles/view")
     Response getRoles(
             @ApiParam(
                     name = "filter",
-                    value = "Role name or a part of it to search.",
+                    value = "Provide a character or a few characters in the role name.",
                     required = false)
             @QueryParam("filter") String filter,
             @ApiParam(
                     name = "user-store",
-                    value = "From which user store the roles must be fetched.",
+                    value = "The name of the UserStore you wish to get the list of roles.",
                     required = false)
             @QueryParam("user-store") String userStoreName,
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time." +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince,
             @ApiParam(
                     name = "offset",
-                    value = "Starting point within the complete list of items qualified.",
+                    value = "The starting pagination index for the complete list qualified items.",
-                    required = false)
+                    required = false,
+                    defaultValue = "0")
             @QueryParam("offset") int offset,
             @ApiParam(
                     name = "limit",
-                    value = "Maximum size of resource array to return.",
+                    value = "Provide how many roles details you require from the starting pagination index/offset.",
-                    required = false)
+                    required = false,
+                    defaultValue = "5")
             @QueryParam("limit") int limit);
 
     @GET
@@ -111,10 +115,10 @@ public interface RoleManagementService {
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
-            value = "Getting permission details of a role.",
+            value = "Getting Permission Details of a Role",
-            notes = "In an organization an individual is associated a with set of responsibilities based on their " +
+            notes = "An individual is associated a with set of responsibilities based on their " +
-                    "role. In  EMM you are able to configure permissions based on the responsibilities carried " +
+                    "role. In  WSO2 EMM you are able to configure permissions based on the responsibilities carried " +
-                    "out by a role. Therefore if you wish to retrieve the permission details of a role, you can do " +
+                    "out by various roles. Therefore, if you wish to retrieve the permission details of a role, you can do " +
                     "so using this REST API.",
             response = UIPermissionNode.class,
             responseContainer = "List",
@@ -124,7 +128,7 @@ public interface RoleManagementService {
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Successfully fetched the permission list of the given role.",
+                            message = "OK. \n Successfully fetched the permissions details for the specified role.",
                             response = UIPermissionNode.class,
                             responseContainer = "List",
                             responseHeaders = {
@@ -142,14 +146,14 @@ public interface RoleManagementService {
                             }),
                     @ApiResponse(
                             code = 304,
-                            message = "Not Modified. \n Empty body because the client has already the latest version of the requested resource."),
+                            message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource.\n"),
                     @ApiResponse(
                             code = 400,
                             message = "Bad Request. \n Invalid request or validation error.",
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 404,
-                            message = "Not Found. \n Role does not exist.",
+                            message = "Not Found. \n The specified role does not exist.",
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 406,
@@ -157,19 +161,22 @@ public interface RoleManagementService {
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 500,
-                            message = "Internal Server ErrorResponse. \n Server error occurred while fetching the permission list of the requested role.",
+                            message = "Internal Server ErrorResponse. \n Server error occurred while fetching the permission list for the requested role.",
                             response = ErrorResponse.class)
             })
     @Permission(name = "View Roles", permission = "/device-mgt/roles/view")
     Response getPermissionsOfRole(
             @ApiParam(
                     name = "roleName",
-                    value = "Name of the role.",
+                    value = "The name of the role.",
-                    required = true)
+                    required = true,
+                    defaultValue = "Engineer")
             @PathParam("roleName") String roleName,
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time." +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince);
 
@@ -178,15 +185,15 @@ public interface RoleManagementService {
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
-            value = "Get details of a role.",
+            value = "Getting Details of a Role",
-            notes = "If you wish to get the details of a role in  EMM, you can do so using this REST API.",
+            notes = "Get the permissions associated with a role and role specific details using this REST API.",
             response = RoleInfo.class,
             tags = "Role Management")
     @ApiResponses(
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Successfully fetched the requested role.",
+                            message = "OK. \n Successfully fetched the details of the role.",
                             response = RoleInfo.class,
                             responseHeaders = {
                                     @ResponseHeader(
@@ -203,15 +210,14 @@ public interface RoleManagementService {
                             }),
                     @ApiResponse(
                             code = 304,
-                            message = "Not Modified. \n Empty body because the client has already the latest version of" +
+                            message = "Not Modified. \n Empty body because the client already has the latest version of the requested resource."),
-                                    " the requested resource."),
                     @ApiResponse(
                             code = 400,
                             message = "Bad Request. \n Invalid request or validation error.",
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 404,
-                            message = "Not Found. \n Role does not exist.",
+                            message = "Not Found. \n The specified role does not exist.",
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 406,
@@ -219,7 +225,7 @@ public interface RoleManagementService {
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 500,
-                            message = "Internal Server Error. \n Server error occurred while fetching the " +
+                            message = "Internal Server Error. \n Server error occurred while fetching the details of" +
                                     "requested role.",
                             response = ErrorResponse.class)
     })
@@ -227,12 +233,15 @@ public interface RoleManagementService {
     Response getRole(
             @ApiParam(
                     name = "roleName",
-                    value = "Name of the role.",
+                    value = "The name of the role.",
-                    required = true)
+                    required = true,
+                    defaultValue = "admin")
             @PathParam("roleName") String roleName,
             @ApiParam(
                     name = "If-Modified-Since",
-                    value = "Validates if the requested variant has not been modified since the time specified",
+                    value = "Checks if the requested variant was modified, since the specified date-time." +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200",
                     required = false)
             @HeaderParam("If-Modified-Since") String ifModifiedSince);
 
@@ -241,17 +250,17 @@ public interface RoleManagementService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Add a role.",
+            value = "Adding a Role",
-            notes = "You are able to add a new role to EMM using the REST API.",
+            notes = "WSO2 EMM supports role-based access control (RBAC) and role management. Add a new role to WSO2 EMM using this REST API.",
             tags = "Role Management")
     @ApiResponses(value = {
             @ApiResponse(
                     code = 201,
-                    message = "Created. \n Role has successfully been created",
+                    message = "Created. \n Successfully created the role.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
-                                    description = "The URL of the role added."),
+                                    description = "The URL to the newly added role."),
                             @ResponseHeader(
                                     name = "Content-Type",
                                     description = "The content type of the body"),
@@ -265,7 +274,7 @@ public interface RoleManagementService {
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 303,
-                    message = "See Other. \n Source can be retrieved from the URL specified at the Location header.",
+                    message = "See Other. \n The source can be retrieved from the URL specified in the location header.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Location",
@@ -276,7 +285,7 @@ public interface RoleManagementService {
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format.",
+                    message = "Unsupported media type. \n The format of the requested entity was not supported.",
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 500,
@@ -287,7 +296,7 @@ public interface RoleManagementService {
     Response addRole(
             @ApiParam(
                     name = "role",
-                    value = "Details about the role to be added.",
+                    value = "The properties required to add a new role.",
                     required = true) RoleInfo role);
 
     @PUT
@@ -296,14 +305,14 @@ public interface RoleManagementService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Update a role.",
+            value = "Updating Role Details",
-            notes = "There will be situations where you will need to update the role details, such as the permissions" +
+            notes = "There will be situations where you need to update the role details, such as the permissions" +
-                    " or the role name. In such situation you can update the role details.",
+                    " or the role name. Update the role details using this REST API.",
             tags = "Role Management")
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Role has been updated successfully",
+                    message = "OK. \n Successfully updated the specified role.",
                     responseHeaders = {
                             @ResponseHeader(
                                     name = "Content-Type",
@@ -314,7 +323,7 @@ public interface RoleManagementService {
                                             "Used by caches, or in conditional requests."),
                             @ResponseHeader(
                                     name = "Last-Modified",
-                                    description = "Date and time the resource has been modified the last time.\n" +
+                                    description = "Date and time the resource was last modified.\n" +
                                             "Used by caches, or in conditional requests.")}),
             @ApiResponse(
                     code = 400,
@@ -322,11 +331,11 @@ public interface RoleManagementService {
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Role to be deleted does not exist.",
+                    message = "Not Found. \n The specified role does not exist.",
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format.",
+                    message = "Unsupported media type. \n The format of the requested entity was not supported.\n",
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 500,
@@ -337,33 +346,34 @@ public interface RoleManagementService {
     Response updateRole(
             @ApiParam(
                     name = "roleName",
-                    value = "Name of the role.",
+                    value = "The name of the role.",
-                    required = true)
+                    required = true,
+                    defaultValue = "engineer")
             @PathParam("roleName") String roleName,
             @ApiParam(
                     name = "role",
-                    value = "Details about the role to be added.",
+                    value = "The properties required to update a role.",
                     required = true) RoleInfo role);
 
     @DELETE
     @Path("/{roleName}")
     @ApiOperation(
             httpMethod = "DELETE",
-            value = "Delete a role.",
+            value = "Deleting a Role",
-            notes = "In a situation when your Organization identifies that a specific role is no longer required you " +
+            notes = "Roles become obsolete over time due to various reasons. In a situation where your Organization identifies that a specific role is no longer required, you " +
-                    "will need to remove the role details from  EMM.",
+                    "can delete a role using this REST API.",
             tags = "Role Management")
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
-                    message = "OK. \n Role has successfully been removed"),
+                    message = "OK. \n Successfully removed the specified role."),
             @ApiResponse(
                     code = 400,
                     message = "Bad Request. \n Invalid request or validation error.",
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Role to be deleted does not exist.",
+                    message = "Not Found. \n The specified role does not exist.",
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 500,
@@ -374,8 +384,9 @@ public interface RoleManagementService {
     Response deleteRole(
             @ApiParam(
                     name = "roleName",
-                    value = "Name of the role to de deleted.",
+                    value = "The name of the role that needs to de deleted.",
-                    required = true)
+                    required = true,
+                    defaultValue = "engineer")
             @PathParam("roleName") String roleName);
 
     @PUT
@@ -384,19 +395,19 @@ public interface RoleManagementService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
-            value = "Add users to a role.",
+            value = "Adding Users to a Role",
-            notes = "Defining the users to a role at the point of creating a new role is optional, " +
+            notes = "Defining users to a role at the point of creating a new role is optional. " +
-                    "therefore you are able to update the users that belong to a given role after you have created " +
+                    "You can update the users that belong to a given role after you have created " +
-                    "a role using this REST API." +
+                    "a role using this REST API.\n" +
                     "Example: Your Organization hires 30 new engineers. Updating the role details for each user can " +
-                    "be cumbersome, therefore you can define all the new employees that belong to the engineering " +
+                    "be cumbersome. Therefore, you can define all the new employees that belong to the engineering " +
                     "role using this API.",
             tags = "Role Management")
     @ApiResponses(
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n User list of the role has been updated successfully",
+                            message = "OK. \n Successfully added the users to the specified role.",
                             responseHeaders = {
                                     @ResponseHeader(
                                             name = "Content-Type",
@@ -415,17 +426,17 @@ public interface RoleManagementService {
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 404,
-                            message = "Not Found. \n Resource to be deleted does not exist.",
+                            message = "Not Found. \n The specified role does not exist.",
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 415,
-                            message = "Unsupported media type. \n The entity of the request was in a not " +
+                            message = "Unsupported media type. \n The format of the requested entity was not supported.\n" +
                                     "supported format.",
                             response = ErrorResponse.class),
                     @ApiResponse(
                             code = 500,
                             message = "Internal Server Error. \n " +
-                                    "Server error occurred while updating the user list of the role.",
+                                    "Server error occurred while adding the user to the specified role.",
                             response = ErrorResponse.class)
     })
     @Permission(name = "Manage Roles", permission = "/device-mgt/roles/manage")
@@ -437,7 +448,10 @@ public interface RoleManagementService {
             @PathParam("roleName") String roleName,
             @ApiParam(
                     name = "users",
-                    value = "List of usernames to be added.",
+                    value = "Define the users that belong to the role.\n" +
-                    required = true) List<String> users);
+                            "Multiple users can be added to a role by using comma separated values. ",
+                    required = true,
+                    defaultValue = "[jim]"
+            ) List<String> users);
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java

@@ -142,6 +142,11 @@ public interface UserManagementService {
                     value = "Username of the user to be fetched.",
                     required = true)
             @PathParam("username") String username,
+            @ApiParam(
+                    name = "domain",
+                    value = "Domain name of the user store.",
+                    required = false)
+            @QueryParam("domain") String domain,
             @ApiParam(
                     name = "If-Modified-Since",
                     value = "Validates if the requested variant has not been modified since the time specified",
@@ -199,6 +204,11 @@ public interface UserManagementService {
                     value = "Username of the user to be updated.",
                     required = true)
             @PathParam("username") String username,
+            @ApiParam(
+                    name = "domain",
+                    value = "Domain name of the user store.",
+                    required = false)
+            @QueryParam("domain") String domain,
             @ApiParam(
                     name = "userData",
                     value = "User related details.",
@@ -230,7 +240,12 @@ public interface UserManagementService {
     @Permission(name = "Manage Users", permission = "/device-mgt/users/manage")
     Response removeUser(
             @ApiParam(name = "username", value = "Username of the user to be deleted.", required = true)
-            @PathParam("username") String username);
+            @PathParam("username") String username,
+            @ApiParam(
+                    name = "domain",
+                    value = "Domain name of the user store.",
+                    required = false)
+            @QueryParam("domain") String domain);
 
     @GET
     @Path("/{username}/roles")
@@ -279,7 +294,12 @@ public interface UserManagementService {
     @Permission(name = "View Users", permission = "/device-mgt/users/view")
     Response getRolesOfUser(
             @ApiParam(name = "username", value = "Username of the user.", required = true)
-            @PathParam("username") String username);
+            @PathParam("username") String username,
+            @ApiParam(
+                    name = "domain",
+                    value = "Domain name of the user store.",
+                    required = false)
+            @QueryParam("domain") String domain);
 
     @GET
     @ApiOperation(

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java

@@ -49,14 +49,14 @@ public interface ApplicationManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Application installation API.(Internal API)",
+            value = "Installing an Application (Internal API)",
-            notes = "This is an internal API used for application installation on a device.",
+            notes = "This is an internal API that can be used to install an application on a device.",
             response = Activity.class,
             tags = "Application Management Administrative Service")
     @ApiResponses(value = {
             @ApiResponse(
                     code = 202,
-                    message = "OK. \n Install application operation will be delivered to the given devices",
+                    message = "Accepted. \n The install application operation will be delivered to the specified devices",
                     response = Activity.class),
             @ApiResponse(
                     code = 400,
@@ -64,15 +64,15 @@ public interface ApplicationManagementAdminService {
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be processed does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 415,
-                    message = "Unsupported media type. \n The entity of the request was in a not supported format."),
+                    message = "Unsupported media type. \n The format of the requested entity was not supported."),
             @ApiResponse(
                     code = 500,
                     message = "Internal Server Error. \n " +
-                            "Server error occurred while bulk issuing application installation operations upon " +
+                            "Server error occurred while executing the application install operation in bulk" +
-                            "a given set of devices.",
+                            " for a specified set of devices.",
                     response = ErrorResponse.class)
     })
     @Permission(name = "Install/Uninstall applications", permission = "/device-mgt/applications/manage")
@@ -88,14 +88,14 @@ public interface ApplicationManagementAdminService {
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "POST",
-            value = "Application un-installation API.(Internal API)",
+            value = "Uninstalling an Application (Internal API)\n",
-            notes = "This is an internal API used for application un-installation on a device.",
+            notes = "This is an internal API that can be used to uninstall an application.",
             response = Activity.class,
             tags = "Application Management Administrative Service")
     @ApiResponses(value = {
             @ApiResponse(
                     code = 202,
-                    message = "OK. \n Uninstall application operation will be delivered to the provided devices",
+                    message = "Accepted. \n The uninstall application operation will be delivered to the provided devices",
                     response = Activity.class),
             @ApiResponse(
                     code = 400,
@@ -103,15 +103,14 @@ public interface ApplicationManagementAdminService {
                     response = ErrorResponse.class),
             @ApiResponse(
                     code = 404,
-                    message = "Not Found. \n Resource to be processed does not exist."),
+                    message = "Not Found. \n The specified resource does not exist."),
             @ApiResponse(
                     code = 415,
                     message = "Unsupported media type. \n The entity of the request was in a not supported format."),
             @ApiResponse(
                     code = 500,
-                    message = "Internal Server Error. \n " +
+                    message = "Internal Server Error. \n Server error occurred while executing the application install operation in bulk" +
-                            "Server error occurred while bulk issuing application un-installation operations upon " +
+                    " for a specified set of devices.",
-                            "a given set of devices.",
                     response = ErrorResponse.class)
     })
     @Permission(name = "Install/Uninstall applications", permission = "/device-mgt/applications/manage")

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java

@@ -78,6 +78,11 @@ public interface UserManagementAdminService {
             @PathParam("username")
             @Size(max = 45)
             String username,
+            @ApiParam(
+                name = "domain",
+                value = "Domain name of the user store.",
+                required = false)
+            @QueryParam("domain") String domain,
             @ApiParam(
                     name = "credentials",
                     value = "Credential.",

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -105,8 +105,11 @@ public class UserManagementServiceImpl implements UserManagementService {
     @GET
     @Path("/{username}")
     @Override
-    public Response getUser(@PathParam("username") String username,
+    public Response getUser(@PathParam("username") String username, @QueryParam("domain") String domain,
                             @HeaderParam("If-Modified-Since") String ifModifiedSince) {
+        if (domain != null && !domain.isEmpty()) {
+            username = domain + '/' + username;
+        }
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
             if (!userStoreManager.isExistingUser(username)) {
@@ -131,7 +134,10 @@ public class UserManagementServiceImpl implements UserManagementService {
     @PUT
     @Path("/{username}")
     @Override
-    public Response updateUser(@PathParam("username") String username, UserInfo userInfo) {
+    public Response updateUser(@PathParam("username") String username, @QueryParam("domain") String domain, UserInfo userInfo) {
+        if (domain != null && !domain.isEmpty()) {
+            username = domain + '/' + username;
+        }
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
             if (!userStoreManager.isExistingUser(username)) {
@@ -205,7 +211,10 @@ public class UserManagementServiceImpl implements UserManagementService {
     @DELETE
     @Path("/{username}")
     @Override
-    public Response removeUser(@PathParam("username") String username) {
+    public Response removeUser(@PathParam("username") String username, @QueryParam("domain") String domain) {
+        if (domain != null && !domain.isEmpty()) {
+            username = domain + '/' + username;
+        }
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
             if (!userStoreManager.isExistingUser(username)) {
@@ -233,7 +242,10 @@ public class UserManagementServiceImpl implements UserManagementService {
     @GET
     @Path("/{username}/roles")
     @Override
-    public Response getRolesOfUser(@PathParam("username") String username) {
+    public Response getRolesOfUser(@PathParam("username") String username, @QueryParam("domain") String domain) {
+        if (domain != null && !domain.isEmpty()) {
+            username = domain + '/' + username;
+        }
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
             if (!userStoreManager.isExistingUser(username)) {

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/UserManagementAdminServiceImpl.java

@@ -37,7 +37,10 @@ public class UserManagementAdminServiceImpl implements UserManagementAdminServic
     @Override
     public Response resetUserPassword(@PathParam("username")
                                       @Size(max = 45)
-                                          String user, PasswordResetWrapper credentials) {
+                                          String user, @QueryParam("domain") String domain, PasswordResetWrapper credentials) {
+        if (domain != null && !domain.isEmpty()) {
+            user = domain + '/' + user;
+        }
         return CredentialManagementResponseBuilder.buildResetPasswordResponse(user, credentials);
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js

@@ -177,10 +177,18 @@ var userModule = function () {
      */
     publicMethods.getUser = function (username) {
         var carbonUser = privateMethods.getCarbonUser();
+        var domain;
+        if (username.indexOf('/') > 0) {
+            domain = username.substr(0, username.indexOf('/'));
+            username = username.substr(username.indexOf('/') + 1);
+        }
         try {
             utility.startTenantFlow(carbonUser);
             var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/users/" +
                       encodeURIComponent(username);
+            if (domain) {
+                url += '?domain=' + domain;
+            }
             var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
             response["content"] = parse(response.content);
             response["userDomain"] = carbonUser.domain;
@@ -199,10 +207,18 @@ var userModule = function () {
      */
     publicMethods.getRolesByUsername = function (username) {
         var carbonUser = privateMethods.getCarbonUser();
+        var domain;
+        if (username.indexOf('/') > 0) {
+            domain = username.substr(0, username.indexOf('/'));
+            username = username.substr(username.indexOf('/') + 1);
+        }
         try {
             utility.startTenantFlow(carbonUser);
             var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/users/" +
                       encodeURIComponent(username) + "/roles";
+            if (domain) {
+                url += '?domain=' + domain;
+            }
             var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
             if (response.status == "success") {
                 response.content = parse(response.content).roles;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js

@@ -83,7 +83,7 @@ function hidePopup() {
  * initial mode and with out select mode.
  */
 function InitiateViewOption() {
-    $(location).attr('href', $(this).data("url"));
+    // $(location).attr('href', $(this).data("url"));
 }
 
 function loadRoles() {
@@ -124,8 +124,8 @@ function loadRoles() {
             class: "remove-padding icon-only content-fill",
             data: null,
             defaultContent: "<div class='thumbnail icon'>" +
-                "<i class='square-element text fw fw-bookmark' style='font-size: 74px;'></i>" +
+            "<i class='square-element text fw fw-bookmark' style='font-size: 74px;'></i>" +
-                "</div>"
+            "</div>"
         },
         {
             class: "fade-edge",

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js

@@ -235,8 +235,8 @@ $(document).ready(function () {
                 roles = [];
             }
             addUserFormData.roles = roles;
-
+            username = username.substr(username.indexOf('/') + 1);
-            var addUserAPI = deviceMgtBasePath + "/users/" + username;
+            var addUserAPI = deviceMgtBasePath + "/users/" + username + "?domain=" + domain;
 
             invokerUtil.put(
                 addUserAPI,

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js

@@ -45,7 +45,7 @@ var modalPopupContent = modalPopup + " .modal-content";
 var body = "body";
 
 /**
- * 
+ *
  * Fires the res_text when ever a data table redraw occurs making
  * the font icons change the size to respective screen resolution.
  *
@@ -162,9 +162,15 @@ function resetPassword(username) {
         } else {
             var resetPasswordFormData = {};
             resetPasswordFormData.newPassword = unescape(confirmedPassword);
-
+            var domain;
-            var resetPasswordServiceURL = apiBasePath + "/admin/users/"+ username +"/credentials";
+            if (username.indexOf('/') > 0) {
-
+                domain = username.substr(0, username.indexOf('/'));
+                username = username.substr(username.indexOf('/') + 1);
+            }
+            var resetPasswordServiceURL = apiBasePath + "/admin/users/" + username + "/credentials";
+            if (domain) {
+                resetPasswordServiceURL += '?domain=' + domain;
+            }
             invokerUtil.post(
                 resetPasswordServiceURL,
                 resetPasswordFormData,
@@ -198,7 +204,15 @@ function resetPassword(username) {
  * on User Listing page in WSO2 MDM Console.
  */
 function removeUser(username) {
+    var domain;
+    if (username.indexOf('/') > 0) {
+        domain = username.substr(0, username.indexOf('/'));
+        username = username.substr(username.indexOf('/') + 1);
+    }
     var removeUserAPI = apiBasePath + "/users/" + username;
+    if (domain) {
+        removeUserAPI += '?domain=' + domain;
+    }
     $(modalPopupContent).html($('#remove-user-modal-content').html());
     showPopup();
 
@@ -207,7 +221,11 @@ function removeUser(username) {
             removeUserAPI,
             function (data, textStatus, jqXHR) {
                 if (jqXHR.status == 200) {
-                    $("#user-" + username).remove();
+                    if (domain) {
+                        $("#user-" + domain + "\\/" + username).remove();
+                    } else {
+                        $("#user-" + username).remove();
+                    }
                     // update modal-content with success message
                     $(modalPopupContent).html($('#remove-user-success-content').html());
                     $("a#remove-user-success-link").click(function () {
@@ -281,9 +299,11 @@ function loadUsers() {
         {
             class: "remove-padding icon-only content-fill",
             data: null,
-            defaultContent: '<div class="thumbnail icon">' +
+            render: function (data, type, row, meta) {
-                '<i class="square-element text fw fw-user" style="font-size: 74px;"></i>' +
+                return '<div class="thumbnail icon viewEnabledIcon" data-url="' + context +'/user/view?username=' + data.filter + '">' +
-                '</div>'
+                    '<i class="square-element text fw fw-user" style="font-size: 74px;"></i>' +
+                    '</div>';
+            }
         },
         {
             class: "fade-edge",
@@ -318,7 +338,7 @@ function loadUsers() {
             class: "text-right content-fill text-left-on-grid-view no-wrap",
             data: null,
             render: function (data, type, row, meta) {
-                return '&nbsp;<a href="/emm/user/edit?username=' + data.filter + '" data-username="' + data.filter + '" ' +
+                var editbtn=  '&nbsp;<a data-toggle="tooltip" data-placement="bottom" title="Edit User"href="' + context + '/user/edit?username=' + data.filter + '" data-username="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
                     'class="btn padding-reduce-on-grid-view edit-user-link"> ' +
                     '<span class="fw-stack"> ' +
@@ -328,8 +348,9 @@ function loadUsers() {
                     '<span class="hidden-xs hidden-on-grid-view">' +
                     '&nbsp;&nbsp;Edit' +
                     '</span>' +
-                    '</a>' +
+                    '</a>';
-                    '<a href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
+
+                var resetPasswordbtn = '<a data-toggle="tooltip" data-placement="bottom" title="Reset Password" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="edit-form" ' +
                     'onclick="javascript:resetPassword(\'' + data.filter + '\')" ' +
                     'class="btn padding-reduce-on-grid-view remove-user-link">' +
@@ -340,8 +361,9 @@ function loadUsers() {
                     '<span class="hidden-xs hidden-on-grid-view">' +
                     '&nbsp;&nbsp;Reset Password' +
                     '</span>' +
-                    '</a>' +
+                    '</a>';
-                    '<a href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
+
+                var removebtn = '<a data-toggle="tooltip" data-placement="bottom" title="Remove User" href="#" data-username="' + data.filter + '" data-userid="' + data.filter + '" ' +
                     'data-click-event="remove-form" ' +
                     'onclick="javascript:removeUser(\'' + data.filter + '\')" ' +
                     'class="btn padding-reduce-on-grid-view remove-user-link">' +
@@ -353,6 +375,19 @@ function loadUsers() {
                     '&nbsp;&nbsp;Remove' +
                     '</span>' +
                     '</a>';
+
+                var returnbtnSet = '';
+                if($("#can-edit").length > 0) {
+                    returnbtnSet = returnbtnSet + editbtn;
+                }
+                if($("#can-reset-password").length > 0) {
+                    returnbtnSet = returnbtnSet + resetPasswordbtn;
+                }
+                if($("#can-remove").length > 0) {
+                    returnbtnSet = returnbtnSet + removebtn;
+                }
+
+                return returnbtnSet;
             }
         }
 
@@ -365,14 +400,16 @@ function loadUsers() {
 
     $('#user-grid').datatables_extended_serverside_paging(null, '/api/device-mgt/v1.0/users', dataFilter, columns, fnCreatedRow, null, options);
     $(loadingContentView).hide();
+
 }
 
 $(document).ready(function () {
     loadUsers();
-    $(".viewEnabledIcon").click(function () {
+    $(function () {
-        InitiateViewOption();
+        $('[data-toggle="tooltip"]').tooltip()
     });
     if (!$("#can-invite").val()) {
         $("#invite-user-button").remove();
     }
+
 });

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js

@@ -25,7 +25,7 @@ $.fn.datatables_extended = function(settings){
 
     // EMM related function
     if (InitiateViewOption) {
-        $(".viewEnabledIcon").bind("click", InitiateViewOption);
+        $(document).on('click','.viewEnabledIcon',InitiateViewOption);
     }
     //--- End of EMM related codes
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.serversidepaging.js

@@ -35,7 +35,7 @@ $.fn.datatables_extended_serverside_paging = function (settings , url, dataFilte
 
     // EMM related function
     if (InitiateViewOption) {
-        $(".viewEnabledIcon").bind("click", InitiateViewOption);
+        $(document).on('click','.viewEnabledIcon',InitiateViewOption);
     }
 
     var deviceType;
@@ -239,14 +239,14 @@ $.fn.datatables_extended_serverside_paging = function (settings , url, dataFilte
                         $(button).addClass("active").html('Cancel');
                         $(button).parent().next().children("button").removeClass("disabled");
                         // EMM related code
-                        $(".viewEnabledIcon").unbind("click");
+                        $(document).off('click','.viewEnabledIcon');
                         //--- End of EMM related codes
                     } else if ($(button).html() == 'Cancel') {
                         thisTable.removeClass("table-selectable");
                         $(button).addClass("active").html('Select');
                         $(button).parent().next().children().addClass("disabled");
                         // EMM related function
-                        $(".viewEnabledIcon").bind("click", InitiateViewOption);
+                        $(document).on('click','.viewEnabledIcon',InitiateViewOption);
                         //--- End of EMM related codes
                     }
                 });

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs

@@ -22,7 +22,7 @@
             <!-- content -->
             <div id="config-save-form" class="container col-centered wr-content">
                 <br>
-                Device Notifications
+                <h4> Device Notifications </h4>
                 <br>
                 <br>
                 <div class="wr-advance-operations">

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

@@ -65,6 +65,15 @@ function loadNotifications() {
 function showAdvanceOperation(operation, button) {
     $(button).addClass('selected');
     $(button).siblings().removeClass('selected');
+
+    if ($(button).attr("id") == 'allNotifications') {
+        $("#ast-container").html('<div class="panel-body">You do not have any unread notifications </div>');
+    } else if ($(button).attr("id") == 'unReadNotifications') {
+        $("#ast-container").html('<div class="panel-body">You do not have any notifications </div>');
+    } else {
+        $("#ast-container").html('<div class="panel-body">You do not have any notifications </div>');
+    }
+
     var hiddenOperation = ".wr-hidden-operations-content > div";
     $(hiddenOperation + '[data-operation="' + operation + '"]').show();
     $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide();
@@ -82,7 +91,7 @@ $(document).ready(function () {
 
     loadNotifications();
 
-    $("#ast-container").on("click", ".new-notification", function(e) {
+    $("#ast-container").on("click", ".new-notification", function (e) {
         var notificationId = $(this).data("id");
         // var redirectUrl = $(this).data("url");
         var query = deviceMgtAPIBaseURI + "/notifications" + "/" + notificationId + "/mark-checked";

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

@@ -57,7 +57,7 @@
                     <tr data-type="selectable" data-id="{{id}}">
                         <td  data-display="{{description}}" data-grid-label="Description">{{description}}</td>
                         <td style="text-align: center;">
-                            <a href="{{appContext}}/device/{{deviceType}}?id={{deviceIdentifier}}" data-click-event="remove-form">
+                            <a href="device/{{deviceType}}?id={{deviceIdentifier}}" 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>

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

@@ -66,9 +66,7 @@ $(document).ready(function () {
                 var changePasswordFormData = {};
                 changePasswordFormData["oldPassword"] = unescape((currentPassword));
                 changePasswordFormData["newPassword"] = unescape((newPassword));
-
+                var changePasswordAPI = "/api/device-mgt/v1.0/users/credentials";
-                var changePasswordAPI = "/api/device-mgt/v1.0/users/" + user + "/credentials";
-
                 invokerUtil.put(
                     changePasswordAPI,
                     changePasswordFormData,
@@ -97,4 +95,4 @@ $(document).ready(function () {
             hidePopup();
         });
     });
-});
+});

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

@@ -46,7 +46,7 @@
                 </li>
 
                 <div id="change-password-window" class="hide">
-                    <input type="hidden" id="user" value="{{username}}">
+                    <input type="hidden" id="user" value="{{@user.username}}">
                     <div class="modal-header">
                         <h4 class="pull-left modal-title">
                 <span class="fw-stack">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs

@@ -19,6 +19,9 @@
     <a href="{{#defineZone "productUri"}}{{@app.context}}/{{/defineZone}}">
         <img src="{{@unit.publicUri}}/img/logo.png" alt="{{defineZone "productName"}}"
              title="{{defineZone "productName"}}" class="logo" />
-        <h1>{{#defineZone "productName"}}Unified UI Template App{{/defineZone}}</h1>
+        <h1>
+            <span class="hidden-xs">{{#defineZone "productName"}}Unified UI Template App{{/defineZone}}</span>

+            <span class="visible-xs-inline">{{#defineZone "productNameResponsive"}}UUI Tmpl. App{{/defineZone}}</span>
+        </h1>
     </a>
 {{/zone}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.user-menu/user-menu.hbs

@@ -27,12 +27,7 @@
                     {{@user.username}}<span class="caret"></span>
                 </span>
             </a>
-            <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+            <ul class="dropdown-menu dropdown-menu-right slideInDown" role="menu">
-                role="menu">
-                <li class="dropdown-header visible-xs">
-                    {{@user.username}}<span class="caret"></span>
-                </li>
-                <li class="divider visible-xs"></li>
                 {{#defineZone "userMenu-items"}}
                     <li>
                         <a href="{{@app.context}}/signout">Sign Out</a>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header/header.hbs

@@ -18,10 +18,10 @@
 {{#zone "header"}}
     <header class="header header-default">
         <div class="container-fluid">
-            <div class="pull-left brand float-remove-xs text-center-xs">
+            <div class="pull-left brand">
                 {{defineZone "brand"}}
             </div>
-            <div class="pull-right auth float-remove-xs text-center-xs">
+            <div class="pull-right auth">
                 {{defineZone "userMenu"}}
             </div>
         </div>

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

@@ -2791,6 +2791,7 @@ header .brand {
 }
 header .brand img.logo {
   height: 24px;
+  margin-top:0px;
 }
 header .brand a {
   display: inline-block;
@@ -2822,6 +2823,9 @@ header .nav .open > a:focus {
 }
 header .nav .dropdown-menu {
   background: black;
+  padding:0px;
+  margin:0px;
+  top:50px;
 }
 header .nav .dropdown-menu a {
   color: #fff;
@@ -2954,7 +2958,7 @@ tbody.collapse.in {
 }
 .dropdown-menu > li > a {
   display: block;
-  padding: 3px 20px;
+  padding: 8px 20px;
   clear: both;
   font-weight: normal;
   line-height: 1.42857;
@@ -3050,6 +3054,12 @@ tbody.collapse.in {
     right: auto;
   }
 }
+@media (max-width : 480px) {
+    .navbar-right .dropdown-menu-right {
+        left: auto;
+        right: 0;
+    }
+}
 .btn-group,
 .btn-group-vertical {
   position: relative;