External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 21:35:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

remove license input field and add ng-class to default text

Browse Source
This commit is contained in:
Leigh Johnson
2016-05-03 14:31:15 -04:00
committed by John Mitchell
parent dcd89aabfc
commit adb4703d45
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,9 @@
.License-field--label{ .License-field--label{
.OnePlusTwo-left--detailsLabel; .OnePlusTwo-left--detailsLabel;
} }
.License-fileName{
padding-left: 20px;
}
.License-management .CodeMirror-scroll{ .License-management .CodeMirror-scroll{
min-height: 140px; min-height: 140px;
} }

2
awx/ui/client/src/license/license.controller.js
View File

@@ -73,7 +73,7 @@ export default
return moment().add(days, 'days').calendar(); return moment().add(days, 'days').calendar();
}; };
var init = function(){ var init = function(){
$scope.fileName = "Please choose a file..."; $scope.fileName = "No file selected.";
$scope.title = $rootScope.licenseMissing ? "Tower License" : "License Management"; $scope.title = $rootScope.licenseMissing ? "Tower License" : "License Management";
Wait('start'); Wait('start');
CheckLicense.get() CheckLicense.get()

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

@@ -98,8 +98,8 @@
<form id="License-form" name="license"> <form id="License-form" name="license">
<div class="License-subTitleText prepend-asterisk"> License File</div> <div class="License-subTitleText prepend-asterisk"> License File</div>
<div class="input-group License-file--container"> <div class="input-group License-file--container">
<span class="btn btn-default input-group-addon" ng-click="fakeClick()">Browse...</span> <span class="btn btn-primary" ng-click="fakeClick()">Browse</span>
<input class="form-control License-input--fake" ng-disabled="true" placeholder="{{fileName}}" /> <span class="License-fileName" ng-class="{'License-helperText' : fileName == 'No file selected.'}">{{fileName}}</span>
<input id="License-file" class="form-control" type="file" file-on-change="getKey"/> <input id="License-file" class="form-control" type="file" file-on-change="getKey"/>
</div> </div>
<div class="License-subTitleText prepend-asterisk"> End User License Agreement</div> <div class="License-subTitleText prepend-asterisk"> End User License Agreement</div>