nishan
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #892 from Kamidu/master

Browse Source 
Device cloud related ui improvments
revert-70aa11f8
Rasika Perera 7 years ago committed by GitHub
parent c2406a86c5 19a4204254
commit 41e9833c5b
5 changed files with 101 additions and 61 deletions
Show Stats Download Patch File Download Diff File

5
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-protected-service-invokers.js
Unescape View File

@ -116,6 +116,11 @@ var invokers = function () {
log.debug("Request payload if any : " + stringify(requestPayload)); log.debug("Request payload if any : " + stringify(requestPayload));
log.debug("Response status : " + xmlHttpRequest.status); log.debug("Response status : " + xmlHttpRequest.status);
log.debug("Response payload if any : " + xmlHttpRequest.responseText); 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.status == 401) {
if ((xmlHttpRequest.responseText == TOKEN_EXPIRED || if ((xmlHttpRequest.responseText == TOKEN_EXPIRED ||

113
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
Unescape View File

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

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.js
Unescape View File

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

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs
Unescape View File

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

38
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
Unescape View File

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

Write Preview
Loading…
Cancel
Save