From 3acaf472095a60e81a23a14c06f96caf1df3c874 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Wed, 5 Oct 2016 12:50:47 +0530 Subject: [PATCH 1/5] Device details view tablist container height defect fix --- .../mdm.unit.device.view/public/js/device-detail.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 dd53bc04ef..65b3fe27dc 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 @@ -25,12 +25,13 @@ var InitiateViewOption = null; var ownership = deviceId.data("ownership"); var operationTable; + positionArrow($(".media .list-group-item.active"),"#device_details_tab"); $(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) { var activeTabPane = $(e.target).attr("href"); var activeListGroupItem = $(".media .list-group-item.active"); $(activeTabPane).removeClass("visible-xs-block"); $(activeTabPane).siblings().not(".arrow-left").addClass("visible-xs-block"); - positionArrow(activeListGroupItem); + positionArrow(activeListGroupItem,activeTabPane); }); $(".media.tab-responsive .tab-content").on("shown.bs.collapse", function (e) { @@ -50,7 +51,7 @@ var InitiateViewOption = null; } }); - function positionArrow(selectedTab) { + function positionArrow(selectedTab,activeTabPane) { var selectedTabHeight = $(selectedTab).innerHeight(); var arrowPosition = 0; var totalHeight = 0; @@ -75,6 +76,12 @@ var InitiateViewOption = null; } $(arrow).css("top", arrowPosition - 10); + + var listHeight = $(".tab-responsive .media-left ul").height(); + var paneHeight = $(activeTabPane).height(); + if(listHeight > paneHeight){ + $(activeTabPane).height(listHeight); + } } function loadOperationsLog(update) { From 9d9e8a81958ff78691a7180162a32d24d22091b5 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Wed, 5 Oct 2016 19:18:06 +0530 Subject: [PATCH 2/5] [EMM-1694] - Header responsive issues fix --- .../devicemgt/app/units/mdm.unit.ui.header.logo/logo.hbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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.ui.header.logo/logo.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.header.logo/logo.hbs index cef6f17c55..3d7aa546b7 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.header.logo/logo.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.header.logo/logo.hbs @@ -15,4 +15,5 @@ specific language governing permissions and limitations under the License. }} -{{#zone "productName"}}ENTERPRISE MOBILITY MANAGER{{/zone}} \ No newline at end of file +{{#zone "productName"}}ENTERPRISE MOBILITY MANAGER{{/zone}} +{{#zone "productNameResponsive"}}EMM{{/zone}} \ No newline at end of file From 4c54ba434a7e717b9ca231519952eab3f335912c Mon Sep 17 00:00:00 2001 From: Megala Date: Thu, 6 Oct 2016 11:31:45 +0530 Subject: [PATCH 3/5] Fixing EMM-1688 --- .../public/js/policy-create.js | 17 ++++++++++++++++- .../templates/hidden-operations-android.hbs | 2 +- .../mdm.unit.policy.edit/public/js/edit.js | 17 ++++++++++++++++- .../templates/hidden-operations-android.hbs | 2 +- .../templates/hidden-operations-android.hbs | 2 +- .../templates/hidden-operations-android.hbs | 2 +- 6 files changed, 36 insertions(+), 6 deletions(-) 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.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js index 6ee4e6d822..ae8c031a81 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js @@ -355,7 +355,22 @@ validateStep["policy-profile"] = function () { }; continueToCheckNextInputs = false; } - + // For the secure wifi types, it is required to have a password + var wifiTypeUIElement = $("#wifi-type"); + var wifiType = wifiTypeUIElement.find("option:selected").val(); + if (wifiTypeUIElement.is("input:checkbox")) { + wifiType = wifiTypeUIElement.is(":checked").toString(); + } + if (wifiType !== "none") { + if (!$("#wifi-password").val()) { + validationStatus = { + "error": true, + "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". Please provide a password to proceed.", + "erroneousFeature": operation + }; + continueToCheckNextInputs = false; + } + } // at-last, if the value of continueToCheckNextInputs is still true // this means that no error is found if (continueToCheckNextInputs) { 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.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs index f05d320f93..0756465ed4 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs @@ -879,7 +879,7 @@