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

embed license panel within settings pane

Browse Source
This commit is contained in:
John Mitchell
2018-04-04 16:43:32 -04:00
parent 4e6ce9af18
commit a0948b410e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy/styles/forms.less
View File

@@ -102,6 +102,10 @@
flex-wrap:wrap; flex-wrap:wrap;
} }
.Form-tabHolder--licenseSelected {
margin-bottom: -20px;
}
.Form-tabs { .Form-tabs {
flex: 1 0 auto; flex: 1 0 auto;
display: flex; display: flex;

9
awx/ui/client/src/configuration/configuration.partial.html
View File

@@ -5,13 +5,13 @@
</div> </div>
<div class="tab-pane" id="configuration-panel"> <div class="tab-pane" id="configuration-panel">
<div ng-cloak id="htmlTemplate" class="Panel" ng-class="{'Panel--noBottomPadding': vm.activeTab === 'license' }"> <div ng-cloak id="htmlTemplate" class="Panel">
<div class="Form-header"> <div class="Form-header">
<div class="Form-title" translate>CONFIGURE {{BRAND_NAME}}</div> <div class="Form-title Form-title--uppercase" translate>CONFIGURE {{BRAND_NAME}}</div>
</div> </div>
<div class="row Form-tabRow"> <div class="row Form-tabRow">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="Form-tabHolder"> <div class="Form-tabHolder"ng-class="{'Form-tabHolder--licenseSelected': vm.activeTab === 'license'}">
<div class="Form-tab" ng-click="vm.activeTabCheck('auth')" ng-class="{'is-selected': vm.activeTab === 'auth' }" translate>Authentication</div> <div class="Form-tab" ng-click="vm.activeTabCheck('auth')" ng-class="{'is-selected': vm.activeTab === 'auth' }" translate>Authentication</div>
<div class="Form-tab" ng-click="vm.activeTabCheck('jobs')" ng-class="{'is-selected': vm.activeTab === 'jobs' }" translate>Jobs</div> <div class="Form-tab" ng-click="vm.activeTabCheck('jobs')" ng-class="{'is-selected': vm.activeTab === 'jobs' }" translate>Jobs</div>
<div class="Form-tab" ng-click="vm.activeTabCheck('system')" ng-class="{'is-selected': vm.activeTab === 'system' }" translate>System</div> <div class="Form-tab" ng-click="vm.activeTabCheck('system')" ng-class="{'is-selected': vm.activeTab === 'system' }" translate>System</div>
@@ -24,8 +24,7 @@
<div ui-view="jobs" ng-show="vm.activeTab === 'jobs'"></div> <div ui-view="jobs" ng-show="vm.activeTab === 'jobs'"></div>
<div ui-view="system" ng-show="vm.activeTab === 'system'"></div> <div ui-view="system" ng-show="vm.activeTab === 'system'"></div>
<div ui-view="ui" ng-show="vm.activeTab === 'ui'"></div> <div ui-view="ui" ng-show="vm.activeTab === 'ui'"></div>
<div ui-view="license" ng-show="vm.product === 'Tower' && vm.activeTab === 'license'"></div>
<div id="FormModal-dialog"></div> <div id="FormModal-dialog"></div>
</div> </div>
</div> </div>
<div ui-view="license" ng-show="vm.product === 'Tower' && vm.activeTab === 'license'"></div>