Merge pull request #892 from Kamidu/master

Device cloud related ui improvments
revert-70aa11f8
Rasika Perera 7 years ago committed by GitHub
commit 41e9833c5b

@ -116,6 +116,11 @@ var invokers = function () {
log.debug("Request payload if any : " + stringify(requestPayload));
log.debug("Response status : " + xmlHttpRequest.status);
log.debug("Response payload if any : " + xmlHttpRequest.responseText);
if (devicemgtProps["isCloud"]) {
log.info("Request : " + httpMethod + " " + endpoint);
log.info("Request payload if any : " + stringify(requestPayload));
log.info("Response status : " + xmlHttpRequest.status);
}
if (xmlHttpRequest.status == 401) {
if ((xmlHttpRequest.responseText == TOKEN_EXPIRED ||

@ -27,26 +27,37 @@
Platform Configurations
</h1>
<br>
General and Platform Specific Server Settings for the Tenant
{{#if isCloud}}
iOS Mobile Management Specific Server Settings for the Tenant
{{else}}
General and Platform Specific Server Settings for the Tenant
{{/if}}
<br>
<br>
<div class="wr-advance-operations">
<div class="row no-gutter">
<div class="wr-hidden-operations-nav col-lg-4">
<a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
<span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i>
<span class="fw-stack fw-move-right fw-move-bottom">
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
<i class="fw fw-circle fw-stack-2x"></i>
<i class="fw fw-mobile fw-stack-1x fw-inverse"></i>
{{#unless isCloud}}
<a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
<span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i>
<span class="fw-stack fw-move-right fw-move-bottom">
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
<i class="fw fw-circle fw-stack-2x"></i>
<i class="fw fw-mobile fw-stack-1x fw-inverse"></i>
</span>
</span>
</span>
General Configurations
</a>
General Configurations
</a>
{{/unless}}
{{#each deviceTypes}}
<a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)">
<a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)"
{{#if isCloud}}
class="selected"
{{/if}} >
<span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i>
<span class="fw-stack fw-move-right fw-move-bottom">
@ -62,50 +73,52 @@
<div class="wr-hidden-operations-content col-lg-8">
<!-- general -->
<div class="wr-hidden-operation" data-operation="general" style="display: block">
<div class="panel panel-default">
<div id="general-config-heading" class="panel-heading" role="tab">
<h2 class="sub-title panel-title">
Policy Monitoring
</h2>
</div>
<div id="email-config-body" class="panel-collapse panel-body"
role="tabpanel">
<div id="email-config-error-msg"
class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
{{#unless isCloud}}
<div class="wr-hidden-operation" data-operation="general" style="display: block">
<div class="panel panel-default">
<div id="general-config-heading" class="panel-heading" role="tab">
<h2 class="sub-title panel-title">
Policy Monitoring
</h2>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="email-config-host">
Monitoring Frequency
<span class="helper" title="SMTP Server Host">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
( Should be in seconds )
</label>
<input id="monitoring-config-frequency" type="text"
class="form-control"
placeholder="[ Required Field ]">
<div id="email-config-body" class="panel-collapse panel-body"
role="tabpanel">
<div id="email-config-error-msg"
class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="email-config-host">
Monitoring Frequency
<span class="helper" title="SMTP Server Host">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
( Should be in seconds )
</label>
<input id="monitoring-config-frequency" type="text"
class="form-control"
placeholder="[ Required Field ]">
</div>
<div class="wr-input-control wr-btn-grp">
<button id="save-general-btn" class="wr-btn">Save</button>
</div>
</div>
<div class="wr-input-control wr-btn-grp">
<button id="save-general-btn" class="wr-btn">Save</button>
<div id="general-config-heading" role="tab">
<h2 class="sub-title panel-title">
Geo Analytics
</h2>
</div>
</div>
<div id="general-config-heading" role="tab">
<h2 class="sub-title panel-title">
Geo Analytics
</h2>
</div>
<div class="panel-collapse panel-body" role="tabpanel">
<div class="wr-input-control">
<button class="wr-btn" onclick="artifactGeoUpload();">
Deploy Geo Analytics Artifacts
</button>
<div class="panel-collapse panel-body" role="tabpanel">
<div class="wr-input-control">
<button class="wr-btn" onclick="artifactGeoUpload();">
Deploy Geo Analytics Artifacts
</button>
</div>
</div>
</div>
</div>
</div>
{{/unless}}
<!-- general-->
{{#each deviceTypes}}
<div class="wr-hidden-operation" data-operation="{{name}}" style="display: none;">

@ -18,6 +18,7 @@
function onRequest(context) {
var utility = require("/app/modules/utility.js").utility;
var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
//get all device types
var isAuthorized = false;
@ -49,6 +50,7 @@ function onRequest(context) {
}
return {
"deviceTypes": deviceTypesArray,
"isAuthorized": isAuthorized
"isAuthorized": isAuthorized,
"isCloud": mdmProps["isCloud"]
};
}

@ -175,7 +175,7 @@
Upgrade Now
</a>
<a href="{{Main.Account.dropDown.[Request Extension].url}}" id="expire-req-ext-link" class="btn-operations">
Request Exception
Request Extension
</a>
</div>
</div>

@ -95,15 +95,35 @@
{{/if}}
{{#if permissions.TENANT_CONFIGURATION}}
<li><a><i class="fw fw-settings"></i>Configuration Management</a>
<ul>
<li><a href="{{@app.context}}/platform-configuration"><i class="fw fw-service"></i>Platform Configurations</a>
</li>
<!-- todo change the permission and get the related permission -->
<li><a href="{{@app.context}}/certificates"><i class="fw fw-security-policy"></i>Certificate Configurations</a>
</li>
</ul>
</li>
{{#if isCloud}}
<li>
<a href="{{@app.context}}/platform-configuration"><i class="fw fw-service"></i>
Platform Configurations
</a>
</li>
{{else}}
<li>
<a><i class="fw fw-settings"></i>Configuration Management</a>
<ul>
<li>
<a href="{{@app.context}}/platform-configuration"><i class="fw fw-service"></i>
Platform Configurations
</a>
</li>
<!-- todo change the permission and get the related permission -->
<li>
<a href="{{@app.context}}/certificates"><i class="fw fw-security-policy"></i>
Certificate Configurations
</a>
</li>
</ul>
</li>
{{/if}}
{{/if}}

Loading…
Cancel
Save