Merge pull request #750 from Kamidu/master

ui enhancement and adding new analytics icon
revert-dabc3590
Madhawa Perera 7 years ago committed by GitHub
commit c02bef8f22

@ -30,10 +30,7 @@
</div> </div>
<a class="padding-left" <a class="padding-left"
href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}"> href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}">
<span class="fw-stack"> <span class="fw-stack"> <i class="fw fw-circle-outline fw-stack-2x"></i> <i class="fw fw-statistics fw-stack-1x"></i> <span class="fw-stack fw-move-right fw-move-bottom"> <i class="fw fw-circle fw-stack-2x fw-stroke"></i> <i class="fw fw-clock fw-stack-1x fw-inverse"></i> </span> </span> View Device Analytics
<i class="fw fw-circle-outline fw-stack-2x"></i>
<i class="fw fw-statistics fw-stack-1x"></i>
</span> View Device Analytics
</a> </a>
<!-- /statistics --> <!-- /statistics -->
{{#zone "bottomJs"}} {{#zone "bottomJs"}}

@ -30,10 +30,7 @@
</div> </div>
<a class="padding-left" <a class="padding-left"
href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}"> href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}">
<span class="fw-stack"> <span class="fw-stack"> <i class="fw fw-circle-outline fw-stack-2x"></i> <i class="fw fw-statistics fw-stack-1x"></i> <span class="fw-stack fw-move-right fw-move-bottom"> <i class="fw fw-circle fw-stack-2x fw-stroke"></i> <i class="fw fw-clock fw-stack-1x fw-inverse"></i> </span> </span> View Device Analytics
<i class="fw fw-circle-outline fw-stack-2x"></i>
<i class="fw fw-statistics fw-stack-1x"></i>
</span> View Device Analytics
</a> </a>
<!-- /statistics --> <!-- /statistics -->
{{#zone "bottomJs"}} {{#zone "bottomJs"}}

@ -30,10 +30,7 @@
</div> </div>
<a class="padding-left" <a class="padding-left"
href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}"> href="{{@app.context}}/device/{{device.type}}/analytics?deviceId={{device.deviceIdentifier}}&deviceName={{device.name}}">
<span class="fw-stack"> <span class="fw-stack"> <i class="fw fw-circle-outline fw-stack-2x"></i> <i class="fw fw-statistics fw-stack-1x"></i> <span class="fw-stack fw-move-right fw-move-bottom"> <i class="fw fw-circle fw-stack-2x fw-stroke"></i> <i class="fw fw-clock fw-stack-1x fw-inverse"></i> </span> </span> View Device Analytics
<i class="fw fw-circle-outline fw-stack-2x"></i>
<i class="fw fw-statistics fw-stack-1x"></i>
</span> View Device Analytics
</a> </a>
<!-- /statistics --> <!-- /statistics -->
{{#zone "bottomJs"}} {{#zone "bottomJs"}}

@ -85,7 +85,8 @@
class="fw fw-success"></i></span> class="fw fw-success"></i></span>
<span id="cosu-profile-configuration-ok" class="has-success status-icon hidden"><i <span id="cosu-profile-configuration-ok" class="has-success status-icon hidden"><i
class="fw fw-success"></i></span> class="fw fw-success"></i></span>
<span id="cosu-profile-configuration-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span> <span id="cosu-profile-configuration-error" class="has-error status-icon hidden"><i
class="fw fw-error"></i></span>
</a> </a>
<a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)"> <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
<span class="fw-stack fw-lg"> <span class="fw-stack fw-lg">
@ -109,7 +110,8 @@
class="fw fw-success"></i></span> class="fw fw-success"></i></span>
<span id="runtime-permission-policy-ok" class="has-success status-icon hidden"><i <span id="runtime-permission-policy-ok" class="has-success status-icon hidden"><i
class="fw fw-success"></i></span> class="fw fw-success"></i></span>
<span id="runtime-permission-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span> <span id="runtime-permission-policy-error" class="has-error status-icon hidden"><i
class="fw fw-error"></i></span>
</a> </a>
<a href="javascript:void(0)" class="worker-profile" <a href="javascript:void(0)" class="worker-profile"
onclick="showAdvanceOperation('cosu-system-update-policy', this)"> onclick="showAdvanceOperation('cosu-system-update-policy', this)">
@ -157,7 +159,8 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
Enforce a configured passcode policy on Android devices. Enforce a configured passcode policy on Android devices.
Once this profile is applied, the device owners won't be able to modify the password settings on their devices. Once this profile is applied, the device owners won't be able to modify the password settings on
their devices.
</div> </div>
</div> </div>
<div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
@ -307,7 +310,8 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
Restrict predefined settings on Android devices. Restrict predefined settings on Android devices.
Once this profile is applied, the device owners won't be able to modify the configured settings on their devices. Once this profile is applied, the device owners won't be able to modify the configured settings
on their devices.
</div> </div>
</div> </div>
<div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel"
@ -337,6 +341,7 @@
<b>work-profile owner</b> or <b>device owner</b>.</a> <b>work-profile owner</b> or <b>device owner</b>.</a>
</ul> </ul>
</div> </div>
<br/>
<div class="wr-input-control worker-profile-or-owner"> <div class="wr-input-control worker-profile-or-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="disallow-configuring-credentials-enabled" type="checkbox" <input id="disallow-configuring-credentials-enabled" type="checkbox"
@ -518,8 +523,19 @@
<a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
the the
<b>device owner</b>.</a> <b>device owner</b>.</a>
{{#unless isdeviceownerenabled}}
<p><i>Please change the configuration <b>'isDeviceOwnerEnabled'</b> to
<b>'true'</b> if you have enabled device owner for the agent.</i></p>
{{/unless}}
</ul> </ul>
</div> </div>
<br/>
<div
{{#unless isdeviceownerenabled}}
class="testing" title="Please change the configuration 'isDeviceOwnerEnabled' to
'true' if you have enabled device owner for the agent."
{{/unless}}
>
<div class="wr-input-control device-owner"> <div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys" <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
@ -560,7 +576,8 @@
<input id="disallow-configuring-bluetooth-enabled" type="checkbox" <input id="disallow-configuring-bluetooth-enabled" type="checkbox"
class="operationDataKeys" class="operationDataKeys"
data-key="disallowConfigBluetooth"/> data-key="disallowConfigBluetooth"/>
<span class="helper" title="Having this checked would disallow configuring bluetooth."> <span class="helper"
title="Having this checked would disallow configuring bluetooth.">
Disallow configuring bluetooth. Disallow configuring bluetooth.
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
@ -585,7 +602,8 @@
<input id="disallow-configuring-tethering-enabled" type="checkbox" <input id="disallow-configuring-tethering-enabled" type="checkbox"
class="operationDataKeys" class="operationDataKeys"
data-key="disallowConfigTethering"/> data-key="disallowConfigTethering"/>
<span class="helper" title="Having this checked would disallow configuring tethering."> <span class="helper"
title="Having this checked would disallow configuring tethering.">
Disallow configuring tethering Disallow configuring tethering
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
@ -594,7 +612,8 @@
<br> <br>
<div class="wr-input-control device-owner"> <div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="disallow-configuring-Wifi-enabled" type="checkbox" class="operationDataKeys" <input id="disallow-configuring-Wifi-enabled" type="checkbox"
class="operationDataKeys"
data-key="disallowConfigWifi"/> data-key="disallowConfigWifi"/>
<span class="helper" title="Having this checked would disallow configuring Wifi."> <span class="helper" title="Having this checked would disallow configuring Wifi.">
Disallow configuring Wifi Disallow configuring Wifi
@ -616,7 +635,8 @@
<br> <br>
<div class="wr-input-control device-owner"> <div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="disallow-outgoing-calls-enabled" type="checkbox" class="operationDataKeys" <input id="disallow-outgoing-calls-enabled" type="checkbox"
class="operationDataKeys"
data-key="disallowOutgoingCalls"/> data-key="disallowOutgoingCalls"/>
<span class="helper" title="Having this checked would disallow outgoing calls."> <span class="helper" title="Having this checked would disallow outgoing calls.">
Disallow outgoing calls Disallow outgoing calls
@ -630,7 +650,8 @@
<input id="disallow-mount-physical-media-enabled" type="checkbox" <input id="disallow-mount-physical-media-enabled" type="checkbox"
class="operationDataKeys" class="operationDataKeys"
data-key="disallowMountPhysicalMedia"/> data-key="disallowMountPhysicalMedia"/>
<span class="helper" title="Having this checked would disallow mount physical media."> <span class="helper"
title="Having this checked would disallow mount physical media.">
Disallow mount physical media Disallow mount physical media
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
@ -705,7 +726,8 @@
<br> <br>
<div class="wr-input-control device-owner"> <div class="wr-input-control device-owner">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="disallow-unmute-microphone-enabled" type="checkbox" class="operationDataKeys" <input id="disallow-unmute-microphone-enabled" type="checkbox"
class="operationDataKeys"
data-key="disallowUnmuteMicrophone"/> data-key="disallowUnmuteMicrophone"/>
<span class="helper" title="Having this checked would disallow unmute microphone."> <span class="helper" title="Having this checked would disallow unmute microphone.">
Disallow unmute microphone Disallow unmute microphone
@ -713,8 +735,9 @@
</span> </span>
</label> </label>
</div> </div>
</div>
<br> <br>
<div class="device-owner"> <div class="">
<ul class="message message-info"> <ul class="message message-info">
<i class="icon fw fw-info"></i> <i class="icon fw fw-info"></i>
<a id="policy-listing-status-msg">Below restrictions will be applied on devices with <a id="policy-listing-status-msg">Below restrictions will be applied on devices with
@ -722,7 +745,8 @@
version 6.0 Marshmallow onwards only.</a> version 6.0 Marshmallow onwards only.</a>
</ul> </ul>
</div> </div>
<div class="wr-input-control device-owner"> <br/>
<div class="wr-input-control">
<label class="wr-input-control checkbox"> <label class="wr-input-control checkbox">
<input id="disable-status-bar-enabled" type="checkbox" class="operationDataKeys" <input id="disable-status-bar-enabled" type="checkbox" class="operationDataKeys"
data-key="disableStatusBar"/> data-key="disableStatusBar"/>
@ -754,8 +778,10 @@
</label> </label>
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
Encrypt data on an Android device when the device is locked and make it readable when the device is unlocked. Encrypt data on an Android device when the device is locked and make it readable when the device
Once this profile is applied, the device owners won't be able to modify the configured settings on their devices. is unlocked.
Once this profile is applied, the device owners won't be able to modify the configured settings
on their devices.
</div> </div>
</div> </div>
<div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel"
@ -798,7 +824,8 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
Configure the Wi-Fi settings on Android devices. Configure the Wi-Fi settings on Android devices.
Once this profile is applied, the device owners won't be able to modify the configured settings on their devices. Once this profile is applied, the device owners won't be able to modify the configured settings
on their devices.
</div> </div>
</div> </div>
<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
@ -1083,7 +1110,8 @@
<div id="cosu-profile-configuration-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="cosu-profile-configuration-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-profile-configuration-body"> aria-labelledby="cosu-profile-configuration-body">
<hr/> <hr/>
<div id="cosu-profile-configuration-feature-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-profile-configuration-feature-error-msg" class="alert alert-danger hidden"
role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<form class="form-horizontal"> <form class="form-horizontal">
@ -1248,7 +1276,8 @@
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
Configure the VPN settings on Android devices. Configure the VPN settings on Android devices.
Once this profile is applied, the device owners won't be able to modify the configured settings on their devices. Once this profile is applied, the device owners won't be able to modify the configured settings
on their devices.
</div> </div>
</div> </div>
<div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
@ -1320,7 +1349,8 @@
</label> </label>
</h2> </h2>
<div class="panel-title-description"> <div class="panel-title-description">
Configure these settings to manage the applications in the work profile. </div> Configure these settings to manage the applications in the work profile.
</div>
</div> </div>
<div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" <div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="work-profile-policy-body"> aria-labelledby="work-profile-policy-body">
@ -1353,11 +1383,13 @@
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="work-profile-policy-enable-system-apps"> <label class="wr-input-label" for="work-profile-policy-enable-system-apps">
Enable System Apps Enable System Apps
<span class="helper" title="The system applications that needs to enabled in the work-profile."> <span class="helper"
title="The system applications that needs to enabled in the work-profile.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br> <br>
(Provide the exact package name. Multiple package names can be provided as comma separated values. Ex: com.google.android.apps.maps, (Provide the exact package name. Multiple package names can be provided as comma separated
values. Ex: com.google.android.apps.maps,
com.google.android.calculator) com.google.android.calculator)
</label> </label>
<textarea id="workProfilePolicyEnableSystemApps" type="text" <textarea id="workProfilePolicyEnableSystemApps" type="text"
@ -1367,11 +1399,13 @@
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="work-profile-policy-hide-system-apps"> <label class="wr-input-label" for="work-profile-policy-hide-system-apps">
Hide System Apps Hide System Apps
<span class="helper" title="The system applications that needs to be hidden in the work-profile."> <span class="helper"
title="The system applications that needs to be hidden in the work-profile.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br> <br>
(Provide the exact package name. Multiple package names can be provided as comma separated values. Ex: com.google.android.apps.maps, (Provide the exact package name. Multiple package names can be provided as comma separated
values. Ex: com.google.android.apps.maps,
com.google.android.calculator) com.google.android.calculator)
</label> </label>
<textarea id="work-profile-policy-hide-system-apps" class="form-control operationDataKeys" <textarea id="work-profile-policy-hide-system-apps" class="form-control operationDataKeys"
@ -1380,10 +1414,12 @@
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="work-profile-policy-unhide-system-apps"> <label class="wr-input-label" for="work-profile-policy-unhide-system-apps">
Unhide System Apps Unhide System Apps
<span class="helper" title=" The system applications that needs to be shown in the work-profile."></span> <span class="helper"
title=" The system applications that needs to be shown in the work-profile."></span>
</span> </span>
<br> <br>
(Provide the exact package name. Multiple package names can be provided as comma separated values. Ex: com.google.android.apps.maps, (Provide the exact package name. Multiple package names can be provided as comma separated
values. Ex: com.google.android.apps.maps,
com.google.android.calculator) com.google.android.calculator)
</label> </label>
<textarea id="work-profile-policy-unhide-system-apps" class="form-control operationDataKeys" <textarea id="work-profile-policy-unhide-system-apps" class="form-control operationDataKeys"
@ -1397,7 +1433,8 @@
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br> <br>
(Provide the exact package name. Multiple package names can be provided as comma separated values. Ex: com.google.android.apps.maps, (Provide the exact package name. Multiple package names can be provided as comma separated
values. Ex: com.google.android.apps.maps,
com.google.android.calculator) com.google.android.calculator)
</label> </label>
<textarea id="work-profile-policy-install-playstore-apps" class="form-control operationDataKeys" <textarea id="work-profile-policy-install-playstore-apps" class="form-control operationDataKeys"
@ -1492,7 +1529,8 @@
<span class="index"></span> <span class="index"></span>
</td> </td>
<td data-title="App Name"> <td data-title="App Name">
<input type="text" class="form-control grid-input-text" data-child-key="appName" <input type="text" class="form-control grid-input-text"
data-child-key="appName"
maxlength="50" data-default="" placeholder="[ Android Pay ]"/> maxlength="50" data-default="" placeholder="[ Android Pay ]"/>
</td> </td>
<td data-title="Package Name"> <td data-title="Package Name">
@ -1516,7 +1554,8 @@
</td> </td>
<td> <td>
<span class="list-group-item-actions"> <span class="list-group-item-actions">
<a href="#runtime-permission-applications-grid" class="grid-input-remove" <a href="#runtime-permission-applications-grid"
class="grid-input-remove"
data-click-event="remove-form"> data-click-event="remove-form">
<span class="fw-stack helper" title="Remove Entry"> <span class="fw-stack helper" title="Remove Entry">
<i class="fw fw-circle-outline fw-stack-2x"></i> <i class="fw fw-circle-outline fw-stack-2x"></i>
@ -1538,7 +1577,8 @@
Already granted or denied permissions are not affected by this policy. Already granted or denied permissions are not affected by this policy.
<br> <br>
<i class="icon fw fw-info"></i> <i class="icon fw fw-info"></i>
Permissions can be granted or revoked only for applications built with a Target SDK Version of Android Marshmallow or later. Permissions can be granted or revoked only for applications built with a Target SDK Version
of Android Marshmallow or later.
</ul> </ul>
</div> </div>
</div> </div>

Loading…
Cancel
Save