-
-
+
Do you really want to remove the selected policy(s)?
- - +
-
-
-
-
+
Done. Selected policy was successfully removed.
+
+
+ + Done. Selected policy was successfully removed. +
+ +
-
-
+
-
-
-
-
+
An unexpected error occurred. Please try again later.
+
+
+ + An unexpected error occurred. Please try again later +
+ +
-
-
+
-
-
-
-
+ - You cannot remove policies that have been already applied to devices. - Please deselect active policies from your selection and try again. -
- - -
+
+ + Please Try again. +
+ +
+
+
You cannot remove policies that have been already applied to devices. + Please deselect active policies from your selection and try again.
+
-
-
-
-
+ Do you really want to publish the selected policy(s)?
- - -
+
+ + Do you really want to publish the selected policy(s)? +
+ +
+
+
-
-
-
-
+ Done. Selected policy was successfully published.
- - -
+
+ + Done. Selected policy was successfully published. +
+ +
+
+
-
-
-
-
+ An unexpected error occurred. Please try again later.
- - -
+
+ + An unexpected error occurred. Please try again later. +
+ +
+
+
-
-
-
-
Do you really want to unpublish the selected policy(s)?
- -
-
-
-
-
+ Done. Selected policy was successfully unpublished.
- - -
+
+ + Done. Selected policy was successfully unpublished. +
+ +
+
+
-
-
-
-
+ An unexpected error occurred. Please try again later.
- - -
+
+ + An unexpected error occurred. Please try again later. +
+ +
+
+
-
-
-
-
+ Done. New Policy priorities were successfully updated.
- - -
+
+ + Done. New Policy priorities were successfully updated. +
+ +
+
+
-
-
-
-
+ An unexpected error occurred. Please try again later.
- - - -
+
+ + An unexpected error occurred. Please try again later. +
+ +
+
+
-
-
-
-
Do you really want to apply changes to all policies?
- -
-
-
-
-
+ Done. Changes applied successfully.
- - -
+
+ + Done. Changes applied successfully. +
+ +
+
+
-
-
-
-
+ An unexpected error occurred. Please try again later.
- - -
+
+ + An unexpected error occurred. Please try again later. +
+ +
+
+
-
-
-
-
-
+
+
+
+
-
+
+
+
- Action cannot be performed !
-
-
- Please select a policy or a list of policies to un-publish.
-
-
-
-
+ Action cannot be performed !
+
+
+ + - Action cannot be performed ! -
-- Please select a policy or a list of policies to un-publish. -
- - -
+
+
Please select a policy or a list of policies to un-publish.
+
-
-
-
-
-
+
+
+
+
-
+
+
+
- Action cannot be performed !
-
-
- You cannot select already inactive policies to be unpublished.
- Please deselect inactive policies and try again.
-
-
-
-
+ Action cannot be performed !
+
+
+ + - Action cannot be performed ! -
-- You cannot select already inactive policies to be unpublished. - Please deselect inactive policies and try again. -
- - -
+
+
You cannot select already inactive policies to be unpublished. + Please deselect inactive policies and try again.
+
-
-
-
-
-
+
+
+
+
-
+
+
+
- Action cannot be performed !
-
-
- You cannot select already active policies. Please deselect active policies and try again.
-
-
-
-
+ Action cannot be performed !
+
+
+ + - Action cannot be performed ! -
-- You cannot select already active policies. Please deselect active policies and try again. -
- - -
+
+
You cannot select already active policies. Please deselect active policies and try again.
+
-
-
-
-
-
+
+
+
+
-
+
+
+
- Action cannot be performed !
-
-
- Please select a policy or a list of policies to publish.
-
-
-
-
+ Action cannot be performed !
+
+
+ + - Action cannot be performed ! -
-- Please select a policy or a list of policies to publish. -
- - -
+
+
Please select a policy or a list of policies to publish.
+
-
-
-
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js
index 978d6f0bd7..e6eb9bf045 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js
@@ -61,9 +61,9 @@ function InitiateViewOption() {
* Modal related stuff are as follows.
*/
-var modalPopup = ".wr-modalpopup";
-var modalPopupContainer = modalPopup + " .modalpopup-container";
-var modalPopupContent = modalPopup + " .modalpopup-content";
+var modalPopup = ".modal";
+var modalPopupContainer = modalPopup + " .modal-content";
+var modalPopupContent = modalPopup + " .modal-content";
var body = "body";
/*
@@ -81,8 +81,7 @@ function setPopupMaxHeight() {
* show popup function.
*/
function showPopup() {
- $(modalPopup).show();
- setPopupMaxHeight();
+ $(modalPopup).modal('show');
}
/*
@@ -90,7 +89,9 @@ function showPopup() {
*/
function hidePopup() {
$(modalPopupContent).html('');
- $(modalPopup).hide();
+ $(modalPopup).modal('hide');
+ $('body').removeClass('modal-open').css('padding-right','0px');
+ $('.modal-backdrop').remove();
}
/*
@@ -215,7 +216,7 @@ $(document).ready(function () {
// on-click function for policy un-publishing "yes" button
$("a#unpublish-policy-yes-link").click(function () {
- invokerUtil.put(
+ invokerUtil.post(
serviceURL,
policyList,
// on success
@@ -268,7 +269,7 @@ $(document).ready(function () {
// on-click function for policy removing "yes" button
$("a#publish-policy-yes-link").click(function () {
- invokerUtil.put(
+ invokerUtil.post(
serviceURL,
policyList,
// on success
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.hbs
index e4a17d8f02..fc4b7fefb5 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.hbs
@@ -15,13 +15,15 @@
specific language governing permissions and limitations
under the License.
}}
+
{{#zone "content"}}
-
-
-
+
+
+
+
-
+
+
+
- Action cannot be performed !
-
-
- Please select a policy or a list of policies to remove.
-
-
-
-
+ Action cannot be performed !
+
+
+ + - Action cannot be performed ! -
-- Please select a policy or a list of policies to remove. -
- - -
+
+
Please select a policy or a list of policies to remove.
+
+
{{unit "mdm.unit.device.operation-mod"}}
{{/zone}}
{{#zone "bottomJs"}}
+
{{js "js/operation-bar.js"}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
new file mode 100644
index 0000000000..d8e8b84050
--- /dev/null
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/operation-bar.js
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+function onRequest(context) {
+ // var log = new Log("mdm.unit.device.operation-bar");
+ var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
+ var viewModel = {};
+ var permissions = {};
+
+ // adding android operations related permission checks
+ permissions["android"] = [];
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/ring")) {
+ permissions["android"].push("DEVICE_RING");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/lock-devices")) {
+ permissions["android"].push("DEVICE_LOCK");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/unlock-devices")) {
+ permissions["android"].push("DEVICE_UNLOCK");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/location")) {
+ permissions["android"].push("DEVICE_LOCATION");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/clear-password")) {
+ permissions["android"].push("CLEAR_PASSWORD");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/reboot")) {
+ permissions["android"].push("DEVICE_REBOOT");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/upgrade-firmware")) {
+ permissions["android"].push("UPGRADE_FIRMWARE");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/mute")) {
+ permissions["android"].push("DEVICE_MUTE");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/send-notification")) {
+ permissions["android"].push("NOTIFICATION");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/change-lock-code")) {
+ permissions["android"].push("CHANGE_LOCK_CODE");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/enterprise-wipe")) {
+ permissions["android"].push("ENTERPRISE_WIPE");
+ }
+ if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/android/wipe")) {
+ permissions["android"].push("WIPE_DATA");
+ }
+
+ // adding ios operations related permission checks
+
+ // adding windows operations related permission checks
+
+ viewModel["permissions"] = stringify(permissions);
+
+ return viewModel;
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
index 0485b20e09..a3186092ac 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js
@@ -108,8 +108,21 @@ function loadOperationBar(deviceType) {
//var serviceURL = "/mdm-admin/features/" + platformType;
var serviceURL = "/api/device-mgt/v1.0/devices/" + platformType + "/*/features";
var successCallback = function (data) {
+ var permittedOperations = [];
+ var i;
+ var permissionList = $("#operations-mod").data("permissions");
+ var totalFeatures = JSON.parse(data);
+ for (i = 0; i < permissionList[deviceType].length; i++) {
+ var j;
+ for (j = 0; j < totalFeatures.length; j++) {
+ if (permissionList[deviceType][i] == totalFeatures[j]["code"]) {
+ permittedOperations.push(totalFeatures[j]);
+ }
+ }
+ }
+
var viewModel = {};
- data = JSON.parse(data).filter(function (current) {
+ permittedOperations = permittedOperations.filter(function (current) {
var iconName;
switch (deviceType) {
case platformTypeConstants.ANDROID:
@@ -129,7 +142,8 @@ function loadOperationBar(deviceType) {
return current;
}
});
- viewModel.features = data;
+
+ viewModel.features = permittedOperations;
var content = template(viewModel);
$(".wr-operations").html(content);
};
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
index 27d0d40625..43a6019157 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
@@ -1,85 +1,87 @@
-
-
-
-
+ - - - - - Operation cannot be performed ! -
-- Please select a device or a list of devices to perform an operation. -
- -
+
+ + + + + + Operation cannot be performed ! +
+ +
+
+
+ Please select a device or a list of devices to perform an operation. +
+
-
-
-
-
+ - - - - - Operation cannot be performed ! -
-- Unexpected error occurred. Please Try again later. -
- -
+
+ + + + + + Operation cannot be performed ! +
+ +
+
+
+ Unexpected error occurred. Please Try again later. +
+
-
-
-
-
+ - - - - - Operation queued successfully ! -
-- Operation has been queued successfully to be sent to the device. -
- -
+
+ + + + + + Operation queued successfully ! +
+ +
+
+
+ Operation has been queued successfully to be sent to the device. +
+
-
-
-
@@ -89,107 +91,127 @@
{{name}}
-
-
+
+
+
+
-
+
+
+
- Message sent successfully !
-
-
- Message has been queued to be sent to the device.
-
-
-
+ Message sent successfully !
+
+
+ + - Message sent successfully ! -
-- Message has been queued to be sent to the device. -
- -
+
+
Message has been queued to be sent to the device.
+
-
-
-
-
-
-
-
-
- {{name}}
-
-
- {{#equal code "WIPE_DATA"}}
- {{#equal type "android"}}
- Enter PIN code (Optional - This is required only if the device type is BYOD).
-
-
-
-
-
- {{name}}
-
-
-
- {{#equal code "WIPE_DATA"}}
- {{#equal type "android"}}
- Enter PIN code (Optional - This is required only if the device type is BYOD).
-
-
-
-
-
- {{/equal}}
- {{/equal}}
- {{#equal code "NOTIFICATION"}}
- Type your message below.
+
+
+
+
+
+
+
+
+ {{name}}
+
+
+
+
+
+
+ {{#equal code "WIPE_DATA"}}
+ {{#equal type "android"}}
+ Enter PIN code (Optional - This is required only if the device type is BYOD).
-
-
-
-
-
-
+
+
{{/equal}}
- {{#equal code "CHANGE_LOCK_CODE"}}
- Type new lock-code below.
+ {{/equal}}
+ {{#equal code "NOTIFICATION"}}
+ Type your message below.
+
+
+
+
+
+
+
+
+
+ {{/equal}}
+ {{#equal code "CHANGE_LOCK_CODE"}}
+ Type new lock-code below.
+
+
+
+ {{/equal}}
+ {{#equal code "DEVICE_LOCK"}}
+ {{#equal type "android"}}
+ Type your message to be shown in the lock screen (Optional).
-
-
- {{/equal}}
- {{#equal code "DEVICE_LOCK"}}
- {{#equal type "android"}}
- Type your message to be shown in the lock screen (Optional).
-
-
+
-
-
-
+
+
- {{/equal}}
+
{{/equal}}
- {{#equal code "UPGRADE_FIRMWARE"}}
- {{#equal type "android"}}
- Enter firmware upgrade scheduling information.
-
-
+
+
+ Enter the date and time to schedule firmware upgrade.
-
- Enter the date and time to schedule firmware upgrade.
-
-
-
+
+
+
+
+
+ Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
+ (Optional).
-
- Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
- (Optional).
-
-
-
-
-
- {{/equal}}
+ }
+ });
+
+
{{/equal}}
-
- Do you want to perform this operation on selected device(s) ?
-
-
-
+ {{/equal}}
+
+ Do you want to perform this operation on selected device(s) ?
+
+
+
+
+
{{/each}}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index 3f1219765d..a7002bb7f7 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -80,7 +80,9 @@ var operationModule = function () {
"AUTO_TIME" : "AUTO_TIME",
"SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED",
"SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED",
- "APPLICATION_OPERATION_CODE":"APP-RESTRICTION"
+ "APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
+ "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY",
+ "KIOSK_APPS_CODE": "KIOSK_APPS"
};
// Constants to define Windows Operation Constants
@@ -115,8 +117,8 @@ var operationModule = function () {
var featureMap = {
"DEVICE_LOCK": "lock",
"VPN": "vpn",
- "PER_APP_VPN": "perappvpn",
- "APP_TO_PER_APP_VPN_MAPPING": "apptoperappvpnmapping",
+ "PER_APP_VPN": "per-app-vpn",
+ "APP_TO_PER_APP_VPN_MAPPING": "app-to-per-app-vpn-mapping",
"RING": "ring",
"LOCATION": "location",
"NOTIFICATION": "notification",
@@ -124,12 +126,12 @@ var operationModule = function () {
"RESTRICTION": "restriction",
"CELLULAR": "cellular",
"WIFI": "wifi",
- "INSTALL_STORE_APPLICATION": "storeapplication",
- "INSTALL_ENTERPRISE_APPLICATION": "enterpriseapplication",
- "REMOVE_APPLICATION": "removeapplication",
- "ENTERPRISE_WIPE": "enterprisewipe"
+ "INSTALL_STORE_APPLICATION": "store-application",
+ "INSTALL_ENTERPRISE_APPLICATION": "enterprise-application",
+ "REMOVE_APPLICATION": "remove-application",
+ "ENTERPRISE_WIPE": "enterprise-wipe"
};
- return "/ios/operation/" + featureMap[operationCode];
+ return "/api/device-mgt/ios/v1.0/admin/devices/" + featureMap[operationCode];
};
/**
@@ -1012,6 +1014,24 @@ var operationModule = function () {
}
};
break;
+ case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
+ operationType = operationTypeConstants["PROFILE"];
+ payload = {
+ "operation": {
+ "type": operationData["cosuSystemUpdateType"],
+ "startTime": operationData["cosuWindowStartTime"],
+ "endTime": operationData["cosuWindowEndTime"]
+ }
+ };
+ break;
+ case androidOperationConstants["KIOSK_APPS_CODE"]:
+ operationType = operationTypeConstants["PROFILE"];
+ payload = {
+ "operation": {
+ "whitelistedApplications": operationData["cosuWhitelistedApplications"]
+ }
+ };
+ break;
default:
// If the operation is neither of above, it is a command operation
operationType = operationTypeConstants["COMMAND"];
@@ -1276,6 +1296,8 @@ var operationModule = function () {
value = operationDataObj.val();
} else if (operationDataObj.is(":checkbox")) {
value = operationDataObj.is(":checked");
+ } else if (operationDataObj.is(":radio") && operationDataObj.is(":checked")) {
+ value = operationDataObj.val();
} else if (operationDataObj.is("select")) {
value = operationDataObj.find("option:selected").attr("value");
} else if (operationDataObj.hasClass("grouped-array-input")) {
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
index d1c3e40a1c..5da7c3427e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
@@ -17,20 +17,27 @@
}}
{{#zone "content"}}
-
-
-
- Scan QR code to start enrollment
-
- Please scan the QR code using your mobile device to retrieve enrollment URL.
-
-
-
-
-
+
+
+ Scan QR code to start enrollment
+
+
+
+
+
+
+ Please scan the QR code using your mobile device to retrieve enrollment URL.
+
+
+
+
+
{{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png
old mode 100755
new mode 100644
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
index 0740950349..87d902e44d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
@@ -50,49 +50,61 @@ var InitiateViewOption = null;
);
}
+
$(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) {
- var activeTabPane = $(e.target).attr("href"),
- activeCollapsePane = $(activeTabPane).find("[data-toggle=collapse]").data("target"),
- activeCollapsePaneSiblings = $(activeTabPane).siblings().find("[data-toggle=collapse]").data("target"),
- activeListGroupItem = $(".media .list-group-item.active");
+ var activeTabPane = $(e.target).attr("href");
+ var activeListGroupItem = $(".media .list-group-item.active");
- $(activeCollapsePaneSiblings).collapse("hide");
- $(activeCollapsePane).collapse("show");
+ $(activeTabPane).removeClass("visible-xs-block");
+ $(activeTabPane).siblings().not(".arrow-left").addClass("visible-xs-block");
positionArrow(activeListGroupItem);
-
- $(".panel-heading .caret-updown").removeClass("fw-sort-down");
- $(".panel-heading.collapsed .caret-updown").addClass("fw-sort-up");
});
$(".media.tab-responsive .tab-content").on("shown.bs.collapse", function (e) {
- var activeTabPane = $(e.target).parent().attr("id");
- $(".media.tab-responsive [data-toggle=tab][href=#" + activeTabPane + "]").tab("show");
- $(".panel-heading .caret-updown").removeClass("fw-sort-up");
- $(".panel-heading.collapsed .caret-updown").addClass("fw-sort-down");
+ var thisParent = $(e.target).parent();
+ var activeTabPaneCaret = thisParent.find('.caret-updown');
+ var activeTabPaneCaretSiblings = thisParent.siblings().find('.caret-updown');
+
+ activeTabPaneCaret.removeClass("fw-up").addClass("fw-down");
+ activeTabPaneCaretSiblings.removeClass("fw-down").addClass("fw-up");
+ });
+
+
+ $('.media.tab-responsive a[data-toggle="collapse"]').on('click',function(){
+ var clickedPanel = $(this).attr('href');
+
+ if($(clickedPanel).hasClass('in')){
+ $(clickedPanel).collapse('hide');
+ }else{
+ $(clickedPanel).collapse('show');
+ }
});
+
function positionArrow(selectedTab) {
- var selectedTabHeight = $(selectedTab).outerHeight();
+ var selectedTabHeight = $(selectedTab).innerHeight();
var arrowPosition = 0;
var totalHeight = 0;
var arrow = $(".media .panel-group.tab-content .arrow-left");
- var parentHeight = $(arrow).parent().outerHeight();
+ var parentHeight = $(arrow).parent().innerHeight();
-// if($(selectedTab).prev().length){
-// $(selectedTab).prevAll().each(function() {
-// totalHeight += $(this).outerHeight();
-// });
-// arrowPosition = totalHeight + (selectedTabHeight / 2);
-// }else{
-// arrowPosition = selectedTabHeight / 2;
-// }
+
+ if($(selectedTab).prev().length){
+ $(selectedTab).prevAll().each(function() {
+ totalHeight += $(this).innerHeight();
+ });
+ arrowPosition = totalHeight + (selectedTabHeight / 2);
+ }else{
+ arrowPosition = selectedTabHeight / 2;
+ }
if(arrowPosition >= parentHeight){
- parentHeight = arrowPosition + 10;
- $(arrow).parent().height(parentHeight);
+ parentHeight = arrowPosition + 50;
+ $(arrow).siblings(".panel.active").height(parentHeight);
}else{
$(arrow).parent().removeAttr("style");
}
+
$(arrow).css("top", arrowPosition - 10);
}
@@ -228,8 +240,8 @@ var InitiateViewOption = null;
$("#applications-list-container").html(content);
} else {
$("#applications-list-container").
- html("
No applications found. " +
- "please try refreshing the list in a while.
");
+ html("");
}
}
},
@@ -315,4 +327,5 @@ var InitiateViewOption = null;
}
);
}
+
}());
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index b21c3982d8..8345741ac9 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -2,372 +2,368 @@
{{unit "cdmf.unit.lib.qrcode"}}
{{unit "mdm.unit.device.qr-modal"}}
-{{#zone "contentTitle"}}
-
-
-
-{{/zone}}
-
{{#zone "content"}}
-
-
-
-
-
-
- Device Overview
- {{#defineZone "device-detail-properties"}}
-
-
-
- Device
- {{device.viewModel.vendor}} {{device.properties.model}}
-
- {{#if device.viewModel.model}}
-
- Model
- {{device.viewModel.model}}
-
- {{/if}}
-
- IMEI
- {{device.viewModel.imei}}
-
- {{#if device.viewModel.udid}}
+ {{#if isAuthorized}}
+
+ Device {{device.name}}
+ {{#if device.viewModel.model}}
+
+ ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
+
+ {{/if}}
+
+
+
+
+
+
+
+ Device Overview
+ {{#defineZone "device-detail-properties"}}
+
+
- UDID
- {{device.viewModel.udid}}
+ Device
+ {{device.viewModel.vendor}} {{device.properties.model}}
- {{/if}}
- {{#if device.viewModel.os_build_date}}
+ {{#if device.viewModel.model}}
+
+ Model
+ {{device.viewModel.model}}
+
+ {{/if}}
- Firmware Build Date
- {{device.viewModel.os_build_date}}
+ IMEI
+ {{device.viewModel.imei}}
- {{/if}}
- {{#if device.viewModel.phoneNumber}}
+ {{#if device.viewModel.udid}}
+
+ UDID
+ {{device.viewModel.udid}}
+
+ {{/if}}
+ {{#if device.viewModel.os_build_date}}
+
+ Firmware Build Date
+ {{device.viewModel.os_build_date}}
+
+ {{/if}}
+ {{#if device.viewModel.phoneNumber}}
+
+ Phone Number
+ {{device.viewModel.phoneNumber}}
+
+ {{/if}}
- Phone Number
- {{device.viewModel.phoneNumber}}
+ Status
+
+ {{#equal device.status "ACTIVE"}} Active{{/equal}}
+ {{#equal device.status "INACTIVE"}} Inactive{{/equal}}
+ {{#equal device.status "BLOCKED"}} Blocked{{/equal}}
+ {{#equal device.status "REMOVED"}} Removed{{/equal}}
+
- {{/if}}
-
- Status
-
- {{#equal device.status "ACTIVE"}} Active{{/equal}}
- {{#equal device.status "INACTIVE"}} Inactive{{/equal}}
- {{#equal device.status "BLOCKED"}} Blocked{{/equal}}
- {{#equal device.status "REMOVED"}} Removed{{/equal}}
-
-
-
-
- {{/defineZone}}
- Operations
-
- {{unit "mdm.unit.device.operation-bar" deviceType=device.type}}
+
+
+ {{/defineZone}}
+ Operations
+
+ {{unit "mdm.unit.device.operation-bar" deviceType=device.type}}
+
-
-
-
-
- {{#defineZone "device-detail-properties"}}
-
-
-
+
+
+ {{#defineZone "device-detail-properties"}}
+
+
+
-
-
-
-
- Device Details
-
-
-
- Device Details
-
-
Loading Device Details . . .
-
-
-
+
+
+
+
+
+ {{name}}
+
+
+
+
+
+
+
+
+ {{name}}
+
+
+
+
+
+ {{#equal code "WIPE_DATA"}}
+ {{#equal type "android"}}
+ Enter PIN code (Optional - This is required only if the device type is BYOD).
+ {{#equal code "WIPE_DATA"}}
+ {{#equal type "android"}}
+ Enter PIN code (Optional - This is required only if the device type is BYOD).
-
-
-
-
-
-
+
+
{{/equal}}
- {{#equal code "CHANGE_LOCK_CODE"}}
- Type new lock-code below.
+ {{/equal}}
+ {{#equal code "NOTIFICATION"}}
+ Type your message below.
+
+
+
+
+
+
+
+
+
+ {{/equal}}
+ {{#equal code "CHANGE_LOCK_CODE"}}
+ Type new lock-code below.
+
+
+
+ {{/equal}}
+ {{#equal code "DEVICE_LOCK"}}
+ {{#equal type "android"}}
+ Type your message to be shown in the lock screen (Optional).
-
-
- {{/equal}}
- {{#equal code "DEVICE_LOCK"}}
- {{#equal type "android"}}
- Type your message to be shown in the lock screen (Optional).
-
-
+
-
-
-
+
+
- {{/equal}}
+
{{/equal}}
- {{#equal code "UPGRADE_FIRMWARE"}}
- {{#equal type "android"}}
- Enter firmware upgrade scheduling information.
-
-
+
+
+ Enter the date and time to schedule firmware upgrade.
-
- Enter the date and time to schedule firmware upgrade.
-
-
-
+
+
+
+
+
+ Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
+ (Optional).
-
- Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
- (Optional).
-
-
-
-
-
- {{/equal}}
+ }
+ });
+
+
{{/equal}}
-
- Do you want to perform this operation on selected device(s) ?
-
-
-
+ {{/equal}}
+
+ Do you want to perform this operation on selected device(s) ?
+
+
+
+
+
{{/each}}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
index 3f1219765d..a7002bb7f7 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-mod/public/js/operation-mod.js
@@ -80,7 +80,9 @@ var operationModule = function () {
"AUTO_TIME" : "AUTO_TIME",
"SET_SCREEN_CAPTURE_DISABLED" : "SET_SCREEN_CAPTURE_DISABLED",
"SET_STATUS_BAR_DISABLED" : "SET_STATUS_BAR_DISABLED",
- "APPLICATION_OPERATION_CODE":"APP-RESTRICTION"
+ "APPLICATION_OPERATION_CODE":"APP-RESTRICTION",
+ "SYSTEM_UPDATE_POLICY_CODE": "SYSTEM_UPDATE_POLICY",
+ "KIOSK_APPS_CODE": "KIOSK_APPS"
};
// Constants to define Windows Operation Constants
@@ -115,8 +117,8 @@ var operationModule = function () {
var featureMap = {
"DEVICE_LOCK": "lock",
"VPN": "vpn",
- "PER_APP_VPN": "perappvpn",
- "APP_TO_PER_APP_VPN_MAPPING": "apptoperappvpnmapping",
+ "PER_APP_VPN": "per-app-vpn",
+ "APP_TO_PER_APP_VPN_MAPPING": "app-to-per-app-vpn-mapping",
"RING": "ring",
"LOCATION": "location",
"NOTIFICATION": "notification",
@@ -124,12 +126,12 @@ var operationModule = function () {
"RESTRICTION": "restriction",
"CELLULAR": "cellular",
"WIFI": "wifi",
- "INSTALL_STORE_APPLICATION": "storeapplication",
- "INSTALL_ENTERPRISE_APPLICATION": "enterpriseapplication",
- "REMOVE_APPLICATION": "removeapplication",
- "ENTERPRISE_WIPE": "enterprisewipe"
+ "INSTALL_STORE_APPLICATION": "store-application",
+ "INSTALL_ENTERPRISE_APPLICATION": "enterprise-application",
+ "REMOVE_APPLICATION": "remove-application",
+ "ENTERPRISE_WIPE": "enterprise-wipe"
};
- return "/ios/operation/" + featureMap[operationCode];
+ return "/api/device-mgt/ios/v1.0/admin/devices/" + featureMap[operationCode];
};
/**
@@ -1012,6 +1014,24 @@ var operationModule = function () {
}
};
break;
+ case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
+ operationType = operationTypeConstants["PROFILE"];
+ payload = {
+ "operation": {
+ "type": operationData["cosuSystemUpdateType"],
+ "startTime": operationData["cosuWindowStartTime"],
+ "endTime": operationData["cosuWindowEndTime"]
+ }
+ };
+ break;
+ case androidOperationConstants["KIOSK_APPS_CODE"]:
+ operationType = operationTypeConstants["PROFILE"];
+ payload = {
+ "operation": {
+ "whitelistedApplications": operationData["cosuWhitelistedApplications"]
+ }
+ };
+ break;
default:
// If the operation is neither of above, it is a command operation
operationType = operationTypeConstants["COMMAND"];
@@ -1276,6 +1296,8 @@ var operationModule = function () {
value = operationDataObj.val();
} else if (operationDataObj.is(":checkbox")) {
value = operationDataObj.is(":checked");
+ } else if (operationDataObj.is(":radio") && operationDataObj.is(":checked")) {
+ value = operationDataObj.val();
} else if (operationDataObj.is("select")) {
value = operationDataObj.find("option:selected").attr("value");
} else if (operationDataObj.hasClass("grouped-array-input")) {
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
index d1c3e40a1c..5da7c3427e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
@@ -17,20 +17,27 @@
}}
{{#zone "content"}}
-
-
-
- Scan QR code to start enrollment
-
- Please scan the QR code using your mobile device to retrieve enrollment URL.
-
-
-
-
-
+
+
+ Scan QR code to start enrollment
+
+
+
+
+
+
+ Please scan the QR code using your mobile device to retrieve enrollment URL.
+
+
+
+
+
{{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png
old mode 100755
new mode 100644
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
index 0740950349..87d902e44d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
@@ -50,49 +50,61 @@ var InitiateViewOption = null;
);
}
+
$(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) {
- var activeTabPane = $(e.target).attr("href"),
- activeCollapsePane = $(activeTabPane).find("[data-toggle=collapse]").data("target"),
- activeCollapsePaneSiblings = $(activeTabPane).siblings().find("[data-toggle=collapse]").data("target"),
- activeListGroupItem = $(".media .list-group-item.active");
+ var activeTabPane = $(e.target).attr("href");
+ var activeListGroupItem = $(".media .list-group-item.active");
- $(activeCollapsePaneSiblings).collapse("hide");
- $(activeCollapsePane).collapse("show");
+ $(activeTabPane).removeClass("visible-xs-block");
+ $(activeTabPane).siblings().not(".arrow-left").addClass("visible-xs-block");
positionArrow(activeListGroupItem);
-
- $(".panel-heading .caret-updown").removeClass("fw-sort-down");
- $(".panel-heading.collapsed .caret-updown").addClass("fw-sort-up");
});
$(".media.tab-responsive .tab-content").on("shown.bs.collapse", function (e) {
- var activeTabPane = $(e.target).parent().attr("id");
- $(".media.tab-responsive [data-toggle=tab][href=#" + activeTabPane + "]").tab("show");
- $(".panel-heading .caret-updown").removeClass("fw-sort-up");
- $(".panel-heading.collapsed .caret-updown").addClass("fw-sort-down");
+ var thisParent = $(e.target).parent();
+ var activeTabPaneCaret = thisParent.find('.caret-updown');
+ var activeTabPaneCaretSiblings = thisParent.siblings().find('.caret-updown');
+
+ activeTabPaneCaret.removeClass("fw-up").addClass("fw-down");
+ activeTabPaneCaretSiblings.removeClass("fw-down").addClass("fw-up");
+ });
+
+
+ $('.media.tab-responsive a[data-toggle="collapse"]').on('click',function(){
+ var clickedPanel = $(this).attr('href');
+
+ if($(clickedPanel).hasClass('in')){
+ $(clickedPanel).collapse('hide');
+ }else{
+ $(clickedPanel).collapse('show');
+ }
});
+
function positionArrow(selectedTab) {
- var selectedTabHeight = $(selectedTab).outerHeight();
+ var selectedTabHeight = $(selectedTab).innerHeight();
var arrowPosition = 0;
var totalHeight = 0;
var arrow = $(".media .panel-group.tab-content .arrow-left");
- var parentHeight = $(arrow).parent().outerHeight();
+ var parentHeight = $(arrow).parent().innerHeight();
-// if($(selectedTab).prev().length){
-// $(selectedTab).prevAll().each(function() {
-// totalHeight += $(this).outerHeight();
-// });
-// arrowPosition = totalHeight + (selectedTabHeight / 2);
-// }else{
-// arrowPosition = selectedTabHeight / 2;
-// }
+
+ if($(selectedTab).prev().length){
+ $(selectedTab).prevAll().each(function() {
+ totalHeight += $(this).innerHeight();
+ });
+ arrowPosition = totalHeight + (selectedTabHeight / 2);
+ }else{
+ arrowPosition = selectedTabHeight / 2;
+ }
if(arrowPosition >= parentHeight){
- parentHeight = arrowPosition + 10;
- $(arrow).parent().height(parentHeight);
+ parentHeight = arrowPosition + 50;
+ $(arrow).siblings(".panel.active").height(parentHeight);
}else{
$(arrow).parent().removeAttr("style");
}
+
$(arrow).css("top", arrowPosition - 10);
}
@@ -228,8 +240,8 @@ var InitiateViewOption = null;
$("#applications-list-container").html(content);
} else {
$("#applications-list-container").
- html("
No applications found. " +
- "please try refreshing the list in a while.
");
+ html("");
}
}
},
@@ -315,4 +327,5 @@ var InitiateViewOption = null;
}
);
}
+
}());
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index b21c3982d8..8345741ac9 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -2,372 +2,368 @@
{{unit "cdmf.unit.lib.qrcode"}}
{{unit "mdm.unit.device.qr-modal"}}
-{{#zone "contentTitle"}}
-
-
-
-{{/zone}}
-
{{#zone "content"}}
-
-
-
-
-
-
- Device Overview
- {{#defineZone "device-detail-properties"}}
-
-
-
- Device
- {{device.viewModel.vendor}} {{device.properties.model}}
-
- {{#if device.viewModel.model}}
-
- Model
- {{device.viewModel.model}}
-
- {{/if}}
-
- IMEI
- {{device.viewModel.imei}}
-
- {{#if device.viewModel.udid}}
+ {{#if isAuthorized}}
+
+ Device {{device.name}}
+ {{#if device.viewModel.model}}
+
+ ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
+
+ {{/if}}
+
+
+
+
+
+
+
+ Device Overview
+ {{#defineZone "device-detail-properties"}}
+
+
- UDID
- {{device.viewModel.udid}}
+ Device
+ {{device.viewModel.vendor}} {{device.properties.model}}
- {{/if}}
- {{#if device.viewModel.os_build_date}}
+ {{#if device.viewModel.model}}
+
+ Model
+ {{device.viewModel.model}}
+
+ {{/if}}
- Firmware Build Date
- {{device.viewModel.os_build_date}}
+ IMEI
+ {{device.viewModel.imei}}
- {{/if}}
- {{#if device.viewModel.phoneNumber}}
+ {{#if device.viewModel.udid}}
+
+ UDID
+ {{device.viewModel.udid}}
+
+ {{/if}}
+ {{#if device.viewModel.os_build_date}}
+
+ Firmware Build Date
+ {{device.viewModel.os_build_date}}
+
+ {{/if}}
+ {{#if device.viewModel.phoneNumber}}
+
+ Phone Number
+ {{device.viewModel.phoneNumber}}
+
+ {{/if}}
- Phone Number
- {{device.viewModel.phoneNumber}}
+ Status
+
+ {{#equal device.status "ACTIVE"}} Active{{/equal}}
+ {{#equal device.status "INACTIVE"}} Inactive{{/equal}}
+ {{#equal device.status "BLOCKED"}} Blocked{{/equal}}
+ {{#equal device.status "REMOVED"}} Removed{{/equal}}
+
- {{/if}}
-
- Status
-
- {{#equal device.status "ACTIVE"}} Active{{/equal}}
- {{#equal device.status "INACTIVE"}} Inactive{{/equal}}
- {{#equal device.status "BLOCKED"}} Blocked{{/equal}}
- {{#equal device.status "REMOVED"}} Removed{{/equal}}
-
-
-
-
- {{/defineZone}}
- Operations
-
- {{unit "mdm.unit.device.operation-bar" deviceType=device.type}}
+
+
+ {{/defineZone}}
+ Operations
+
+ {{unit "mdm.unit.device.operation-bar" deviceType=device.type}}
+
-
-
-
-
- {{#defineZone "device-detail-properties"}}
-
-
-
+
+
+ {{#defineZone "device-detail-properties"}}
+
+
+
-
-
-
-
- Device Details
-
-
-
- Device Details
-
-
Loading Device Details . . .
-
-
-
+
{{/equal}} - {{#equal code "CHANGE_LOCK_CODE"}} - Type new lock-code below. + {{/equal}} + {{#equal code "NOTIFICATION"}} + Type your message below. +
+ +
+
+
+
+
+
+ + {{/equal}} + {{#equal code "CHANGE_LOCK_CODE"}} + Type new lock-code below. +
+ +
+ {{/equal}} + {{#equal code "DEVICE_LOCK"}} + {{#equal type "android"}} + Type your message to be shown in the lock screen (Optional).
- -
- {{/equal}} - {{#equal code "DEVICE_LOCK"}} - {{#equal type "android"}} - Type your message to be shown in the lock screen (Optional). -
-
+
-
+
-
- -
+ - {{/equal}} + {{/equal}} - {{#equal code "UPGRADE_FIRMWARE"}} - {{#equal type "android"}} - Enter firmware upgrade scheduling information. -
- +
+
+ Enter the date and time to schedule firmware upgrade.
-
+
+
-
- Enter the date and time to schedule firmware upgrade.
-
- - + + +
+ - - + + +
+
+ Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
+ (Optional).
-
- {{/equal}} + } + }); + +
{{/equal}} -
- Do you want to perform this operation on selected device(s) ? -
- - + {{/equal}} +
+ Do you want to perform this operation on selected device(s) ? +
+ +
+
-
- Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)
- (Optional).
-
- -
-
- - -
- {{/equal}} + } + }); + +
{{/equal}} -
- Do you want to perform this operation on selected device(s) ? -
- - + {{/equal}} +
+ Do you want to perform this operation on selected device(s) ? +
+ +
-
-
-
");
+ html("");
}
}
},
@@ -315,4 +327,5 @@ var InitiateViewOption = null;
}
);
}
+
}());
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index b21c3982d8..8345741ac9 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -2,372 +2,368 @@
{{unit "cdmf.unit.lib.qrcode"}}
{{unit "mdm.unit.device.qr-modal"}}
-{{#zone "contentTitle"}}
-
Scan QR code to start enrollment
-- Please scan the QR code using your mobile device to retrieve enrollment URL. -
-
-
{{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png
old mode 100755
new mode 100644
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
index 0740950349..87d902e44d 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/js/device-detail.js
@@ -50,49 +50,61 @@ var InitiateViewOption = null;
);
}
+
$(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) {
- var activeTabPane = $(e.target).attr("href"),
- activeCollapsePane = $(activeTabPane).find("[data-toggle=collapse]").data("target"),
- activeCollapsePaneSiblings = $(activeTabPane).siblings().find("[data-toggle=collapse]").data("target"),
- activeListGroupItem = $(".media .list-group-item.active");
+ var activeTabPane = $(e.target).attr("href");
+ var activeListGroupItem = $(".media .list-group-item.active");
- $(activeCollapsePaneSiblings).collapse("hide");
- $(activeCollapsePane).collapse("show");
+ $(activeTabPane).removeClass("visible-xs-block");
+ $(activeTabPane).siblings().not(".arrow-left").addClass("visible-xs-block");
positionArrow(activeListGroupItem);
-
- $(".panel-heading .caret-updown").removeClass("fw-sort-down");
- $(".panel-heading.collapsed .caret-updown").addClass("fw-sort-up");
});
$(".media.tab-responsive .tab-content").on("shown.bs.collapse", function (e) {
- var activeTabPane = $(e.target).parent().attr("id");
- $(".media.tab-responsive [data-toggle=tab][href=#" + activeTabPane + "]").tab("show");
- $(".panel-heading .caret-updown").removeClass("fw-sort-up");
- $(".panel-heading.collapsed .caret-updown").addClass("fw-sort-down");
+ var thisParent = $(e.target).parent();
+ var activeTabPaneCaret = thisParent.find('.caret-updown');
+ var activeTabPaneCaretSiblings = thisParent.siblings().find('.caret-updown');
+
+ activeTabPaneCaret.removeClass("fw-up").addClass("fw-down");
+ activeTabPaneCaretSiblings.removeClass("fw-down").addClass("fw-up");
+ });
+
+
+ $('.media.tab-responsive a[data-toggle="collapse"]').on('click',function(){
+ var clickedPanel = $(this).attr('href');
+
+ if($(clickedPanel).hasClass('in')){
+ $(clickedPanel).collapse('hide');
+ }else{
+ $(clickedPanel).collapse('show');
+ }
});
+
function positionArrow(selectedTab) {
- var selectedTabHeight = $(selectedTab).outerHeight();
+ var selectedTabHeight = $(selectedTab).innerHeight();
var arrowPosition = 0;
var totalHeight = 0;
var arrow = $(".media .panel-group.tab-content .arrow-left");
- var parentHeight = $(arrow).parent().outerHeight();
+ var parentHeight = $(arrow).parent().innerHeight();
-// if($(selectedTab).prev().length){
-// $(selectedTab).prevAll().each(function() {
-// totalHeight += $(this).outerHeight();
-// });
-// arrowPosition = totalHeight + (selectedTabHeight / 2);
-// }else{
-// arrowPosition = selectedTabHeight / 2;
-// }
+
+ if($(selectedTab).prev().length){
+ $(selectedTab).prevAll().each(function() {
+ totalHeight += $(this).innerHeight();
+ });
+ arrowPosition = totalHeight + (selectedTabHeight / 2);
+ }else{
+ arrowPosition = selectedTabHeight / 2;
+ }
if(arrowPosition >= parentHeight){
- parentHeight = arrowPosition + 10;
- $(arrow).parent().height(parentHeight);
+ parentHeight = arrowPosition + 50;
+ $(arrow).siblings(".panel.active").height(parentHeight);
}else{
$(arrow).parent().removeAttr("style");
}
+
$(arrow).css("top", arrowPosition - 10);
}
@@ -228,8 +240,8 @@ var InitiateViewOption = null;
$("#applications-list-container").html(content);
} else {
$("#applications-list-container").
- html("
-
-
+
+
+ + Scan QR code to start enrollment +
+ +
+
+
+
+ Please scan the QR code using your mobile device to retrieve enrollment URL. +
+
+
+
No applications found. " + - "please try refreshing the list in a while.
-
-
-{{/zone}}
-
{{#zone "content"}}
-
-
-
-
-
-
-
-
-
-
-
+ {{/defineZone}}
+
Device Overview
- {{#defineZone "device-detail-properties"}}
- | Device | -{{device.viewModel.vendor}} {{device.properties.model}} | -||
| Model | -{{device.viewModel.model}} | -||
| IMEI | -{{device.viewModel.imei}} | -
| UDID | -{{device.viewModel.udid}} | +Device | +{{device.viewModel.vendor}} {{device.properties.model}} |
| Model | +{{device.viewModel.model}} | +||
| Firmware Build Date | -{{device.viewModel.os_build_date}} | +IMEI | +{{device.viewModel.imei}} |
| UDID | +{{device.viewModel.udid}} | +||
| Firmware Build Date | +{{device.viewModel.os_build_date}} | +||
| Phone Number | +{{device.viewModel.phoneNumber}} | +||
| Phone Number | -{{device.viewModel.phoneNumber}} | +Status | ++ {{#equal device.status "ACTIVE"}} Active{{/equal}} + {{#equal device.status "INACTIVE"}} Inactive{{/equal}} + {{#equal device.status "BLOCKED"}} Blocked{{/equal}} + {{#equal device.status "REMOVED"}} Removed{{/equal}} + |
| Status | -- {{#equal device.status "ACTIVE"}} Active{{/equal}} - {{#equal device.status "INACTIVE"}} Inactive{{/equal}} - {{#equal device.status "BLOCKED"}} Blocked{{/equal}} - {{#equal device.status "REMOVED"}} Removed{{/equal}} - | -
Operations
-
- {{unit "mdm.unit.device.operation-bar" deviceType=device.type}}
+
Operations
+
+ {{unit "mdm.unit.device.operation-bar" deviceType=device.type}}
+
-
-
- {{#defineZone "device-detail-properties"}}
-
-
-
+
+
+ {{#defineZone "device-detail-properties"}}
+
+
+
-
-
-
- - - Device Details - -
-Device Details
-
-
Loading Device Details . . .
-
- Loading Device Details . . .
-
-