community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

Browse Source
This commit is contained in:
kamidu 2016-10-14 20:01:45 +05:30
commit f6b8847e69
5 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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
View File

@ -91,9 +91,10 @@ function showPopup() {
* hide popup function. * hide popup function.
*/ */
function hidePopup() { function hidePopup() {
$(modalPopupContent).html(''); $(modalPopupContent).html("");
$(modalPopupContent).removeClass("operation-data");
$(modalPopup).modal('hide'); $(modalPopup).modal('hide');
$('body').removeClass('modal-open').css('padding-right', '0px'); $('body').removeClass('modal-open').css('padding-right','0px');
$('.modal-backdrop').remove(); $('.modal-backdrop').remove();
} }

2
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
View File

@ -70,7 +70,7 @@ var InitiateViewOption = null;
if(arrowPosition >= parentHeight){ if(arrowPosition >= parentHeight){
parentHeight = arrowPosition + 50; parentHeight = arrowPosition + 50;
$(arrow).siblings(".panel.active").height(parentHeight); $(arrow).siblings(".panel.active").css("min-height",parentHeight);
}else{ }else{
$(arrow).parent().removeAttr("style"); $(arrow).parent().removeAttr("style");
} }

16
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
View File

@ -2559,6 +2559,22 @@ $(document).ready(function () {
} }
}); });
$(advanceOperations).on('hidden.bs.collapse', function () {
if($(this).find('input').prop('checked')){
$(this).find('input').prop('checked',false);
}
});
$(advanceOperations).on('shown.bs.collapse', function () {
if($(this).find('input').prop('checked') == false){
$(this).find('input').prop('checked',true);
}
});
// adding support for cloning multiple profiles per feature with cloneable class definitions // adding support for cloning multiple profiles per feature with cloneable class definitions
$(advanceOperations).on("click", ".multi-view.add.enabled", function () { $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
// get a copy of .cloneable and create new .cloned div element // get a copy of .cloneable and create new .cloned div element

BIN
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk
View File

Binary file not shown.

11
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs
View File

@ -52,4 +52,15 @@ under the License. --}}
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-4 wr-text">
<div class="wr-buttons text-center">
<br class="c-both" />
<br/>
For evaluation purposes, you can skip the installer and proceed with enrollment.
<br/><br/>
<a href="#" class="btn btn-secondary">Skip Agent Installer</a>
</div>
</div>
</div>
{{/zone}} {{/zone}}