From 86a48bd455bd96ff1bd33459168317c3e5c79937 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 6 Sep 2016 10:31:57 +0530 Subject: [PATCH 1/3] Making "host" HTTPS -> HTTP to fix android agent download issue --- .../resources/jaggeryapps/emm-web-agent/app/conf/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json index 67df3a79d..b3f8ba718 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json @@ -46,7 +46,7 @@ "keyStoreName" : "/repository/resources/security/wso2carbon.jks" }, "generalConfig" : { - "host" : "%https.ip%", + "host" : "%http.ip%", "companyName" : "WSO2 Enterprise Mobility Manager", "browserTitle" : "WSO2 EMM", "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved." From 94ff1ea3ef279fb0de4986c0e3597e7c2b919d32 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Tue, 6 Sep 2016 10:32:22 +0530 Subject: [PATCH 2/3] Fixing android agent download issue --- .../download-agent.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/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/download-agent.js b/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/download-agent.js index 45dbdad72..c6dc94c70 100644 --- a/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/download-agent.js +++ b/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/download-agent.js @@ -21,9 +21,11 @@ function onRequest(context) { var mdmProps = require("/app/modules/conf-reader/main.js")["conf"]; var viewModel = {}; - + // setting android agent download URL - viewModel.agentDownloadURL = context.page.publicUri + "/asset/" + mdmProps["androidAgentApp"]; + // Needs host=>http:9763 since self-signed certificates won't allow downloads in android + //TODO: try to retrieve page name from UUF + viewModel.agentDownloadURL = mdmProps["generalConfig"]["host"] + mdmProps["appContext"] + "public/mdm.page.enrollments.android.agent.download/asset/" + mdmProps["androidAgentApp"]; var companyProps = session.get("COMPANY_DETAILS"); if (!companyProps) { viewModel.companyName = mdmProps.generalConfig.companyName; From b1e973dc0664c19ea3e3b767d0b8fb9701b0371b Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Tue, 6 Sep 2016 10:34:37 +0530 Subject: [PATCH 3/3] web agent layout defects, scrolling issues fixed --- .../app/layouts/mdm.layout.enrollment.hbs | 39 ++++++++++++------- .../download-agent.hbs | 2 +- .../download-agent.hbs | 2 +- .../public/css/custom-common.css | 5 +-- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/layouts/mdm.layout.enrollment.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/layouts/mdm.layout.enrollment.hbs index cee58594d..2a9ba1322 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/layouts/mdm.layout.enrollment.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/layouts/mdm.layout.enrollment.hbs @@ -43,25 +43,34 @@ under the License. --}} {{defineZone "topJs"}} -
-
-
- +
+
+
-
-
-
-

{{defineZone "headerTitle"}}

-
+
+ +
+
+
+
+

{{defineZone "headerTitle" }}

+
+
+ + {{defineZone "content"}} + + {{!-- {{ defineZone "footer"}} --}}
- - {{defineZone "content"}} -
- {{!-- {{ defineZone "footer"}} --}}
+
+
+ {{defineZone "footer"}} +
+
+ {{defineZone "bottomJs" }} \ 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/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/download-agent.hbs b/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/download-agent.hbs index 279f84318..26f32fefb 100644 --- a/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/download-agent.hbs +++ b/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/download-agent.hbs @@ -36,7 +36,7 @@ under the License. --}} currentStepIndex = 0 }}
-
+
If you have not already enrolled this device with {{companyName}}, Download and install following EMM Agent to continue.
diff --git a/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 b/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 index 6827ec7b0..5b2429a12 100644 --- a/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 +++ b/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 @@ -38,7 +38,7 @@ under the License. --}} currentStepIndex = 0 }}
-
+
If you have not already enrolled this device with {{companyName}}, Install following EMM Certificate and Agent to continue.
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css index d0e34d8a3..cc768351b 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css @@ -150,7 +150,7 @@ body { font-size: 14px; margin:0; padding:0; - height: 100%; + /*height: 100%;*/ } .container { @@ -262,10 +262,8 @@ header { .footer { height: 40px; background-color: #222; - padding-top:5px; color:#fff; font-weight: 500; - padding-left:20px; font-size:12px; letter-spacing: 1px; position:absolute; @@ -274,7 +272,6 @@ header { } .footer p { - padding-top: 5px; margin: 0; }