External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 03:17:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

License Page UX Audit Changes

Browse Source
This commit is contained in:
Jared Tabor
2016-05-03 13:46:16 -07:00
committed by John Mitchell
parent f5232953ac
commit c7f0de41e9
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/app.js
View File

@@ -110,6 +110,7 @@ var tower = angular.module('Tower', [
JobTemplates.name, JobTemplates.name,
portalMode.name, portalMode.name,
search.name, search.name,
AdminsList.name,
'ngToast', 'ngToast',
'templates', 'templates',
'Utilities', 'Utilities',

3
awx/ui/client/src/license/license.block.less
View File

@@ -61,6 +61,7 @@
} }
.License-field--content{ .License-field--content{
.OnePlusTwo-left--detailsContent; .OnePlusTwo-left--detailsContent;
text-transform: capitalize;
} }
.License-field{ .License-field{
.OnePlusTwo-left--detailsRow; .OnePlusTwo-left--detailsRow;
@@ -70,9 +71,11 @@
} }
.License-greenText{ .License-greenText{
color: @submit-button-bg; color: @submit-button-bg;
padding-right: 10px;
} }
.License-redText{ .License-redText{
color: @default-err; color: @default-err;
padding-right: 10px;
} }
.License-fields{ .License-fields{
.OnePlusTwo-left--details; .OnePlusTwo-left--details;

20
awx/ui/client/src/license/license.partial.html
View File

@@ -7,32 +7,32 @@
<div class="License-field"> <div class="License-field">
<div class="License-field--label">License</div> <div class="License-field--label">License</div>
<div class="License-field--content"> <div class="License-field--content">
<span ng-show='valid'><i class="fa fa-circle License-greenText"></i> Valid</span> <span ng-show='valid'><i class="fa fa-circle License-greenText"></i>Valid</span>
<span ng-show='invalid'><i class="fa fa-circle License-redText"></i> Invalid</span> <span ng-show='invalid'><i class="fa fa-circle License-redText"></i>Invalid</span>
</div> </div>
</div> </div>
<div class="License-field"> <div class="License-field">
<div class="License-field--label">Version</div> <div class="License-field--label">Version</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.version || "No result found"}} {{license.version}}
</div> </div>
</div> </div>
<div class="License-field"> <div class="License-field">
<div class="License-field--label">License Type</div> <div class="License-field--label">License Type</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.license_info.license_type || "No result found"}} {{license.license_info.license_type}}
</div> </div>
</div> </div>
<div class="License-field"> <div class="License-field">
<div class="License-field--label">Subscription</div> <div class="License-field--label">Subscription</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.license_info.subscription_name || "No result found"}} {{license.license_info.subscription_name}}
</div> </div>
</div> </div>
<div class="License-field"> <div class="License-field">
<div class="License-field--label">License Key</div> <div class="License-field--label">License Key</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.license_info.license_key || "No result found"}} {{license.license_info.license_key}}
</div> </div>
</div> </div>
<div class="License-field"> <div class="License-field">
@@ -50,24 +50,24 @@
<div class="License-field"> <div class="License-field">
<div class="License-field--label">Hosts Available</div> <div class="License-field--label">Hosts Available</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.license_info.available_instances || "No result found"}} {{license.license_info.available_instances}}
</div> </div>
</div> </div>
<div class="License-field"> <div class="License-field">
<div class="License-field--label">Hosts Used</div> <div class="License-field--label">Hosts Used</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.license_info.current_instances || "No result found"}} {{license.license_info.current_instances}}
</div> </div>
</div> </div>
<div class="License-field License-greenText"> <div class="License-field License-greenText">
<div class="License-field--label">Hosts Remaining</div> <div class="License-field--label">Hosts Remaining</div>
<div class="License-field--content"> <div class="License-field--content">
{{license.license_info.free_instances || "No result found"}} {{license.license_info.free_instances}}
</div> </div>
</div> </div>
</div> </div>
<div class="License-upgradeText">If you are ready to upgrade, please contact us by clicking the button below</div> <div class="License-upgradeText">If you are ready to upgrade, please contact us by clicking the button below</div>
<a href="https://www.ansible.com/renew" target="_blank"><button class="btn btn-default">Upgrade</button></a> <a href="https://www.ansible.com/renew" target="_blank"><button class="btn btn-primary">Upgrade</button></a>
</div> </div>
</div> </div>
<div class="License-management" ng-class="{'License-management--missingLicense' : licenseMissing}"> <div class="License-management" ng-class="{'License-management--missingLicense' : licenseMissing}">