From a0948b410e8a8c52cd0ba15a0bb87c7ed27bee00 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Wed, 4 Apr 2018 16:43:32 -0400
Subject: [PATCH] embed license panel within settings pane

---
 awx/ui/client/legacy/styles/forms.less                   | 4 ++++
 .../client/src/configuration/configuration.partial.html  | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/legacy/styles/forms.less b/awx/ui/client/legacy/styles/forms.less
index 9cc5779d36..e3cfe1e765 100644
--- a/awx/ui/client/legacy/styles/forms.less
+++ b/awx/ui/client/legacy/styles/forms.less
@@ -102,6 +102,10 @@
     flex-wrap:wrap;
 }
 
+.Form-tabHolder--licenseSelected {
+    margin-bottom: -20px;
+}
+
 .Form-tabs {
     flex: 1 0 auto;
     display: flex;
diff --git a/awx/ui/client/src/configuration/configuration.partial.html b/awx/ui/client/src/configuration/configuration.partial.html
index a567e6bde2..c7f65fd05e 100644
--- a/awx/ui/client/src/configuration/configuration.partial.html
+++ b/awx/ui/client/src/configuration/configuration.partial.html
@@ -5,13 +5,13 @@
 </div>
 
 <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-title" translate>CONFIGURE {{BRAND_NAME}}</div>
+            <div class="Form-title Form-title--uppercase" translate>CONFIGURE {{BRAND_NAME}}</div>
         </div>
         <div class="row Form-tabRow">
             <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('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>
@@ -24,8 +24,7 @@
         <div ui-view="jobs" ng-show="vm.activeTab === 'jobs'"></div>
         <div ui-view="system" ng-show="vm.activeTab === 'system'"></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>
 </div>
-
-<div ui-view="license" ng-show="vm.product === 'Tower' && vm.activeTab === 'license'"></div>