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-06 15:08:43 +05:30
commit 9f558ffd0f
8 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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

@ -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) {

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

@ -355,7 +355,23 @@ 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) {

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

@ -879,7 +879,7 @@
</div>
<div class="wr-input-control" id="control-wifi-password" style="display:none;">
<label class="wr-input-label" for="wifi-password">
Password
Password*
<span class="helper" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>

18
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

@ -382,7 +382,23 @@ 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) {

2
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/templates/hidden-operations-android.hbs
View File

@ -903,7 +903,7 @@
</div>
<div class="wr-input-control" id="control-wifi-password" style="display:none;">
<label class="wr-input-label" for="wifi-password">
Password
Password*
<span class="helper" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs
View File

@ -866,7 +866,7 @@
</div>
<div class="wr-input-control" id="control-wifi-password" style="display:none;">
<label class="wr-input-label" for="wifi-password">
Password
Password*
<span class="helper" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/templates/hidden-operations-android.hbs
View File

@ -335,7 +335,7 @@
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="wifi-password">
Password
Password*
<span class="helper" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>

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

@ -15,4 +15,5 @@
specific language governing permissions and limitations
under the License.
}}
{{#zone "productName"}}ENTERPRISE MOBILITY MANAGER{{/zone}}
{{#zone "productName"}}ENTERPRISE MOBILITY MANAGER{{/zone}}
{{#zone "productNameResponsive"}}EMM{{/zone}}