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 pull request #355 from thusithak/master

Browse Source 
EMM 2.2.0-Alpha2 theme migration and issue fixes
This commit is contained in:
Kamidu Sachith Punchihewa 2016-10-06 11:33:07 +05:30 committed by GitHub
commit 4312d94e35
2 changed files with 11 additions and 3 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 ownership = deviceId.data("ownership");
var operationTable; var operationTable;
positionArrow($(".media .list-group-item.active"),"#device_details_tab");
$(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) { $(".media.tab-responsive [data-toggle=tab]").on("shown.bs.tab", function (e) {
var activeTabPane = $(e.target).attr("href"); var activeTabPane = $(e.target).attr("href");
var activeListGroupItem = $(".media .list-group-item.active"); var activeListGroupItem = $(".media .list-group-item.active");
$(activeTabPane).removeClass("visible-xs-block"); $(activeTabPane).removeClass("visible-xs-block");
$(activeTabPane).siblings().not(".arrow-left").addClass("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) { $(".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 selectedTabHeight = $(selectedTab).innerHeight();
var arrowPosition = 0; var arrowPosition = 0;
var totalHeight = 0; var totalHeight = 0;
@ -75,6 +76,12 @@ var InitiateViewOption = null;
} }
$(arrow).css("top", arrowPosition - 10); $(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) { function loadOperationsLog(update) {

1
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

@ -16,3 +16,4 @@
under the License. under the License.
}} }}
{{#zone "productName"}}ENTERPRISE MOBILITY MANAGER{{/zone}} {{#zone "productName"}}ENTERPRISE MOBILITY MANAGER{{/zone}}
{{#zone "productNameResponsive"}}EMM{{/zone}}