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:
harshanl 2016-09-06 11:11:58 +05:30
commit c8d9f7b4ac
6 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
View File

@ -46,7 +46,7 @@
"keyStoreName" : "/repository/resources/security/wso2carbon.jks" "keyStoreName" : "/repository/resources/security/wso2carbon.jks"
}, },
"generalConfig" : { "generalConfig" : {
"host" : "%https.ip%", "host" : "%http.ip%",
"companyName" : "WSO2 Enterprise Mobility Manager", "companyName" : "WSO2 Enterprise Mobility Manager",
"browserTitle" : "WSO2 EMM", "browserTitle" : "WSO2 EMM",
"copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved." "copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved."

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

@ -43,25 +43,34 @@ under the License. --}}
{{defineZone "topJs"}} {{defineZone "topJs"}}
</head> </head>
<body> <body>
<div class="container col-lg-12 col-md-12 col-sm-12"> <header class="header header-default">
<header> <div class="container-fluid ">
<div class="row wr-global-header"> <div class="col-sm-8 app-logo">
<div class="col-sm-8 app-logo"> {{defineZone "brand"}}
{{defineZone "brand"}} </div>
</div>
</header>
<div class="page-content-wrapper">
<div class="container-fluid ">
<div class="body-wrapper">
<div class="wr-head">
<h2>{{defineZone "headerTitle" }}</h2>
<hr>
</div> </div>
<!-- start: zone-content-->
{{defineZone "content"}}
<!-- end: zone-content-->
{{!-- {{ defineZone "footer"}} --}}
</div> </div>
</header>
<div class="container c-both">
<div class="wr-head">
<h2>{{defineZone "headerTitle"}}</h2>
<hr>
</div>
<!-- start: zone-content-->
{{defineZone "content"}}
<!-- end: zone-content-->
</div> </div>
{{!-- {{ defineZone "footer"}} --}}
</div> </div>
<footer class="footer">
<div class="container-fluid">
{{defineZone "footer"}}
</div>
</footer>
{{defineZone "bottomJs" }} {{defineZone "bottomJs" }}
</body> </body>
</html> </html>

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

@ -36,7 +36,7 @@ under the License. --}}
currentStepIndex = 0 currentStepIndex = 0
}} }}
<div class="row"> <div class="row">
<div class="container col-md-4 wr-text"> <div class="col-md-4 wr-text">
If you have not already enrolled this device with {{companyName}}, If you have not already enrolled this device with {{companyName}},
Download and install following EMM Agent to continue. Download and install following EMM Agent to continue.
<div class="wr-buttons"> <div class="wr-buttons">

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

@ -21,9 +21,11 @@ function onRequest(context) {
var mdmProps = require("/app/modules/conf-reader/main.js")["conf"]; var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
var viewModel = {}; var viewModel = {};
// setting android agent download URL // 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"); var companyProps = session.get("COMPANY_DETAILS");
if (!companyProps) { if (!companyProps) {
viewModel.companyName = mdmProps.generalConfig.companyName; viewModel.companyName = mdmProps.generalConfig.companyName;

2
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

@ -38,7 +38,7 @@ under the License. --}}
currentStepIndex = 0 currentStepIndex = 0
}} }}
<div class="row"> <div class="row">
<div class="container col-md-4 wr-text"> <div class="col-md-4 wr-text">
If you have not already enrolled this device with {{companyName}}, If you have not already enrolled this device with {{companyName}},
Install following EMM Certificate and Agent to continue. Install following EMM Certificate and Agent to continue.
<div class="wr-buttons"> <div class="wr-buttons">

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

@ -150,7 +150,7 @@ body {
font-size: 14px; font-size: 14px;
margin:0; margin:0;
padding:0; padding:0;
height: 100%; /*height: 100%;*/
} }
.container { .container {
@ -262,10 +262,8 @@ header {
.footer { .footer {
height: 40px; height: 40px;
background-color: #222; background-color: #222;
padding-top:5px;
color:#fff; color:#fff;
font-weight: 500; font-weight: 500;
padding-left:20px;
font-size:12px; font-size:12px;
letter-spacing: 1px; letter-spacing: 1px;
position:absolute; position:absolute;
@ -274,7 +272,6 @@ header {
} }
.footer p { .footer p {
padding-top: 5px;
margin: 0; margin: 0;
} }